diff --git a/textproc/add-css-links/Makefile b/textproc/add-css-links/Makefile
index c796b9b4529f..3ee4c17834f3 100644
--- a/textproc/add-css-links/Makefile
+++ b/textproc/add-css-links/Makefile
@@ -11,11 +11,13 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Add one or more CSS 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
diff --git a/textproc/add-css-links/pkg-plist b/textproc/add-css-links/pkg-plist
deleted file mode 100644
index 36d0daba8cb0..000000000000
--- a/textproc/add-css-links/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-share/xsl/xhtml/add-css-links.xsl
-@dirrmtry share/xsl/xhtml
-@dirrmtry share/xsl
diff --git a/textproc/aft/Makefile b/textproc/aft/Makefile
index 8668ae4ce9d7..4ef5c2a4725f 100644
--- a/textproc/aft/Makefile
+++ b/textproc/aft/Makefile
@@ -10,13 +10,16 @@ MASTER_SITES= http://www.maplefish.com/todd/
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
diff --git a/textproc/aft/pkg-plist b/textproc/aft/pkg-plist
index 2e3a7e87cd34..b301e3a3c065 100644
--- a/textproc/aft/pkg-plist
+++ b/textproc/aft/pkg-plist
@@ -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%%
diff --git a/textproc/aiksaurus-gtk/Makefile b/textproc/aiksaurus-gtk/Makefile
index c22a860a13af..3d7481a296ff 100644
--- a/textproc/aiksaurus-gtk/Makefile
+++ b/textproc/aiksaurus-gtk/Makefile
@@ -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
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 3bc17fcc20de..64f6005bc207 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -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
diff --git a/textproc/align/Makefile b/textproc/align/Makefile
index 04bda49153fc..f05be422b68e 100644
--- a/textproc/align/Makefile
+++ b/textproc/align/Makefile
@@ -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
diff --git a/textproc/ansifilter/Makefile b/textproc/ansifilter/Makefile
index e5b06d3ab646..de27e8465e79 100644
--- a/textproc/ansifilter/Makefile
+++ b/textproc/ansifilter/Makefile
@@ -9,34 +9,26 @@ MASTER_SITES= http://www.andre-simon.de/zip/
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
+PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
-MAN1= ${PORTNAME}.1
-MANCOMPRESSED= yes
-
-.if !defined(NOPORTDOCS)
PORTDOCS= ChangeLog README
-.endif
-
-NO_STAGE= yes
-.include
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
+.include
diff --git a/textproc/ant-xinclude-task/Makefile b/textproc/ant-xinclude-task/Makefile
index 5a7ac56dfbe3..a88ecfa45c79 100644
--- a/textproc/ant-xinclude-task/Makefile
+++ b/textproc/ant-xinclude-task/Makefile
@@ -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
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index 29c70b3707d7..4fb609fd4355 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -10,19 +10,17 @@ MASTER_SITES= http://www.winfield.demon.nl/linux/
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
-
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
diff --git a/textproc/antiword/pkg-plist b/textproc/antiword/pkg-plist
index 0e9bc3892c4e..b83b3016eff2 100644
--- a/textproc/antiword/pkg-plist
+++ b/textproc/antiword/pkg-plist
@@ -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
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index fdc7a560d5fe..fa95cb618d88 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -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
-
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
diff --git a/textproc/apache-solr3/Makefile b/textproc/apache-solr3/Makefile
index 5be9e132612b..e268df463ff5 100644
--- a/textproc/apache-solr3/Makefile
+++ b/textproc/apache-solr3/Makefile
@@ -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
diff --git a/textproc/apache-solr3/pkg-descr b/textproc/apache-solr3/pkg-descr
index 60e4ece056bb..df0c5733bbd0 100644
--- a/textproc/apache-solr3/pkg-descr
+++ b/textproc/apache-solr3/pkg-descr
@@ -4,4 +4,4 @@ faceted search, caching, replication, a web administration interface
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/
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 82ba258ae3cd..e2574893c2cd 100644
--- a/textproc/archmage/Makefile
+++ b/textproc/archmage/Makefile
@@ -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
diff --git a/textproc/archmage/pkg-plist b/textproc/archmage/pkg-plist
index 4a6a504692e6..d4d16ba8c0d5 100644
--- a/textproc/archmage/pkg-plist
+++ b/textproc/archmage/pkg-plist
@@ -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
diff --git a/textproc/artha/Makefile b/textproc/artha/Makefile
index fecd0ee74861..1008fc7b956a 100644
--- a/textproc/artha/Makefile
+++ b/textproc/artha/Makefile
@@ -11,10 +11,8 @@ COMMENT= A free cross-platform English thesaurus
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${LOCALBASE}/include/WordNet
OPTIONS_DEFINE= NOTIFY
NOTIFY_DESC= Popup word definition as notification
-NO_STAGE= yes
-.include
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
-.endif
+NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify
.include
diff --git a/textproc/artha/pkg-plist b/textproc/artha/pkg-plist
index 7a7c73c681b9..f3cbf3f51d23 100644
--- a/textproc/artha/pkg-plist
+++ b/textproc/artha/pkg-plist
@@ -1,4 +1,5 @@
bin/artha
+man/man1/artha.1.gz
share/applications/artha.desktop
share/pixmaps/artha.png
%%DATADIR%%/gui.glade
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index 3b68c9a1fe8d..633b24d23ea9 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -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 ${LOCALBASE}/share/aclocal
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
diff --git a/textproc/augeas/pkg-plist b/textproc/augeas/pkg-plist
index 63b32444187b..bcdb60809a97 100644
--- a/textproc/augeas/pkg-plist
+++ b/textproc/augeas/pkg-plist
@@ -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