Support STAGEDIR.

18 files changed, 66 insertions, 55 deletions

diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
index 8e420a3f93c0..cc26ed47971a 100644
--- a/sysutils/bchunk/Makefile
+++ b/sysutils/bchunk/Makefile
@@ -9,15 +9,13 @@ MASTER_SITES=	http://he.fi/bchunk/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts .bin/.cue files to .iso/audio
 
-MAN1=		bchunk.1
-PLIST_FILES=	bin/bchunk
+PLIST_FILES=	bin/bchunk man/man1/bchunk.1.gz
 
-NO_STAGE=	yes
 do-build:
 	cd ${WRKSRC}; ${CC} ${CFLAGS} bchunk.c -o bchunk
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bchunk ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/bchunk ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile
index 7f9adfd7253c..0d8a42c49645 100644
--- a/sysutils/bkpupsd/Makefile
+++ b/sysutils/bkpupsd/Makefile
@@ -9,7 +9,4 @@ MASTER_SITES=	http://ftp.knit.kagoshima-u.ac.jp/pub/Unix/bkpupsd/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple UPS daemon for APC BK Pro(TM)
 
-MAN8=		bkpupsd.8
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/bkpupsd/files/patch-aa b/sysutils/bkpupsd/files/patch-Makefile
index 88642dbb8306..f31f1e1f32dc 100644
--- a/sysutils/bkpupsd/files/patch-aa
+++ b/sysutils/bkpupsd/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Aug  3 13:02:37 1997
-+++ Makefile	Wed Aug  4 13:43:37 1999
+--- Makefile.orig	1997-08-04 01:02:37.000000000 +0800
++++ Makefile	2013-11-08 20:53:42.000000000 +0800
 @@ -5,24 +5,22 @@
  # ver 1.0 A
  #
