diff options
| author | jlam <jlam@pkgsrc.org> | 2002-10-09 21:14:40 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-10-09 21:14:40 +0000 |
| commit | 52cd2e2f277b55ca4c155c4a0333ece36bfc0a91 (patch) | |
| tree | 0fc5d7581d21dd4289b2444eb9b1d86803382cde /net/tightvncviewer | |
| parent | 4293faa86cf8e728924e84d7533d73ebd386c334 (diff) | |
| download | pkgsrc-52cd2e2f277b55ca4c155c4a0333ece36bfc0a91.tar.gz | |
buildlink1 -> buildlink2
Diffstat (limited to 'net/tightvncviewer')
| -rw-r--r-- | net/tightvncviewer/Makefile | 9 | ||||
| -rw-r--r-- | net/tightvncviewer/distinfo | 4 | ||||
| -rw-r--r-- | net/tightvncviewer/patches/patch-aa | 13 |
3 files changed, 15 insertions, 11 deletions
diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile index 59420d98ff8..2fdd3556608 100644 --- a/net/tightvncviewer/Makefile +++ b/net/tightvncviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/05/12 10:16:49 abs Exp $ +# $NetBSD: Makefile,v 1.5 2002/10/09 21:14:40 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp # @@ -15,8 +15,9 @@ COMMENT= Viewer for remote X and Win32 VNC servers CONFLICTS= vncviewer-[0-9]* CRYPTO= yes -NO_INSTALL_MANPAGES= yes +USE_BUILDLINK2= yes USE_IMAKE= yes +NO_INSTALL_MANPAGES= yes WRKSRC= ${WRKDIR}/vnc_unixsrc @@ -28,5 +29,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vncviewer ${INSTALL_DATA} ${WRKSRC}/vncviewer/README ${PREFIX}/share/doc/vncviewer/README -.include "../../graphics/jpeg/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/net/tightvncviewer/distinfo b/net/tightvncviewer/distinfo index b5f7cd566c5..d683df282d3 100644 --- a/net/tightvncviewer/distinfo +++ b/net/tightvncviewer/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/02/12 07:11:26 martti Exp $ +$NetBSD: distinfo,v 1.4 2002/10/09 21:14:41 jlam Exp $ SHA1 (tightvnc-1.2.2_unixsrc.tar.bz2) = c764122d17bb54a78accdf658029b5097caaa4f1 Size (tightvnc-1.2.2_unixsrc.tar.bz2) = 1720393 bytes -SHA1 (patch-aa) = 5abe62317828290e8f88549b388add8e63dab315 +SHA1 (patch-aa) = 81fff66d91a45b2d053cbb469efc1aca41d48919 diff --git a/net/tightvncviewer/patches/patch-aa b/net/tightvncviewer/patches/patch-aa index 2fd25d7f6c1..dea6488d3d6 100644 --- a/net/tightvncviewer/patches/patch-aa +++ b/net/tightvncviewer/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2001/09/23 00:58:14 mycroft Exp $ +$NetBSD: patch-aa,v 1.3 2002/10/09 21:14:41 jlam Exp $ ---- vncviewer/Imakefile.orig Mon Jun 18 13:17:15 2001 -+++ vncviewer/Imakefile Sun Sep 23 00:57:07 2001 -@@ -6,19 +6,14 @@ +--- vncviewer/Imakefile.orig Tue Nov 13 03:31:34 2001 ++++ vncviewer/Imakefile +@@ -6,19 +6,14 @@ CCOPTIONS = CDEBUGFLAGS = -O2 #endif @@ -13,12 +13,13 @@ $NetBSD: patch-aa,v 1.2 2001/09/23 00:58:14 mycroft Exp $ DEFINES = -DMITSHM -#endif - INCLUDES = -I../include -I. -I/usr/include +-INCLUDES = -I../include -I. -I/usr/include ++INCLUDES = -I../include -I. ${BUILDLINK_CPPFLAGS} VNCAUTH_LIB = ../libvncauth/libvncauth.a -ZLIB_LIB = /usr/lib/libz.a -JPEG_LIB = /usr/lib/libjpeg.a +ZLIB_LIB = -lz -+JPEG_LIB = ${BUILDLINK_LDFLAGS} -Wl,-rpath ${LOCALBASE}/lib -ljpeg ++JPEG_LIB = ${BUILDLINK_LDFLAGS} -ljpeg -DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB) +DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB) |