svn commit: r329737 - in head/textproc: wiggle xmlto

[Matthias Andree]

Author: mandree
Date: Mon Oct  7 20:48:03 2013
New Revision: 329737
URL: http://svnweb.freebsd.org/changeset/ports/329737

Log:
  Convert to staging; USE_GMAKE -> USES=gmake

Added:
  head/textproc/wiggle/pkg-plist   (contents, props changed)
Modified:
  head/textproc/wiggle/Makefile
  head/textproc/xmlto/Makefile
  head/textproc/xmlto/pkg-plist   (contents, props changed)

Modified: head/textproc/wiggle/Makefile
==============================================================================
--- head/textproc/wiggle/Makefile	Mon Oct  7 20:17:20 2013	(r329736)
+++ head/textproc/wiggle/Makefile	Mon Oct  7 20:48:03 2013	(r329737)
@@ -14,14 +14,10 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_GCC=	4.2+	# uses nested functions
-USE_GMAKE=	yes
+USES=		gmake
 
 MAKE_ARGS+=	CFLAGS="${CFLAGS} -I. -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter"
 
-MAN1=		wiggle.1
-PLIST_FILES=	bin/wiggle
-
-NO_STAGE=	yes
 pre-patch:
 		${REINPLACE_CMD} -Ee 's,\./dotest,bash ./dotest,' ${WRKSRC}/Makefile
 		${REINPLACE_CMD} -Ee "s,/usr/bin/time -o .time -f '%U',," ${WRKSRC}/dotest
@@ -30,7 +26,7 @@ pre-patch:
 		${REINPLACE_CMD} -Ee 's|(^[[:space:]]+[[:<:]])cols = cols;|\1(void)cols;|' ${WRKSRC}/vpatch.c
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/wiggle ${PREFIX}/bin/
-		${INSTALL_MAN} ${WRKSRC}/wiggle.1 ${PREFIX}/man/man1/
+		${INSTALL_PROGRAM} ${WRKSRC}/wiggle ${STAGEDIR}${PREFIX}/bin/
+		${INSTALL_MAN} ${WRKSRC}/wiggle.1 ${STAGEDIR}${PREFIX}/man/man1/
 
 .include <bsd.port.mk>

Added: head/textproc/wiggle/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/wiggle/pkg-plist	Mon Oct  7 20:48:03 2013	(r329737)
@@ -0,0 +1,3 @@
+bin/wiggle
+man/man1/wiggle.1.gz
+

Modified: head/textproc/xmlto/Makefile
==============================================================================
--- head/textproc/xmlto/Makefile	Mon Oct  7 20:17:20 2013	(r329736)
+++ head/textproc/xmlto/Makefile	Mon Oct  7 20:48:03 2013	(r329737)
@@ -29,16 +29,15 @@ PASSIVETEX_DESC=	Add dependency on Passi
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	BASH=${BASH_CMD} GETOPT=${GETOPT_CMD} PDFXMLTEX=${PDFXMLTEX_CMD}
+MAKE_ENV+=	HOME=/dev/null
 
 BASH_CMD=	${LOCALBASE}/bin/bash
 GETOPT_CMD=	${LOCALBASE}/bin/getopt
 XSL_DIR=	${LOCALBASE}/share/xsl/docbook
 PDFXMLTEX_CMD=	${LOCALBASE}/bin/pdftex
 
-MAN1=		xmlif.1 xmlto.1
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS THANKS
 # these two documentation files do not convey information useful for
-NO_STAGE=	yes
 # the FreeBSD port at this time:
 # PORTDOCS+=	FAQ README
 
@@ -68,8 +67,8 @@ post-patch:
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/textproc/xmlto/pkg-plist
==============================================================================
--- head/textproc/xmlto/pkg-plist	Mon Oct  7 20:17:20 2013	(r329736)
+++ head/textproc/xmlto/pkg-plist	Mon Oct  7 20:48:03 2013	(r329737)
@@ -1,5 +1,7 @@
 bin/xmlif
 bin/xmlto
+man/man1/xmlif.1.gz
+man/man1/xmlto.1.gz
 %%DATADIR%%/format/docbook/awt
 %%DATADIR%%/format/docbook/dvi
 %%DATADIR%%/format/docbook/epub