@@ -24,10 +24,10 @@
 -	cp ./doc/bkpupsd.8 ${MANDIR}/man8/bkpupsd.8
 -	chown root.wheel ./scripts/*
 -	cp -fR ./scripts ${SCRIPTDIR}/bkpupsd
-+	${BSD_INSTALL_PROGRAM} ./bin/bkpupsd ${SBINDIR}
-+	${BSD_INSTALL_MAN} ./doc/bkpupsd.8 ${MANDIR}
-+	mkdir -p ${SCRIPTDIR}
-+	(cd scripts; for i in *; do ${BSD_INSTALL_SCRIPT} $$i ${SCRIPTDIR}; done)
++	${BSD_INSTALL_PROGRAM} ./bin/bkpupsd ${DESTDIR}${SBINDIR}
++	${BSD_INSTALL_MAN} ./doc/bkpupsd.8 ${DESTDIR}${MANDIR}
++	mkdir -p ${DESTDIR}${SCRIPTDIR}
++	(cd scripts; for i in *; do ${BSD_INSTALL_SCRIPT} $$i ${DESTDIR}${SCRIPTDIR}; done)
  
  clean:
  	rm -f ./bin/bkpupsd
diff --git a/sysutils/bkpupsd/pkg-plist b/sysutils/bkpupsd/pkg-plist
index 370451c82906..c5ab1d983eb6 100644
--- a/sysutils/bkpupsd/pkg-plist
+++ b/sysutils/bkpupsd/pkg-plist
@@ -1,6 +1,7 @@
-sbin/bkpupsd
+libexec/bkpupsd/bkpups.battlow
 libexec/bkpupsd/bkpups.failed
 libexec/bkpupsd/bkpups.restored
 libexec/bkpupsd/bkpups.shutdown
-libexec/bkpupsd/bkpups.battlow
+man/man8/bkpupsd.8.gz
+sbin/bkpupsd
 @dirrm libexec/bkpupsd
diff --git a/sysutils/cdargs/Makefile b/sysutils/cdargs/Makefile
index b3f9288afd33..8bb4f426766f 100644
--- a/sysutils/cdargs/Makefile
+++ b/sysutils/cdargs/Makefile
@@ -15,9 +15,8 @@ LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
 
 MAN1=		cdargs.1
-PLIST_FILES=	bin/cdargs
+PLIST_FILES=	bin/cdargs man/man1/cdargs.1.gz
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^AM_CXXFLAGS|#AM_CXXFLAGS|' ${WRKSRC}/src/Makefile.in
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index 169e9ad93c63..4554bfa8bfd0 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Simple but full-featured backup/restore perl scripts (uses gnu tar)
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
-RUN_DEPENDS=	${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -22,8 +21,6 @@ GNU_CONFIGURE=	yes
 USES=		perl5
 CONFIGURE_ENV+=	PATH=${PATH}:${LOCALBASE}/sbin
 
-MAN1=		cdbkup.1 cdappend.1 cdcat.1 cdrstr.1 cdsplit.1
 PORTDOCS=	README TODO COMPLIANCE
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/cdbkup/pkg-plist b/sysutils/cdbkup/pkg-plist
index a92934125db7..dd0d24a0fed1 100644
--- a/sysutils/cdbkup/pkg-plist
+++ b/sysutils/cdbkup/pkg-plist
@@ -1,3 +1,8 @@
+man/man1/cdappend.1.gz
+man/man1/cdbkup.1.gz
+man/man1/cdcat.1.gz
+man/man1/cdrstr.1.gz
+man/man1/cdsplit.1.gz
 sbin/cdappend
 sbin/cdbkup
 sbin/cdcat
diff --git a/sysutils/cdroot/Makefile b/sysutils/cdroot/Makefile
index 81e1d1603b59..789576426d3b 100644
--- a/sysutils/cdroot/Makefile
+++ b/sysutils/cdroot/Makefile
@@ -10,5 +10,4 @@ MASTER_SITE_SUBDIR=	bsd
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scripts to automate setting up a bootable CD-ROM based FreeBSD system
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/cdroot/files/patch-Makefile b/sysutils/cdroot/files/patch-Makefile
new file mode 100644
index 000000000000..506fcdef82bb
--- /dev/null
+++ b/sysutils/cdroot/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig	2002-08-09 22:29:24.000000000 +0800
++++ Makefile	2013-11-08 21:22:16.000000000 +0800
+@@ -1,8 +1,8 @@
+ # $Id: Makefile,v 1.15 2002/08/09 14:29:24 bsd Exp $
+ 
+ PREFIX  ?= /usr/local
+-BINDIR  = ${PREFIX}/bin
+-LIBDIR  = ${PREFIX}/share/cdroot
++BINDIR  = ${DESTDIR}${PREFIX}/bin
++LIBDIR  = ${DESTDIR}${PREFIX}/share/cdroot
+ 
+ all : mkcdroot.inst
+ 
diff --git a/sysutils/cdroot/pkg-plist b/sysutils/cdroot/pkg-plist
index e07581855965..c35f64309857 100644
--- a/sysutils/cdroot/pkg-plist
+++ b/sysutils/cdroot/pkg-plist
@@ -1,8 +1,8 @@
 bin/mkcdroot
-share/cdroot/README
-share/cdroot/cdroot_initdisk
-share/cdroot/cdroot_inst
-share/cdroot/cdroot_mount
-share/cdroot/cdroot_site_overrides.sample
-share/cdroot/rc.replacement
-@dirrm share/cdroot
+%%DATADIR%%/README
+%%DATADIR%%/cdroot_initdisk
+%%DATADIR%%/cdroot_inst
+%%DATADIR%%/cdroot_mount
+%%DATADIR%%/cdroot_site_overrides.sample
+%%DATADIR%%/rc.replacement
+@dirrm %%DATADIR%%
diff --git a/sysutils/chgrep/Makefile b/sysutils/chgrep/Makefile
index 668089087bfd..40db91e3cf0c 100644
--- a/sysutils/chgrep/Makefile
+++ b/sysutils/chgrep/Makefile
@@ -13,14 +13,12 @@ COMMENT=	Fast string substitution across multiple files
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-MAN1=		chgrep.1
-PLIST_FILES=	bin/chgrep
+PLIST_FILES=	bin/chgrep man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/chgrep \
-		${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/chgrep.1 \
-		${MANPREFIX}/man/man1
+		${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/clonehdd/Makefile b/sysutils/clonehdd/Makefile
index 39d829f1dfbf..0055b16ffc8e 100644
--- a/sysutils/clonehdd/Makefile
+++ b/sysutils/clonehdd/Makefile
@@ -11,15 +11,11 @@ COMMENT=	Tool for clone HDD on FreeBSD
 
 USES=		perl5
 USE_PERL5=	run
-PLIST_FILES=	sbin/clonehdd
+PLIST_FILES=	sbin/clonehdd man/man8/${PORTNAME}.8.gz
 NO_BUILD=	YES
-MAN8=		clonehdd.8
-SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/clonehdd ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/clonehdd.8 ${MAN8PREFIX}/man/man8
-	${CAT} ${PKGMESSAGE}
+	${INSTALL_SCRIPT} ${WRKSRC}/clonehdd ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/clonehdd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/clonehdd/files/pkg-message.in b/sysutils/clonehdd/pkg-message
index 02fb0c773e3f..02fb0c773e3f 100644
--- a/sysutils/clonehdd/files/pkg-message.in
+++ b/sysutils/clonehdd/pkg-message
diff --git a/sysutils/consolehm/Makefile b/sysutils/consolehm/Makefile
index 32cf9cd3d33b..71e0ee777baf 100644
--- a/sysutils/consolehm/Makefile
+++ b/sysutils/consolehm/Makefile
@@ -14,11 +14,8 @@ COMMENT=	Console based hardware monitor for FreeBSD
 WRKSRC=		${WRKDIR}/consolehm/consolehm
 
 GNU_CONFIGURE=	yes
-MAN8=		chm.8
-MANCOMPRESSED=	yes
-PLIST_FILES=	bin/chm
+PLIST_FILES=	bin/chm man/man8/chm.8.gz
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
diff --git a/sysutils/cotty/Makefile b/sysutils/cotty/Makefile
index ed86f1252b08..61fc5c0eb537 100644
--- a/sysutils/cotty/Makefile
+++ b/sysutils/cotty/Makefile
@@ -16,11 +16,10 @@ EXTRACT_CMD=	${GZCAT}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	> ${WRKSRC}/${DISTNAME}.c
 
-NO_STAGE=	yes
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/cotty ${WRKSRC}/${DISTNAME}.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cotty ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cotty ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/cw/Makefile b/sysutils/cw/Makefile
index fe2804fbc8f2..bad704b821ec 100644
--- a/sysutils/cw/Makefile
+++ b/sysutils/cw/Makefile
@@ -12,20 +12,15 @@ COMMENT=	Non-intrusive color wrapper for common commands
 
 GNU_CONFIGURE=	yes
 
-MANCOMPRESSED=	yes
-MAN1=		cw.1 cwe.1 cwu.1
-
 OPTIONS_DEFINE=	DOCS
-PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .  for file in CHANGES CONTRIB FILES INSTALL PLATFORM README VERSION
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .  endfor
 .endif
 
diff --git a/sysutils/cw/files/patch-Makefile.in b/sysutils/cw/files/patch-Makefile.in
new file mode 100644
index 000000000000..73e6c5118589
--- /dev/null
+++ b/sysutils/cw/files/patch-Makefile.in
@@ -0,0 +1,9 @@
+--- Makefile.in.orig	2013-11-08 22:45:17.000000000 +0800
++++ Makefile.in	2013-11-08 22:46:17.000000000 +0800
+@@ -1,5 +1,5 @@
+ # this was NOT generated by automake.
+-PREFIX=@prefix@
++PREFIX=${DESTDIR}@prefix@
+ BINDIR=${PREFIX}/bin
+ LIBDIR=${PREFIX}/lib
+ MANDIR=@mandir@
diff --git a/sysutils/cw/pkg-plist b/sysutils/cw/pkg-plist
index 225572bdece4..b0479e0302c2 100644
--- a/sysutils/cw/pkg-plist
+++ b/sysutils/cw/pkg-plist
@@ -121,5 +121,13 @@ lib/cw/wc
 lib/cw/whereis
 lib/cw/who
 lib/cw/xferlog@
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIB
+%%PORTDOCS%%%%DOCSDIR%%/FILES
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/PLATFORM
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/cw/etc
 @dirrm lib/cw