buildlink1 -> buildlink2

NetBSD · Sep 23, 2002 · 3ac80e0 · 3ac80e0
1 parent 0fb75d8
commit 3ac80e0
Show file tree

Hide file tree

Showing 15 changed files with 151 additions and 96 deletions.
diff --git a/misc/yrolo/Makefile b/misc/yrolo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/09 15:11:19 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/24 00:26:56 jlam Exp $
 #
 
 DISTNAME=       yrolo-1.1
@@ -11,10 +11,11 @@ COMMENT=	Contact management software
 
 WRKSRC=		${WRKDIR}/yrolo1.1
 
+USE_BUILDLINK2=	yes
+USE_X11=	yes
 USE_IMAKE=	yes
 
 INSTALL_TARGET=	install install.man
 
-.include "../../mk/x11.buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
+.include "../../mk/motif.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/yrolo/distinfo b/misc/yrolo/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/08/12 11:42:29 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/09/24 00:26:56 jlam Exp $
 
 SHA1 (yrolo-1.1.tar.gz) = 3d2f6f36ad57a41dca940a28a6139a381e5f7a33
 Size (yrolo-1.1.tar.gz) = 79332 bytes
-SHA1 (patch-aa) = a8edd2449d9e7d53fbef96445096cc4f5641759a
+SHA1 (patch-aa) = 8a7eeebc990b78cb014f6eef697b065d24023861
diff --git a/misc/yrolo/patches/patch-aa b/misc/yrolo/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/08/12 11:42:30 agc Exp $
+$NetBSD: patch-aa,v 1.4 2002/09/24 00:26:57 jlam Exp $
 
 --- Yrolo.tmpl	2002/05/09 14:46:24	1.1
 +++ Yrolo.tmpl	2002/05/09 14:47:36
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2002/08/12 11:42:30 agc Exp $
  XCOMM
 
 +#ifdef NetBSDArchitecture
-+LOCAL_LIBRARIES= XmClientLibs -lcompat -Wl,-R${X11BASE}/lib -L${X11PREFIX}/lib -Wl,-R${X11PREFIX}/lib
++LOCAL_LIBRARIES= XmClientLibs -lcompat ${LDFLAGS}
 +#else
  LOCAL_LIBRARIES= XmClientLibs
 +#endif

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2002/08/22 00:30:07 itojun Exp $
+# $NetBSD: Makefile,v 1.65 2002/09/24 00:13:13 jlam Exp $
 
 DISTNAME=		ethereal-0.9.6
 CATEGORIES=		net
@@ -9,23 +9,24 @@ MAINTAINER=		[email protected]
 HOMEPAGE=		http://www.ethereal.com/
 COMMENT=		Network protocol analyzer
 
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 USE_PERL5=		build
 
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-gtk-prefix=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-ucdsnmp=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-pcap=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-gtk-prefix=${BUILDLINK_PREFIX.gtk}
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-ucdsnmp=${BUILDLINK_PREFIX.ucd-snmp}
+CONFIGURE_ARGS+=	--with-pcap=${BUILDLINK_PREFIX.libpcap}
+CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
-.include "../../devel/zlib/buildlink.mk"
-.include "../../net/libpcap/buildlink.mk"
-.include "../../net/ucd-snmp/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../net/libpcap/buildlink2.mk"
+.include "../../net/ucd-snmp/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/09/10 16:06:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/24 00:07:31 jlam Exp $
 
 DISTNAME=	gnapster-1.5.0
 PKGREVISION=	2
@@ -11,14 +11,15 @@ COMMENT=	simple client for the online mp3 community
 
 BUILD_USES_MSGFMT=	YES
 
-USE_GMAKE=	YES
-USE_LIBTOOL=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
+
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_BUILDLINK_ONLY=	YES
 
-GNU_CONFIGURE=	YES
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../x11/gnome-core/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/09/10 16:06:47 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2002/09/23 23:57:13 jlam Exp $
 #
 
 DISTNAME=	gtm-0.4.11
@@ -12,15 +12,15 @@ COMMENT=	Gnome Transfer Manager
 
 DEPENDS+=	wget-[0-9]*:../../net/wget
 
-GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
-USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=		YES
 
 #post-install:
 #	${RMDIR} ${PREFIX}/share/gnome/help/gtm/C/images
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../x11/gnome-core/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/21 10:47:31 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/23 23:55:25 jlam Exp $
 #
 
 DISTNAME=	xmftp-1.0.4
