Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

9 files changed, 32 insertions, 35 deletions

diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile
index a070394d023..81966f9d03c 100644
--- a/time/asclock-gtk/Makefile
+++ b/time/asclock-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:07 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:22 jlam Exp $
 #
 
 DISTNAME=	asclock-gtk-2.1.10beta
@@ -12,15 +12,13 @@ COMMENT=	dockable clock and calendar with themes for GTK+
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
-USE_BUILDLINK_ONLY=	# defined
-USE_CONFIG_WRAPPER=	# defined
-USE_X11BASE=		# defined
+USE_BUILDLINK2=	# defined
+USE_X11BASE=	# defined
 
 PLIST_SRC=	${PKGDIR}/PLIST \
 		${PKGDIR}/PLIST.themes
 
 ALL_TARGET=	asclock
-MAKE_ENV+=	CONFIG_PATH="${BUILDLINK_DIR}/bin/"	# for gtk-config
 
 pre-configure:
 	cd ${WRKSRC}; ${LN} -sf themes/classic default_theme
@@ -37,6 +35,5 @@ do-install:
 	${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-gtk
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-gtk
 
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/devtodo/Makefile b/time/devtodo/Makefile
index 10fefa35e70..0e32552a4ae 100644
--- a/time/devtodo/Makefile
+++ b/time/devtodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/21 02:14:43 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:22 jlam Exp $
 #
 
 DISTNAME=	devtodo-0.1.6-1
@@ -14,7 +14,7 @@ COMMENT=	Display and manage a list of items that are outstanding
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 
 # We don't need curses, just termcap.
@@ -22,5 +22,5 @@ CONFIGURE_ENV+=		ac_cv_lib_curses_tputs=no
 
 USE_GNU_READLINE=	# uses rl_startup_hook()
 
-.include "../../devel/readline/buildlink.mk"
+.include "../../devel/readline/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/glclock/Makefile b/time/glclock/Makefile
index 35830ae10a6..772f6759a4f 100644
--- a/time/glclock/Makefile
+++ b/time/glclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:08 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:23 jlam Exp $
 #
 
 DISTNAME=		glclock-6.0b6.0
@@ -11,7 +11,9 @@ COMMENT=		OpenGL-based pocket watch
 
 MAKEFILE=		makefile
 ALL_TARGET=		glclock
-USE_BUILDLINK_ONLY=	yes
+
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -26,6 +28,5 @@ do-install:
 #			mwclock woodclock;do \
 #	${INSTALL_SCRIPT} ${WRKSRC}/$$i ${PREFIX}/bin; done
 
-.include "../../graphics/Mesa/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/glclock/distinfo b/time/glclock/distinfo
index 8b88800a728..3c26d767268 100644
--- a/time/glclock/distinfo
+++ b/time/glclock/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/09/14 16:32:30 drochner Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:51:23 jlam Exp $
 
 SHA1 (glclock-6.0b6.0.tar.gz) = e276a516d543c9a6c04f06cfa046f89a476a8685
 Size (glclock-6.0b6.0.tar.gz) = 811803 bytes
-SHA1 (patch-aa) = ad8e2962a1648c0d3b977c658ea3c150dac16687
+SHA1 (patch-aa) = 388d8c9e3236f377912dd6261af50cd42064eb22
 SHA1 (patch-ab) = 8d4f12c9948d703e4fbff68282388efc7a352f59
diff --git a/time/glclock/patches/patch-aa b/time/glclock/patches/patch-aa
index a68e19a0db8..a1a75d2072b 100644
--- a/time/glclock/patches/patch-aa
+++ b/time/glclock/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/09/14 16:32:31 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 21:51:23 jlam Exp $
 
 --- makefile.orig	Sun Jun 18 16:37:40 2000
 +++ makefile
@@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.3 2001/09/14 16:32:31 drochner Exp $
  
 -   INCLUDE_PATH = -I/usr/X11R6/include
 -       LIB_PATH = -L/usr/X11R6/lib
-+   INCLUDE_PATH = -I${BUILDLINK_DIR}/include
-+       LIB_PATH = -L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib
++   INCLUDE_PATH = -I${LOCALBASE}/include
++       LIB_PATH = -L${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib
  
 -           LIBS = -lglut -lGLU -lGL -lXi -lXmu -lXext -lX11 -lm
 +           LIBS = -lglut -lGLU -lGL -lXext -lXmu -lXt -lSM -lICE -lXi -lX11 -lm
diff --git a/time/plan/Makefile b/time/plan/Makefile
index 0b6358975f8..eba05190890 100644
--- a/time/plan/Makefile
+++ b/time/plan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/04/23 02:08:54 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/25 21:51:24 jlam Exp $
 #
 
 DISTNAME=	plan-1.8.4
@@ -10,9 +10,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.in-berlin.de/User/bitrot/plan.html
 COMMENT=	Schedule planner based on X/Motif
 
-USE_BUILDLINK_ONLY=	YES
-USE_X11BASE=		YES
-ALL_TARGET=		netbsd
+USE_BUILDLINK2=	YES
+USE_X11BASE=	YES
+ALL_TARGET=	netbsd
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/plan ${PREFIX}/share/plan \
@@ -23,6 +23,5 @@ pre-install:
 		${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$$f ${PREFIX}/share/plan; \
 	done
 
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../mk/motif.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/plan/PLIST b/time/plan/PLIST
index 6640bf01191..f6cde288acb 100644
--- a/time/plan/PLIST
+++ b/time/plan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:30:03 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:24 jlam Exp $
 bin/plan
 libexec/plan/pland
 libexec/plan/notifier
diff --git a/time/sunclock/Makefile b/time/sunclock/Makefile
index e1c91988502..9fdf7bec810 100644
--- a/time/sunclock/Makefile
+++ b/time/sunclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:25 jlam Exp $
 #
 
 DISTNAME=	sunclock-1.4
@@ -8,6 +8,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 MAINTAINER=	perry@netbsd.org
 COMMENT=	Show which portion of the Earth's surface is illuminated by the Sun
 
+USE_BUILDLINK2=	yes
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile
index 6969f7e100c..027d6af0b38 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/15 07:58:50 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:26 jlam Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
@@ -9,22 +9,21 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
 COMMENT=	another WindowMaker calendar/clock dockapp
 
-USE_BUILDLINK_ONLY=	YES
-USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_BUILDLINK2=	YES
+USE_X11BASE=	YES
+USE_GMAKE=	YES
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/Src
+WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-MAKE_ENV+=		EXTRALIBS="-lsocket -lnsl"
+MAKE_ENV+=	EXTRALIBS="-lsocket -lnsl"
 .endif
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"