From 734d8eb9ec850e3cfd24dcf88bea14bac9b38ae9 Mon Sep 17 00:00:00 2001
From: snj <snj@pkgsrc.org>
Date: Tue, 11 May 2004 04:22:48 +0000
Subject: Convert to buildlink3.

---
 net/p5-ispman/Makefile        | 4 ++--
 net/tightvnc/Makefile         | 8 ++++----
 net/tightvnc/distinfo         | 4 ++--
 net/tightvnc/patches/patch-ad | 6 +++---
 net/tightvncviewer/Makefile   | 8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'net')

diff --git a/net/p5-ispman/Makefile b/net/p5-ispman/Makefile
index 35e416f1b9d..d31c9cf99e6 100644
--- a/net/p5-ispman/Makefile
+++ b/net/p5-ispman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/26 02:27:48 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/11 04:22:48 snj Exp $
 #
 
 DISTNAME=		ispman-0.5
@@ -20,7 +20,7 @@ DEPENDS+=		p5-Convert-ASN1>=0.07:../../textproc/p5-Convert-ASN1
 DEPENDS+=		p5-IO-stringy>=1.213:../../devel/p5-IO-stringy
 
 WRKSRC=			${WRKDIR}/ispman/Modules/ISPMan
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/ISPMan/.packlist
 PLIST_SRC=		${WRKDIR}/PLIST
 PERL5_CONFIGURE_DIRS=	${WRKSRC} ${WRKSRC}/../IO-stringy-1.212_patched
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 2a157e571b7..2fa1ee6a29e 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:22:22 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/11 04:22:49 snj Exp $
 #
 
 DISTNAME=		tightvnc-1.2.9
@@ -14,7 +14,7 @@ CONFLICTS=		vnc-[0-9]*
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 CRYPTO=			yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
 USE_PERL5=		yes
@@ -46,6 +46,6 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/vncserver.man \
 	    ${PREFIX}/man/man1/vncserver.1
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index 58c29983b08..45691af46f5 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2004/01/03 14:18:57 mrg Exp $
+$NetBSD: distinfo,v 1.10 2004/05/11 04:22:49 snj Exp $
 
 SHA1 (tightvnc-1.2.9_unixsrc.tar.bz2) = 62b55237676bbdc7f08771e6ff72c0f70264f4ee
 Size (tightvnc-1.2.9_unixsrc.tar.bz2) = 1738256 bytes
 SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4
 SHA1 (patch-ab) = b610979131497edae24119961bb56122e9d5a5c4
 SHA1 (patch-ac) = 7068947b76270e858c66d1c46a8ebb8675ecdbbd
-SHA1 (patch-ad) = 9606ffc253ea40fa03058cf40c4eab447adafa61
+SHA1 (patch-ad) = 437c27c443bd8511bce0c3787e028a54829ab223
 SHA1 (patch-ae) = f541c3d7f143145798eb2d3eca3d2a1992619a50
 SHA1 (patch-af) = 372b8ca93a93dab938363c6b9408ab82155a172d
 SHA1 (patch-ag) = 675c42780888ff471109521de0a358ba40a6b8f3
diff --git a/net/tightvnc/patches/patch-ad b/net/tightvnc/patches/patch-ad
index 4b9860b4f4c..ecdb171dc3d 100644
--- a/net/tightvnc/patches/patch-ad
+++ b/net/tightvnc/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2003/11/27 17:27:29 abs Exp $
+$NetBSD: patch-ad,v 1.4 2004/05/11 04:22:49 snj Exp $
 
 --- Xvnc/config/cf/vnclibs.def.orig	2002-06-28 06:53:19.000000000 +0100
 +++ Xvnc/config/cf/vnclibs.def
@@ -7,8 +7,8 @@ $NetBSD: patch-ad,v 1.3 2003/11/27 17:27:29 abs Exp $
  VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a
  #else
 -VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
-+VNCSYSLIBS = ${BUILDLINK_LDFLAGS} -ljpeg -lz
++VNCSYSLIBS = ${LDFLAGS} -ljpeg -lz
  #endif
  
 -VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
-+VNCCPPFLAGS = -I$(TOP)/../include ${BUILDLINK_CPPFLAGS}
++VNCCPPFLAGS = -I$(TOP)/../include ${CPPFLAGS}
diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile
index 34226d43c43..da5f50f5d86 100644
--- a/net/tightvncviewer/Makefile
+++ b/net/tightvncviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:22:22 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/11 04:22:49 snj Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
@@ -16,7 +16,7 @@ CONFLICTS=		vncviewer-[0-9]*
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 CRYPTO=			yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_IMAKE=		yes
 
 CONFIGURE_DIRS=		${WRKSRC}/libvncauth
@@ -31,7 +31,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/vncviewer/README			\
 		${PREFIX}/share/doc/vncviewer/README
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3