summaryrefslogtreecommitdiff
path: root/graphics/fnlib
diff options
context:
space:
mode:
authorjlam <jlam>2001-08-29 22:41:00 +0000
committerjlam <jlam>2001-08-29 22:41:00 +0000
commitf1323b234ca20824755b76198612200030970f1a (patch)
tree0943c3791afa0b712d3818b69672014acfe55e03 /graphics/fnlib
parentbe19eefa6c1513ef751e213c6afbe76404f3ced2 (diff)
downloadpkgsrc-f1323b234ca20824755b76198612200030970f1a.tar.gz
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'graphics/fnlib')
-rw-r--r--graphics/fnlib/Makefile16
1 files changed, 15 insertions, 1 deletions
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index dab27eb440e..5af82a8cfde 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/03 16:30:19 zuntum Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:16 jlam Exp $
DISTNAME= fnlib-0.5
CATEGORIES= x11 graphics
@@ -14,9 +14,23 @@ 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 "../../mk/bsd.pkg.mk"