From 87d3f71d6d9dc46893dbd489c4bd321cb218d8b1 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 23 Sep 2013 11:24:00 +0000
Subject: [PATCH] - Support STAGEDIR

---
 ports-mgmt/portupgrade/Makefile  | 28 +++-------------------------
 ports-mgmt/portupgrade/pkg-plist | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index bd646073df2a..a5b7a39518b7 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -19,32 +19,14 @@ OPTIONS_DEFINE=	DOCS
 
 CONFLICTS_INSTALL=	portupgrade-devel-*
 
-NO_STAGE=	yes
 DIST_SUBDIR=	${PORTNAME}
 USE_BZIP2=	yes
 USE_RUBY=	yes
 
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
 
-MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}" RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}"
-
-MAN1=		pkg_deinstall.1 \
-		pkg_fetch.1 \
-		pkg_glob.1 \
-		pkg_sort.1 \
-		pkgdb.1 \
-		pkgdu.1 \
-		portcvsweb.1 \
-		portsclean.1 \
-		portsdb.1 \
-		portupgrade.1 \
-		portversion.1
-MAN5=		pkgtools.conf.5
-MLINKS=		pkgdb.1 pkg_which.1 \
-		portupgrade.1 portinstall.1 \
-		portcvsweb.1 portsvnweb.1 \
-		portsdb.1 ports_glob.1
-MANCOMPRESSED=	maybe
+MAKE_ARGS=	PREFIX="${PREFIX}" RUBY="${RUBY}" \
+		RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" MKDIR="${MKDIR}"
 
 EXAMPLESDIR=	${PREFIX}/share/examples/pkgtools
 DOCSDIR=	${PREFIX}/share/doc/pkgtools
@@ -71,10 +53,6 @@ PLIST_SUB+=	SCRIPT="@comment "
 .endif
 
 post-install:
-	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
-		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
-	fi
-	${MKDIR} ${PREFIX}/lib/compat/pkg
-	${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index e84d7ecea9fb..642f3880f9fb 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -1,6 +1,22 @@
 @exec /bin/mkdir -p %D/lib/compat/pkg
 @dirrmtry lib/compat/pkg
 @dirrmtry lib/compat
+man/man1/pkg_deinstall.1.gz
+man/man1/pkg_fetch.1.gz
+man/man1/pkg_glob.1.gz
+man/man1/pkg_sort.1.gz
+man/man1/pkg_which.1.gz
+man/man1/pkgdb.1.gz
+man/man1/pkgdu.1.gz
+man/man1/portcvsweb.1.gz
+man/man1/portinstall.1.gz
+man/man1/ports_glob.1.gz
+man/man1/portsclean.1.gz
+man/man1/portsdb.1.gz
+man/man1/portsvnweb.1.gz
+man/man1/portupgrade.1.gz
+man/man1/portversion.1.gz
+man/man5/pkgtools.conf.5.gz
 sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob