From owner-svn-ports-head@FreeBSD.ORG Tue Jun 17 12:41:34 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DD0BCE; Tue, 17 Jun 2014 12:41:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBC572AD0; Tue, 17 Jun 2014 12:41:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5HCfXl8060252; Tue, 17 Jun 2014 12:41:33 GMT (envelope-from sanpei@svn.freebsd.org) Received: (from sanpei@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5HCfXQ3060250; Tue, 17 Jun 2014 12:41:33 GMT (envelope-from sanpei@svn.freebsd.org) Message-Id: <201406171241.s5HCfXQ3060250@svn.freebsd.org> From: MIHIRA Sanpei Yoshiro Date: Tue, 17 Jun 2014 12:41:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358107 - head/net/vnc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2014 12:41:34 -0000 Author: sanpei Date: Tue Jun 17 12:41:33 2014 New Revision: 358107 URL: http://svnweb.freebsd.org/changeset/ports/358107 QAT: https://qat.redports.org/buildarchive/r358107/ Log: support stage. Modified: head/net/vnc/Makefile head/net/vnc/pkg-plist Modified: head/net/vnc/Makefile ============================================================================== --- head/net/vnc/Makefile Tue Jun 17 12:41:28 2014 (r358106) +++ head/net/vnc/Makefile Tue Jun 17 12:41:33 2014 (r358107) @@ -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 .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 Modified: head/net/vnc/pkg-plist ============================================================================== --- head/net/vnc/pkg-plist Tue Jun 17 12:41:28 2014 (r358106) +++ head/net/vnc/pkg-plist Tue Jun 17 12:41:33 2014 (r358107) @@ -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%%