buildlink1 -> buildlink2

7 files changed, 25 insertions, 24 deletions

diff --git a/textproc/stardic/Makefile b/textproc/stardic/Makefile
index cc1c88abf56..1a18daa1476 100644
--- a/textproc/stardic/Makefile
+++ b/textproc/stardic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/15 09:21:43 shell Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/23 23:30:25 jlam Exp $
 
 DISTNAME=	dic
 PKGNAME=	stardic-1.31
@@ -10,6 +10,8 @@ COMMENT=	English-Chinese dictionary
 
 DIST_SUBDIR=	${PKGNAME}
 
+USE_BUILDLINK2=	# defined
+USE_X11=	# defined
 MAKEFILE=	makefile
 
 post-patch:
@@ -19,6 +21,5 @@ post-patch:
 	${ECHO} 'hz16ft.pcf.gz hz16ft' >> ${WRKSRC}/hzfont/fonts.dir
 	${ECHO} 'yb10x20.pcf.gz yb10x20' >> ${WRKSRC}/hzfont/fonts.dir
 
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../mk/motif.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/stardic/distinfo b/textproc/stardic/distinfo
index 799b3017c09..99565983e83 100644
--- a/textproc/stardic/distinfo
+++ b/textproc/stardic/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/15 09:21:43 shell Exp $
+$NetBSD: distinfo,v 1.2 2002/09/23 23:30:25 jlam Exp $
 
 SHA1 (stardic-1.31/dic.tar.gz) = 89a4edcbac415232627c98680a9817f2a7676f48
 Size (stardic-1.31/dic.tar.gz) = 1800940 bytes
-SHA1 (patch-aa) = 79fda2fc17b7af8dc5ebadbf34df46f77f8410e4
+SHA1 (patch-aa) = af0aede61350b2e77d9df1deaa0d42a0a62cf043
 SHA1 (patch-ab) = 1389a4a616315da0f9dbd430939f472452e15064
diff --git a/textproc/stardic/patches/patch-aa b/textproc/stardic/patches/patch-aa
index bd30359a002..7601d88fbdd 100644
--- a/textproc/stardic/patches/patch-aa
+++ b/textproc/stardic/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/15 09:21:43 shell Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/23 23:30:26 jlam Exp $
 
 --- makefile.orig	Sat Jan 29 12:07:34 2000
 +++ makefile
@@ -10,14 +10,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/06/15 09:21:43 shell Exp $
  
  # for linux
 -LDFLAGS= -L/usr/X11/lib -lXm -lXt -lXext -lX11
-+LDFLAGS+= -L/usr/X11/lib -lXm -lXt -lXext -lX11
++LDFLAGS+= -L${X11BASE}/lib -lXm -lXt -lXext -lX11
  
  # for solaris
  # LDFLAGS= -lXm -lXt -lXext -lX11
  
  # for linux
 -CPPFLAGS= -I/usr/X11/include
-+CPPFLAGS+= -I/usr/X11/include -DTRANSHOME=\"$(TRANSDIR)\"
++CPPFLAGS+= -I${X11BASE}/include -DTRANSHOME=\"$(TRANSDIR)\"
  
  # for solaris
  #CPPFLAGS= -I/usr/dt/include -I/usr/openwin/include
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index d5d1e040a7f..d56c179b9ec 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2002/08/22 10:58:40 martti Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/23 23:24:24 jlam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-gnome-/}
-COMMENT=		Small, fast and light-weight window manager (GNOME version)
+PKGNAME=	${DISTNAME:S/-/-gnome-/}
+COMMENT=	Small, fast and light-weight window manager (GNOME version)
 
-CONFLICTS+=		icewm-[0-9]*
+CONFLICTS+=	icewm-[0-9]*
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 
 .include "../icewm/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-gnome-menus="${GNOME_CONFIG}"
 CONFIGURE_ARGS+=	--with-imlib
 
 pre-configure:
@@ -18,6 +17,5 @@ pre-configure:
 	${SED} 's/XIV(bool, autoDetectGnome,			false)/XIV(bool, autoDetectGnome,			true)/' \
 		< src/default.h.orig > src/default.h
 
-.include "../../x11/gnome-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile
index 07d13244072..22e07b04f1d 100644
--- a/wm/matchbox/Makefile
+++ b/wm/matchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/08/04 13:17:06 grant Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/23 23:23:26 jlam Exp $
 #
 
 DISTNAME=	matchbox-0.3.2
@@ -9,9 +9,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://handhelds.org/~mallum/matchbox/
 COMMENT=	window manager designed for computers with small displays
 
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/matchbox/distinfo b/wm/matchbox/distinfo
index 1b22590a304..0520b994a26 100644
--- a/wm/matchbox/distinfo
+++ b/wm/matchbox/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/01 15:53:46 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/09/23 23:23:27 jlam Exp $
 
 SHA1 (matchbox-0.3.2.tar.gz) = 48916f7be3274cfd4b8c746c488cc928031edb0c
 Size (matchbox-0.3.2.tar.gz) = 195045 bytes
-SHA1 (patch-aa) = 4c2f1a91014f16b8c20b923ad3f7dab2339aaebd
+SHA1 (patch-aa) = b9e186bbe6308399a124700c0f35dd5cc943daf0
 SHA1 (patch-ab) = 92a0fd3cb70f01ebfb72477a4652e6d2d61a1d71
diff --git a/wm/matchbox/patches/patch-aa b/wm/matchbox/patches/patch-aa
index 65044675571..85ad3b95eb0 100644
--- a/wm/matchbox/patches/patch-aa
+++ b/wm/matchbox/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/01 15:53:46 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/23 23:23:27 jlam Exp $
 
 --- util/Makefile.in.orig	Thu Aug  1 16:22:33 2002
 +++ util/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/01 15:53:46 wiz Exp $
  am_minivol_OBJECTS = minivol.$(OBJEXT) tray.$(OBJEXT)
  minivol_OBJECTS = $(am_minivol_OBJECTS)
 -minivol_LDADD = $(LDADD)
-+minivol_LDADD = $(LDADD) -lossaudio
++minivol_LDADD = $(LDADD) $(LIBOSSAUDIO)
  minivol_DEPENDENCIES =
  minivol_LDFLAGS =
  am_miniwave_OBJECTS = miniwave.$(OBJEXT) tray.$(OBJEXT)