diff options
Diffstat (limited to 'net/tightvnc')
| -rw-r--r-- | net/tightvnc/Makefile | 21 | ||||
| -rw-r--r-- | net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf | 20 | ||||
| -rw-r--r-- | net/tightvnc/files/patch-Xvnc::config::cf::Imake.cf | 15 | ||||
| -rw-r--r-- | net/tightvnc/files/patch-Xvnc::programs::Xserver::os::access.c | 11 | ||||
| -rw-r--r-- | net/tightvnc/pkg-plist | 44 |
5 files changed, 81 insertions, 30 deletions
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index da747643401e..a9fa4dcb5b34 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -8,6 +8,7 @@ PORTNAME= tightvnc PORTVERSION= 1.3.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SF MASTER_SITE_SUBDIR= vnc-tight @@ -17,7 +18,8 @@ MAINTAINER= itetcu@FreeBSD.org COMMENT= Enhanced version of VNC LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/misc/10x20.pcf.gz:${X_FONTS_MISC_PORT} +RUN_DEPENDS= xorg-fonts>=7.2:${PORTSDIR}/x11-fonts/xorg-fonts \ + xauth:${PORTSDIR}/x11/xauth CONFLICTS= tridiavnc-[0-9]* vnc-[0-9]* @@ -29,10 +31,23 @@ USE_IMAKE= yes USE_XPM= yes ALL_TARGET= World NO_INSTALL_MANPAGES= yes -XFREE86_HTML_MAN= no MAN1= Xvnc.1 vncviewer.1 vncpasswd.1 vncconnect.1 vncserver.1 +OPTIONS= JVNC_VIEWER "Install Java-based vnc viewer" off + +#.include <bsd.port.pre.mk> + +.include "bsd.port.options.mk" + +.ifdef(WITH_JVNC_VIEWER) +USE_JAVA= yes +JAVA_RUN= yes +PLIST_SUB+= JVNC_VIEWER="" +.else +PLIST_SUB+= JVNC_VIEWER="@comment " +.endif + .include <bsd.port.pre.mk> .if exists(${X11BASE}/share/vnc/classes/index.vnc) @@ -53,7 +68,9 @@ do-install: .for FILE in Xvnc vncviewer vncpasswd vncconnect @${STRIP_CMD} ${PREFIX}/bin/${FILE} .endfor +.ifdef(WITH_JVNC_VIEWER) @${MKDIR} ${DATADIR}/classes ${INSTALL_DATA} ${WRKSRC}/classes/*.* ${DATADIR}/classes +.endif .include <bsd.port.post.mk> diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf index 1aa0f83d7d98..83b3d1f55259 100644 --- a/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf +++ b/net/tightvnc/files/patch-Xvnc::config::cf::FreeBSD.cf @@ -1,18 +1,26 @@ ---- Xvnc/config/cf/FreeBSD.cf.orig Sun Jun 11 08:00:51 2000 -+++ Xvnc/config/cf/FreeBSD.cf Tue Sep 26 19:07:31 2006 -@@ -253,9 +253,9 @@ +--- Xvnc/config/cf/FreeBSD.cf.orig 2000-06-11 21:00:51.000000000 +0900 ++++ Xvnc/config/cf/FreeBSD.cf 2007-09-04 17:11:16.000000000 +0900 +@@ -253,11 +253,17 @@ #endif #ifdef i386Architecture -# define OptimizedCDebugFlags DefaultGcc2i386Opt -+# define OptimizedCDebugFlags %%CFLAGS%% ++# define OptimizedCDebugFlags -O -pipe #else -# define OptimizedCDebugFlags -O2 -+# define OptimizedCDebugFlags %%CFLAGS%% ++# define OptimizedCDebugFlags -O -pipe #endif ++#ifdef x86_64Architecture ++# define OptimizedCDebugFlags -O -pipe ++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME ++# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 ++#endif /* x86_64Architecture */ ++ #ifndef PreIncDir -@@ -359,6 +359,5 @@ + # define PreIncDir /usr/include + #endif +@@ -359,6 +366,5 @@ #include <bsdLib.rules> diff --git a/net/tightvnc/files/patch-Xvnc::config::cf::Imake.cf b/net/tightvnc/files/patch-Xvnc::config::cf::Imake.cf new file mode 100644 index 000000000000..1aaf39698bcb --- /dev/null +++ b/net/tightvnc/files/patch-Xvnc::config::cf::Imake.cf @@ -0,0 +1,15 @@ +--- Xvnc/config/cf/Imake.cf.orig 2006-12-23 21:07:55.000000000 +0900 ++++ Xvnc/config/cf/Imake.cf 2007-09-05 07:45:05.000000000 +0900 +@@ -206,6 +206,12 @@ + # define i386Architecture + # undef i386 + # endif ++# ifdef __x86_64__ ++# ifndef x86_64Architecture ++# define x86_64Architecture ++# endif ++# undef __x86_64__ ++# endif + # ifdef __alpha__ + # define AlphaBsdArchitecture + # define AlphaArchitecture diff --git a/net/tightvnc/files/patch-Xvnc::programs::Xserver::os::access.c b/net/tightvnc/files/patch-Xvnc::programs::Xserver::os::access.c new file mode 100644 index 000000000000..820b5ccac84f --- /dev/null +++ b/net/tightvnc/files/patch-Xvnc::programs::Xserver::os::access.c @@ -0,0 +1,11 @@ +--- Xvnc/programs/Xserver/os/access.c.orig 2000-06-11 21:00:51.000000000 +0900 ++++ Xvnc/programs/Xserver/os/access.c 2007-09-05 12:07:30.000000000 +0900 +@@ -634,7 +634,7 @@ + #endif + ifc.ifc_len = sizeof (buf); + ifc.ifc_buf = buf; +- if (ifioctl (fd, (int) SIOCGIFCONF, (pointer) &ifc) < 0) ++ if (ifioctl (fd, SIOCGIFCONF, (pointer) &ifc) < 0) + Error ("Getting interface configuration (4)"); + + #ifdef ISC diff --git a/net/tightvnc/pkg-plist b/net/tightvnc/pkg-plist index 4a8ba9f70a9f..252c3c9156f2 100644 --- a/net/tightvnc/pkg-plist +++ b/net/tightvnc/pkg-plist @@ -3,25 +3,25 @@ bin/vncconnect bin/vncpasswd bin/vncserver bin/vncviewer -%%DATADIR%%/classes/AuthPanel.class -%%DATADIR%%/classes/ButtonPanel.class -%%DATADIR%%/classes/CapabilityInfo.class -%%DATADIR%%/classes/CapsContainer.class -%%DATADIR%%/classes/ClipboardFrame.class -%%DATADIR%%/classes/DesCipher.class -%%DATADIR%%/classes/InStream.class -%%DATADIR%%/classes/MemInStream.class -%%DATADIR%%/classes/OptionsFrame.class -%%DATADIR%%/classes/RecordingFrame.class -%%DATADIR%%/classes/ReloginPanel.class -%%DATADIR%%/classes/RfbProto.class -%%DATADIR%%/classes/SessionRecorder.class -%%DATADIR%%/classes/SocketFactory.class -%%DATADIR%%/classes/VncCanvas.class -%%DATADIR%%/classes/VncCanvas2.class -%%DATADIR%%/classes/VncViewer.class -%%DATADIR%%/classes/VncViewer.jar -%%DATADIR%%/classes/ZlibInStream.class -%%DATADIR%%/classes/index.vnc -@dirrm %%DATADIR%%/classes -@dirrm %%DATADIR%% +%%JVNC_VIEWER%%%%DATADIR%%/classes/AuthPanel.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/ButtonPanel.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/CapabilityInfo.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/CapsContainer.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/ClipboardFrame.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/DesCipher.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/InStream.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/MemInStream.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/OptionsFrame.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/RecordingFrame.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/ReloginPanel.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/RfbProto.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/SessionRecorder.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/SocketFactory.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/VncCanvas.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/VncCanvas2.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/VncViewer.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/VncViewer.jar +%%JVNC_VIEWER%%%%DATADIR%%/classes/ZlibInStream.class +%%JVNC_VIEWER%%%%DATADIR%%/classes/index.vnc +%%JVNC_VIEWER%%@dirrm %%DATADIR%%/classes +%%JVNC_VIEWER%%@dirrm %%DATADIR%% |