From owner-svn-ports-all@FreeBSD.ORG Fri Mar 7 10:28:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6A1959C; Fri, 7 Mar 2014 10:28:19 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9755FB63; Fri, 7 Mar 2014 10:28:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27ASJ9R074796; Fri, 7 Mar 2014 10:28:19 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27ASJK7074794; Fri, 7 Mar 2014 10:28:19 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201403071028.s27ASJK7074794@svn.freebsd.org> From: Dmitry Marakasov Date: Fri, 7 Mar 2014 10:28:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347353 - head/net/tightvnc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 10:28:19 -0000 Author: amdmi3 Date: Fri Mar 7 10:28:18 2014 New Revision: 347353 URL: http://svnweb.freebsd.org/changeset/ports/347353 QAT: https://qat.redports.org/buildarchive/r347353/ Log: - Support staging - Use new LIB_DEPENDS syntax PR: 187333 Submitted by: amdmi3 Approved by: Koichiro IWAO (maintainer) Modified: head/net/tightvnc/Makefile head/net/tightvnc/pkg-plist Modified: head/net/tightvnc/Makefile ============================================================================== --- head/net/tightvnc/Makefile Fri Mar 7 09:46:25 2014 (r347352) +++ head/net/tightvnc/Makefile Fri Mar 7 10:28:18 2014 (r347353) @@ -14,7 +14,7 @@ COMMENT= Enhanced version of VNC LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENCE.TXT -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= showrgb:${PORTSDIR}/x11/rgb \ xauth:${PORTSDIR}/x11/xauth \ xorg-fonts>=7.2:${PORTSDIR}/x11-fonts/xorg-fonts @@ -28,14 +28,10 @@ CFLAGS+= -Wno-return-type USE_BZIP2= yes USE_XORG= xaw ALL_TARGET= World -NO_INSTALL_MANPAGES= yes - -MAN1= Xvnc.1 vncviewer.1 vncpasswd.1 vncconnect.1 vncserver.1 OPTIONS_DEFINE= JVNC_VIEWER JVNC_VIEWER_DESC= Install Java-based vnc viewer -NO_STAGE= yes .include .if ${PORT_OPTIONS:MJVNC_VIEWER} @@ -58,7 +54,7 @@ IGNORE= vnc has already been installed, post-patch: .for file in vncviewer/Imakefile Xvnc/config/cf/vnclibs.def - @${REINPLACE_CMD} -i '' -e "s|%%LOCALBASE%%|${PREFIX}|g" ${WRKSRC}/${file} + @${REINPLACE_CMD} -i '' -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/${file} .endfor @${REINPLACE_CMD} -i '' -e "s|/usr/local/vnc/classes|${DATADIR}/classes|g" \ ${WRKSRC}/vncserver @@ -66,15 +62,15 @@ post-patch: s|%%CFLAGS%%|${CFLAGS}|g" ${WRKSRC}/Xvnc/config/cf/FreeBSD.cf do-install: - @(cd ${WRKSRC}; ./vncinstall ${PREFIX}/bin ${PREFIX}/man) + @(cd ${WRKSRC}; ./vncinstall ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/man) .if defined(STRIP) && ${STRIP} != "" .for FILE in Xvnc vncviewer vncpasswd vncconnect - @${STRIP_CMD} ${PREFIX}/bin/${FILE} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${FILE} .endfor .endif .if ${PORT_OPTIONS:MJVNC_VIEWER} - @${MKDIR} ${DATADIR}/classes - ${INSTALL_DATA} ${WRKSRC}/classes/*.* ${DATADIR}/classes + @${MKDIR} ${STAGEDIR}${DATADIR}/classes + ${INSTALL_DATA} ${WRKSRC}/classes/*.* ${STAGEDIR}${DATADIR}/classes .endif .include Modified: head/net/tightvnc/pkg-plist ============================================================================== --- head/net/tightvnc/pkg-plist Fri Mar 7 09:46:25 2014 (r347352) +++ head/net/tightvnc/pkg-plist Fri Mar 7 10:28:18 2014 (r347353) @@ -25,3 +25,8 @@ bin/vncviewer %%JVNC_VIEWER%%%%DATADIR%%/classes/index.vnc %%JVNC_VIEWER%%@dirrm %%DATADIR%%/classes %%JVNC_VIEWER%%@dirrm %%DATADIR%% +man/man1/Xvnc.1.gz +man/man1/vncconnect.1.gz +man/man1/vncpasswd.1.gz +man/man1/vncserver.1.gz +man/man1/vncviewer.1.gz