@@ -9,6 +9,7 @@ MAINTAINER=	[email protected]
 HOMEPAGE=	http://www.cse.fau.edu/~valankar/old/xmftp/
 COMMENT=	X/Motif FTP client
 
+USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 
@@ -21,7 +22,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/../CHANGES ${PREFIX}/share/doc/xmftp
 	${INSTALL_DATA} ${WRKSRC}/../FAQ ${PREFIX}/share/doc/xmftp
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/pan/Makefile b/news/pan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/10 16:06:48 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/23 23:56:28 jlam Exp $
 #
 
 DISTNAME=	pan-0.11.2
@@ -14,13 +14,13 @@ COMMENT=	Newsreader for Gnome
 
 BUILD_USES_MSGFMT=	YES
 
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		LOCALEDIR="${PKGLOCALEDIR}"
-CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 LIBS=			-lcompat
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../x11/gnome-core/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../x11/gnome-core/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/08/25 19:23:15 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/24 00:17:51 jlam Exp $
 #
 
 DISTNAME=		krb4-1.1.1
@@ -19,25 +19,29 @@ CONFLICTS+=		zephyr-[0-9]*
 CONFLICTS+=		libdes-[0-9]*
 
 CRYPTO=			yes
-GNU_CONFIGURE=		yes
 
+USE_BUILDLINK2=		yes
+USE_X11=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--includedir=${PREFIX}/include/kerberosIV
 
-.include "../../mk/x11.buildlink.mk"
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+EXAMPLEDIR=		${PREFIX}/share/examples/kth-krb4
+
 # this hangs while compiling one of the files, at least with the
 # toolchain as of 1.5ZC (20020329)
 .if ${MACHINE_ARCH} == "sparc64"
 BROKEN=			toolchain problems on sparc64 (1.5ZC, 20020329)
 .endif
 
 post-patch:
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
-		<${WRKSRC}/lib/kafs/kafs.h                                    \
-		>${WRKSRC}/lib/kafs/kafs.h.sed
-	@${MV} ${WRKSRC}/lib/kafs/kafs.h.sed ${WRKSRC}/lib/kafs/kafs.h
+	@for file in ${WRKSRC}/lib/kafs/kafs.h; do			\
+		${SED}	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'	\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
 
 # enable this once our autoconf has been upgraded to autoconf>=2.52:
 #pre-configure:
@@ -48,12 +52,12 @@ post-patch:
 #	${LOCALBASE}/bin/autoconf
 
 post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${WRKSRC}/etc/krb.realms ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${WRKSRC}/etc/inetd.conf.changes ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${FILESDIR}/services-1.4.2.diff ${PREFIX}/share/examples/kth-krb4
