From effedb2681ec7624e29e85137b113b4042dcd5f2 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sat, 24 Apr 2004 01:15:12 +0000
Subject: Convert to bl3. While here, fix some problems: . find/chmod on dirs
 must be done with exec, not xargs, since xargs happens   too late . do not
 use ${BUILDLINK_DIR}

---
 graphics/xart/Makefile         | 14 +++++++-------
 graphics/xart/distinfo         |  4 ++--
 graphics/xart/patches/patch-ac | 28 ++++++++++++++--------------
 3 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'graphics/xart')

diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index 6ef7f289572..d3e8de6f69c 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/20 12:18:17 agc Exp $
+# $NetBSD: Makefile,v 1.33 2004/04/24 01:15:12 wiz Exp $
 #
 
 DISTNAME=       xart19980415
@@ -13,15 +13,15 @@ HOMEPAGE=	http://linux01.gwdg.de/~rhohen/linux.html
 COMMENT=	Paint program (enhanced xpaint)
 
 WRKSRC=		${WRKDIR}/19980415
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_IMAKE=      YES
 
 post-extract:
-	${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
+	${FIND} ${WRKSRC} -type d -exec ${CHMOD} 755 {} \;
 	${FIND} ${WRKSRC} -type f -print | ${XARGS} ${CHMOD} 644
 
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xart/distinfo b/graphics/xart/distinfo
index 970f7d686e3..7713ca0837f 100644
--- a/graphics/xart/distinfo
+++ b/graphics/xart/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2004/01/01 19:23:48 darcy Exp $
+$NetBSD: distinfo,v 1.7 2004/04/24 01:15:12 wiz Exp $
 
 SHA1 (xart19980415.tgz) = d4445392e33a5dcf5ae951babac82394e7cdd65c
 Size (xart19980415.tgz) = 343909 bytes
 SHA1 (patch-aa) = 7d8ae61d9a624cc537396f406b496f28376cf7b5
 SHA1 (patch-ab) = b0f00e29560ce786e37a8ba62fef82dae80c4ee9
-SHA1 (patch-ac) = d2794c84766345aaea294785f7985b41c129f94a
+SHA1 (patch-ac) = 28d32baa735b55a579a0e12a106621b95f60b2ba
 SHA1 (patch-ad) = 08059ca068d156be0e31283180c5deaebb99f7bd
 SHA1 (patch-ae) = 20d847bc9faa0e13bf161041d7fd7a44af73bad1
 SHA1 (patch-af) = 6bf891c7532f257a18d3e2917353a36ca519221f
diff --git a/graphics/xart/patches/patch-ac b/graphics/xart/patches/patch-ac
index 34eaea6c358..b842f4ff9bd 100644
--- a/graphics/xart/patches/patch-ac
+++ b/graphics/xart/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2001/12/11 15:37:05 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2004/04/24 01:15:12 wiz Exp $
 
 --- Local.config.orig	Wed Apr  1 02:58:05 1998
 +++ Local.config
@@ -8,8 +8,8 @@ $NetBSD: patch-ac,v 1.4 2001/12/11 15:37:05 jlam Exp $
  #ifdef HaveTIFF
 -TIFF_LIB     = -L/usr/local/lib -ltiff
 -TIFF_INCLUDE = -I/usr/local/include/tiff
-+TIFF_LIB     = -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -ltiff
-+TIFF_INCLUDE = -I${BUILDLINK_DIR}/include
++TIFF_LIB     = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -ltiff
++TIFF_INCLUDE = -I${LOCALBASE}/include
  #endif
  
  XCOMM  If you have the JPEG library, make HaveJPEG defined
@@ -19,8 +19,8 @@ $NetBSD: patch-ac,v 1.4 2001/12/11 15:37:05 jlam Exp $
  #ifdef HaveJPEG
 -JPEG_LIB     = -L/usr/local/lib -ljpeg
 -JPEG_INCLUDE = -I/usr/local/include/jpeg
-+JPEG_LIB     = -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -ljpeg
-+JPEG_INCLUDE = -I${BUILDLINK_DIR}/include
++JPEG_LIB     = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -ljpeg
++JPEG_INCLUDE = -I${LOCALBASE}/include
  #endif
  
  XCOMM  If you have the PNG library, make HavePNG defined
@@ -30,8 +30,8 @@ $NetBSD: patch-ac,v 1.4 2001/12/11 15:37:05 jlam Exp $
  #ifdef HavePNG
 -PNG_LIB     = -L/usr/local/lib -lpng -lz
 -PNG_INCLUDE = -I/usr/local/include/png
-+PNG_LIB     = -Wl,-R${LOCALBASE}/lib -L${BUILDLINK_DIR}/lib -lpng -lz
-+PNG_INCLUDE = -I${BUILDLINK_DIR}/include
++PNG_LIB     = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng -lz
++PNG_INCLUDE = -I${LOCALBASE}/include
  #endif
  
  XCOMM  If you are running SunOS and get an error with the following undefined
@@ -40,12 +40,12 @@ $NetBSD: patch-ac,v 1.4 2001/12/11 15:37:05 jlam Exp $
  XCOMM  Make sure the path name to the library is correct.
  
 -XPM_LIB     = -L/usr/X11R6/lib -lXpm
-+XPM_LIB     = -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -lXpm
++XPM_LIB     = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXpm
  
  XCOMM  Make sure this points to the location of the 'xpm.h' file.
  
 -XPM_INCLUDE = -I/usr/X11R6/include/X11
-+XPM_INCLUDE = -I${BUILDLINK_DIR}/include/X11
++XPM_INCLUDE = -I${X11BASE}/include/X11
  
  
  DEPENDFLAGS = -I./bitmaps
@@ -73,9 +73,9 @@ $NetBSD: patch-ac,v 1.4 2001/12/11 15:37:05 jlam Exp $
 -JPEG_INCLUDE = -I/usr/local/include
 -JPEG_LIB     = -L/usr/local/lib -ljpeg
 -XPM_INCLUDE = -I/usr/X11R6/include/X11
-+TIFF_INCLUDE = -I${BUILDLINK_DIR}/include
-+TIFF_LIB     = -Wl,-R${LOCALBASE} -L${BUILDLINK_DIR}/lib -ltiff
-+JPEG_INCLUDE = -I${BUILDLINK_DIR}/include
-+JPEG_LIB     = -Wl,-R${LOCALBASE} -L${BUILDLINK_DIR}/lib -ljpeg
-+XPM_INCLUDE = -I${BUILDLINK_DIR}/include/X11
++TIFF_INCLUDE = -I${LOCALBASE}/include
++TIFF_LIB     = -Wl,-R${LOCALBASE} -L${LOCALBASE}/lib -ltiff
++JPEG_INCLUDE = -I${LOCALBASE}/include
++JPEG_LIB     = -Wl,-R${LOCALBASE} -L${LOCALBASE}/lib -ljpeg
++XPM_INCLUDE = -I${X11BASE}/include/X11
  #endif
-- 
cgit v1.2.3