diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | net/tightvncviewer/Makefile | 24 | ||||
| -rw-r--r-- | net/tightvncviewer/PLIST | 4 | ||||
| -rw-r--r-- | net/tightvncviewer/distinfo | 7 | ||||
| -rw-r--r-- | net/tightvncviewer/patches/patch-aa | 32 |
5 files changed, 21 insertions, 49 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 2a9e2cf4b7e..d7dc54ebc61 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.940 2002/12/29 18:55:58 wiz Exp $ +$NetBSD: CHANGES,v 1.941 2002/12/29 19:04:12 jlam Exp $ Changes to the packages collection and infrastructure in 2002: @@ -4307,3 +4307,4 @@ Changes to the packages collection and infrastructure in 2002: Updated ethereal to 0.9.8nb1 [veego 2002-12-29] Updated pkgdepgraph to 1.2 [atatat 2002-12-29] Removed lclint [wiz 2002-12-29] + Updated tightvncviewer to 1.2.7 [jlam 2002-12-29] diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile index 337f6a2ead4..648e484bfc7 100644 --- a/net/tightvncviewer/Makefile +++ b/net/tightvncviewer/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.6 2002/10/17 12:17:14 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2002/12/29 19:02:49 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp # -DISTNAME= tightvnc-1.2.6 -PKGNAME= tightvncviewer-1.2.6 +DISTNAME= tightvnc-1.2.7 +PKGNAME= tightvncviewer-1.2.7 CATEGORIES= net x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/} -DISTFILES= tightvnc-1.2.6_unixsrc.tar.bz2 +DISTFILES= ${DISTNAME}_unixsrc.tar.bz2 MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www.tightvnc.com/ @@ -19,13 +19,17 @@ USE_BUILDLINK2= yes USE_IMAKE= yes WRKSRC= ${WRKDIR}/vnc_unixsrc - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer - ${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${PREFIX}/man/man1/vncviewer.1 - ${INSTALL_DATA} ${WRKSRC}/vncviewer/Vncviewer ${PREFIX}/lib/X11/app-defaults +CONFIGURE_DIRS= ${WRKSRC}/libvncauth +CONFIGURE_DIRS+= ${WRKSRC}/vncviewer +BUILD_DIRS= ${CONFIGURE_DIRS} +INSTALL_DIRS= ${WRKSRC}/vncviewer + +post-install: + ${INSTALL_DATA} ${WRKSRC}/vncviewer/Vncviewer \ + ${PREFIX}/lib/X11/app-defaults ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vncviewer - ${INSTALL_DATA} ${WRKSRC}/vncviewer/README ${PREFIX}/share/doc/vncviewer/README + ${INSTALL_DATA} ${WRKSRC}/vncviewer/README \ + ${PREFIX}/share/doc/vncviewer/README .include "../../devel/zlib/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" diff --git a/net/tightvncviewer/PLIST b/net/tightvncviewer/PLIST index 961621559b2..434759a15ab 100644 --- a/net/tightvncviewer/PLIST +++ b/net/tightvncviewer/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2002/10/17 12:17:14 lukem Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/12/29 19:02:49 jlam Exp $ bin/vncviewer lib/X11/app-defaults/Vncviewer -man/man1/vncviewer.1 +man/cat1/vncviewer.0 share/doc/vncviewer/README @dirrm share/doc/vncviewer diff --git a/net/tightvncviewer/distinfo b/net/tightvncviewer/distinfo index 4d70d1a47c2..3a50d2c8a8a 100644 --- a/net/tightvncviewer/distinfo +++ b/net/tightvncviewer/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/10/17 12:17:14 lukem Exp $ +$NetBSD: distinfo,v 1.6 2002/12/29 19:02:49 jlam Exp $ -SHA1 (tightvnc-1.2.6_unixsrc.tar.bz2) = 3ff266a89d12cf49855fbeee3c7c6a8c6c2f07bd -Size (tightvnc-1.2.6_unixsrc.tar.bz2) = 1717851 bytes -SHA1 (patch-aa) = d3c3ef90e110293b5934f85a77344b9733677bdc +SHA1 (tightvnc-1.2.7_unixsrc.tar.bz2) = 39b28b4272dbc915045a375ca21a50ff23a989eb +Size (tightvnc-1.2.7_unixsrc.tar.bz2) = 1725728 bytes diff --git a/net/tightvncviewer/patches/patch-aa b/net/tightvncviewer/patches/patch-aa deleted file mode 100644 index 6449d7dd66c..00000000000 --- a/net/tightvncviewer/patches/patch-aa +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2002/10/17 12:17:14 lukem Exp $ - ---- vncviewer/Imakefile.orig Fri Jun 28 15:53:19 2002 -+++ vncviewer/Imakefile -@@ -3,24 +3,14 @@ - EXTRA_DEFINES = -D__EXTENSIONS__ - #endif - --XCOMM Shared memory support works OK on x86 linux, not tested elsewhere but --XCOMM seems to cause problems on Digital Unix. -- --#if defined(i386Architecture) && defined(LinuxArchitecture) - DEFINES = -DMITSHM --#endif - - ZLIB_INC = -I/usr/local/include - JPEG_INC = -I/usr/local/include --INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include -+INCLUDES = -I../include -I. ${BUILDLINK_CPPFLAGS} - VNCAUTH_LIB = ../libvncauth/libvncauth.a --ZLIB_LIB = -L/usr/local/lib -lz --#ifdef OSF1Architecture --XCOMM Avoid linking with different libjpeg in /usr/shlib under Tru64. --JPEG_LIB = /usr/local/lib/libjpeg.a --#else --JPEG_LIB = -L/usr/local/lib -ljpeg --#endif -+ZLIB_LIB = -lz -+JPEG_LIB = ${BUILDLINK_LDFLAGS} -ljpeg - - DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) - LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) |