Support STAGEDIR.

10 files changed, 66 insertions, 85 deletions

diff --git a/sysutils/lxsplit/pkg-plist b/sysutils/lxsplit/pkg-plist
new file mode 100644
index 000000000000..0fa548fc1b14
--- /dev/null
+++ b/sysutils/lxsplit/pkg-plist
@@ -0,0 +1,4 @@
+bin/lxsplit
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/sysutils/mgeupsd/Makefile b/sysutils/mgeupsd/Makefile
index 6567f8defec1..a9e987eaa05c 100644
--- a/sysutils/mgeupsd/Makefile
+++ b/sysutils/mgeupsd/Makefile
@@ -1,31 +1,28 @@
 # Created by: Andreas Dobloug <andreasd@@ifi.uio.no>
 # $FreeBSD$
 
-PORTNAME=		mgeupsd
-PORTVERSION=		0.3
+PORTNAME=	mgeupsd
+PORTVERSION=	0.3
 PORTREVISION=	1
-CATEGORIES=		sysutils
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/ups
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Monitor a state of MGE Pulsar UPS connected to RS-232 port
 
-USE_GMAKE=		YES
-WRKSRC=			${WRKDIR}/MGE
+USES=		gmake
+WRKSRC=		${WRKDIR}/MGE
 
-PLIST_FILES=		sbin/mgeupsd sbin/powerhandler etc/rc.d/mgeupsd.sh
-MAN8=			mgeupsd.8
-SUB_FILES=		pkg-message
+PLIST_FILES=	man/man8/${PORTNAME}.8.gz sbin/mgeupsd sbin/powerhandler etc/rc.d/mgeupsd.sh
+SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 post-patch:
-		@${REINPLACE_CMD} -e '/^CC=/s:gcc:${CC}:' \
-			-e '/^CFLAGS=/s:-Wall -O2:${CFLAGS}:' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^CC=/s:gcc:${CC}:' \
+		-e '/^CFLAGS=/s:-Wall -O2:${CFLAGS}:' ${WRKSRC}/Makefile
 
 post-install:
