svn commit: r370993 - in head/devel: adabooch adacurses afay ahven alog florist-gpl gnatcoll gprbuild gps libspark2012 pcsc-ada sdl_gnat

John Marino marino at FreeBSD.org
Thu Oct 16 10:36:19 UTC 2014


Author: marino
Date: Thu Oct 16 10:36:14 2014
New Revision: 370993
URL: https://svnweb.freebsd.org/changeset/ports/370993
QAT: https://qat.redports.org/buildarchive/r370993/

Log:
  marino 12 devel ports: Remove @dirrm, tend install commands, plus
  
  The main purpose of this commit is to remove @dirrm from the pkg-plist of
  some of my ports in devel category.  While here, also:
    * Unmask some commands
    * Use parenthesis on compound commands for multi-job support
    * Add a license in one case
    * USES=python conversion in one case
    * Add WWW and reformat description in one case
    * Respect 80-columns

Modified:
  head/devel/adabooch/pkg-plist
  head/devel/adacurses/Makefile
  head/devel/adacurses/pkg-plist
  head/devel/afay/Makefile
  head/devel/afay/pkg-descr
  head/devel/afay/pkg-plist
  head/devel/ahven/Makefile
  head/devel/ahven/pkg-plist
  head/devel/alog/pkg-plist
  head/devel/florist-gpl/pkg-plist
  head/devel/gnatcoll/pkg-plist
  head/devel/gprbuild/Makefile
  head/devel/gprbuild/pkg-plist
  head/devel/gps/Makefile
  head/devel/libspark2012/pkg-plist
  head/devel/pcsc-ada/pkg-plist
  head/devel/sdl_gnat/pkg-plist

Modified: head/devel/adabooch/pkg-plist
==============================================================================
--- head/devel/adabooch/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/adabooch/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -583,9 +583,3 @@ lib/gnat/bc.gpr
 %%PORTDOCS%%share/doc/adabooch/overview.html
 %%PORTDOCS%%share/doc/adabooch/release.html
 %%PORTDOCS%%share/doc/adabooch/x.ada
-%%PORTDOCS%%@dirrm share/doc/adabooch
- at dirrmtry lib/gnat
- at dirrm lib/bc/lib-static
- at dirrm lib/bc/lib-relocatable
- at dirrm lib/bc
- at dirrm include/bc

Modified: head/devel/adacurses/Makefile
==============================================================================
--- head/devel/adacurses/Makefile	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/adacurses/Makefile	Thu Oct 16 10:36:14 2014	(r370993)
@@ -34,10 +34,10 @@ post-install:
 	${SED} "s|@PREFIX@|${PREFIX}|g" ${FILESDIR}/adacurses.gpr.in > \
 		${STAGEDIR}${PREFIX}/lib/gnat/adacurses.gpr
 .if ${PORT_OPTIONS:MDOCS}
-	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \
+	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} install.html)
 .else
-	@${RM} ${STAGEDIR}${PREFIX}/man/man1/adacurses-config.1
+	${RM} ${STAGEDIR}${PREFIX}/man/man1/adacurses-config.1
 .endif
 
 .include <bsd.port.mk>

Modified: head/devel/adacurses/pkg-plist
==============================================================================
--- head/devel/adacurses/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/adacurses/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -209,10 +209,3 @@ lib/gnat/adacurses.gpr
 %%PORTDOCS%%share/doc/AdaCurses/ada/terminal_interface-curses__adb.htm
 %%PORTDOCS%%share/doc/AdaCurses/ada/terminal_interface-curses__ads.htm
 %%PORTDOCS%%share/doc/AdaCurses/ada/terminal_interface__ads.htm
-%%PORTDOCS%%@dirrmtry share/doc/AdaCurses/ada/funcs
-%%PORTDOCS%%@dirrmtry share/doc/AdaCurses/ada/files
-%%PORTDOCS%%@dirrmtry share/doc/AdaCurses/ada
-%%PORTDOCS%%@dirrmtry share/doc/AdaCurses
- at dirrmtry lib/adacurses
- at dirrmtry lib/gnat
- at dirrmtry include/adacurses

Modified: head/devel/afay/Makefile
==============================================================================
--- head/devel/afay/Makefile	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/afay/Makefile	Thu Oct 16 10:36:14 2014	(r370993)
@@ -6,11 +6,16 @@ PORTVERSION=	041111
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://thiberlog.free.fr/src/
-DISTNAME=	${PORTNAME}_thiberlog_${PORTVERSION}
+DISTNAME=	afay_thiberlog_${PORTVERSION}
 
 MAINTAINER=	marino at FreeBSD.org
 COMMENT=	Improved aflex and ayacc Ada 95 scanner and parser generators
 
