svn commit: r329327 - in head/sysutils/moreutils: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Oct  4 15:36:36 2013
New Revision: 329327
URL: http://svnweb.freebsd.org/changeset/ports/329327

Log:
  - Support STAGEDIR

Added:
  head/sysutils/moreutils/pkg-plist   (contents, props changed)
Modified:
  head/sysutils/moreutils/Makefile
  head/sysutils/moreutils/files/patch-Makefile

Modified: head/sysutils/moreutils/Makefile
==============================================================================
--- head/sysutils/moreutils/Makefile	Fri Oct  4 15:33:10 2013	(r329326)
+++ head/sysutils/moreutils/Makefile	Fri Oct  4 15:36:36 2013	(r329327)
@@ -16,56 +16,40 @@ RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/d
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
+OPTIONS_SUB=	yes
 
 ALL_TARGET=	bins
 USES=		perl5
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MANCOMPRESSED=	no
-PLIST_FILES=	bin/chronic \
-		bin/combine \
-		bin/errno \
-		bin/ifne \
-		bin/isutf8 \
-		bin/lckdo \
-		bin/mispipe \
-		bin/pee \
-		bin/sponge \
-		bin/ts \
-		bin/vidir \
-		bin/vipe \
-		bin/zrun
+MANPAGES_ALL_TARGET=	mans
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMANPAGES}
-ALL_TARGET+=	mans
-CANNED_MAN1=	errno.1 \
+CANNED_MANPAGES=errno.1 \
 		ifne.1 \
 		isutf8.1 \
 		lckdo.1 \
 		mispipe.1 \
 		pee.1 \
 		sponge.1
-MAN1=		chronic.1 \
+MANPAGES=	chronic.1 \
 		combine.1 \
 		ts.1 \
 		vidir.1 \
 		vipe.1 \
 		zrun.1 \
-		${CANNED_MAN1}
-.endif
+		${CANNED_MANPAGES}
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/xml/docbook/schema/dtd/|local/share/xml/docbook/|' ${WRKSRC}/*.docbook
 .if ${PORT_OPTIONS:MMANPAGES}
-	@cd ${FILESDIR}/ && ${CP} ${CANNED_MAN1} ${WRKSRC}/
+	@cd ${FILESDIR}/ && ${CP} ${CANNED_MANPAGES} ${WRKSRC}/
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MMANPAGES}
-	cd ${WRKSRC}/ && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/
+	cd ${WRKSRC}/ && ${INSTALL_MAN} ${MANPAGES} ${STAGEDIR}${PREFIX}/man/man1/
 .endif
 
 .include <bsd.port.mk>

Modified: head/sysutils/moreutils/files/patch-Makefile
==============================================================================
--- head/sysutils/moreutils/files/patch-Makefile	Fri Oct  4 15:33:10 2013	(r329326)
+++ head/sysutils/moreutils/files/patch-Makefile	Fri Oct  4 15:36:36 2013	(r329327)
@@ -1,6 +1,6 @@
 --- Makefile.orig	2012-06-06 01:55:53.000000000 +0800
 +++ Makefile	2013-02-24 13:23:52.068205829 +0800
-@@ -1,60 +1,38 @@
+@@ -1,14 +1,17 @@
 -BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel errno
 +BINS=isutf8 ifne pee sponge mispipe lckdo errno
  PERLSCRIPTS=vidir vipe ts combine zrun chronic
@@ -23,13 +23,9 @@
  clean:
  	rm -f $(BINS) $(MANS) dump.c errnos.h errno.o
  
- install:
--	mkdir -p $(DESTDIR)$(PREFIX)/bin
--	$(INSTALL_BIN) $(BINS) $(DESTDIR)$(PREFIX)/bin
--	install $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
-+	mkdir -p $(PREFIX)/bin
-+	$(INSTALL_BIN) $(BINS) $(PREFIX)/bin
-+	install $(PERLSCRIPTS) $(PREFIX)/bin
+@@ -17,44 +20,19 @@
+ 	$(INSTALL_BIN) $(BINS) $(DESTDIR)$(PREFIX)/bin
+ 	install $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
  	
 -	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
 -	install $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1

Added: head/sysutils/moreutils/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/moreutils/pkg-plist	Fri Oct  4 15:36:36 2013	(r329327)
@@ -0,0 +1,26 @@
+bin/chronic
+bin/combine
+bin/errno
+bin/ifne
+bin/isutf8
+bin/lckdo
+bin/mispipe
+bin/pee
+bin/sponge
+bin/ts
+bin/vidir
+bin/vipe
+bin/zrun
+%%MANPAGES%%man/man1/chronic.1.gz
+%%MANPAGES%%man/man1/combine.1.gz
+%%MANPAGES%%man/man1/errno.1.gz
+%%MANPAGES%%man/man1/ifne.1.gz
+%%MANPAGES%%man/man1/isutf8.1.gz
+%%MANPAGES%%man/man1/lckdo.1.gz
+%%MANPAGES%%man/man1/mispipe.1.gz
+%%MANPAGES%%man/man1/pee.1.gz
+%%MANPAGES%%man/man1/sponge.1.gz
+%%MANPAGES%%man/man1/ts.1.gz
+%%MANPAGES%%man/man1/vidir.1.gz
+%%MANPAGES%%man/man1/vipe.1.gz
+%%MANPAGES%%man/man1/zrun.1.gz