- Convert to staging

- Add license
- Rename patch to follow makepatch naming
- Use new options knobs

Sponsored by:	Absolight

17 files changed, 79 insertions, 133 deletions

diff --git a/textproc/c2html/Makefile b/textproc/c2html/Makefile
index 1cf40208888f..6d9cc738cdea 100644
--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@@ -10,17 +10,17 @@ MASTER_SITE_SUBDIR=	apps/www/converters
 MAINTAINER=		mkamm@gmx.net
 COMMENT=	C-language sources to HTML converter
 
+LICENSE=	GPLv2
+
 USE_AUTOTOOLS=	autoconf213
 
-MAN1=			c2html.1
+PLIST_FILES=	bin/c2html man/man1/c2html.1.gz
+PORTDOCS=	AUTHORS NEWS README
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS NEWS README
-	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_MAN} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/c2html/files/patch-aa b/textproc/c2html/files/patch-Makefile.in
index 64206583c854..d7e60beba7eb 100644
--- a/textproc/c2html/files/patch-aa
+++ b/textproc/c2html/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Apr 15 17:16:25 2000
-+++ Makefile.in	Sun Apr 23 15:53:23 2000
+--- ./Makefile.in.orig	2006-03-28 10:26:30.000000000 +0000
++++ ./Makefile.in	2014-01-26 10:48:24.000000000 +0000
 @@ -27,7 +27,7 @@
  # for gzip because otherwise the load on the web server
  # grows without having big benefits.
@@ -25,10 +25,12 @@
 -install: $(TARGET) install-doc
 +install: $(TARGET)
  	@echo "Installing" $(TARGET) "to" $(bindir)
