cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 3.3.3r2 and modernize

Browse Source 
- fix vncserver Xauthority problem
- take MAINTAINER from ports@
This commit is contained in:
matt 2001-05-22 19:30:16 +00:00
parent 2452c2ecf2
commit 4fea871ff3
7 changed files with 165 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
net/vnc/Makefile
View File

@ -1,48 +1,46 @@
# $OpenBSD: Makefile,v 1.10 2001/05/06 05:00:40 lebel Exp $
# $OpenBSD: Makefile,v 1.11 2001/05/22 19:30:16 matt Exp $
# $FreeBSD: Makefile,v 1.10 1999/02/18 16:05:47 steve Exp $
COMMENT= "display X & Win32 desktops on remote X/Win32/Java displays"
DISTNAME= vnc-3.3.2r3_unixsrc
PKGNAME= vnc-3.3.2r3
VERSION= 3.3.3r2
PKGNAME= vnc-${VERSION}
DISTNAME= ${PKGNAME}_unixsrc
CATEGORIES= net
NEED_VERSION= 1.402
MASTER_SITES= http://www.uk.research.att.com/vnc/dist/
DISTFILES= vnc-3.3.2r3_unixsrc.tgz vnc-3.3.2_doc.tgz
MAINTAINER= ports@openbsd.org
HOMEPAGE= http://www.uk.research.att.com/vnc/
MAINTAINER= Matt Behrens <matt@openbsd.org>
LICENSE_TYPE= GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
EXTRACT_ONLY= vnc-3.3.2r3_unixsrc.tgz
IGNOREFILES= ${DISTFILES}
MASTER_SITES= http://www.uk.research.att.com/vnc/dist/
DISTFILES= ${DISTNAME}.tgz ${IGNOREFILES}
IGNOREFILES= vnc-latest_doc.tgz
WRKDIST= ${WRKDIR}/vnc_unixsrc
CONFIGURE_STYLE= imake
CONFIGURE_STYLE=imake
WRKDIST= ${WRKDIR}/vnc_unixsrc
ALL_TARGET= World
# We have to frob a few things, and we want our own permissions, so it's easier
# to do the install ourselves.
post-install:
${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
sed -e s%/usr/local/vnc/classes%${TRUEPREFIX}/share/vnc/classes% \
${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
sed -e s%/usr/local/vnc/classes%${TRUEPREFIX}/share/vnc/classes% \
< ${WRKSRC}/vncserver \
> ${WRKSRC}/vncserver.local
${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
# The documentation comes with bogus ownerships; this is a little leaky security-wise
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vnc
tar -C ${PREFIX}/share/doc/vnc -xzf ${DISTDIR}/vnc-3.3.2_doc.tgz
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/vnc
# Go install Java classes
${INSTALL_DATA_DIR} ${PREFIX}/share/vnc
cp -R ${WRKSRC}/classes ${PREFIX}/share/vnc
${INSTALL_DATA} ${WRKDIR}/vnc_docs/* ${PREFIX}/share/doc/vnc/
${INSTALL_DATA_DIR} ${PREFIX}/share/vnc/classes
${INSTALL_DATA} ${WRKSRC}/classes/* ${PREFIX}/share/vnc/classes/
.include <bsd.port.mk>

6
net/vnc/files/md5
View File

@ -1,2 +1,4 @@
MD5 (vnc-3.3.2r3_unixsrc.tgz) = IGNORE
MD5 (vnc-3.3.2_doc.tgz) = IGNORE
MD5 (vnc-3.3.3r2_unixsrc.tgz) = 6fc83e1b6153d3252649953267713f17
MD5 (vnc-latest_doc.tgz) = IGNORE
RMD160 (vnc-3.3.3r2_unixsrc.tgz) = 3c70c386065d8b0254b1a0627455fb7bc03846ae
SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176

12
net/vnc/patches/patch-Imakefile Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Imakefile,v 1.1 2001/05/22 19:30:16 matt Exp $
--- Imakefile.orig Thu Oct 26 09:28:32 2000
+++ Imakefile Tue May 22 10:17:59 2001
@@ -11,6 +11,8 @@ World:
@echo Built $(SUBDIRS).
@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
@echo ""
+ (cd Xvnc; make World)
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
+

13
net/vnc/patches/patch-aa
View File

@ -1,13 +0,0 @@
*** Imakefile.orig Mon May 18 06:18:46 1998
--- Imakefile Sat Jun 20 17:24:00 1998
***************
*** 11,16 ****
--- 11,18 ----
@echo Built $(SUBDIRS).
@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
@echo ""
+ (cd Xvnc; make World)
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
+

50
net/vnc/patches/patch-ab → net/vnc/patches/patch-vncserver
View File

@ -1,31 +1,32 @@
--- vncserver.orig Wed Jul 15 08:40:23 1998
+++ vncserver Wed Oct 7 20:05:26 1998
@@ -46,13 +46,23 @@
$OpenBSD: patch-vncserver,v 1.1 2001/05/22 19:30:17 matt Exp $
--- vncserver.orig Thu Oct 26 11:16:37 2000
+++ vncserver Tue May 22 14:19:07 2001
@@ -46,13 +46,23 @@ $defaultXStartup
"xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
"twm &\n");
+$defaultFontPath
+ = (
+ "/usr/X11R6/lib/X11/fonts/Type1/,".
+ "/usr/X11R6/lib/X11/fonts/Speedo/,".
+ "/usr/X11R6/lib/X11/fonts/cyrillic/,".
+ "/usr/X11R6/lib/X11/fonts/misc/,".
+ "/usr/X11R6/lib/X11/fonts/75dpi/,".
+ "/usr/X11R6/lib/X11/fonts/100dpi/"
+ );
+ "/usr/X11R6/lib/X11/fonts/Type1/,".
+ "/usr/X11R6/lib/X11/fonts/Speedo/,".
+ "/usr/X11R6/lib/X11/fonts/cyrillic/,".
+ "/usr/X11R6/lib/X11/fonts/misc/,".
+ "/usr/X11R6/lib/X11/fonts/75dpi/,".
+ "/usr/X11R6/lib/X11/fonts/100dpi/"
+ );
+
chop($host = `uname -n`);
# Check command line options
&ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-help",0,
- "-kill",1);
+ "-kill",1,"-fp",1);
&ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,
- "-help",0,"-h",0,"--help",0);
+ "-help",0,"-h",0,"--help",0,"-fp",1);
&Usage() if ($opt{'-help'});
&Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
@@ -74,6 +84,26 @@
@@ -74,6 +84,26 @@ if ($opt{'-pixelformat'}) {
}
&CheckGeometryAndDepth();
@ -52,7 +53,7 @@
if ($opt{'-name'}) {
$desktopName = $opt{'-name'};
@@ -143,8 +173,8 @@
@@ -145,8 +175,8 @@ $cmd .= " -rfbauth $vncUserDir/passwd";
$cmd .= " -rfbport $vncPort";
# Add font path and color database stuff here, e.g.:
@ -63,12 +64,11 @@
# $cmd .= " -co /usr/lib/X11/rgb";
#
@@ -237,7 +267,7 @@
{
foreach $n (1..99) {
if (&CheckDisplayNumber($n)) {
- return $n;
+ return $n+0;
}
}
@@ -190,6 +220,7 @@ if (-e "/tmp/.X11-unix/X$displayNumber")
$ENV{DISPLAY}= "$host:$displayNumber";
}
$ENV{VNCDESKTOP}= $desktopName;
+$ENV{XAUTHORITY}= $xauthorityFile;
system("$vncUserDir/xstartup >> " . &quotedString($desktopLog) . " 2>&1 &");

9
net/vnc/patches/patch-vncviewer_Imakefile Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-vncviewer_Imakefile,v 1.1 2001/05/22 19:30:17 matt Exp $
--- vncviewer/Imakefile.orig Fri Aug 13 05:29:34 1999
+++ vncviewer/Imakefile Tue May 22 10:39:24 2001
@@ -35,4 +35,4 @@ SRCS = \
OBJS = $(SRCS:.c=.o)
-ComplexProgramTarget(vncviewer)
+ComplexProgramTargetNoMan(vncviewer)

174
net/vnc/pkg/PLIST
View File

@ -1,107 +1,124 @@
@comment $OpenBSD: PLIST,v 1.2 2001/05/22 19:30:17 matt Exp $
bin/Xvnc
bin/vncviewer
bin/vncpasswd
bin/vncserver
share/doc/vnc/_private/footer.html
share/doc/vnc/_private/header.html
share/doc/vnc/_private/sidebar.html
share/doc/vnc/_vti_pvt/_x_todo.htm
share/doc/vnc/_vti_pvt/_x_todoh.htm
bin/vncviewer
share/doc/vnc/Xvnc.gif
share/doc/vnc/ach.jpg
share/doc/vnc/alicebobcharlie.gif
share/doc/vnc/alicecharlie.gif
share/doc/vnc/announcement.html
share/doc/vnc/attbutton.gif
share/doc/vnc/attlogo.gif
share/doc/vnc/backbutton.gif
share/doc/vnc/badgeshad.gif
share/doc/vnc/bgdot.gif
share/doc/vnc/bluepix.gif
share/doc/vnc/button.gif
share/doc/vnc/cdplay.gif
share/doc/vnc/cevncviewer.html
share/doc/vnc/cim.jpg
share/doc/vnc/clientserver.gif
share/doc/vnc/collage.gif
share/doc/vnc/collagesmaller.gif
share/doc/vnc/conndlg.gif
share/doc/vnc/contribbutton.gif
share/doc/vnc/contribs.html
share/doc/vnc/docbutton.gif
share/doc/vnc/docs.html
share/doc/vnc/download.htm
share/doc/vnc/download.htm~
share/doc/vnc/download.html
share/doc/vnc/downloadbutton.gif
share/doc/vnc/downloadtemplate.html
share/doc/vnc/extras.html
share/doc/vnc/faq.dtd
share/doc/vnc/faq.html
share/doc/vnc/faq.xml
share/doc/vnc/faqbutton.gif
share/doc/vnc/faqtemplate.html
share/doc/vnc/free.html
share/doc/vnc/freebutton.gif
share/doc/vnc/gpl.html
share/doc/vnc/help.html
share/doc/vnc/helpbutton.gif
share/doc/vnc/homebutton.gif
share/doc/vnc/howitworks.html
share/doc/vnc/images/backbutton.gif
share/doc/vnc/images/badgeshad.gif
share/doc/vnc/images/bluepix.gif
share/doc/vnc/images/cdplay.gif
share/doc/vnc/images/clientserver.gif
share/doc/vnc/images/collage.gif
share/doc/vnc/images/collagesmaller.gif
share/doc/vnc/images/conndlg.gif
share/doc/vnc/images/docbutton.gif
share/doc/vnc/images/downloadbutton.gif
share/doc/vnc/images/freebutton.gif
share/doc/vnc/images/homebutton.gif
share/doc/vnc/images/ie1.gif
share/doc/vnc/images/ie1_small.gif
share/doc/vnc/images/intouchbutton.gif
share/doc/vnc/images/newlogosmall2.gif
share/doc/vnc/images/ns1.gif
share/doc/vnc/images/ns1_small.gif
share/doc/vnc/images/orlbutton.gif
share/doc/vnc/images/screenbutton.gif
share/doc/vnc/images/vnc.gif
share/doc/vnc/images/sidebarbg.gif
share/doc/vnc/images/spacer.gif
share/doc/vnc/images/startbutton.gif
share/doc/vnc/images/vinci1.gif
share/doc/vnc/images/vinci1_small.gif
share/doc/vnc/images/winviewer1.gif
share/doc/vnc/images/winviewer1_small.gif
share/doc/vnc/images/winvnctray.GIF
share/doc/vnc/images/Xvnc.gif
share/doc/vnc/images/makefile
share/doc/vnc/images/.lastinstall
share/doc/vnc/images/makefile~
share/doc/vnc/images/faqbutton.gif
share/doc/vnc/images/people/ach.jpg
share/doc/vnc/images/people/jnw.jpg
share/doc/vnc/images/people/krw.jpg
share/doc/vnc/images/people/pmw.jpg
share/doc/vnc/images/people/qsf.jpg
share/doc/vnc/images/people/tjr.jpg
share/doc/vnc/images/people/makefile
share/doc/vnc/images/people/.lastinstall
share/doc/vnc/images/vncpeoplebutton.gif
share/doc/vnc/images/helpbutton.gif
share/doc/vnc/images/viewertray.gif
share/doc/vnc/images/iemacwin.gif
share/doc/vnc/images/iemacwin_small.gif
share/doc/vnc/images/iemacx.gif
share/doc/vnc/images/iemacx_small.gif
share/doc/vnc/images/photos/vncce1.jpg
share/doc/vnc/images/photos/vncce1_small.jpg
share/doc/vnc/images/photos/vncce2.jpg
share/doc/vnc/images/photos/vncce2_small.jpg
share/doc/vnc/images/photos/vncce3.jpg
share/doc/vnc/images/photos/vncce3_small.jpg
share/doc/vnc/images/photos/makefile
share/doc/vnc/images/photos/makefile~
share/doc/vnc/images/photos/.lastinstall
share/doc/vnc/images/contribbutton.gif
share/doc/vnc/images/sideblank.gif
share/doc/vnc/images/sidelogo.gif
share/doc/vnc/images/searchbutton.gif
share/doc/vnc/images/videos1.jpg
share/doc/vnc/images/videos2.jpg
share/doc/vnc/images/videos3.jpg
share/doc/vnc/ie1.gif
share/doc/vnc/ie1_small.gif
share/doc/vnc/iemacwin.gif
share/doc/vnc/iemacwin_small.gif
share/doc/vnc/iemacx.gif
share/doc/vnc/iemacx_small.gif
share/doc/vnc/index.html
share/doc/vnc/internalversion.html
share/doc/vnc/intouch.html
share/doc/vnc/intouchbutton.gif
share/doc/vnc/invalid-download.html
share/doc/vnc/javavncviewer.html
share/doc/vnc/makefile
share/doc/vnc/oldcontribs.html
share/doc/vnc/oldfaq.html
share/doc/vnc/jnw.jpg
share/doc/vnc/join.html
share/doc/vnc/krw.jpg
share/doc/vnc/machistory.html
share/doc/vnc/macshot.gif
share/doc/vnc/macshot_small.gif
share/doc/vnc/macvnc.html
share/doc/vnc/macvncviewer.html
share/doc/vnc/mailinglist.html
share/doc/vnc/newlogosmall2.gif
share/doc/vnc/ns1.gif
share/doc/vnc/ns1_small.gif
share/doc/vnc/platforms.html
share/doc/vnc/pmw.jpg
share/doc/vnc/protocol.html
share/doc/vnc/qsf.jpg
share/doc/vnc/rfbcounter.gif
share/doc/vnc/rfbcounter.html
share/doc/vnc/rfbproto.pdf
share/doc/vnc/rfbprotoheader.pdf
share/doc/vnc/screenbutton.gif
share/doc/vnc/screenshots.html
share/doc/vnc/searchbutton.gif
share/doc/vnc/sidebarbg.gif
share/doc/vnc/sideblank.gif
share/doc/vnc/sidelogo.gif
share/doc/vnc/spacer.gif
share/doc/vnc/sshvnc.html
share/doc/vnc/sshwin.html
share/doc/vnc/start.html
share/doc/vnc/startbutton.gif
share/doc/vnc/styles.css
share/doc/vnc/template.html
share/doc/vnc/tjr.jpg
share/doc/vnc/twmideas.html
share/doc/vnc/videos.html
share/doc/vnc/videos1.jpg
share/doc/vnc/videos2.jpg
share/doc/vnc/videos3.jpg
share/doc/vnc/viewertray.gif
share/doc/vnc/vinci1.gif
share/doc/vnc/vinci1_small.gif
share/doc/vnc/virus.html
share/doc/vnc/vnc.gif
share/doc/vnc/vncce1.jpg
share/doc/vnc/vncce1_medium.jpg
share/doc/vnc/vncce1_small.jpg
share/doc/vnc/vncce2.jpg
share/doc/vnc/vncce2_small.jpg
share/doc/vnc/vncce3.jpg
share/doc/vnc/vncce3_small.jpg
share/doc/vnc/vnchistory.html
share/doc/vnc/vncpeople.html
share/doc/vnc/vncpeoplebutton.gif
share/doc/vnc/vnctitle.gif
share/doc/vnc/winhistory.html
share/doc/vnc/winviewer1.gif
share/doc/vnc/winviewer1_small.gif
share/doc/vnc/winvnc.html
share/doc/vnc/winvnctray.GIF
share/doc/vnc/winvncviewer.html
share/doc/vnc/xlibvncviewer.html
share/doc/vnc/xvnc.html
share/doc/vnc/xvnchistory.html
share/doc/vnc/xvncviewer.html
share/vnc/classes/DesCipher.class
share/vnc/classes/animatedMemoryImageSource.class
@ -114,11 +131,6 @@ share/vnc/classes/shared.vnc
share/vnc/classes/vncCanvas.class
share/vnc/classes/vncviewer.class
share/vnc/classes/vncviewer.jar
@dirrm share/doc/vnc/images/photos
@dirrm share/doc/vnc/images/people
@dirrm share/doc/vnc/images
@dirrm share/doc/vnc/_vti_pvt
@dirrm share/doc/vnc/_private
@dirrm share/doc/vnc
@dirrm share/vnc/classes
@dirrm share/vnc
@dirrm share/doc/vnc