From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 6 23:00:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 6C369953 for ; Thu, 6 Mar 2014 23:00:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 14DBE88F for ; Thu, 6 Mar 2014 23:00:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s26N00w2063762 for ; Thu, 6 Mar 2014 23:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s26N00Cb063759; Thu, 6 Mar 2014 23:00:00 GMT (envelope-from gnats) Resent-Date: Thu, 6 Mar 2014 23:00:00 GMT Resent-Message-Id: <201403062300.s26N00Cb063759@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov 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 0963585F for ; Thu, 6 Mar 2014 22:54:48 +0000 (UTC) Received: from smtpout6.timeweb.ru (smtpout6.timeweb.ru [92.53.117.39]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B7EEF853 for ; Thu, 6 Mar 2014 22:54:46 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WLhBb-0001Jn-IO; Fri, 07 Mar 2014 02:54:43 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 405A3F18; Fri, 7 Mar 2014 02:54:43 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 1E6D11CA68; Fri, 7 Mar 2014 02:54:42 +0400 (MSK) Message-Id: <20140306225443.1E6D11CA68@hades.panopticon> Date: Fri, 7 Mar 2014 02:54:42 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187333: [PATCH] net/tightvnc: support staging Cc: meta+ports@vmeta.jp X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 23:00:01 -0000 >Number: 187333 >Category: ports >Synopsis: [PATCH] net/tightvnc: support staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 06 23:00:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: [DESCRIBE CHANGES] Port maintainer (meta+ports@vmeta.jp) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports) >How-To-Repeat: - Support staging - Use new LIB_DEPENDS syntax >Fix: --- tightvnc-1.3.10.patch begins here --- diff -ruN /usr/ports/net/tightvnc/Makefile ./Makefile --- /usr/ports/net/tightvnc/Makefile 2014-01-21 05:18:22.000000000 +0400 +++ ./Makefile 2014-03-06 18:04:51.526156212 +0400 @@ -14,7 +14,7 @@ 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 @@ 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 @@ 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 @@ 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 diff -ruN /usr/ports/net/tightvnc/pkg-plist ./pkg-plist --- /usr/ports/net/tightvnc/pkg-plist 2014-01-22 19:16:56.000000000 +0400 +++ ./pkg-plist 2014-03-06 18:04:31.014157875 +0400 @@ -25,3 +25,8 @@ %%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 --- tightvnc-1.3.10.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: