buildlink1 -> buildlink2

6 files changed, 28 insertions, 20 deletions

diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 1b44e9d6e12..f8b806f24cd 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/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:18:40 jlam Exp $
 #
 
 DISTNAME=		tightvnc-1.2.2
@@ -16,14 +16,18 @@ COMMENT=		Display X and Win32 desktops on remote X/Win32/Java displays
 CONFLICTS=		vnc-[0-9]*
 
 CRYPTO=			yes
-NO_INSTALL_MANPAGES=	yes
+USE_BUILDLINK2=		yes
 USE_IMAKE=		yes
+NO_INSTALL_MANPAGES=	yes
 USE_PERL5=		yes
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 
 ALL_TARGET=		World
 
+post-extract:
+	${RM} -rf ${WRKSRC}/Xvnc/lib/zlib
+
 # We have to frob a few things, and we want our own permissions, so it's easier
 # to do the install ourselves.
 post-install:
@@ -40,5 +44,6 @@ post-install:
 	${INSTALL_DATA} *.GIF *.css *.gif *.jpg *.htm *.html *.pdf \
 	  ${PREFIX}/share/doc/vnc
 
-.include "../../graphics/jpeg/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index 0a418712e56..d0a3f4b68ed 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/02/19 00:02:28 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2002/10/09 21:18:41 jlam Exp $
 
 SHA1 (tightvnc-1.2.2_unixsrc.tar.bz2) = c764122d17bb54a78accdf658029b5097caaa4f1
 Size (tightvnc-1.2.2_unixsrc.tar.bz2) = 1720393 bytes
@@ -11,6 +11,6 @@ SHA1 (patch-ad) = a524db9a403428bd750819d25e6157d4c3cb96f7
 SHA1 (patch-ae) = 399ff1527ff75eee7d181dd4f90f95edab028bd7
 SHA1 (patch-af) = 369961aa3e089195653980da91e8fba53807fc53
 SHA1 (patch-ag) = 0cb088fd8c5b2bad1e990a3e81e7b3a26c46f000
-SHA1 (patch-ba) = 15b5fd12abd04ef8caa43e9ce2d540f3df81db60
+SHA1 (patch-ba) = 8489c523ec15d575533e83336e42e843fcfd4b5c
 SHA1 (patch-bb) = 5c16b81e57acfcc0dabce4ee3f429dd9be322d89
 SHA1 (patch-bc) = a7f399320d3c06fa5c6ee940a8ede4c6422c7937
diff --git a/net/tightvnc/patches/patch-ba b/net/tightvnc/patches/patch-ba
index 0d042c33d02..5f3b1ef8518 100644
--- a/net/tightvnc/patches/patch-ba
+++ b/net/tightvnc/patches/patch-ba
@@ -1,12 +1,11 @@
-$NetBSD: patch-ba,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+$NetBSD: patch-ba,v 1.2 2002/10/09 21:18:41 jlam Exp $
 
 --- Xvnc/config/cf/vnclibs.def.orig	Mon Jan 29 21:24:14 2001
 +++ Xvnc/config/cf/vnclibs.def	Sun Sep 23 01:08:42 2001
-@@ -5,5 +5,6 @@
+@@ -5,5 +5,5 @@
   * and programs/Xserver/hw/vnc whenever you change this file.
   */
  
 -VNCLIBS = $(TOP)/../libvncauth/libvncauth.a /usr/lib/libjpeg.a
-+VNCLIBS = $(TOP)/../libvncauth/libvncauth.a \
-+	  ${BUILDLINK_LDFLAGS} -Wl,-rpath ${LOCALBASE}/lib -ljpeg
++VNCLIBS = $(TOP)/../libvncauth/libvncauth.a ${BUILDLINK_LDFLAGS} -ljpeg
  VNCCPPFLAGS = -I$(TOP)/../include
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)