Date: Sat, 25 Jan 2014 22:03:15 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341120 - in head/textproc: add-css-links aft aiksaurus aiksaurus-gtk align ansifilter ant-xinclude-task antiword apache-solr apache-solr3 archmage artha augeas Message-ID: <201401252203.s0PM3F5L030753@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Sat Jan 25 22:03:15 2014 New Revision: 341120 URL: http://svnweb.freebsd.org/changeset/ports/341120 QAT: https://qat.redports.org/buildarchive/r341120/ Log: - Convert to staging - Add license - Convert to options helpers Sponsored by: Absolight Deleted: head/textproc/add-css-links/pkg-plist Modified: head/textproc/add-css-links/Makefile head/textproc/aft/Makefile head/textproc/aft/pkg-plist head/textproc/aiksaurus-gtk/Makefile head/textproc/aiksaurus/Makefile head/textproc/align/Makefile head/textproc/ansifilter/Makefile head/textproc/ant-xinclude-task/Makefile head/textproc/antiword/Makefile head/textproc/antiword/pkg-plist head/textproc/apache-solr/Makefile head/textproc/apache-solr3/Makefile head/textproc/apache-solr3/pkg-descr head/textproc/archmage/Makefile head/textproc/archmage/pkg-plist head/textproc/artha/Makefile head/textproc/artha/pkg-plist head/textproc/augeas/Makefile head/textproc/augeas/pkg-plist Modified: head/textproc/add-css-links/Makefile ============================================================================== --- head/textproc/add-css-links/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/add-css-links/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -11,11 +11,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Add one or more CSS <link> elements to an XHTML document NO_BUILD= yes +WRKSRC= ${WRKDIR}/xhtml + +PLIST_FILES= share/xsl/xhtml/add-css-links.xsl +PLIST_DIRSTRY= share/xsl/xhtml share/xsl -NO_STAGE= yes do-install: - @${ECHO} "Installing in ${PREFIX}/share/xsl/xhtml/" - @${MKDIR} ${PREFIX}/share/xsl/xhtml - @${CP} ${WRKDIR}/xhtml/*.xsl ${PREFIX}/share/xsl/xhtml/ + @${MKDIR} ${STAGEDIR}${PREFIX}/share/xsl/xhtml + ${CP} ${WRKSRC}/*.xsl ${STAGEDIR}${PREFIX}/share/xsl/xhtml/ .include <bsd.port.mk> Modified: head/textproc/aft/Makefile ============================================================================== --- head/textproc/aft/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/aft/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -10,13 +10,16 @@ MASTER_SITES= http://www.maplefish.com/t MAINTAINER= culot@FreeBSD.org COMMENT= A document preparation system using an Almost Free Text input format -USES= perl5 -USE_GMAKE= yes +LICENSE= CART +LICENSE_GROUPS= FSF OSI +LICENSE_NAME= Clarified Artistic License +LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_PERMS= auto-accept + +USES= perl5 gmake GNU_CONFIGURE= yes +OPTIONS_DEFINE= DOCS -.if defined(NOPORTDOCS) -INSTALL_TARGET= install-binSCRIPTS install-pkgdataDATA install-pkgdataSCRIPTS -.endif +PORTDOCS= * -NO_STAGE= yes .include <bsd.port.mk> Modified: head/textproc/aft/pkg-plist ============================================================================== --- head/textproc/aft/pkg-plist Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/aft/pkg-plist Sat Jan 25 22:03:15 2014 (r341120) @@ -13,25 +13,4 @@ bin/aft %%DATADIR%%/compile.pl %%DATADIR%%/launch_ie.pl %%DATADIR%%/postrtf.pl -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.aft -%%PORTDOCS%%%%DOCSDIR%%/aft-refman.html -%%PORTDOCS%%%%DOCSDIR%%/aft.eps -%%PORTDOCS%%%%DOCSDIR%%/aft.gif -%%PORTDOCS%%%%DOCSDIR%%/aft.jpg -%%PORTDOCS%%%%DOCSDIR%%/aft2rtf-doc.rtf -%%PORTDOCS%%%%DOCSDIR%%/backends/aft-bn-html.dat -%%PORTDOCS%%%%DOCSDIR%%/backends/aft-dbarticle.dat -%%PORTDOCS%%%%DOCSDIR%%/backends/aft-html.dat -%%PORTDOCS%%%%DOCSDIR%%/backends/aft-lout.dat -%%PORTDOCS%%%%DOCSDIR%%/backends/aft-loutbook.dat -%%PORTDOCS%%%%DOCSDIR%%/backends/aft-loutreport.dat -%%PORTDOCS%%%%DOCSDIR%%/backends/aft-rtf.dat -%%PORTDOCS%%%%DOCSDIR%%/backends/aft-tex.dat -%%PORTDOCS%%%%DOCSDIR%%/backends/aft-xhtml.dat -%%PORTDOCS%%%%DOCSDIR%%/examples/aft-refman.aft -%%PORTDOCS%%%%DOCSDIR%%/examples/aft.aft -%%PORTDOCS%%%%DOCSDIR%%/examples/aft2rtf-doc.aft -%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples -%%PORTDOCS%%@dirrm %%DOCSDIR%%/backends -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%% Modified: head/textproc/aiksaurus-gtk/Makefile ============================================================================== --- head/textproc/aiksaurus-gtk/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/aiksaurus-gtk/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -14,7 +14,6 @@ PKGDIR= ${.CURDIR} USE_GNOME= gtk20 CONFIGURE_ARGS=--with-gtk -NO_STAGE= yes pre-install: @${REINPLACE_CMD} -e 's|base [$$][(]GTKSRCDIR[)] data|$$(GTKSRCDIR)|g' \ ${WRKSRC}/Makefile Modified: head/textproc/aiksaurus/Makefile ============================================================================== --- head/textproc/aiksaurus/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/aiksaurus/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -10,6 +10,8 @@ MASTER_SITES= SF MAINTAINER?= gnome@FreeBSD.org COMMENT?= A set of libraries and applications which provide a thesaurus +LICENSE= GPLv2 + USE_AUTOTOOLS= libtool USE_CSTD= gnu89 USES= pathfix gmake pkgconfig @@ -17,7 +19,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS?=--without-gtk -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure Modified: head/textproc/align/Makefile ============================================================================== --- head/textproc/align/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/align/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -21,10 +21,9 @@ SHEBANG_FILES= align width PLIST_FILES= bin/align bin/width -NO_STAGE= yes do-install: .for i in align width - (cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} ${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} ${STAGEDIR}${PREFIX}/bin) .endfor .include <bsd.port.mk> Modified: head/textproc/ansifilter/Makefile ============================================================================== --- head/textproc/ansifilter/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/ansifilter/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -9,34 +9,26 @@ MASTER_SITES= http://www.andre-simon.de/ MAINTAINER= ports@FreeBSD.org COMMENT= Customizable ANSI Code Converter +LICENSE= GPLv3 + USE_BZIP2= yes MAKEFILE= makefile MAKE_ARGS= CC="${CXX}" \ CFLAGS="${CXXFLAGS} ${CPPFLAGS} -c" \ LDFLAGS="${LDFLAGS}" -PLIST_FILES= bin/ansifilter - -MAN1= ${PORTNAME}.1 -MANCOMPRESSED= yes +PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz -.if !defined(NOPORTDOCS) PORTDOCS= ChangeLog README -.endif - -NO_STAGE= yes -.include <bsd.port.pre.mk> post-patch: @${REINPLACE_CMD} -e \ 's|^PREFIX =|PREFIX ?=|' ${WRKSRC}/${MAKEFILE} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/${MAN1}.gz ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1.gz ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/textproc/ant-xinclude-task/Makefile ============================================================================== --- head/textproc/ant-xinclude-task/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/ant-xinclude-task/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -17,27 +17,17 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes -ALL_TARGET= jar -.if !defined(NOPORTDOCS) -ALL_TARGET+= apidocs +OPTIONS_DEFINE= DOCS + +ALL_TARGET= jar apidocs PORTDOCS= * -.endif -MAKE_ENV+= CLASSPATH=${JAVAJARDIR}/xincluder.jar +MAKE_ENV= CLASSPATH=${JAVAJARDIR}/xincluder.jar -PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME}.jar +PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar -NO_STAGE= yes do-install: - @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." @${MKDIR} ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.jar ${JAVAJARDIR}/ - @${ECHO_MSG} " [ DONE ]" - -.if !defined(NOPORTDOCS) - @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." - @cd ${WRKSRC}/build/apidocs && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} ";" - @cd ${WRKSRC}/build/apidocs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} ";" - @${ECHO_MSG} " [ DONE ]" -.endif + ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/ + cd ${WRKSRC}/build/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/textproc/antiword/Makefile ============================================================================== --- head/textproc/antiword/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/antiword/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -10,19 +10,17 @@ MASTER_SITES= http://www.winfield.demon. MAINTAINER= leeym@FreeBSD.org COMMENT= An application to display Microsoft(tm) Word files -USE_GMAKE= yes +LICENSE= GPLv2 + +USES= gmake MAKE_JOBS_UNSAFE=yes INSTALL_TARGET= global_install -MAN1= antiword.1 PORTDOCS= COPYING ChangeLog Emacs Exmh FAQ History Mozilla Mutt Netscape \ QandA ReadMe antiword.1 antiword.man antiword.php testdoc.doc CFLAGS+= -DNDEBUG -NO_STAGE= yes -.include <bsd.port.options.mk> - post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \ -e 's,/usr/local,${PREFIX},g' \ @@ -32,10 +30,8 @@ post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' ${WRKSRC}/Unix-only/fontinfo.pl post-install: - @${INSTALL_MAN} ${WRKSRC}/Docs/antiword.1 ${MANPREFIX}/man/man1 -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/Docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + ${INSTALL_MAN} ${WRKSRC}/Docs/antiword.1 ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/Docs && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/textproc/antiword/pkg-plist ============================================================================== --- head/textproc/antiword/pkg-plist Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/antiword/pkg-plist Sat Jan 25 22:03:15 2014 (r341120) @@ -1,5 +1,6 @@ bin/antiword bin/kantiword +man/man1/antiword.1.gz %%DATADIR%%/8859-1.txt %%DATADIR%%/8859-10.txt %%DATADIR%%/8859-11.txt Modified: head/textproc/apache-solr/Makefile ============================================================================== --- head/textproc/apache-solr/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/apache-solr/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -16,6 +16,8 @@ LICENSE= APACHE20 CONFLICT= apache-solr-3.6.* +USES= shebangfix +SHEBANG_FILES= example/etc/create-solrtest.keystore.sh JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" @@ -23,14 +25,9 @@ USE_JAVA= yes PORTEXAMPLES= * LATEST_LINK= apache-solr -NO_STAGE= yes -.include <bsd.port.options.mk> - do-install: - cd ${WRKSRC}/dist && ${COPYTREE_SHARE} \* ${JAVAJARDIR} -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/example && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} -.endif + cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVAJARDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Modified: head/textproc/apache-solr3/Makefile ============================================================================== --- head/textproc/apache-solr3/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/apache-solr3/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -6,8 +6,8 @@ PORTVERSION= 3.6.2 CATEGORIES= textproc java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= lucene/solr/${PORTVERSION}/ -EXTRACT_SUFX= .tgz PKGNAMESUFFIX= 3 +EXTRACT_SUFX= .tgz MAINTAINER= gaod@hychen.org COMMENT= High performance search server built using Lucene Java @@ -22,12 +22,9 @@ PLIST_SUB+= PORTVERSION="${PORTVERSION}" USE_JAVA= yes PORTEXAMPLES= * -NO_STAGE= yes do-install: - cd ${WRKSRC}/dist && ${COPYTREE_SHARE} \* ${JAVAJARDIR} -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/example && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} -.endif + cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${JAVAJARDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Modified: head/textproc/apache-solr3/pkg-descr ============================================================================== --- head/textproc/apache-solr3/pkg-descr Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/apache-solr3/pkg-descr Sat Jan 25 22:03:15 2014 (r341120) @@ -4,4 +4,4 @@ faceted search, caching, replication, a and many more features. It runs in a Java servlet container such as Tomcat. -WWW: http://lucene.apache.org/solr/ +WWW: http://lucene.apache.org/solr/ Modified: head/textproc/archmage/Makefile ============================================================================== --- head/textproc/archmage/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/archmage/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -10,6 +10,8 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Extensible reader/decompiler of files in CHM format +LICENSE= GPLv2 + RUN_DEPENDS= ${PYTHON_SITELIBDIR}/chm/chm.py:${PORTSDIR}/textproc/pychm \ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 @@ -17,9 +19,7 @@ NO_BUILD= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes -MAN1= ${PORTNAME}.1 -NO_STAGE= yes post-extract: @${GUNZIP_CMD} ${WRKSRC}/${PORTNAME}.1.gz @@ -29,6 +29,6 @@ post-patch: @${REINPLACE_CMD} -e "s,/etc,etc,;/archmage.1/d" ${WRKSRC}/setup.py post-install: - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/ + @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ .include <bsd.port.mk> Modified: head/textproc/archmage/pkg-plist ============================================================================== --- head/textproc/archmage/pkg-plist Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/archmage/pkg-plist Sat Jan 25 22:03:15 2014 (r341120) @@ -1,5 +1,6 @@ bin/archmage etc/archmage/arch.conf +man/man1/archmage.1.gz %%PYTHON_SITELIBDIR%%/archmod/CHM.py %%PYTHON_SITELIBDIR%%/archmod/CHM.pyc %%PYTHON_SITELIBDIR%%/archmod/CHM.pyo Modified: head/textproc/artha/Makefile ============================================================================== --- head/textproc/artha/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/artha/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -11,10 +11,8 @@ COMMENT= A free cross-platform English t LICENSE= GPLv2 -LIB_DEPENDS= dbus-glib:${PORTSDIR}/devel/dbus-glib \ - WN:${PORTSDIR}/textproc/wordnet - -MAN1= artha.1 +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libWN.so:${PORTSDIR}/textproc/wordnet USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes @@ -29,11 +27,6 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LO OPTIONS_DEFINE= NOTIFY NOTIFY_DESC= Popup word definition as notification -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify -.endif +NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify .include <bsd.port.mk> Modified: head/textproc/artha/pkg-plist ============================================================================== --- head/textproc/artha/pkg-plist Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/artha/pkg-plist Sat Jan 25 22:03:15 2014 (r341120) @@ -1,4 +1,5 @@ bin/artha +man/man1/artha.1.gz share/applications/artha.desktop share/pixmaps/artha.png %%DATADIR%%/gui.glade Modified: head/textproc/augeas/Makefile ============================================================================== --- head/textproc/augeas/Makefile Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/augeas/Makefile Sat Jan 25 22:03:15 2014 (r341120) @@ -9,6 +9,8 @@ MASTER_SITES= http://download.augeas.net MAINTAINER= swills@FreeBSD.org COMMENT= A configuration editing tool +LICENSE= LGPL21 + TEST_DEPENDS= bash:${PORTSDIR}/shells/bash \ gsed:${PORTSDIR}/textproc/gsed @@ -19,12 +21,8 @@ ACLOCAL_ARGS= -I . -I gnulib/m4 -I ${LOC AUTOMAKE_ARGS= --add-missing USE_LDCONFIG= yes -MAN1= augparse.1 augtool.1 -MANCOMPRESSED= no - LENSESDIR= ${PREFIX}/share/augeas/lenses -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's:$$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig:' ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's:/bin/bash:/usr/bin/env bash:' ${WRKSRC}/tests/*.sh Modified: head/textproc/augeas/pkg-plist ============================================================================== --- head/textproc/augeas/pkg-plist Sat Jan 25 22:02:50 2014 (r341119) +++ head/textproc/augeas/pkg-plist Sat Jan 25 22:03:15 2014 (r341120) @@ -12,6 +12,8 @@ lib/libfa.la lib/libfa.so lib/libfa.so.5 libdata/pkgconfig/augeas.pc +man/man1/augparse.1.gz +man/man1/augtool.1.gz %%DATADIR%%/lenses/dist/access.aug %%DATADIR%%/lenses/dist/activemq_conf.aug %%DATADIR%%/lenses/dist/activemq_xml.aug
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401252203.s0PM3F5L030753>