buildlink1 -> buildlink2

7 files changed, 24 insertions, 36 deletions

diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index fb5c593911b..8cc8f1e6ba1 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:44 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/23 23:38:30 jlam Exp $
 #
 
 DISTNAME=		medusa-0.5.1
@@ -13,12 +13,12 @@ COMMENT=		file system indexing engine
 
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
 
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_BUILDLINK_ONLY=	YES
 
-.include "../../sysutils/gnome-vfs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../sysutils/gnome-vfs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/medusa/distinfo b/sysutils/medusa/distinfo
index a9c531f3dcd..6a523b70dd6 100644
--- a/sysutils/medusa/distinfo
+++ b/sysutils/medusa/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.2 2002/03/29 19:44:54 fredb Exp $
+$NetBSD: distinfo,v 1.3 2002/09/23 23:38:30 jlam Exp $
 
 SHA1 (medusa-0.5.1.tar.gz) = 8e3a1ae286c9502bceda3f3fa5f2b3559440d8d0
 Size (medusa-0.5.1.tar.gz) = 384482 bytes
 SHA1 (patch-aa) = 76a682d2b7e71488131037fed209a9d2144a97c9
 SHA1 (patch-ab) = f19d58f14f957dff3de7de9015910d4933c1b896
-SHA1 (patch-ac) = b429ce07a98f3eb48fe5922ab68dc12d4875300e
 SHA1 (patch-ad) = 885715122bbe31cb582e4cc75db02296e4282b4f
 SHA1 (patch-ae) = 0e93570781b68d42f9ced0b705e447c965fd611c
-SHA1 (patch-af) = db1f6edb61cc9afdf0fec9f93d982dfa8214cc15
+SHA1 (patch-af) = c4a9458e8583a6f8acd286d1fefb8abb3fbf31ed
 SHA1 (patch-ag) = 9c4ffb05d2108dbacfbf34704c6a81fc06fc6d37
 SHA1 (patch-ah) = aabf5bbb2d0ea1872b76517b94ae65130147ff0c
 SHA1 (patch-ai) = 9c63685f52e62cebd027e7dfdbbb6526b0cd7b6b
diff --git a/sysutils/medusa/patches/patch-ac b/sysutils/medusa/patches/patch-ac
deleted file mode 100644
index 4031b8b0239..00000000000
--- a/sysutils/medusa/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
-
---- medusa-idled/Makefile.in.orig	Sun Apr  8 08:48:34 2001
-+++ medusa-idled/Makefile.in
-@@ -145,7 +145,7 @@
- noinst_HEADERS =  	x-screensaver-code.h 	medusa-idled-private.h 	$(NULL)
- 
- 
--INCLUDES =  	-I$(top_srcdir) 	$(X_CFLAGS) 	$(GLIB_CFLAGS) 	$(NULL)	
-+INCLUDES =  	-I$(top_srcdir) -I${X11BASE}/include	$(X_CFLAGS) 	$(GLIB_CFLAGS) 	$(NULL)	
- 
- 
- medusa_idled_LDADD =  	$(GLIB_LIBS) 	$(top_builddir)/libmedusa/libmedusa.la 	$(XML_LIBS) 	$(VFS_LIBS) 	$(X_LIBS) 	$(GTK_LIBS) 	$(DB_LIB) 	-lXt 	$(NULL)
diff --git a/sysutils/medusa/patches/patch-af b/sysutils/medusa/patches/patch-af
index bdb7dbde087..1d531000e5f 100644
--- a/sysutils/medusa/patches/patch-af
+++ b/sysutils/medusa/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
+$NetBSD: patch-af,v 1.2 2002/09/23 23:38:31 jlam Exp $
 
 --- gnome-vfs-module/Makefile.in.orig	Tue Mar 13 02:40:38 2001
 +++ gnome-vfs-module/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
  
  
 -libvfs_search_la_LIBADD =  	-L$(top_builddir)/libmedusa/.libs -lmedusa 	$(VFS_LIBS) 	$(GLIB_LIBS) 	$(NULL)
