diff options
author | dillo <dillo> | 2002-10-02 21:38:01 +0000 |
---|---|---|
committer | dillo <dillo> | 2002-10-02 21:38:01 +0000 |
commit | 0196704bd0acaeea6eb5d0efa47828549148f7e8 (patch) | |
tree | e629d0382e099f4ebc345d7ff59b7bff0fb229e5 | |
parent | 3b1ed4e096898f6a55ebfda8b4fe9507fd07dd7d (diff) | |
download | pkgsrc-0196704bd0acaeea6eb5d0efa47828549148f7e8.tar.gz |
get rid of autoconf build dependency by patching configure
-rw-r--r-- | graphics/gri/Makefile | 6 | ||||
-rw-r--r-- | graphics/gri/distinfo | 3 | ||||
-rw-r--r-- | graphics/gri/patches/patch-ag | 116 |
3 files changed, 119 insertions, 6 deletions
diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile index 9a0c039fbd3..d15150557bf 100644 --- a/graphics/gri/Makefile +++ b/graphics/gri/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/09/13 06:53:33 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/10/02 21:38:01 dillo Exp $ DISTNAME= gri-2.8.7 CATEGORIES= graphics @@ -9,7 +9,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://gri.sourceforge.net COMMENT= language for scientific graphics applications -BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick GNU_CONFIGURE= # defined @@ -20,9 +19,6 @@ INFO_FILES= gri.info USE_PERL5= build REPLACE_PERL= ${WRKSRC}/gri_merge ${WRKSRC}/gri_unpage -pre-configure: - cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf - .include "../../devel/netcdf/buildlink.mk" .include "../../mk/ghostscript.mk" .include "../../mk/texinfo.mk" diff --git a/graphics/gri/distinfo b/graphics/gri/distinfo index 9d918d5113f..13a374a3962 100644 --- a/graphics/gri/distinfo +++ b/graphics/gri/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/08/11 14:34:16 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3 2002/10/02 21:38:02 dillo Exp $ SHA1 (gri-2.8.7.tgz) = 2d28f1c398e96d4ff7e34746027ce42bb5f2881a Size (gri-2.8.7.tgz) = 1173929 bytes @@ -8,3 +8,4 @@ SHA1 (patch-ac) = b5be8b3b2d9c2ff2ea04fe84cbb2b0d8eea1e164 SHA1 (patch-ad) = ebcc1fdbc4fe52cdcb0f5788acaa637174be4550 SHA1 (patch-ae) = b796adf6b5532e64aa105f8cef6afabfc5a15fa5 SHA1 (patch-af) = aee92b408a7fb6c1ff88fcf29570781ce78d65e6 +SHA1 (patch-ag) = f9f19b9d2bfee659ffd17916be685a525ce7fc99 diff --git a/graphics/gri/patches/patch-ag b/graphics/gri/patches/patch-ag new file mode 100644 index 00000000000..89097ec4fb6 --- /dev/null +++ b/graphics/gri/patches/patch-ag @@ -0,0 +1,116 @@ +$NetBSD: patch-ag,v 1.1 2002/10/02 21:38:02 dillo Exp $ + +--- configure.orig Wed Oct 2 23:34:47 2002 ++++ configure +@@ -1455,66 +1453,58 @@ done + + + +-echo $ac_n "checking for netcdf library""... $ac_c" 1>&6 +-echo "configure:1460: checking for netcdf library" >&5 ++echo $ac_n "checking for ncvarid in -lnetcdf""... $ac_c" 1>&6 ++echo "configure:1458: checking for ncvarid in -lnetcdf" >&5 ++ac_lib_var=`echo netcdf'_'ncvarid | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lnetcdf $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 1466 "configure" ++#include "confdefs.h" ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char ncvarid(); + +- if test -d /opt/netcdf/include ; then +- # +- # Solaris often has it here +- CXXFLAGS="$CXXFLAGS -I/opt/netcdf/include" +- LIBS="$LIBS -L/opt/netcdf/lib -lnetcdf" +- if test $gri_cv_is_sun = yes ; then +- LIBS="$LIBS -lnsl" +- fi +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBNETCDF 1 ++int main() { ++ncvarid() ++; return 0; } + EOF ++if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" + +- echo "yes (in /opt/netcdf/include/netcdf.h and /opt/netcdf/lib/libnetcdf.a)" +- else +- if test -f /usr/local/include/netcdf.h ; then +- CXXFLAGS="$CPPFLAGS -I/usr/local/include" +- LIBS="$LIBS -L/usr/local/lib -lnetcdf" +- if test $gri_cv_is_sun = yes ; then +- LIBS="$LIBS -lnsl" +- fi +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBNETCDF 1 +-EOF ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ HAVE_LIBNETCDF="YES" ++else ++ echo "$ac_t""no" 1>&6 ++HAVE_LIBNETCDF="" ++fi + +- echo "yes (in /usr/local/include/netcdf.h and /usr/local/lib/libnetcdf.a)" +- else +- # +- # Linux/debian often has it here. +- if test -f /usr/include/netcdf.h ; then +- CXXFLAGS="$CPPFLAGS -I/usr/include/netcdf" +- LIBS="$LIBS -L/usr/lib/netcdf -lnetcdf" +- if test $gri_cv_is_sun = yes ; then +- LIBS="$LIBS -lnsl" +- fi +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBNETCDF 1 +-EOF + +- echo "yes (in /usr/include/netcdf.h and /usr/lib/libnetcdf.a)" +- else +- if test -f /boot/home/lib/netcdf ; then +- CXXFLAGS="$CPPFLAGS -I/boot/home/include/netcdf" +- LIBS="$LIBS -L/boot/home/lib/netcdf -lnetcdf" +- if test $gri_cv_is_sun = yes ; then +- LIBS="$LIBS -lnsl" +- fi +- echo "yes (in /boot/home/netcdf)" +- cat >> confdefs.h <<\EOF ++if test -n "$HAVE_LIBNETCDF" ; then ++ cat >> confdefs.h <<\EOF + #define HAVE_LIBNETCDF 1 + EOF +- +- else +- echo "no" +- fi +- fi +- fi +- fi ++ ++ LIBS="-lnetcdf $LIBS" ++fi + + + echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 |