- 	-mkdir -p $(bindir)
- 	$(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
-+	-mkdir -p $(man1dir)
-+	$(INSTALL_DATA) $(srcdir)/$(MANPAGE) $(man1dir)/$(MANPAGE)
+-	-mkdir -p $(bindir)
+-	$(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
++	-mkdir -p $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
++	-mkdir -p $(DESTDIR)$(man1dir)
++	$(INSTALL_DATA) $(srcdir)/$(MANPAGE) $(DESTDIR)$(man1dir)/$(MANPAGE)
  
  install-strip: $(TARGET) install-doc
  	@echo "Installing" $(TARGET) "to" $(bindir)
diff --git a/textproc/c2html/pkg-plist b/textproc/c2html/pkg-plist
deleted file mode 100644
index 3aee28244379..000000000000
--- a/textproc/c2html/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/c2html
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/textproc/cbedic/Makefile b/textproc/cbedic/Makefile
index 4e274c9a6d9a..3fb3f0267f91 100644
--- a/textproc/cbedic/Makefile
+++ b/textproc/cbedic/Makefile
@@ -10,15 +10,18 @@ MASTER_SITES=	SF/kbedic/CBE%20Dictionary/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An English-to-Bulgarian and Bulgarian-to-English dictionary
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	${DICT_DIR}/${DICT_CHECK}:${PORTSDIR}/textproc/bedic-data
 
 DICT_CHECK?=	buleng.dat
 DICT_DIR?=	${LOCALBASE}/share
 
+USES=	gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 
 CONFIGURE_ARGS=	--datadir=${DICT_DIR}
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/cbedic
+
 .include <bsd.port.mk>
diff --git a/textproc/cbedic/pkg-plist b/textproc/cbedic/pkg-plist
deleted file mode 100644
index c6a02ca5ccd5..000000000000
--- a/textproc/cbedic/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/cbedic
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 6664c4a64f19..61797906fe68 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -16,7 +16,8 @@ USES=		perl5
 NO_WRKSUBDIR=		yes
 NO_BUILD=		yes
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/cdif
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${DISTNAME}.dist
@@ -26,6 +27,6 @@ do-patch:
 		< ${WRKSRC}/${DISTNAME}.dist > ${WRKSRC}/${DISTNAME}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/cdif
+	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/cdif
 
 .include <bsd.port.mk>
diff --git a/textproc/cdif/pkg-plist b/textproc/cdif/pkg-plist
deleted file mode 100644
index e27d79bec9ba..000000000000
--- a/textproc/cdif/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2000/03/16 14:08:51 wiz Exp $
-bin/cdif
diff --git a/textproc/chm2pdf/Makefile b/textproc/chm2pdf/Makefile
index 1b07c0114634..e8971614de3b 100644
--- a/textproc/chm2pdf/Makefile
+++ b/textproc/chm2pdf/Makefile
@@ -10,6 +10,8 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	A Python script that converts CHM files into PDF files
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	htmldoc:${PORTSDIR}/textproc/htmldoc \
 		${PYTHON_SITELIBDIR}/chm/chm.py:${PORTSDIR}/textproc/pychm
 
@@ -19,5 +21,4 @@ PYDISTUTILS_PKGVERSION=	0.9
 
 PLIST_FILES=	bin/chm2pdf
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/textproc/code2html/Makefile b/textproc/code2html/Makefile
index 4e59cb47c316..3d24eb18788e 100644
--- a/textproc/code2html/Makefile
+++ b/textproc/code2html/Makefile
@@ -7,7 +7,6 @@ CATEGORIES=	textproc
 MASTER_SITES=	SF \
 		http://www.palfrader.org/code2html/all/
 
-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sourcecode to HTML converter
 
@@ -15,10 +14,8 @@ NO_BUILD=	yes
 USES=		perl5
 USE_PERL5=	run
 
-MAN1=		code2html.1
-PLIST_FILES=	bin/code2html
+PLIST_FILES=	bin/code2html man/man1/code2html.1.gz
 
-NO_STAGE=	yes
 do-configure:
 	@${REINPLACE_CMD} \
 		-e 's|/usr/bin/bzip2|${BZIP2_CMD}|' \
@@ -29,7 +26,7 @@ do-configure:
 		${WRKSRC}/code2html.1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/code2html ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/code2html.1 ${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/code2html ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/code2html.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/textproc/codespell/Makefile b/textproc/codespell/Makefile
index 14b9a3241635..958f16ac25e7 100644
--- a/textproc/codespell/Makefile
+++ b/textproc/codespell/Makefile
@@ -17,34 +17,29 @@ USE_PYTHON=	3.1+
 USE_PYTHON_RUN=	yes
 USE_XZ=		yes
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 PLIST_FILES=	bin/codespell
 PORTDOCS=	COPYING README TODO
 PORTEXAMPLES=	*
 
 SUB_FILES+=	pkg-message
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 do-build:
 	${REINPLACE_CMD} 's|#!/usr/bin/env python3|#!${LOCALBASE}/bin/${PYTHON_VERSION}|' \
 		${WRKSRC}/codespell.py
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/codespell.py ${PREFIX}/bin/codespell
+	${INSTALL_SCRIPT} ${WRKSRC}/codespell.py ${STAGEDIR}${PREFIX}/bin/codespell
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 . endfor
-.endif
 
 .for i in data example
-	@${MKDIR} ${EXAMPLESDIR}/${i}
-	@${INSTALL_DATA} ${WRKSRC}/${i}/* ${EXAMPLESDIR}/${i}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${i}
+	${INSTALL_DATA} ${WRKSRC}/${i}/* ${STAGEDIR}${EXAMPLESDIR}/${i}
 .endfor
-	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/confetti/Makefile b/textproc/confetti/Makefile
index 8903b1c40c7b..d7d08486a878 100644
--- a/textproc/confetti/Makefile
+++ b/textproc/confetti/Makefile
@@ -12,33 +12,23 @@ COMMENT=	Configuration file parser generator
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		bison perl5
+USES=		bison perl5 gmake
 DATE=		20120801
 MAKE_ARGS+=	FLEX=${LOCALBASE}/bin/flex
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	EXAMPLES
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-PLIST_SUB+=	EXAMPLES=""
-.else
-PLIST_SUB+=	EXAMPLES="@comment "
-.endif
+PLIST_FILES=	bin/confetti
+PORTEXAMPLES=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CC=|CC?=|' -e 's|CFLAGS=|CFLAGS?=|' \
 		${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} example ${EXAMPLESDIR}
-.endif
+	${INSTALL} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/confetti/pkg-plist b/textproc/confetti/pkg-plist
deleted file mode 100644
index 597af37250fb..000000000000
--- a/textproc/confetti/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/confetti
-%%EXAMPLES%%%%EXAMPLESDIR%%/example/example.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/example/Makefile
-%%EXAMPLES%%%%EXAMPLESDIR%%/example/my_my_product.cfg
-%%EXAMPLES%%%%EXAMPLESDIR%%/example/example_buffer.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/example/example.cfgtmpl
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/example
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/textproc/csv2latex/Makefile b/textproc/csv2latex/Makefile
index 6bd3d88460fc..db1758b3a56c 100644
--- a/textproc/csv2latex/Makefile
+++ b/textproc/csv2latex/Makefile
@@ -11,25 +11,26 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Converts a well formed csv file to a LaTeX document
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_FILES=	bin/csv2latex
 
-NO_STAGE=	yes
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .if ( defined(WITH_MAN) &&  !defined(NO_INSTALL_MANPAGES) )
 BUILD_DEPENDS +=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man
-MAN1=	${PORTNAME}.1
+PLIST_FILES+=	man/man1/${PORTNAME}.1.gz
 
 post-build:
-	docbook-to-man ${WRKSRC}/${PORTNAME}.sgml > ${WRKSRC}/${MAN1}
+	docbook-to-man ${WRKSRC}/${PORTNAME}.sgml > ${WRKSRC}/${PORTNAME}.1
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .endif
 
diff --git a/textproc/csv2xml/Makefile b/textproc/csv2xml/Makefile
index f18df211c253..6b81576c0646 100644
--- a/textproc/csv2xml/Makefile
+++ b/textproc/csv2xml/Makefile
@@ -11,16 +11,16 @@ COMMENT=	A simple but effective csv to xml converter
 
 USE_BZIP2=	yes
 
-MAN1=		csv2xml.1
-MANCOMPRESSED=	yes
-PLIST_FILES=	bin/csv2xml
+PLIST_FILES=	bin/csv2xml man/man1/csv2xml.1.gz
 MAKE_ARGS=	FLAGS="${CXXFLAGS}"
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' \
-		-e 's/^\(COMPILER[^g]*\)g++$$/\1${CXX}/' \
+	@${REINPLACE_CMD} -e 's/^\(COMPILER[^g]*\)g++$$/\1${CXX}/' \
 		${WRKSRC}/src/Makefile \
 		${WRKSRC}/man/Makefile
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/csv2xml ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/man/csv2xml.1 ${STAGEDIR}${PREFIX}/man/man1
+
 .include <bsd.port.mk>
diff --git a/textproc/csvdiff/Makefile b/textproc/csvdiff/Makefile
index 3f7bb4ec0474..772e40567299 100644
--- a/textproc/csvdiff/Makefile
+++ b/textproc/csvdiff/Makefile
@@ -16,19 +16,14 @@ NO_BUILD=	yes
 USES=		perl5
 PLIST_FILES=	bin/csvdiff
 WRKSRC=		${WRKDIR}
-.if !defined(NOPORTDOCS)
 PORTDOCS=	CHANGES README TODO
-.endif
 
-NO_STAGE=	yes
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
-		${PREFIX}/bin/${PORTNAME}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile
index 4175daaf31f7..51d18f4fb362 100644
--- a/textproc/ctpp2/Makefile
+++ b/textproc/ctpp2/Makefile
@@ -16,8 +16,6 @@ USE_GCC=	yes
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-MAN1=		ctpp2c.1 ctpp2vm.1 ctpp2i.1 ctpp2json.1 ctpp2-config.1
-
 OPTIONS_DEFINE=	DEBUG DISCARD_ILSEQ DOCS MD5 OPTIMIZATION TRANSLITERATE
 OPTIONS_DEFAULT=	DISCARD_ILSEQ MD5 OPTIMIZATION TRANSLITERATE
 DEBUG_DESC=		Enable debug output
@@ -26,46 +24,22 @@ MD5_DESC=		Enable md5 support
 DISCARD_ILSEQ_DESC=	Discard illegal sequence and continue
 TRANSLITERATE_DESC=	Enable transliteration in the conversion
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG}
-CMAKE_ARGS+=	-DDEBUG_MODE=ON
-.else
-CMAKE_ARGS+=	-DDEBUG_MODE=OFF
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
-CMAKE_ARGS+=	-DENABLE_DOCS=ON
-PLIST_SUB+=	DOCS=""
-.else
-CMAKE_ARGS+=	-DENABLE_DOCS=OFF
-PLIST_SUB+=	DOCS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMD5}
-CMAKE_ARGS+=	-DMD5_SUPPORT=ON
-.else
-CMAKE_ARGS+=	-DMD5_SUPPORT=OFF
-.endif
-
-.if ${PORT_OPTIONS:MDISCARD_ILSEQ}
-CMAKE_ARGS+=	-DICONV_DISCARD_ILSEQ=ON
-.else
-CMAKE_ARGS+=	-DICONV_DISCARD_ILSEQ=OFF
-.endif
-
-.if ${PORT_OPTIONS:MTRANSLITERATE}
-CMAKE_ARGS+=	-DICONV_TRANSLITERATE=ON
-.else
-CMAKE_ARGS+=	-DICONV_TRANSLITERATE=OFF
-.endif
-
-.if ${PORT_OPTIONS:MOPTIMIZATION}
-CMAKE_ARGS+=	-DENABLE_OPTIMIZATION=ON
-.else
-CMAKE_ARGS+=	-DENABLE_OPTIMIZATION=OFF
-.endif
+OPTIONS_SUB=	yes
+
+DEBUG_CMAKE_ON=	-DDEBUG_MODE=ON
+DEBUG_CMAKE_OFF=	-DDEBUG_MODE=OFF
+DOCS_BUILD_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils
+DOCS_CMAKE_ON=	-DENABLE_DOCS=ON
+DOCS_CMAKE_OFF=	-DENABLE_DOCS=OFF
+MD5_CMAKE_ON=	-DMD5_SUPPORT=ON
+MD5_CMAKE_OFF=	-DMD5_SUPPORT=OFF
+DISCARD_ILSEQ_CMAKE_ON=	-DICONV_DISCARD_ILSEQ=ON
+DISCARD_ILSEQ_CMAKE_OFF=	-DICONV_DISCARD_ILSEQ=OFF
+TRANSLITERATE_CMAKE_ON=	-DICONV_TRANSLITERATE=ON
+TRANSLITERATE_CMAKE_OFF=	-DICONV_TRANSLITERATE=OFF
+OPTIMIZATION_CMAKE_ON=	-DENABLE_OPTIMIZATION=ON
+OPTIMIZATION_CMAKE_OFF=	-DENABLE_OPTIMIZATION=OFF
+
+PORTDOCS=	template_language.html
 
 .include <bsd.port.mk>
diff --git a/textproc/ctpp2/pkg-plist b/textproc/ctpp2/pkg-plist
index 3bb98f025fcb..21c87c131902 100644
--- a/textproc/ctpp2/pkg-plist
+++ b/textproc/ctpp2/pkg-plist
@@ -65,10 +65,13 @@ include/ctpp2/STLOstream.hpp
 include/ctpp2/STLPair.hpp
 include/ctpp2/STLString.hpp
 include/ctpp2/STLVector.hpp
-%%DOCS%%%%DOCSDIR%%/template_language.html
 lib/libctpp2-st.a
 lib/libctpp2.so
 lib/libctpp2.so.2
 lib/libctpp2.so.%%PORTVERSION%%
-%%DOCS%%@dirrm %%DOCSDIR%%
+man/man1/ctpp2c.1.gz
+man/man1/ctpp2vm.1.gz
+man/man1/ctpp2i.1.gz
+man/man1/ctpp2json.1.gz
+man/man1/ctpp2-config.1.gz
 @dirrm include/ctpp2