diff options
| -rw-r--r-- | Mk/bsd.port.mk | 9 | ||||
| -rw-r--r-- | x11/gnome-menus/Makefile | 4 | ||||
| -rw-r--r-- | x11/libgnome/Makefile | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4fb187574..5cd85887f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1780,7 +1780,7 @@ LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv .endif .if defined(USE_GETTEXT) -. if ${USE_GETTEXT:L} == "yes" || ${USE_GETTEXT:L} == "auto-plist" +. if ${USE_GETTEXT:L} == "yes" || ${USE_GETTEXT:L} == "auto-rmdir" LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext . else LIB_DEPENDS+= intl.${USE_GETTEXT}:${PORTSDIR}/devel/gettext @@ -5436,13 +5436,12 @@ 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} == "auto-plist" +.if defined(USE_GETTEXT) && ${USE_GETTEXT} == "auto-rmdir" @${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 + | ${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} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${CUT} -d / -f ${a} | ${SORT} -r`; do \ + @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 \ diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 577314d9f..8ee98d21c 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.41 2006/11/07 07:54:51 marcus Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.42 2006/11/25 21:46:58 ahze Exp $ # PORTNAME= gnome-menus @@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the FreeDesktop Desktop Menu Spec -USE_GETTEXT= auto-plist +USE_GETTEXT= auto-rmdir USE_BZIP2= yes USE_XLIB= yes USE_GMAKE= yes diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index b776e8351..3f3194ed4 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.89 2006/11/25 16:14:15 ahze Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.90 2006/11/25 21:40:11 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= auto-plist +USE_GETTEXT= auto-rmdir USE_XPM= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack esound \ |