From f2c0e2bffd443772f38eacd6eb89951e00b3bd62 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 23 Sep 2002 23:34:59 +0000
Subject: buildlink1 -> buildlink2

---
 sysutils/xnc/Makefile         | 20 +++++++++++---------
 sysutils/xnc/distinfo         |  4 ++--
 sysutils/xnc/patches/patch-ac |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'sysutils/xnc')

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)
  
-- 
cgit v1.2.3