Date: 9 Dec 2002 10:59:03 -0000 From: James Raftery <james@now.ie> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Munish Chopra <mchopra@engmail.uwaterloo.ca> Subject: ports/46120: [PATCH] Update net/vnc port Makefile to add WITHOUT_SERVER twiddle Message-ID: <20021209105903.14753.qmail@bender.kerna.ie>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk>
---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<W0O"B!$
M25-43D%-13T))'M03U)43D%-17TM)'M03U)45D524TE/3GTM=6YI>'-R8PI`
M0"`M,30L,S0@*S$T+#<P($!`"B!-04E.5$%)3D52/0EM8VAO<')A0&5N9VUA
M:6PN=7=A=&5R;&]O+F-A"B`*($=.55]#3TY&24=54D4]"7EE<PHM55-%7U!%
M4DPU7U)53CT)>65S"B!54T5?4D5)3E!,04-%/0EY97,*(%5315]83$E"/0EY
M97,*(`HM34%.,3T)"5AV;F,N,2!<"BT)"79N8W9I97=E<BXQ(%P**U!,25-4
M/0D))'M74DM$25)]+W!K9RUP;&ES=`HK"BM-04XQ/0D)=FYC=FEE=V5R+C$@
M7`H@"0EV;F-P87-S=V0N,2!<"BT)"79N8V-O;FYE8W0N,2!<"BL)"79N8V-O
M;FYE8W0N,0HK"BLN:68@(61E9FEN960H5TE42$]55%]315)615(I"BM-04XQ
M*ST)"5AV;F,N,2!<"B`)"79N8W-E<G9E<BXQ"B`**U5315]015),-5]254X]
M"7EE<PHK+F5N9&EF"BL*('!O<W0M8G5I;&0Z"BLN:68@9&5F:6YE9"A7251(
M3U547U-%4E9%4BD**PE`)'M%0TA/7TU31WT@(E-K:7!P:6YG(&)U:6QD(&]F
M(%9.0R!S97)V97(N(@HK+F5L<V4*(`E`8V0@)'M74DM34D-]+UAV;F,@)B8@
M;6%K92!7;W)L9`HK+F5N9&EF"BL**W!R92UI;G-T86QL.@HK"4`D>U)-?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=FYC<V5R=F5R(#X^("1[
M4$Q)4U1]"BL)0"1[14-(3U]#341]('-H87)E+W9N8R]C;&%S<V5S+T1E<T-I
M<&AE<BYC;&%S<R`^/B`D>U!,25-4?0HK"4`D>T5#2$]?0TU$?2!S:&%R92]V
M;F,O8VQA<W-E<R]A;FEM871E9$UE;6]R>4EM86=E4V]U<F-E+F-L87-S(#X^
M("1[4$Q)4U1]"BL)0"1[14-(3U]#341]('-H87)E+W9N8R]C;&%S<V5S+V%U
M=&AE;G1I8V%T:6]N4&%N96PN8VQA<W,@/CX@)'M03$E35'T**PE`)'M%0TA/
M7T--1'T@<VAA<F4O=FYC+V-L87-S97,O8VQI<&)O87)D1G)A;64N8VQA<W,@
M/CX@)'M03$E35'T**PE`)'M%0TA/7T--1'T@<VAA<F4O=FYC+V-L87-S97,O
M:6YD97@N=FYC(#X^("1[4$Q)4U1]"BL)0"1[14-(3U]#341]('-H87)E+W9N
M8R]C;&%S<V5S+V]P=&EO;G-&<F%M92YC;&%S<R`^/B`D>U!,25-4?0HK"4`D
M>T5#2$]?0TU$?2!S:&%R92]V;F,O8VQA<W-E<R]R9F)0<F]T;RYC;&%S<R`^
M/B`D>U!,25-4?0HK"4`D>T5#2$]?0TU$?2!S:&%R92]V;F,O8VQA<W-E<R]S
M:&%R960N=FYC(#X^("1[4$Q)4U1]"BL)0"1[14-(3U]#341]('-H87)E+W9N
M8R]C;&%S<V5S+W9N8T-A;G9A<RYC;&%S<R`^/B`D>U!,25-4?0HK"4`D>T5#
M2$]?0TU$?2!S:&%R92]V;F,O8VQA<W-E<R]V;F-V:65W97(N8VQA<W,@/CX@
M)'M03$E35'T**PE`)'M%0TA/7T--1'T@<VAA<F4O=FYC+V-L87-S97,O=FYC
M=FEE=V5R+FIA<B`^/B`D>U!,25-4?0HK"4`D>T5#2$]?0TU$?2!`9&ER<FT@
M<VAA<F4O=FYC+V-L87-S97,@/CX@)'M03$E35'T**PE`)'M%0TA/7T--1'T@
M0&1I<G)M('-H87)E+W9N8R`^/B`D>U!,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!A<W-W9"`^/B`D>U!,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-\+W5S<B]L;V-A;"]V;F,O8VQA<W-E<WPD>U!2149)6'TO<VAA<F4O
M=FYC+V-L87-S97-\9R<@7`H@"0DM92`G<WQ>7",A+W5S<B]B:6XO<&5R;'Q<
M(R$D>U!%4DQ]?&<G("1[5U)+4U)#?2]V;F-S97)V97(*(`DD>TE.4U1!3$Q?
M4%)/1U)!37T@)'M74DM34D-]+UAV;F,O<')O9W)A;7,O6'-E<G9E<B]8=FYC
M("1[4%)%1DE8?2]B:6XO6'9N8PHM"21[24Y35$%,3%]04D]'4D%-?2`D>U=2
M2U-20WTO=FYC=FEE=V5R+W9N8W9I97=E<B`D>U!2149)6'TO8FEN+W9N8W9I
M97=E<@HM"21[24Y35$%,3%]04D]'4D%-?2`D>U=22U-20WTO=FYC<&%S<W=D
M+W9N8W!A<W-W9"`D>U!2149)6'TO8FEN+W9N8W!A<W-W9`HM"21[24Y35$%,
M3%]04D]'4D%-?2`D>U=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]P<F]G<F%M<R]8<V5R=F5R
M+UAV;F,N;6%N("1[4%)%1DE8?2]M86XO;6%N,2]8=FYC+C$*+0DD>TE.4U1!
M3$Q?34%.?2`D>U=22U-20WTO=FYC=FEE=V5R+W9N8W9I97=E<BYM86X@)'M0
M4D5&25A]+VUA;B]M86XQ+W9N8W9I97=E<BXQ"BT))'M)3E-404Q,7TU!3GT@
M)'M74DM34D-]+W9N8W!A<W-W9"]V;F-P87-S=V0N;6%N("1[4%)%1DE8?2]M
M86XO;6%N,2]V;F-P87-S=V0N,0HM"21[24Y35$%,3%]-04Y]("1[5U)+4U)#
M?2]V;F-C;VYN96-T+W9N8V-O;FYE8W0N;6%N("1[4%)%1DE8?2]M86XO;6%N
M,2]V;F-C;VYN96-T+C$*(`DD>TE.4U1!3$Q?34%.?2`D>U=22U-20WTO=FYC
M<V5R=F5R+FUA;B`D>U!2149)6'TO;6%N+VUA;C$O=FYC<V5R=F5R+C$*(",@
M1V\@:6YS=&%L;"!*879A(&-L87-S97,*(`DD>TU+1$E2?2`D>U!2149)6'TO
M<VAA<F4O=FYC"B`))'M#4'T@+5(@)'M74DM34D-]+V-L87-S97,@)'M04D5&
M25A]+W-H87)E+W9N8PHK+F5N9&EF"BL))'M)3E-404Q,7U!23T=204U]("1[
M5U)+4U)#?2]V;F-V:65W97(O=FYC=FEE=V5R("1[4%)%1DE8?2]B:6XO=FYC
M=FEE=V5R"BL))'M)3E-404Q,7U!23T=204U]("1[5U)+4U)#?2]V;F-P87-S
M=V0O=FYC<&%S<W=D("1[4%)%1DE8?2]B:6XO=FYC<&%S<W=D"BL))'M)3E-4
M04Q,7U!23T=204U]("1[5U)+4U)#?2]V;F-C;VYN96-T+W9N8V-O;FYE8W0@
M)'M04D5&25A]+V)I;B]V;F-C;VYN96-T"BL))'M)3E-404Q,7TU!3GT@)'M7
M4DM34D-]+W9N8W9I97=E<B]V;F-V:65W97(N;6%N("1[4%)%1DE8?2]M86XO
M;6%N,2]V;F-V:65W97(N,0HK"21[24Y35$%,3%]-04Y]("1[5U)+4U)#?2]V
M;F-P87-S=V0O=FYC<&%S<W=D+FUA;B`D>U!2149)6'TO;6%N+VUA;C$O=FYC
M<&%S<W=D+C$**PDD>TE.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<V0N<&]R="YM:SX*
`
end
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021209105903.14753.qmail>