summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-10-24 22:10:43 +0000
committerjlam <jlam@pkgsrc.org>2001-10-24 22:10:43 +0000
commita4bc16d30c123e03c4125fdd70bde0eb8a71f4a4 (patch)
treee280bcd13b77df59c664f968eda46414c756ada4 /math
parent452509b0a2eb744db237df7645a87161418d6935 (diff)
downloadpkgsrc-a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4.tar.gz
I am a triple idiot. The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR, which points to the location of the X11R6 hierarchy used during building. If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to ${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use. Remove the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and revert changes to move x11.buildlink.mk before the other buildlink.mk files.
Diffstat (limited to 'math')
-rw-r--r--math/R/Makefile3
-rw-r--r--math/gnumeric/Makefile4
-rw-r--r--math/grace/Makefile4
-rw-r--r--math/xmgr/Makefile4
4 files changed, 8 insertions, 7 deletions
diff --git a/math/R/Makefile b/math/R/Makefile
index 9c31f4863c0..dbcedea133d 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/08/27 14:35:10 tron Exp $
+# $NetBSD: Makefile,v 1.28 2001/10/24 22:11:04 jlam Exp $
DISTNAME= R-1.3.0
CATEGORIES= math
@@ -108,4 +108,5 @@ post-install:
.include "../../graphics/png/buildlink.mk"
.include "../../math/blas/buildlink.mk"
.include "../../x11/tk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index b202cb48af9..81851500789 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2001/10/23 13:15:00 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2001/10/24 22:11:04 jlam Exp $
#
DISTNAME= gnumeric-0.71
@@ -32,7 +32,6 @@ pre-configure:
${MV} $$i.fixed $$i ; \
done
-.include "../../mk/x11.buildlink.mk"
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../textproc/libxml/buildlink.mk"
.include "../../devel/libglade/buildlink.mk"
@@ -40,4 +39,5 @@ pre-configure:
.include "../../devel/oaf/buildlink.mk"
.include "../../devel/gal/buildlink.mk"
.include "../../lang/gb/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 4eda2209a48..7ee908aee7c 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/10/23 13:15:00 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/24 22:11:04 jlam Exp $
#
DISTNAME= grace-5.1.4
@@ -29,7 +29,6 @@ post-install:
${RM} -f ${PREFIX}/bin/xmgrace
${LN} -s ${PREFIX}/grace/bin/xmgrace ${PREFIX}/bin
-.include "../../mk/x11.buildlink.mk"
.include "../../devel/netcdf/buildlink.mk"
.include "../../graphics/jpeg/buildlink.mk"
.include "../../graphics/png/buildlink.mk"
@@ -39,4 +38,5 @@ post-install:
.include "../../textproc/t1lib/buildlink.mk"
.include "../../x11/Xbae/buildlink.mk"
.include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index 7fa42618a02..ace4f33caa1 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/23 13:15:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/24 22:11:04 jlam Exp $
# FreeBSD Id: Makefile,v 1.13 1998/12/12 22:27:21 jseger Exp
#
@@ -29,8 +29,8 @@ EXTRA_INCDIRS= ${BUILDLINK_DIR}/include/X11:${BUILDLINK_DIR}/include
ALL_TARGET= # empty
INSTALL_TARGET= install
-.include "../../mk/x11.buildlink.mk"
.include "../../devel/netcdf/buildlink.mk"
.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"