-	${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${PREFIX}/share/examples/kth-krb4
+	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/krb.realms ${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/inetd.conf.changes ${EXAMPLEDIR}
+	${INSTALL_DATA} ${FILESDIR}/services-1.4.2.diff ${EXAMPLEDIR}
+	${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${EXAMPLEDIR}
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/kth-krb4/distinfo b/security/kth-krb4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/04/05 11:32:20 wennmach Exp $
+$NetBSD: distinfo,v 1.6 2002/09/24 00:17:51 jlam Exp $
 
 SHA1 (krb4-1.1.1.tar.gz) = db192908ec8510a22161c7607f83c8779dc7294a
 Size (krb4-1.1.1.tar.gz) = 1817919 bytes
-SHA1 (patch-ag) = e39c3159fe89cedbb34dd5dadcb95826cd8d4576
+SHA1 (patch-ag) = 41e3b00986b886d820e8d120709c057e58c209af
 SHA1 (patch-ah) = f60b4c67dc6fbd08a337f75585f9597e508c4c4c
 SHA1 (patch-ai) = 716ae2b9675d1d83e5e27edfa90c792d72b37ea5
diff --git a/security/kth-krb4/patches/patch-ag b/security/kth-krb4/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2000/06/08 13:56:01 wennmach Exp $
+$NetBSD: patch-ag,v 1.2 2002/09/24 00:17:51 jlam Exp $
 
 Do not use hardwired paths to arla's configuration directory.
 
@@ -9,7 +9,7 @@ Do not use hardwired paths to arla's configuration directory.
  #define _PATH_THESECELLS	_PATH_VICE "TheseCells"
 
 -#define _PATH_ARLA_VICE		"/usr/arla/etc/"
-+#define _PATH_ARLA_VICE		"@PREFIX@/etc/"
++#define _PATH_ARLA_VICE		"@PKG_SYSCONFDIR@/"
  #define _PATH_ARLA_THISCELL	_PATH_ARLA_VICE "ThisCell"
  #define _PATH_ARLA_CELLSERVDB 	_PATH_ARLA_VICE "CellServDB"
  #define _PATH_ARLA_THESECELLS	_PATH_ARLA_VICE "TheseCells"
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/19 09:04:26 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/24 00:24:37 jlam Exp $
 #
 
 DISTNAME=	ssh-3.2.0
@@ -12,13 +12,14 @@ COMMENT=	Secure Shell client and server for V.2 SSH protocol
 
 CONFLICTS=	openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]*
 
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
-PKG_SYSCONFSUBDIR=	ssh2
 
 BUILD_DEFS+=		USE_INET6
 
 CRYPTO=			YES
+PKG_SYSCONFSUBDIR=	ssh2
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,10 +37,12 @@ SSH_PID_DIR=		${SSH_PID_DIR.${OPSYS}}
 CONFIGURE_ARGS+=	--without-daemonpam --without-clientpam
 CONFIGURE_ARGS+=	--without-ssh-agent1-compat
 CONFIGURE_ARGS+=	--without-ssh1-compat
-CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp-wrappers}
 CONFIGURE_ARGS+=	--with-pid-dir=${SSH_PID_DIR}
+
 # Setting FOREIGN_ETCDIR to PKG_SYSCONFBASE may seem stupid
 # if PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set but it does no harm...
+#
 CONFIGURE_ARGS+=	--with-foreign-etcdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 
@@ -76,7 +79,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${EGDIR}
 .endfor
 
-.include "../../security/tcp_wrappers/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh2/distinfo b/security/ssh2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/06 00:48:10 seb Exp $
+$NetBSD: distinfo,v 1.2 2002/09/24 00:24:37 jlam Exp $
 
 SHA1 (ssh-3.2.0.tar.gz) = 13cefe3d4a890004a37b680b00bc119542247c16
 Size (ssh-3.2.0.tar.gz) = 2256240 bytes
 SHA1 (patch-aa) = eeec9d05b2360fe971a397cf53795caf3fd47bfb
 SHA1 (patch-ab) = 5e4d66e3f8f3f13c9f3926d181e2a1a568c20b4b
 SHA1 (patch-ac) = b87e967252b1eaafc6e6b7ee95d8e09550957bff
 SHA1 (patch-ad) = b6944222c0b84d5f906ad019b5260fb19ee299d9
-SHA1 (patch-ae) = 0132993883abca365175116c2e9769bcfa35cc1f
-SHA1 (patch-af) = 0b42b41e4300bcae167dadadf13e310d3f893433
+SHA1 (patch-ae) = 79288d501031c56fd155f966c905de2e4f5ffc35
+SHA1 (patch-af) = cc26be58b0eaf99119919d3353ba6b603b1449b0
 SHA1 (patch-ag) = 5990115dc53a9278f171158df1dcdd4754080e90
 SHA1 (patch-ah) = 5a4314cf70463638d18599dcb3fddbbc19d52b2a
diff --git a/security/ssh2/patches/patch-ae b/security/ssh2/patches/patch-ae
@@ -1,18 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
+$NetBSD: patch-ae,v 1.2 2002/09/24 00:24:38 jlam Exp $
 
---- configure.in.orig	Thu May 16 10:32:33 2002
+--- configure.in.orig	Thu May 16 03:32:33 2002
 +++ configure.in
-@@ -781,9 +781,6 @@ dnl
- #                    All rights reserved
- #
-
--# So many systems seem to need this that it is better do it here automatically.
--LIBS="-L/usr/local/lib $LIBS"
--
- # Platform-specific stuff.
- case "$target" in
-   alpha*-dec-osf*)
-@@ -1779,6 +1776,8 @@ fi
+@@ -1779,6 +1779,8 @@ fi
  if test -z "$no_libbsd"; then
    AC_CHECK_LIB(bsd, openpty)
  fi