Date: Fri, 7 Mar 2014 02:54:42 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: meta+ports@vmeta.jp Subject: ports/187333: [PATCH] net/tightvnc: support staging Message-ID: <20140306225443.1E6D11CA68@hades.panopticon> Resent-Message-ID: <201403062300.s26N00Cb063759@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
.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 <bsd.port.post.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140306225443.1E6D11CA68>