summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-09-22 00:49:32 +0000
committerjlam <jlam@pkgsrc.org>2002-09-22 00:49:32 +0000
commit2e99492e0d7ce5a438920660aa577fcf8df225e1 (patch)
treeea10532437a6febfc746938861d782d12c182d02
parent2cb588bce67f19333fa7cb23ee88a512da7bcb0c (diff)
downloadpkgsrc-2e99492e0d7ce5a438920660aa577fcf8df225e1.tar.gz
buildlink1 -> buildlink2
-rw-r--r--graphics/dx/Makefile36
-rw-r--r--graphics/gnuplot/Makefile6
2 files changed, 14 insertions, 28 deletions
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index 5c9256968e6..7cee40aed39 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/09/04 14:47:36 agc Exp $
+# $NetBSD: Makefile,v 1.17 2002/09/22 00:49:32 jlam Exp $
DISTNAME= dx-4.1.3
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.research.ibm.com/dx/
COMMENT= Open Visualization Data Explorer
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
USE_X11BASE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -19,32 +19,18 @@ CONFIGURE_ENV+= LEX="flex -l"
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
-CPPFLAGS+= -I${BUILDLINK_DIR}/include/freetype # freetype.h
+CPPFLAGS+= -I${BUILDLINK_PREFIX.freetype-lib}/include/freetype
# Override ARCH to avoid picking up a bad ${ARCH} during the build.
MAKE_ENV+= ARCH=""
CONFIGURE_ENV+= ARCH=""
-# Remove "-I/usr/include -I/usr/local/include" from the INCLUDES, and
-# "-L/usr/X11R6/lib -L/usr/local/lib" from the *_LDADD passed to
-# the compiler, as this defeats buildlink.
-#
-post-patch:
- cd ${WRKSRC}; \
- files=`${FIND} . -name "Makefile.in" -print`; \
- for file in $${files}; do \
- ${SED} -e "/^INCLUDES.*=.*/s|[ ]*-I/usr/include[ ]*-I/usr/local/include||" \
- -e "/^[^ ]*LDADD.*=.*/s|[ ]*-L/usr/X11R6/lib[ ]*-L/usr/local/lib||" \
- $${file} > $${file}.fixed; \
- ${MV} -f $${file}.fixed $${file}; \
- done
-
-.include "../../devel/netcdf/buildlink.mk"
-.include "../../graphics/Mesa/buildlink.mk"
-.include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/netcdf/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 35dff234df9..5acd08b8bee 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/11/26 10:12:03 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/09/22 00:49:49 jlam Exp $
#
DISTNAME= gnuplot-3.7.1
@@ -11,8 +11,8 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.cs.dartmouth.edu/gnuplot_info.html
COMMENT= gnuplot is a nice plotting utility
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
+USE_X11= YES
GNU_CONFIGURE= YES
-.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"