summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-09-12 21:09:04 +0000
committerjlam <jlam@pkgsrc.org>2001-09-12 21:09:04 +0000
commit68f8fa17a611395425faecfac1c9641e278c36e5 (patch)
tree8b89a27f8aee97a523baf9c8affa64f9fdad48ac /graphics
parent58c3cad4dc9d3ba155c3426f4d7a50feacb63c93 (diff)
downloadpkgsrc-68f8fa17a611395425faecfac1c9641e278c36e5.tar.gz
Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. Pass
--without-javadx to configure script to prevent java programs from being detectedly inadvertently (hidden dependency). Also add dependencies on several other graphics and math packages to make DX more useful as a visual data explorer and capable of reading more diverse data files.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/dx/Makefile43
-rw-r--r--graphics/dx/distinfo4
-rw-r--r--graphics/dx/patches/patch-ab24
3 files changed, 54 insertions, 17 deletions
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index c428b9b991f..dd98effe10f 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/08 19:48:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/12 21:09:04 jlam Exp $
DISTNAME= dx-4.1.0
CATEGORIES= graphics
@@ -8,15 +8,40 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.research.ibm.com/dx/
COMMENT= Open Visualization Data Explorer
-DEPENDS+= jpeg-6b:../../graphics/jpeg
+USE_BUILDLINK_ONLY= yes
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --without-javadx
-USE_MOTIF= yes
-USE_MESA= yes
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
+# Ensure we export symbols in the linked shared object.
+LDFLAGS+= -Wl,--export-dynamic
-#override ARCH to avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
-CONFIGURE_ENV+= ARCH=""
+CPPFLAGS+= -I${BUILDLINK_DIR}/include/freetype # freetype.h
+# 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 "../../mk/bsd.pkg.mk"
diff --git a/graphics/dx/distinfo b/graphics/dx/distinfo
index 47c1cb45274..e7eae44d3f0 100644
--- a/graphics/dx/distinfo
+++ b/graphics/dx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/05/08 19:48:45 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2001/09/12 21:09:04 jlam Exp $
SHA1 (dx-4.1.0.tar.gz) = 2440390af3904206e671fca9bc7eba60cf284cb6
Size (dx-4.1.0.tar.gz) = 9055565 bytes
SHA1 (patch-aa) = dcb0c34ae37f0c8a9ca7302c3aab5608c65ac1b5
-SHA1 (patch-ab) = 7108213392e5ec922745417519da11f16f847540
+SHA1 (patch-ab) = f1dfd3dc63ec73b8cfba74a60f0a46ea15b88e5f
SHA1 (patch-ac) = 94bdc8d49d0f575181ccdc15e867844db3c72ac4
SHA1 (patch-ad) = 771272edcb61a0229865086b0df04265a74dc242
SHA1 (patch-ae) = a906f9c42b5c0747749dac1f1a871096c0d9f304
diff --git a/graphics/dx/patches/patch-ab b/graphics/dx/patches/patch-ab
index c6239d88cf1..e3943fa1958 100644
--- a/graphics/dx/patches/patch-ab
+++ b/graphics/dx/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2001/05/08 19:48:46 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.3 2001/09/12 21:09:04 jlam Exp $
--- configure.orig Fri Mar 31 15:07:21 2000
-+++ configure Tue May 8 14:46:58 2001
-@@ -1258,4 +1258,7 @@
++++ configure
+@@ -1257,6 +1257,9 @@
+ if test $unameS = "FreeBSD" ; then
ARCH=freebsd
fi
+ if test $unameS = "NetBSD" ; then
@@ -10,11 +11,22 @@ $NetBSD: patch-ab,v 1.2 2001/05/08 19:48:46 dmcmahill Exp $
+ fi
if test `echo $unameS | tr A-Z a-z | sed "s/^.*cygwin.*$/yes/"` = "yes" ; then
ARCH=cygwin
-@@ -1269,7 +1272,4 @@
+ fi
+@@ -1269,9 +1272,6 @@
if test $unameS = "AIX" ; then
ARCH=ibm6000
-- fi
+ fi
- if test $unameM = "alpha" ; then
- ARCH=alphax
- fi
+- fi
if test $unameS = "HP-UX" ; then
+ ARCH=hp700
+ fi
+@@ -3719,6 +3719,7 @@
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+ echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
++ eval "$ac_cv_have_x"
+ fi
+
+ if test "$x_includes" != "" ; then