From c94066344a0a4474dedf737621fa563948b65376 Mon Sep 17 00:00:00 2001
From: MIHIRA Sanpei Yoshiro <sanpei@FreeBSD.org>
Date: Tue, 17 Jun 2014 12:41:33 +0000
Subject: support stage.

---
 net/vnc/Makefile  | 29 ++++++++++-------------------
 net/vnc/pkg-plist | 10 ++++++++--
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 8064f4b1fd81..33a57b7af70f 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -31,16 +31,10 @@ OPTIONS_DEFINE=	SERVER
 OPTIONS_DEFAULT=	SERVER
 SERVER_DESC=	Install VNC server components
 
-MAN1=		vncviewer.1 \
-		vncpasswd.1 \
-		vncconfig.1 \
-		x0vncserver.1
-
 .ifdef(REALVNC_BASE)
 PREFIX=${REALVNC_BASE}
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "arm"
@@ -71,9 +65,6 @@ EXTRA_PATCHES+=	${WRKSRC}/xc.patch \
 		${PATCHDIR}/extra-patch-fix_Xvnc_no_valid_address \
 		${PATCHDIR}/extra-patch-xc-config-util-printver.c
 
-MAN1+=		Xvnc.1 \
-		vncserver.1
-
 PLIST_SUB+=	SERVER=""
 .else
 PLIST_SUB+=	SERVER="@comment "
@@ -118,26 +109,26 @@ pre-install:
 
 do-install:
 .for f in vncviewer vncpasswd vncconfig x0vncserver
-	${INSTALL_PROGRAM} ${WRKSRC}/${f}/${f} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${f}/${f}.man ${PREFIX}/man/man1/${f}.1
+	${INSTALL_PROGRAM} ${WRKSRC}/${f}/${f} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${f}/${f}.man ${STAGEDIR}${PREFIX}/man/man1/${f}.1
 .endfor
 .if ${PORT_OPTIONS:MSERVER}
 	@${REINPLACE_CMD} -e \
 		's|/usr/local/vnc/classes|${DATADIR}/classes|g' \
 		${WRKSRC}/vncserver
-	${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${STAGEDIR}${PREFIX}/bin
 	@if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \
-		${MKDIR} ${PREFIX}/lib/modules/extensions ; \
+		${MKDIR} ${STAGEDIR}${PREFIX}/lib/modules/extensions ; \
 		${INSTALL_PROGRAM} \
 			${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so \
-			${PREFIX}/lib/modules/extensions ; \
+			${STAGEDIR}${PREFIX}/lib/modules/extensions ; \
 	fi
 	${INSTALL_MAN} ${WRKSRC}/xc/programs/Xserver/Xvnc.man \
-		${PREFIX}/man/man1/Xvnc.1
-	${INSTALL_MAN} ${WRKSRC}/vncserver.man ${PREFIX}/man/man1/vncserver.1
-	${MKDIR} ${DATADIR}/classes
-	${INSTALL_DATA} ${WRKSRC}/../common/javabin/* ${DATADIR}/classes
+		${STAGEDIR}${PREFIX}/man/man1/Xvnc.1
+	${INSTALL_MAN} ${WRKSRC}/vncserver.man ${STAGEDIR}${PREFIX}/man/man1/vncserver.1
+	${MKDIR} ${STAGEDIR}${DATADIR}/classes
+	${INSTALL_DATA} ${WRKSRC}/../common/javabin/* ${STAGEDIR}${DATADIR}/classes
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/vnc/pkg-plist b/net/vnc/pkg-plist
index 063cdd4018ad..21105577cf23 100644
--- a/net/vnc/pkg-plist
+++ b/net/vnc/pkg-plist
@@ -2,10 +2,16 @@ bin/vncviewer
 bin/vncpasswd
 bin/vncconfig
 bin/x0vncserver
+man/man1/vncconfig.1.gz
+man/man1/vncpasswd.1.gz
+man/man1/vncviewer.1.gz
+man/man1/x0vncserver.1.gz
 %%SERVER%%bin/Xvnc
 %%SERVER%%bin/vncserver
+%%SERVER%%man/man1/Xvnc.1.gz
+%%SERVER%%man/man1/vncserver.1.gz
 %%SERVER%%%%DATADIR%%/classes/index.vnc
 %%SERVER%%%%DATADIR%%/classes/logo150x150.gif
 %%SERVER%%%%DATADIR%%/classes/vncviewer.jar
-%%SERVER%%@dirrm %%DATADIR%%/classes
-%%SERVER%%@dirrm %%DATADIR%%
+%%SERVER%%@dirrmtry %%DATADIR%%/classes
+%%SERVER%%@dirrmtry %%DATADIR%%
-- 
cgit v1.2.3