-		${INSTALL_SCRIPT} ${FILESDIR}/mgeupsd.sh ${PREFIX}/etc/rc.d
-		${INSTALL_SCRIPT} ${FILESDIR}/powerhandler ${PREFIX}/sbin
-		@${CAT} ${PKGMESSAGE}
+	${INSTALL_SCRIPT} ${FILESDIR}/mgeupsd.sh ${STAGEDIR}${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${FILESDIR}/powerhandler ${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
diff --git a/sysutils/mgeupsd/files/patch-ab b/sysutils/mgeupsd/files/patch-ab
index d472e7cce2cf..bddb25818bca 100644
--- a/sysutils/mgeupsd/files/patch-ab
+++ b/sysutils/mgeupsd/files/patch-ab
@@ -1,21 +1,13 @@
-*** Makefile.orig	Fri Dec 25 10:10:57 1998
---- Makefile	Tue Aug 10 23:36:12 1999
-***************
-*** 8,15 ****
-  	$(CC) $(LDFLAGS) -o $@ $<
-  
-  install:	mgeupsd
-! 	install mgeupsd /sbin
-! 	install mgeupsd.8 /usr/man/man8
-  
-  clean:
-  	rm -f *.o mgeupsd
---- 8,15 ----
-  	$(CC) $(LDFLAGS) -o $@ $<
-  
-  install:	mgeupsd
-! 	install -c mgeupsd ${PREFIX}/sbin
-! 	install -c mgeupsd.8 ${PREFIX}/man/man8
-  
-  clean:
-  	rm -f *.o mgeupsd
+--- Makefile.orig	1998-12-25 17:10:57.000000000 +0800
++++ Makefile	2013-11-15 23:04:20.000000000 +0800
+@@ -8,8 +8,8 @@ mgeupsd:	mgeupsd.o
+ 	$(CC) $(LDFLAGS) -o $@ $<
+ 
+ install:	mgeupsd
+-	install mgeupsd /sbin
+-	install mgeupsd.8 /usr/man/man8
++	install -c mgeupsd $(DESTDIR)${PREFIX}/sbin
++	install -c mgeupsd.8 $(DESTDIR)${PREFIX}/man/man8
+ 
+ clean:
+ 	rm -f *.o mgeupsd
diff --git a/sysutils/mksunbootcd/Makefile b/sysutils/mksunbootcd/Makefile
index aa2b528c2a39..53db36b3f233 100644
--- a/sysutils/mksunbootcd/Makefile
+++ b/sysutils/mksunbootcd/Makefile
@@ -10,14 +10,12 @@ MASTER_SITES=	${MASTER_SITE_NETBSD}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Makes ISO images suitable to boot on sparc systems
 
-MAN1=		mksunbootcd.1
-PLIST_FILES=	bin/mksunbootcd
+PLIST_FILES=	bin/mksunbootcd man/man1/${PORTNAME}.1.gz
 
 GNU_CONFIGURE=	yes
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mksunbootcd ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/mksunbootcd ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/monitord/Makefile b/sysutils/monitord/Makefile
index 264e17928c6d..0327055e9ad7 100644
--- a/sysutils/monitord/Makefile
+++ b/sysutils/monitord/Makefile
@@ -11,16 +11,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Service that restarts other standalone services
 
 USE_RC_SUBR=	monitord
-MAN8=		monitord.8
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's|syslodg|syslogd|' ${WRKSRC}/${MAN8}
+	@${REINPLACE_CMD} -e 's|syslodg|syslogd|' ${WRKSRC}/${PORTNAME}.8
 	@${REINPLACE_CMD} -e 's|-pipe||' ${WRKSRC}/Makefile
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/monitord.conf.sample \
-		${PREFIX}/etc/monitord.conf.sample
-	@${CAT} ${PKGMESSAGE}
+		${STAGEDIR}${PREFIX}/etc/monitord.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/monitord/files/patch-Makefile b/sysutils/monitord/files/patch-Makefile
index 584f3eb6a78c..2309c6eafd1d 100644
--- a/sysutils/monitord/files/patch-Makefile
+++ b/sysutils/monitord/files/patch-Makefile
@@ -1,6 +1,15 @@
---- Makefile.orig	Thu Jun  7 13:16:14 2007
-+++ Makefile	Thu Jun  7 13:16:41 2007
-@@ -24,8 +24,6 @@
+--- Makefile.orig	2003-08-22 06:36:42.000000000 +0800
++++ Makefile	2013-11-15 23:14:43.000000000 +0800
+@@ -6,7 +6,7 @@ OBJECTS	=	monitord.o mail.o
+ 
+ TARGET =	monitord
+ 
+-MANDIR = 	/usr/local/man
++MANDIR = 	$(PREFIX)/man
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+@@ -24,10 +24,8 @@ clean:
  
  all: $(TARGET)
  
@@ -8,4 +17,9 @@
 -	$(CC) $(OBJECTS) -o $(TARGET)
  
  install:
- 	$(INSTALL) -cs $(TARGET) /usr/local/sbin
+-	$(INSTALL) -cs $(TARGET) /usr/local/sbin
+-	$(INSTALL) -c $(TARGET).conf.sample /usr/local/etc
+-	$(INSTALL) -c $(TARGET).8 $(MANDIR)/man8
++	$(INSTALL) -cs $(TARGET) $(DESTDIR)$(PREFIX)/sbin
++	$(INSTALL) -c $(TARGET).conf.sample $(DESTDIR)$(PREFIX)/etc
++	$(INSTALL) -c $(TARGET).8 $(DESTDIR)$(MANDIR)/man8
diff --git a/sysutils/monitord/files/patch-aa b/sysutils/monitord/files/patch-aa
index 8f2e0b8e1407..e69de29bb2d1 100644
--- a/sysutils/monitord/files/patch-aa
+++ b/sysutils/monitord/files/patch-aa
@@ -1,21 +0,0 @@
---- Makefile.orig	Fri Aug 22 06:36:42 2003
-+++ Makefile	Fri Aug 22 15:07:34 2003
-@@ -6,7 +6,7 @@
- 
- TARGET =	monitord
- 
--MANDIR = 	/usr/local/man
-+MANDIR = 	$(PREFIX)/man
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
-@@ -28,6 +28,6 @@
- 	$(CC) $(OBJECTS) -o $(TARGET)
- 
- install:
--	$(INSTALL) -cs $(TARGET) /usr/local/sbin
--	$(INSTALL) -c $(TARGET).conf.sample /usr/local/etc
--	$(INSTALL) -c $(TARGET).8 $(MANDIR)/man8
-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(PREFIX)/sbin
-+	if [ ! -e $(PREFIX)/etc/$(TARGET).conf.sample ] ; then $(BSD_INSTALL_DATA) $(TARGET).conf.sample $(PREFIX)/etc; fi
-+	$(BSD_INSTALL_MAN) -c $(TARGET).8 $(MANDIR)/man8
diff --git a/sysutils/monitord/pkg-plist b/sysutils/monitord/pkg-plist
index b614b1d21359..d1127ce01db4 100644
--- a/sysutils/monitord/pkg-plist
+++ b/sysutils/monitord/pkg-plist
@@ -1,3 +1,4 @@
 @unexec if cmp -s %D/etc/monitord.conf %D/etc/monitord.conf.sample; then rm -f %D/etc/monitord.conf; fi
 etc/monitord.conf.sample
+man/man8/monitord.8.gz
 sbin/monitord
diff --git a/sysutils/monkeytail/Makefile b/sysutils/monkeytail/Makefile
index 1ebe9606dd63..06122605f554 100644
--- a/sysutils/monkeytail/Makefile
+++ b/sysutils/monkeytail/Makefile
@@ -19,20 +19,13 @@ USE_PERL5=	run
 
 NO_BUILD=	yes
 
-PORTDOCS=	COPYING README
-PLIST_FILES=	bin/mtail
+DOCS=		COPYING README
 
-MAN1=		mtail.1
-MAN5=		mtailrc.5
-
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mtail ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/mtail.1 ${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/mtailrc.5 ${MAN5PREFIX}/man/man5
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/mtail ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/mtail.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/mtailrc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/monkeytail/pkg-plist b/sysutils/monkeytail/pkg-plist
new file mode 100644
index 000000000000..61fa6c4d9a29
--- /dev/null
+++ b/sysutils/monkeytail/pkg-plist
@@ -0,0 +1,6 @@
+bin/mtail
+man/man1/mtail.1.gz
+man/man5/mtailrc.5.gz
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%