From owner-freebsd-ports Mon Dec 9 3: 0:12 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8432537B401 for ; Mon, 9 Dec 2002 03:00:06 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA2A343EBE for ; Mon, 9 Dec 2002 03:00:05 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gB9B05x3029780 for ; Mon, 9 Dec 2002 03:00:05 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gB9B05M6029779; Mon, 9 Dec 2002 03:00:05 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2347137B40C for ; Mon, 9 Dec 2002 02:59:09 -0800 (PST) Received: from worf.kerna.com (worf.kerna.com [194.106.143.118]) by mx1.FreeBSD.org (Postfix) with SMTP id D9DDA43EC5 for ; Mon, 9 Dec 2002 02:59:07 -0800 (PST) (envelope-from james@now.ie) Received: (qmail 14754 invoked by uid 1001); 9 Dec 2002 10:59:03 -0000 Message-Id: <20021209105903.14753.qmail@bender.kerna.ie> Date: 9 Dec 2002 10:59:03 -0000 From: James Raftery Reply-To: James Raftery To: FreeBSD-gnats-submit@FreeBSD.org Cc: Munish Chopra X-Send-Pr-Version: 3.113 Subject: ports/46120: [PATCH] Update net/vnc port Makefile to add WITHOUT_SERVER twiddle Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46120 >Category: ports >Synopsis: [PATCH] Update net/vnc port Makefile to add WITHOUT_SERVER twiddle >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 09 03:00:05 PST 2002 >Closed-Date: >Last-Modified: >Originator: James Raftery >Release: FreeBSD 4.6.2-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD bender.kerna.ie 4.6.2-RELEASE-p5 FreeBSD 4.6.2-RELEASE-p5 #4: Thu Nov 14 12:16:19 GMT 2002 root@bender.kerna.ie:/usr/obj/usr/src/sys/BENDER i386 >Description: net/vnc port install both the VNC viewer and server. In situations where the server is unnecessary it'd be nice not to have to compile and install it. >How-To-Repeat: N/A >Fix: Patch below to the net/vnc Makefile adds a WITHOUT_SERVER twiddle to install just the VNC viewer and utilities. Because the patched Makefile builds ${PLIST} at install time it retires the pkg-plist file in the CVS repository. It also bumps PORTVERSION from 3.3.5 to 3.3.6. Submitted as a PR at port maintainer's request. --BEGIN-- --- Makefile.orig Thu Dec 5 10:17:06 2002 +++ Makefile Mon Dec 9 10:45:41 2002 @@ -6,7 +6,7 @@ # PORTNAME= vnc -PORTVERSION= 3.3.5 +PORTVERSION= 3.3.6 CATEGORIES= net ipv6 MASTER_SITES= http://www.realvnc.com/dist/ DISTNAME= ${PORTNAME}-${PORTVERSION}-unixsrc @@ -14,34 +14,70 @@ MAINTAINER= mchopra@engmail.uwaterloo.ca GNU_CONFIGURE= yes -USE_PERL5_RUN= yes USE_REINPLACE= yes USE_XLIB= yes -MAN1= Xvnc.1 \ - vncviewer.1 \ +PLIST= ${WRKDIR}/pkg-plist + +MAN1= vncviewer.1 \ vncpasswd.1 \ - vncconnect.1 \ + vncconnect.1 + +.if !defined(WITHOUT_SERVER) +MAN1+= Xvnc.1 \ vncserver.1 +USE_PERL5_RUN= yes +.endif + post-build: +.if defined(WITHOUT_SERVER) + @${ECHO_MSG} "Skipping build of VNC server." +.else @cd ${WRKSRC}/Xvnc && make World +.endif + +pre-install: + @${RM} -f ${PLIST} + @${TOUCH} -f ${PLIST} +.if !defined(WITHOUT_SERVER) + @${ECHO_CMD} bin/Xvnc >> ${PLIST} + @${ECHO_CMD} bin/vncserver >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/DesCipher.class >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/animatedMemoryImageSource.class >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/authenticationPanel.class >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/clipboardFrame.class >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/index.vnc >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/optionsFrame.class >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/rfbProto.class >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/shared.vnc >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/vncCanvas.class >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/vncviewer.class >> ${PLIST} + @${ECHO_CMD} share/vnc/classes/vncviewer.jar >> ${PLIST} + @${ECHO_CMD} @dirrm share/vnc/classes >> ${PLIST} + @${ECHO_CMD} @dirrm share/vnc >> ${PLIST} +.endif + @${ECHO_CMD} bin/vncviewer >> ${PLIST} + @${ECHO_CMD} bin/vncpasswd >> ${PLIST} + @${ECHO_CMD} bin/vncconnect >> ${PLIST} do-install: +.if !defined(WITHOUT_SERVER) ${REINPLACE_CMD} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \ -e 's|^\#!/usr/bin/perl|\#!${PERL}|g' ${WRKSRC}/vncserver ${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc - ${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer - ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd - ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect ${INSTALL_SCRIPT} ${WRKSRC}/vncserver ${PREFIX}/bin/vncserver ${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man ${PREFIX}/man/man1/Xvnc.1 - ${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${PREFIX}/man/man1/vncviewer.1 - ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man ${PREFIX}/man/man1/vncpasswd.1 - ${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man ${PREFIX}/man/man1/vncconnect.1 ${INSTALL_MAN} ${WRKSRC}/vncserver.man ${PREFIX}/man/man1/vncserver.1 # Go install Java classes ${MKDIR} ${PREFIX}/share/vnc ${CP} -R ${WRKSRC}/classes ${PREFIX}/share/vnc +.endif + ${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer + ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd + ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect + ${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${PREFIX}/man/man1/vncviewer.1 + ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man ${PREFIX}/man/man1/vncpasswd.1 + ${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man ${PREFIX}/man/man1/vncconnect.1 .include ---END--- begin 644 vnc-makefile.patch M+2TM($UA:V5F:6QE+F]R:6<)5&AU($1E8R`@-2`Q,#HQ-SHP-B`R,#`R"BLK M*R!-86ME9FEL90E-;VX@1&5C("`Y(#$P.C0U.C0Q(#(P,#(*0$`@+38L-R`K M-BPW($!`"B`C"B`*(%!/4E1.04U%/0EV;F,*+5!/4E1615)324]./0DS+C,N M-0HK4$]25%9%4E-)3TX]"3,N,RXV"B!#051%1T]22453/0EN970@:7!V-@H@ M34%35$527U-)5$53/0EH='1P.B\O=W=W+G)E86QV;F,N8V]M+V1I'-R8PI` M0"`M,30L,S0@*S$T+#65S"B!54T5?4D5)3E!,04-%/0EY97,*(%5315]83$E"/0EY M97,*(`HM34%.,3T)"5AV;F,N,2!<"BT)"79N8W9I97=EU)-?2`M M9B`D>U!,25-4?0HK"4`D>U1/54-(?2`M9B`D>U!,25-4?0HK+FEF("%D969I M;F5D*%=)5$A/551?4T525D52*0HK"4`D>T5#2$]?0TU$?2!B:6XO6'9N8R`^ M/B`D>U!,25-4?0HK"4`D>T5#2$]?0TU$?2!B:6XO=FYCU!,25-4?0HK"4`D>T5#2$]?0TU$?2!S:&%R92]V M;F,O8VQA4EM86=E4V]UU!,25-4?0HK"4`D M>T5#2$]?0TU$?2!S:&%R92]V;F,O8VQAU!,25-4?0HK"4`D>T5#2$]?0TU$?2!S:&%R92]V;F,O8VQAU!,25-4?0HK"4`D>T5# M2$]?0TU$?2!S:&%R92]V;F,O8VQAU!,25-4?0HK"4`D>T5#2$]?0TU$?2!`9&ERU!,25-4?0HK+F5N9&EF"BL)0"1[14-( M3U]#341](&)I;B]V;F-V:65W97(@/CX@)'M03$E35'T**PE`)'M%0TA/7T-- M1'T@8FEN+W9N8W!AU!,25-4?0HK"4`D>T5#2$]?0TU$?2!B M:6XO=FYC8V]N;F5C="`^/B`D>U!,25-4?0H@"B!D;RUI;G-T86QL.@HK+FEF M("%D969I;F5D*%=)5$A/551?4T525D52*0H@"21[4D5)3E!,04-%7T--1'T@ M+64@)W-\+W5SU!2149)6'TO7",A+W5SU!%4DQ]?&TE.4U1!3$Q? M4%)/1U)!37T@)'M74DM34D-]+UAV;F,O<')O9W)A;7,O6'-EU=2 M2U-20WTO=FYC=FEE=V5R+W9N8W9I97=EU!2149)6'TO8FEN+W9N8W9I M97=E<@HM"21[24Y35$%,3%]04D]'4D%-?2`D>U=22U-20WTO=FYC<&%SU!2149)6'TO8FEN+W9N8W!AU=22U-20WTO=FYC8V]N;F5C="]V;F-C;VYN96-T("1[ M4%)%1DE8?2]B:6XO=FYC8V]N;F5C=`H@"21[24Y35$%,3%]30U))4%1]("1[ M5U)+4U)#?2]V;F-S97)V97(@)'M04D5&25A]+V)I;B]V;F-S97)V97(*(`DD M>TE.4U1!3$Q?34%.?2`D>U=22U-20WTO6'9N8R]PTE.4U1! M3$Q?34%.?2`D>U=22U-20WTO=FYC=FEE=V5R+W9N8W9I97=ETE.4U1!3$Q?34%.?2`D>U=22U-20WTO=FYC MU!2149)6'TO;6%N+VUA;C$O=FYCTU+1$E2?2`D>U!2149)6'TO MU!2149)6'TO;6%N+VUA;C$O=FYC M<&%STE.4U1!3$Q?34%.?2`D>U=22U-20WTO=FYC8V]N;F5C M="]V;F-C;VYN96-T+FUA;B`D>U!2149)6'TO;6%N+VUA;C$O=FYC8V]N;F5C >Release-Note: >Audit-Trail: >Unformatted: >="XQ"B`*("YI;F-L=61E(#QB