svn commit: r371003 - in head/lang: adacontrol asis gcc-aux gcc47-aux gnat_util gnatdroid-armv5 gnatdroid-armv7 gnatdroid-binutils gnatdroid-sysroot modula3
John Marino
marino at FreeBSD.org
Thu Oct 16 11:53:45 UTC 2014
Author: marino
Date: Thu Oct 16 11:53:42 2014
New Revision: 371003
URL: https://svnweb.freebsd.org/changeset/ports/371003
QAT: https://qat.redports.org/buildarchive/r371003/
Log:
Remove @dirrm from 10 of my lang ports
The majority of these ports had generated plists, not static ones.
Modified:
head/lang/adacontrol/pkg-plist
head/lang/asis/Makefile
head/lang/gcc-aux/Makefile
head/lang/gcc47-aux/Makefile
head/lang/gnat_util/Makefile
head/lang/gnatdroid-armv5/Makefile
head/lang/gnatdroid-armv7/Makefile
head/lang/gnatdroid-binutils/pkg-plist
head/lang/gnatdroid-sysroot/Makefile
head/lang/modula3/Makefile
Modified: head/lang/adacontrol/pkg-plist
==============================================================================
--- head/lang/adacontrol/pkg-plist Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/adacontrol/pkg-plist Thu Oct 16 11:53:42 2014 (r371003)
@@ -10,8 +10,3 @@ share/gps/plug-ins/adactl_ask.gif
share/gps/plug-ins/pfni.py
share/gps/plug-ins/pfni.xml
share/gps/plug-ins/zadactl.xml
- at dirrmtry share/doc/gps/html
- at dirrmtry share/doc/gps
- at dirrmtry share/gprconfig
- at dirrmtry share/gps/plug-ins
- at dirrmtry share/gps
Modified: head/lang/asis/Makefile
==============================================================================
--- head/lang/asis/Makefile Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/asis/Makefile Thu Oct 16 11:53:42 2014 (r371003)
@@ -33,16 +33,10 @@ post-extract:
do-build:
# This target is recreated because -j cannot be set, but
# MAKE_JOBS_SAFE=yes is needed for PROCESSORS value
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_ARGS} all
+ (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all)
post-install:
- @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
- ${SORT} >> ${TMPPLIST}
- @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | \
- ${SORT} -r | ${SED} -e '/lib\/gnat$$/d' -e '/share\/doc$$/d' \
- -e '/share\/gps$$/d' -e '/share\/gps\/plug-ins$$/d' \
- -e 's/^/@dirrm /g' >> ${TMPPLIST}
- @echo "@unexec rmdir %D/share/gps/plug-ins 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/share/gps 2>/dev/null || true" >> ${TMPPLIST}
+ @(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
+ ${SORT} >> ${TMPPLIST})
.include <bsd.port.mk>
Modified: head/lang/gcc-aux/Makefile
==============================================================================
--- head/lang/gcc-aux/Makefile Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/gcc-aux/Makefile Thu Oct 16 11:53:42 2014 (r371003)
@@ -269,16 +269,11 @@ do-install:
${STAGEDIR}${PREFIX}/share/dejagnu/baseboards
post-stage:
- cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
- ${SORT} -dr | ${XARGS} ${RMDIR}
- cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} share \
- \( -type f -or -type l \) | ${SORT} | \
- ${SED} -e 's/\/man\/man[1578]\/.*[1578]$$/&.gz/' >> ${TMPPLIST}
- cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} -type d | ${SORT} -r | \
- ${SED} -e 's/^/@dirrm /g' >> ${TMPPLIST}
- cd ${STAGEDIR}${PREFIX}; ${FIND} share -type d | ${SORT} -r | \
- ${SED} -e 's/\(.*\)/@unexec rmdir %D\/\1 2>\/dev\/null || true/g' \
- >> ${TMPPLIST}
+ (cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
+ ${SORT} -dr | ${XARGS} ${RMDIR})
+ (cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} share \
+ \( -type f -or -type l \) | ${SORT} | ${SED} \
+ -e 's/\/man\/man[1578]\/.*[1578]$$/&.gz/' >> ${TMPPLIST})
.if ${PORT_OPTIONS:MBOOTSTRAP}
${MKDIR} ${NEWBSDIR}
${CP} -a ${STAGEDIR}${PKG_PREFIX}/bin ${NEWBSDIR}/
Modified: head/lang/gcc47-aux/Makefile
==============================================================================
--- head/lang/gcc47-aux/Makefile Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/gcc47-aux/Makefile Thu Oct 16 11:53:42 2014 (r371003)
@@ -291,15 +291,15 @@ test-c:
.endif
do-install:
- cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} ${MAKE_CMD} install-strip DESTDIR=${STAGEDIR}
+ (cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
+ ${MAKE_CMD} install-strip DESTDIR=${STAGEDIR})
post-stage:
${MV} ${STAGEDIR}${PKG_PREFIX}/share/man ${STAGEDIR}/${PKG_PREFIX}
- cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
- ${SORT} -dr | ${XARGS} ${RMDIR}
- cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} \( -type f -or -type l \) | \
- ${AWK} ${AWKMANPAGE} | ${SORT} >> ${TMPPLIST}
- cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} -type d | ${SORT} -r | \
- ${SED} -E -e 's/^/@dirrm /g' >> ${TMPPLIST}
+ (cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
+ ${SORT} -dr | ${XARGS} ${RMDIR})
+ (cd ${STAGEDIR}${PREFIX}; \
+ ${FIND} ${PORTNAME} \( -type f -or -type l \) | \
+ ${AWK} ${AWKMANPAGE} | ${SORT} >> ${TMPPLIST})
.include <bsd.port.mk>
Modified: head/lang/gnat_util/Makefile
==============================================================================
--- head/lang/gnat_util/Makefile Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/gnat_util/Makefile Thu Oct 16 11:53:42 2014 (r371003)
@@ -38,11 +38,7 @@ post-install:
# impunit is needed for GPS menus, just provide the source files
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/gcc/ada/impunit.* \
${STAGEDIR}${PREFIX}/include/gnat_util
- @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
- ${SORT} >> ${TMPPLIST}
- @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | \
- ${SORT} -r | ${SED} -e '/lib\/gnat$$/d' -e 's/^/@dirrm /g' \
- >> ${TMPPLIST}
- @echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${TMPPLIST}
+ @(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
+ ${SORT} >> ${TMPPLIST})
.include <bsd.port.mk>
Modified: head/lang/gnatdroid-armv5/Makefile
==============================================================================
--- head/lang/gnatdroid-armv5/Makefile Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/gnatdroid-armv5/Makefile Thu Oct 16 11:53:42 2014 (r371003)
@@ -114,8 +114,8 @@ post-extract:
do-configure:
${MKDIR} ${BUILD_WRKSRC}
- cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
- ${CFG_SCRIPT} ${ADA_CONFIG_ARGS}
+ (cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ ${CFG_SCRIPT} ${ADA_CONFIG_ARGS})
do-install:
# Buggy makefile; seems to have forgotten this is a cross compiler
@@ -125,26 +125,24 @@ do-install:
${CP} -a ${BUILD_WRKSRC}/gcc/${X}-cross ${BUILD_WRKSRC}/gcc/${X}
. endif
.endfor
- cd ${BUILD_WRKSRC} && ${SETENV} ${INSTALL_ENV} \
- ${MAKE_CMD} install-strip DESTDIR=${STAGEDIR}
+ (cd ${BUILD_WRKSRC} && ${SETENV} ${INSTALL_ENV} \
+ ${MAKE_CMD} install-strip DESTDIR=${STAGEDIR})
${MV} ${STAGEDIR}${PREFIX}/bin/ada \
${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-ada
post-install:
.for loop in A B
- cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty | \
- ${SORT} -dr | ${XARGS} ${RMDIR}
+ (cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty | \
+ ${SORT} -dr | ${XARGS} ${RMDIR})
.endfor
- cd ${STAGEDIR}${PREFIX}; \
- ${FIND} * \( -type f -or -type l \) | ${SORT} | \
- ${SED} -e '/^bin\//d' -e '/^${DROID_TARGET}\/bin\//d' \
- >> ${TMPPLIST}
- cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${SORT} -dr | \
- ${SED} -e 's/^/@dirrmtry /g' >> ${TMPPLIST}
+ (cd ${STAGEDIR}${PREFIX}; \
+ ${FIND} * \( -type f -or -type l \) | ${SORT} | \
+ ${SED} -e '/^bin\//d' -e '/^${DROID_TARGET}\/bin\//d' \
+ >> ${TMPPLIST})
acats: build
- cd ${BUILD_WRKSRC}/gcc && ${SETENV} \
- PATH=${LOCALBASE}/gcc-aux/bin:${PATH}:${PREFIX}/bin \
- gmake -sk check-acats
+ (cd ${BUILD_WRKSRC}/gcc && ${SETENV} \
+ PATH=${LOCALBASE}/gcc-aux/bin:${PATH}:${PREFIX}/bin \
+ ${GMAKE} -sk check-acats)
.include <bsd.port.mk>
Modified: head/lang/gnatdroid-armv7/Makefile
==============================================================================
--- head/lang/gnatdroid-armv7/Makefile Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/gnatdroid-armv7/Makefile Thu Oct 16 11:53:42 2014 (r371003)
@@ -114,8 +114,8 @@ post-extract:
do-configure:
${MKDIR} ${BUILD_WRKSRC}
- cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
- ${CFG_SCRIPT} ${ADA_CONFIG_ARGS}
+ (cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+ ${CFG_SCRIPT} ${ADA_CONFIG_ARGS})
do-install:
# Buggy makefile; seems to have forgotten this is a cross compiler
@@ -125,31 +125,29 @@ do-install:
${CP} -a ${BUILD_WRKSRC}/gcc/${X}-cross ${BUILD_WRKSRC}/gcc/${X}
. endif
.endfor
- cd ${BUILD_WRKSRC} && ${SETENV} ${INSTALL_ENV} \
- ${MAKE_CMD} install-strip DESTDIR=${STAGEDIR}
+ (cd ${BUILD_WRKSRC} && ${SETENV} ${INSTALL_ENV} \
+ ${MAKE_CMD} install-strip DESTDIR=${STAGEDIR})
${MV} ${STAGEDIR}${PREFIX}/bin/ada \
${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-ada
post-stage:
.for loop in A B
- cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty | \
- ${SORT} -dr | ${XARGS} ${RMDIR}
+ (cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty | \
+ ${SORT} -dr | ${XARGS} ${RMDIR})
.endfor
- cd ${STAGEDIR}${PREFIX}; \
- ${FIND} * \( -type f -or -type l \) | ${SORT} | \
- ${SED} -e '/^bin\//d' -e '/^${DROID_TARGET}\/bin\//d' \
- >> ${TMPPLIST}
- cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${SORT} -dr | \
- ${SED} -e 's/^/@dirrmtry /g' >> ${TMPPLIST}
+ (cd ${STAGEDIR}${PREFIX}; \
+ ${FIND} * \( -type f -or -type l \) | ${SORT} | \
+ ${SED} -e '/^bin\//d' -e '/^${DROID_TARGET}\/bin\//d' \
+ >> ${TMPPLIST})
acats: build
- cd ${BUILD_WRKSRC}/gcc && ${SETENV} \
- PATH=${LOCALBASE}/gcc-aux/bin:${PATH}:${PREFIX}/bin \
- gmake -sk check-acats
+ (cd ${BUILD_WRKSRC}/gcc && ${SETENV} \
+ PATH=${LOCALBASE}/gcc-aux/bin:${PATH}:${PREFIX}/bin \
+ ${GMAKE} -sk check-acats)
gnatdg: build
- cd ${BUILD_WRKSRC}/gcc && ${SETENV} \
- PATH=${LOCALBASE}/gcc-aux/bin:${PATH}:${PREFIX}/bin \
- gmake -sk check-gnat RUNTESTFLAGS=--target_board=gnatdroid
-
+ (cd ${BUILD_WRKSRC}/gcc && ${SETENV} \
+ PATH=${LOCALBASE}/gcc-aux/bin:${PATH}:${PREFIX}/bin \
+ ${GMAKE} -sk check-gnat RUNTESTFLAGS=--target_board=gnatdroid)
+
.include <bsd.port.mk>
Modified: head/lang/gnatdroid-binutils/pkg-plist
==============================================================================
--- head/lang/gnatdroid-binutils/pkg-plist Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/gnatdroid-binutils/pkg-plist Thu Oct 16 11:53:42 2014 (r371003)
@@ -49,12 +49,6 @@
%%BRANCH1%%/bin/%%TARGET%%-size
%%BRANCH1%%/bin/%%TARGET%%-strings
%%BRANCH1%%/bin/%%TARGET%%-strip
- at dirrm %%BRANCH1%%/%%TARGET%%/bin
- at dirrm %%BRANCH1%%/%%TARGET%%/lib/ldscripts
- at dirrm %%BRANCH1%%/%%TARGET%%/lib
- at dirrm %%BRANCH1%%/%%TARGET%%
- at dirrm %%BRANCH1%%/bin
- at dirrm %%BRANCH1%%
%%BRANCH2%%/%%TARGET%%/bin/ar
%%BRANCH2%%/%%TARGET%%/bin/as
%%BRANCH2%%/%%TARGET%%/bin/ld
@@ -106,9 +100,3 @@
%%BRANCH2%%/bin/%%TARGET%%-size
%%BRANCH2%%/bin/%%TARGET%%-strings
%%BRANCH2%%/bin/%%TARGET%%-strip
- at dirrm %%BRANCH2%%/%%TARGET%%/bin
- at dirrm %%BRANCH2%%/%%TARGET%%/lib/ldscripts
- at dirrm %%BRANCH2%%/%%TARGET%%/lib
- at dirrm %%BRANCH2%%/%%TARGET%%
- at dirrm %%BRANCH2%%/bin
- at dirrm %%BRANCH2%%
Modified: head/lang/gnatdroid-sysroot/Makefile
==============================================================================
--- head/lang/gnatdroid-sysroot/Makefile Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/gnatdroid-sysroot/Makefile Thu Oct 16 11:53:42 2014 (r371003)
@@ -57,8 +57,6 @@ do-install:
post-install:
@(cd ${STAGEDIR}${PREFIX}; ${FIND} usr \( -type f -or -type l \) | \
- ${SORT} >> ${TMPPLIST})
- @(cd ${STAGEDIR}${PREFIX}; ${FIND} usr -type d | ${SORT} -r | \
- ${SED} -e 's/^/@dirrm /g' >> ${TMPPLIST})
+ ${SORT} >> ${TMPPLIST})
.include <bsd.port.mk>
Modified: head/lang/modula3/Makefile
==============================================================================
--- head/lang/modula3/Makefile Thu Oct 16 11:21:24 2014 (r371002)
+++ head/lang/modula3/Makefile Thu Oct 16 11:53:42 2014 (r371003)
@@ -144,23 +144,6 @@ post-install:
${SORT} | ${SED} -e 's/^man\/man[1578]\/.*[1578]$$/&.gz/' \
> ${TMPPLIST}
@echo ${PLIST_FILES} | awk '{print $$1}' RS=' ' >> ${TMPPLIST}
- cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${SORT} -r | \
- ${SED} -e '/^bin$$/d' -e '/^lib$$/d' -e '/^pkg$$/d' \
- -e '/^share\/examples$$/d' -e '/^share\/doc$$/d' -e '/^share$$/d' \
- -e '/^etc$$/d' -e '/^man\/man[1578]$$/d' -e '/^man$$/d' \
- -e 's/^/@dirrm /g' >> ${TMPPLIST}
- @echo "@unexec rmdir %D/share/doc 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/share/examples 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/share 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/bin 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/etc 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/lib 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/man/man8 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/man/man7 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/man/man5 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/man/man1 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/man 2>/dev/null || true" >> ${TMPPLIST}
- @echo "@unexec rmdir %D/pkg 2>/dev/null || true" >> ${TMPPLIST}
# to create a new bootstrap, invoke "make stage NEW_BOOTSTRAP=1"
.if defined(NEW_BOOTSTRAP)
More information about the svn-ports-all
mailing list