+LICENSE=	aflex
+LICENSE_NAME=	Arcadia-UC-Irvine
+LICENSE_FILE=	${WRKSRC}/afay/aflex/README
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USES=		ada tar:tgz
@@ -21,16 +26,18 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 .include <bsd.port.options.mk>
 
 do-build:
-	@cd ${WRKSRC}/afay/aflex/src/gnat_unix && \
-		${SETENV} ${MAKE_ENV} ${SH} ./README
-	@cd ${WRKSRC}/afay/ayacc/src/gnat_unix && \
-		${SETENV} ${MAKE_ENV} ${SH} ./README
+	@(cd ${WRKSRC}/afay/aflex/src/gnat_unix && \
+		${SETENV} ${MAKE_ENV} ${SH} ./README)
+	@(cd ${WRKSRC}/afay/ayacc/src/gnat_unix && \
+		${SETENV} ${MAKE_ENV} ${SH} ./README)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/afay/aflex/src/aflex ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/afay/ayacc/src/ayacc ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.man ${STAGEDIR}${PREFIX}/man/man1/aflex.1
-	${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/old_docs/ayacc.manpage ${STAGEDIR}${PREFIX}/man/man1/ayacc.1
+	${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.man \
+		${STAGEDIR}${PREFIX}/man/man1/aflex.1
+	${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/old_docs/ayacc.manpage \
+		${STAGEDIR}${PREFIX}/man/man1/ayacc.1
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/READ_ME \

Modified: head/devel/afay/pkg-descr
==============================================================================
--- head/devel/afay/pkg-descr	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/afay/pkg-descr	Thu Oct 16 10:36:14 2014	(r370993)
@@ -1,5 +1,7 @@
-A modified version of Aflex/Ayacc for Ada95 parent/child feature support. A new
-directive "%unit A.B.C" is added, enabling the Ada unit A.B.C to be the parent
-of the generated lexer/parser.
+This is a modified version of Aflex/Ayacc for Ada95 parent/child feature
+support.  A new directive "%unit A.B.C" has been added, enabling the Ada
+unit A.B.C to be the parent of the generated lexer/parser.
 
 Aflex/Ayacc are copyrighted by the The University of California.
+
+WWW: http://thiberlog.free.fr

Modified: head/devel/afay/pkg-plist
==============================================================================
--- head/devel/afay/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/afay/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -22,7 +22,3 @@ man/man1/ayacc.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc/driver.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.l
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test95.l
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ada_parser
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/calc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Modified: head/devel/ahven/Makefile
==============================================================================
--- head/devel/ahven/Makefile	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/ahven/Makefile	Thu Oct 16 10:36:14 2014	(r370993)
@@ -28,7 +28,7 @@ TRACE_DESC=	Build with GNAT-specific sym
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-USE_PYTHON=	yes
+USES+=		python:build
 BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
 		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:${PORTSDIR}/textproc/py-sphinxcontrib-adadomain
 ALL_TARGET+=	docs
@@ -39,7 +39,7 @@ EXTRA_PATCHES=	${FILESDIR}/extra-src_ahv
 .endif
 
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/ahven/html/_sources
-	@${RM} ${STAGEDIR}${PREFIX}/share/doc/ahven/html/.buildinfo
+	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/ahven/html/_sources
+	${RM} ${STAGEDIR}${PREFIX}/share/doc/ahven/html/.buildinfo
 
 .include <bsd.port.mk>

Modified: head/devel/ahven/pkg-plist
==============================================================================
--- head/devel/ahven/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/ahven/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -82,10 +82,3 @@ lib/gnat/ahven.gpr
 %%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
 %%PORTDOCS%%%%DOCSDIR%%/html/search.html
 %%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
- at dirrm include/ahven
- at dirrm lib/ahven
- at dirrmtry lib/gnat
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/_static
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrmtry share/doc

Modified: head/devel/alog/pkg-plist
==============================================================================
--- head/devel/alog/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/alog/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -155,11 +155,3 @@ lib/gnat/alog.gpr
 %%PORTDOCS%%%%DOCSDIR%%/html/api/tree.html
 %%PORTDOCS%%%%DOCSDIR%%/html/asciidoc.css
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html/api/support/images
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html/api/support
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html/api
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
- at dirrmtry lib/gnat
- at dirrm lib/alog
- at dirrm include/alog

Modified: head/devel/florist-gpl/pkg-plist
==============================================================================
--- head/devel/florist-gpl/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/florist-gpl/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -194,6 +194,3 @@ lib/florist/posix_timers.ali
 lib/florist/posix_unsafe_process_primitives.ali
 lib/florist/posix_user_database.ali
 lib/gnat/florist.gpr
- at dirrm include/florist
- at dirrm lib/florist
- at dirrmtry lib/gnat

Modified: head/devel/gnatcoll/pkg-plist
==============================================================================
--- head/devel/gnatcoll/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/gnatcoll/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -300,8 +300,3 @@ lib/gnatcoll/static/libgnatcoll_python.a
 lib/gnatcoll/static/libgnatcoll_readline.a
 lib/gnatcoll/static/libgnatcoll_sqlite.a
 %%DATADIR%%/dborm.py
- at dirrm include/gnatcoll
- at dirrm lib/gnat/gnatcoll
- at dirrm lib/gnatcoll/static
- at dirrm lib/gnatcoll
- at dirrm %%DATADIR%%

Modified: head/devel/gprbuild/Makefile
==============================================================================
--- head/devel/gprbuild/Makefile	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/gprbuild/Makefile	Thu Oct 16 10:36:14 2014	(r370993)
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 do-build:
 #	Recreate the do-build target without -j parameter
 #	It interferes with PROCESSORS make argument
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET})
 
 post-patch:
@@ -49,7 +49,7 @@ post-install:
 .if !${PORT_OPTIONS:MEXAMPLES}
 	${RM} -rf ${STAGEDIR}${EXAMPLESDIR}
 .endif
-	cd ${STAGEDIR}${PREFIX}; ${FIND} share/examples -type d -empty | \
-	  ${SORT} -dr | ${XARGS} ${RMDIR}
+	(cd ${STAGEDIR}${PREFIX} && ${FIND} share/examples -type d -empty | \
+	  ${SORT} -dr | ${XARGS} ${RMDIR})
 
 .include <bsd.port.mk>

Modified: head/devel/gprbuild/pkg-plist
==============================================================================
--- head/devel/gprbuild/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/gprbuild/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -19,6 +19,3 @@ share/gprconfig/linker.xml
 share/gprconfig/nocompiler.xml
 share/gprconfig/targetset.xml
 share/gprconfig/windres.xml
- at dirrm libexec/gprbuild
- at dirrmtry share/gpr
- at dirrmtry share/gprconfig

Modified: head/devel/gps/Makefile
==============================================================================
--- head/devel/gps/Makefile	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/gps/Makefile	Thu Oct 16 10:36:14 2014	(r370993)
@@ -122,14 +122,9 @@ post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/tutorial/_sources
 	echo "This is the GPS GPL Edition for the FreeBSD Ports Collection." \
 		> ${STAGEDIR}${PREFIX}/share/gps/about.txt
-	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty -print | ${XARGS} ${RMDIR}
-	@cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
-	   ${SORT} >> ${TMPPLIST}
-	@cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
-	   ${SED} -e '/share\/doc$$/d' -e '/share\/gps$$/d' \
-	   -e '/share\/gps\/plug-ins$$/d' -e '/share\/examples$$/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 d -empty -print | ${XARGS} ${RMDIR})
+	@(cd ${STAGEDIR}${PREFIX} ; \
+		${FIND} * \( -type f -or -type l \) | ${SORT} >> ${TMPPLIST})
 
 .include <bsd.port.mk>

Modified: head/devel/libspark2012/pkg-plist
==============================================================================
--- head/devel/libspark2012/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/libspark2012/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -51,6 +51,3 @@ lib/spark2012/spark-crypto-hash.ali
 lib/spark2012/spark-crypto.ali
 lib/spark2012/spark-unsigned.ali
 lib/spark2012/spark.ali
- at dirrm lib/spark2012
- at dirrmtry lib/gnat
- at dirrm include/spark2012

Modified: head/devel/pcsc-ada/pkg-plist
==============================================================================
--- head/devel/pcsc-ada/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/pcsc-ada/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -26,8 +26,3 @@ lib/pcscada/pcsc.ali
 %%PORTDOCS%%%%DOCSDIR%%/html/README.html
 %%PORTDOCS%%%%DOCSDIR%%/html/asciidoc.css
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
- at dirrm lib/pcscada
- at dirrmtry lib/gnat
- at dirrm include/pcscada

Modified: head/devel/sdl_gnat/pkg-plist
==============================================================================
--- head/devel/sdl_gnat/pkg-plist	Thu Oct 16 10:34:50 2014	(r370992)
+++ head/devel/sdl_gnat/pkg-plist	Thu Oct 16 10:36:14 2014	(r370993)
@@ -70,6 +70,3 @@ lib/gnat_sdl/stdlib_h.ali
 lib/gnat_sdl/umingw_h.ali
 lib/gnat_sdl/umingw_off_t_h.ali
 lib/gnat_sdl/vadefs_h.ali
- at dirrm lib/gnat_sdl
- at dirrmtry lib/gnat
- at dirrm include/gnat_sdl


More information about the svn-ports-all mailing list