diff options
| -rw-r--r-- | Mk/bsd.port.mk | 16 | ||||
| -rw-r--r-- | x11/libgnome/Makefile | 4 |
2 files changed, 11 insertions, 9 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 801367388..31499c221 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.544 2006/09/30 19:25:45 linimon Exp $ +# $FreeBSD$ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -1780,9 +1780,7 @@ LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv .endif .if defined(USE_GETTEXT) -. if ${USE_GETTEXT:L} == "find-dirs" -LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext -. elif ${USE_GETTEXT:L} == "yes" +. if ${USE_GETTEXT:L} == "yes" || ${USE_GETTEXT:L} == "auto-plist" LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext . else LIB_DEPENDS+= intl.${USE_GETTEXT}:${PORTSDIR}/devel/gettext @@ -5438,10 +5436,14 @@ generate-plist: .for dir in ${PLIST_DIRS} @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${SED} -e 's,^,@dirrm ,' >> ${TMPPLIST} .endfor -.if defined(USE_GETTEXT) && ${USE_GETTEXT} == "find-dirs" +.if defined(USE_GETTEXT) && ${USE_GETTEXT} == "auto-plist" + @${MKDIR} ${WRKDIR}/emptydir + @> ${WKRDIR}/.locale.mtree + @${MTREE_CMD} -f ${MTREE_FILE} -L -p ${WRKDIR}/emptydir | ${GREP} "share/locale/.*/LC_MESSAGES" \ + | ${SED} -e 's|./||; s| missing||' >> ${WRKDIR}/.locale.mtree . for a in 1-4 1-3 - for i in `${GREP} "^share/locale/.*/LC_MESSAGES/.*\.mo" ${TMPPLIST} | ${CUT} -d / -f ${a} | ${SORT} -r`; do \ - if [ "/$${i}/" != "`${MKDIR} ${WRKDIR}/emptydir && ${MTREE_CMD} -f ${MTREE_FILE} -L -p ${WRKDIR}/emptydir|${GREP} "share/locale/.*/LC_MESSAGES" | ${SED} -e 's|./||; s| missing||' | ${GREP} -o "/$${i}/"`" ]; then \ + for i in `${GREP} "^share/locale/.*/LC_MESSAGES/.*\.mo" ${TMPPLIST} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${CUT} -d / -f ${a} | ${SORT} -r`; do \ + if [ "/$${i}/" != "`${GREP} -o "/$${i}/" ${WRKDIR}/.locale.mtree`" ]; then \ ${ECHO_CMD} "@unexec rmdir %D/$${i} 2>/dev/null || true" >> ${TMPPLIST} ; \ fi \ done diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 8b0c81445..b776e8351 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,7 +3,7 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/x11/libgnome/Makefile,v 1.88 2006/11/08 05:55:21 marcus Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.89 2006/11/25 16:14:15 ahze Exp $ # PORTNAME= libgnome @@ -24,7 +24,7 @@ USE_BZIP2= yes BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper -USE_GETTEXT= find-dirs +USE_GETTEXT= auto-plist USE_XPM= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack esound \ |