From f22b8c42a61ccfbb462bf2b94c3486b7baec18bd Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 25 Aug 2002 18:38:05 +0000
Subject: Merge changes in packages from the buildlink2 branch that have
 buildlink2.mk files back into the main trunk.  This provides sufficient
 buildlink2 infrastructure to start merging other packages from the buildlink2
 branch that have already been converted to use the buildlink2 framework.

---
 graphics/fnlib/Makefile | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'graphics/fnlib/Makefile')

diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 5761c024e58..32c7622f6e0 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:06 fredb Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 18:38:58 jlam Exp $
 
 DISTNAME=		fnlib-0.5
 PKGREVISION=		1
@@ -8,30 +8,16 @@ MASTER_SITES=		ftp://ftp.enlightenment.org/pub/e/enlightenment/libs/
 MAINTAINER=		root@garbled.net
 COMMENT=		color font rendering library for X11R6
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		# defined
 USE_X11BASE=		# defined
 GNU_CONFIGURE=		# defined
 
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-# Remove -I$(includedir) from the INCLUDES passed to the compiler as this
-# defeats buildlink.
-#
-post-patch:
-	cd ${WRKSRC};							\
-	files=`${FIND} . -name "Makefile.in" -print`;			\
-	for file in $${files}; do					\
-		${MV} -f $${file} $${file}.fixme;			\
-		${SED} -e "/^INCLUDES.*=.*/s|[  ]*-I\$$(includedir)||"	\
-			$${file}.fixme > $${file};			\
-		${RM} $${file}.fixme;					\
-	done
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fnlib
 	${INSTALL_DATA} ${WRKSRC}/doc/fontinfo.README ${PREFIX}/share/doc/fnlib
 
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/imlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3