-+libvfs_search_la_LIBADD =  	-L`cd $(top_builddir)/libmedusa/ ; pwd` -lmedusa 	$(VFS_LIBS) 	$(GLIB_LIBS) 	$(NULL)
++libvfs_search_la_LIBADD =  	$(top_builddir)/libmedusa/libmedusa.la 	$(VFS_LIBS) 	$(GLIB_LIBS) 	$(NULL)
  
  
  libvfs_search_la_LDFLAGS = -export_dynamic -avoid-version
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 0c2dc384ce5..800ed06e4f1 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/07/08 14:25:03 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/23 23:35:49 jlam Exp $
 
 DISTNAME=	xnc-4.4.7.src
 PKGNAME=	xnc-4.4.7
@@ -12,17 +12,19 @@ COMMENT=	File manager for X Window
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
+USE_BUILDLINK2=	yes
+USE_X11=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
 post-install:
-		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xnc
-		${INSTALL_DATA} ${WRKSRC}/Docs/* ${PREFIX}/share/doc/xnc
-		${INSTALL_MAN_DIR} ${PREFIX}/man/man1
-		${INSTALL_MAN} ${WRKSRC}/yo-man/*.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xnc
+	${INSTALL_DATA} ${WRKSRC}/Docs/* ${PREFIX}/share/doc/xnc
+	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/yo-man/*.1 ${PREFIX}/man/man1/
+
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
 
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xnc/distinfo b/sysutils/xnc/distinfo
index 340c7199bd6..145c137ccea 100644
--- a/sysutils/xnc/distinfo
+++ b/sysutils/xnc/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2002/07/08 14:25:03 jschauma Exp $
+$NetBSD: distinfo,v 1.3 2002/09/23 23:35:49 jlam Exp $
 
 SHA1 (xnc-4.4.7.src.tar.gz) = f66a0cb754a555d11df8e831d3d38af9b0b27563
 Size (xnc-4.4.7.src.tar.gz) = 1647931 bytes
 SHA1 (patch-aa) = 1bdbb1a794048ba72c406dc2fc88dd943bae8bc9
 SHA1 (patch-ab) = 4ab216cd0edf1e37391bf426fdfb451f9510a961
-SHA1 (patch-ac) = 58b1deb7f553ca1796f938c466a79986e793569c
+SHA1 (patch-ac) = f8548211d9ce05a68e55d3b7e6e80e961c423669
 SHA1 (patch-ad) = 651217c540fb4331cf3f5481789ec567eb66402b
 SHA1 (patch-ae) = f6185cabeb30ea23c6d5facaa970ed01386953e6
 SHA1 (patch-af) = d218a7ba6056d567500a38a4e337b85bf4a4292c
diff --git a/sysutils/xnc/patches/patch-ac b/sysutils/xnc/patches/patch-ac
index 05cd4e2e8c9..0792bd3549d 100644
--- a/sysutils/xnc/patches/patch-ac
+++ b/sysutils/xnc/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/07/08 14:25:05 jschauma Exp $
+$NetBSD: patch-ac,v 1.3 2002/09/23 23:35:49 jlam Exp $
 
 --- ives/makefile.in.orig	Sun Jul  7 12:57:19 2002
 +++ ives/makefile.in	Sun Jul  7 12:57:59 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 2002/07/08 14:25:05 jschauma Exp $
  
             CXXOPT=-DIVES $(NO_ALT) $(STYLE) $(DEB) $(DEFS) $(CFLAGS)
 -           LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L/usr/lib $(PNGLIB) $(ZLIB) $(LIBS)
-+           LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L/usr/lib $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
++           LOCAL_LIBRARIES=$(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
  
   PROGRAM =ives iedit iview $(IMAGEOBJS) $(JDEP)