pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/GMT * Ensure NETCDF is defined properly durin...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/022168c5375e
branches:  trunk
changeset: 495810:022168c5375e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 22 08:34:54 2005 +0000

description:
* Ensure NETCDF is defined properly during the build.  As part of this
  change, remove some unnecessary changes to the configure script and
  makefiles that caused @NETCDF@ to be substituted since the existing
  mechanism (simply set NETCDFHOME in the environment) is more than
  sufficient.

* Remove some unnecessary changes to the configure script and makefiles
  to cause @LIBTOOL@ to be substituted.  We can simply pass in the
  right value via MAKE_ENV instead of hardcoding the value.

* Fix a place where we weren't calling the compiler correctly, which
  broke the build of certain programs that should be installed and
  which were already listed in the PLIST.

* Add --mode=MODE tags in the appropriate places to suppress the
  warnings from libtool that were cluttering the build log.

Commit approved during the deep freeze by <agc>.

diffstat:

 graphics/GMT/Makefile         |   7 +++----
 graphics/GMT/distinfo         |  30 +++++++++++++++---------------
 graphics/GMT/patches/patch-aa |  18 +++++++++---------
 graphics/GMT/patches/patch-ab |  24 ++++--------------------
 graphics/GMT/patches/patch-ac |  20 ++++----------------
 graphics/GMT/patches/patch-ak |   8 ++++----
 graphics/GMT/patches/patch-al |  12 ++++++------
 graphics/GMT/patches/patch-am |  12 ++++++------
 graphics/GMT/patches/patch-an |  12 ++++++------
 graphics/GMT/patches/patch-ao |  10 +++++-----
 graphics/GMT/patches/patch-ap |  14 +++++++-------
 graphics/GMT/patches/patch-aq |   8 ++++----
 graphics/GMT/patches/patch-ar |  10 +++++-----
 graphics/GMT/patches/patch-as |   8 ++++----
 graphics/GMT/patches/patch-at |  12 ++++++------
 graphics/GMT/patches/patch-au |   8 ++++----
 16 files changed, 92 insertions(+), 121 deletions(-)

diffs (truncated from 614 to 300 lines):

diff -r 48c1448ba5e3 -r 022168c5375e graphics/GMT/Makefile
--- a/graphics/GMT/Makefile     Wed Jun 22 02:31:36 2005 +0000
+++ b/graphics/GMT/Makefile     Wed Jun 22 08:34:54 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/05 10:17:47 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/22 08:34:54 jlam Exp $
 
 DISTNAME=      GMT3.4
 PKGNAME=       GMT-3.4
@@ -25,14 +25,13 @@
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 
-NETCDF_DEFAULT=        ${LOCALBASE}
-EVAL_PREFIX+=  NETCDF=netcdf
-
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include/gmt
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gmt
 CONFIGURE_ARGS+=--enable-eps
 CONFIGURE_ARGS+=--enable-www=${PREFIX}/share/doc/html
 CONFIGURE_ARGS+=--enable-mansect=1
+MAKE_ENV+=     NETCDFHOME=${BUILDLINK_PREFIX.netcdf:Q}
+MAKE_ENV+=     LIBTOOL=${LIBTOOL:Q}
 
 BUILD_TARGET=  all suppl
 INSTALL_TARGET= install-all
diff -r 48c1448ba5e3 -r 022168c5375e graphics/GMT/distinfo
--- a/graphics/GMT/distinfo     Wed Jun 22 02:31:36 2005 +0000
+++ b/graphics/GMT/distinfo     Wed Jun 22 08:34:54 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 08:45:01 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/06/22 08:34:54 jlam Exp $
 
 SHA1 (GMT3.4/GMT3.4_progs.tar.bz2) = b9fa8f60fe20ff9509ef3ebdf15fcc74e01d3f95
 RMD160 (GMT3.4/GMT3.4_progs.tar.bz2) = efa76d4066070af694ec106c3d85d374af085e78
@@ -24,9 +24,9 @@
 SHA1 (GMT3.4/GMT3.4_web.tar.bz2) = efbde777b67d45cf706b680f23c0171bc983c4e3
 RMD160 (GMT3.4/GMT3.4_web.tar.bz2) = a428c198fcc7de3a6f380717634b14c1952d4218
 Size (GMT3.4/GMT3.4_web.tar.bz2) = 1644571 bytes
-SHA1 (patch-aa) = b36fa4900d8f27b1c9663172ccf95b8810f0afcc
-SHA1 (patch-ab) = 51e6616f5c08c7e1f0ae414f310b01e42c90e91f
-SHA1 (patch-ac) = d4ae35538313806567af7f077ad3d5b73ceea3dc
+SHA1 (patch-aa) = dadac1e16003da4902147dceacb8370d9861a03e
+SHA1 (patch-ab) = d53e80a2bdf4386f24f78c9509ab2df9de9a37b6
+SHA1 (patch-ac) = 1ea2263200b94baace742a97ab331ad471e1be81
 SHA1 (patch-ad) = e59e871e51e9a46909de5ec389cad5744de62016
 SHA1 (patch-ae) = e543e7593b949e1476d9f8b8f85b65a892967fb1
 SHA1 (patch-af) = eac4b86614b6ffe88a3790b37b3f0b17f999947d
@@ -34,17 +34,17 @@
 SHA1 (patch-ah) = 80fe4869af2c3c2eacf4f24dd9e6585153479f41
 SHA1 (patch-ai) = e95feed7fde9fb7a5a98cd3c73d0d9d7c057af43
 SHA1 (patch-aj) = 1b4994e217756f1a6978e6b4bbc3e7e7b2a26351
-SHA1 (patch-ak) = 78a08380047c154cf11ad41d94619e05375b7a6d
-SHA1 (patch-al) = 21b50de82954941058ca8fc81337b013f67f878c
-SHA1 (patch-am) = cbff4b734cabea337a504779d92a17584064a9f0
-SHA1 (patch-an) = c043f414d4bf96a788637663f81eb3eb46f65995
-SHA1 (patch-ao) = 671e4bfb66628e231e193c807aca8866cc09cc52
-SHA1 (patch-ap) = 3475a19a50375dd50aba4ac0dda0d55acc085635
-SHA1 (patch-aq) = f131f99906396c617a7c6d9af9e0de54545f3cf6
-SHA1 (patch-ar) = f5628cff11b6330207c3c87217c8c00eb2f596e5
-SHA1 (patch-as) = 42da16147de379bc55a0f6e0f4e7aeb62cfc9843
-SHA1 (patch-at) = 32a3c3527ab9cae4f23163e4d49596aea8f32a76
-SHA1 (patch-au) = d4ac8225cdd83f81b71af7ca26d79a45bb76e283
+SHA1 (patch-ak) = 124368204367c86ae6272e20bbe7930267e764ad
+SHA1 (patch-al) = 429325839b9872858ce549b4a126fdc7b27ae0aa
+SHA1 (patch-am) = 994c931fe2af0af2d2cc2431ff5a10ce4f116c76
+SHA1 (patch-an) = c9762b3bd06a7af30b6661e1074cee50a68e6ce6
+SHA1 (patch-ao) = 2abd32103f35e3f945eb6cc92b33ac0f471be59b
+SHA1 (patch-ap) = c6a58f60f9cad393d092ab77086c150fe9f66de5
+SHA1 (patch-aq) = 5113f8020440c3506ac7162ffb9dfb32ed67e67a
+SHA1 (patch-ar) = 4117f47e6b710d161a1162541c9a103673be1e74
+SHA1 (patch-as) = 7c33dad7423ff19876e71061b41ce62b8cbf6517
+SHA1 (patch-at) = 9994714addb475dfcfba8314113bbb18c909f33f
+SHA1 (patch-au) = 3fc505b42192c9046293b83947bda59a2e233118
 SHA1 (patch-av) = fcc8aafb4a8163c0eb38744b9c7a05162d57db08
 SHA1 (patch-aw) = c9f81b674e8f0428d0bba521e3e58a6baf925ec8
 SHA1 (patch-ax) = 2475174e67f445a0f025cf409832676dfda96db9
diff -r 48c1448ba5e3 -r 022168c5375e graphics/GMT/patches/patch-aa
--- a/graphics/GMT/patches/patch-aa     Wed Jun 22 02:31:36 2005 +0000
+++ b/graphics/GMT/patches/patch-aa     Wed Jun 22 08:34:54 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2001/04/19 20:51:31 jtb Exp $
+$NetBSD: patch-aa,v 1.7 2005/06/22 08:34:54 jlam Exp $
 
 --- src/Makefile.orig  Fri Mar  9 19:20:44 2001
 +++ src/Makefile
@@ -51,8 +51,8 @@
 -                              $(INSTALL) -m 444 libpsl.$(SL) $(libdir); \
 -                              $(INSTALL) -m 444 libgmt.$(SL) $(libdir); \
 -                      fi; \
-+                      $(LIBTOOL) $(INSTALL_DATA) libpsl.la $(libdir); \
-+                      $(LIBTOOL) $(INSTALL_DATA) libgmt.la $(libdir); \
++                      $(LIBTOOL) --mode=install $(INSTALL_DATA) libpsl.la $(libdir); \
++                      $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt.la $(libdir); \
                fi
                if [ ! -d $(includedir) ]; then \
                        mkdir -p $(includedir); \
@@ -67,7 +67,7 @@
 +                      mkdir -p $(bindir); \
 +              fi
 +              for i in $(PROGS); do \
-+                      $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++                      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
 +              done
 +              $(INSTALL) GMT $(bindir)
  
@@ -97,7 +97,7 @@
 -              $(AR) cvur libpsl.a $?
 -              $(RANLIB) libpsl.a
 +libpsl.la:    pslib.o
-+              @$(LIBTOOL) $(CC) -o $@ pslib.lo $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir)
++              @$(LIBTOOL) --mode=link $(CC) -o $@ pslib.lo $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir)
  
  pslib.o:      pslib.c $(PS_H)
 -              $(CC) $(CFLAGS) -c pslib.c
@@ -108,12 +108,12 @@
 -
 -libpsl.$(SL): pslib.o
 -              $(LD) $(LD_OPT) $? -o $@
-+              @$(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) -c pslib.c
++              @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c pslib.c
  
 -libgmt.$(SL): $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
 -              $(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) -o $@
 +libgmt.la:    $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
-+              @$(LIBTOOL) $(CC) -o $@ $(LIB_O:.o=.lo) $(TRIANGLE_O:.o=.lo) \
++              @$(LIBTOOL) --mode=link $(CC) -o $@ $(LIB_O:.o=.lo) $(TRIANGLE_O:.o=.lo) \
 +              $(ALPHA_SINCOS_O:.o=.lo) $(LDFLAGS) $(CDF) $(LIBS)      \
 +              --version-info 0:0 -rpath $(libdir)
  
@@ -123,9 +123,9 @@
  
  $(PROGS):     $(GMTLIB) $(PROGS_O)
 -              $(CC) $(CFLAGS) $@.o -L. -lgmt -lpsl $(CDF) $(LIBS) $(LDFLAGS) -o $@
-+              @$(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) $@.o libgmt.la \
++              @$(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $@.o libgmt.la \
 +              libpsl.la $(CDF) $(LIBS) $(LDFLAGS) -o $@
                $(COMPRESS) $@$(EXE)
  .c.o:
 -              $(CC) -c $(CFLAGS) $<
-+              @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++              @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff -r 48c1448ba5e3 -r 022168c5375e graphics/GMT/patches/patch-ab
--- a/graphics/GMT/patches/patch-ab     Wed Jun 22 02:31:36 2005 +0000
+++ b/graphics/GMT/patches/patch-ab     Wed Jun 22 08:34:54 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2001/04/19 20:51:31 jtb Exp $
+$NetBSD: patch-ab,v 1.5 2005/06/22 08:34:54 jlam Exp $
 
---- src/makegmt.macros.in.orig Fri Mar  2 05:40:57 2001
+--- src/makegmt.macros.in.orig 2001-03-02 00:40:57.000000000 -0500
 +++ src/makegmt.macros.in
-@@ -48,12 +48,16 @@
+@@ -48,6 +48,9 @@ LIBS = @LIBS@
  # Misc. Standard Utilities:
  #---------------------------------------------------------------
  INSTALL               = @INSTALL@
@@ -12,23 +12,7 @@
  AWK           = @AWK@
  AS            = @AS@
  AR            = @AR@
- RANLIB                = @RANLIB@
- CSH           = @CSH@
- LD            = @LD@
-+LIBTOOL               = @LIBTOOL@
- #---------------------------------------------------------------
- #     Misc. macros for Cygwin
- #     Normally empty, EXE=.exe and WIN32=_WIN32 under Cygwin
-@@ -73,7 +77,7 @@
- #     Required path to netcdf (with lib & include)
- #---------------------------------------------------------------
- #
--NETCDF                 = $(NETCDFHOME)
-+NETCDF                 = @NETCDF@
- #---------------------------------------------------------------
- #     Required path to GMT home (used as $GMTHOME by users)
- #---------------------------------------------------------------
-@@ -139,4 +143,4 @@
+@@ -139,4 +142,4 @@ ALPHA_SINCOS_O     = @ALPHA_SINCOS_O@
  #     Select STATIC (Default) or SHARED libraries
  #-------------------------------------------------------------------------------
  #
diff -r 48c1448ba5e3 -r 022168c5375e graphics/GMT/patches/patch-ac
--- a/graphics/GMT/patches/patch-ac     Wed Jun 22 02:31:36 2005 +0000
+++ b/graphics/GMT/patches/patch-ac     Wed Jun 22 08:34:54 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2001/04/19 20:51:31 jtb Exp $
+$NetBSD: patch-ac,v 1.4 2005/06/22 08:34:54 jlam Exp $
 
---- configure.orig     Wed Apr 18 09:28:26 2001
+--- configure.orig     2001-04-18 05:28:26.000000000 -0400
 +++ configure
-@@ -2904,9 +2904,7 @@
+@@ -2904,9 +2904,7 @@ EOF
  
  fi
  
@@ -13,19 +13,7 @@
  
  trap '' 1 2 15
  cat > confcache <<\EOF
-@@ -3074,9 +3072,11 @@
- s%@wrapbindir@%$wrapbindir%g
- s%@wrapmandir@%$wrapmandir%g
- s%@mansection@%$mansection%g
-+s%@NETCDF@%$NETCDF%g
- s%@AR@%$AR%g
- s%@CSH@%$CSH%g
- s%@LD@%$LD%g
-+s%@LIBTOOL@%$LIBTOOL%g
- s%@AS@%$AS%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-@@ -3328,7 +3328,7 @@
+@@ -3328,7 +3326,7 @@ if test "$no_recursion" != yes; then
      esac
    done
  
diff -r 48c1448ba5e3 -r 022168c5375e graphics/GMT/patches/patch-ak
--- a/graphics/GMT/patches/patch-ak     Wed Jun 22 02:31:36 2005 +0000
+++ b/graphics/GMT/patches/patch-ak     Wed Jun 22 08:34:54 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-ak,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- ./src/dbase/makefile.orig  Wed Apr 11 19:58:09 2001
 +++ ./src/dbase/makefile
@@ -7,14 +7,14 @@
  
  install:      all
 -              $(INSTALL) grdraster$(EXE) $(bindir)
-+              @$(LIBTOOL) $(INSTALL_PROGRAM) grdraster$(EXE) $(bindir)
++              @$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) grdraster$(EXE) $(bindir)
  
  uninstall:
                \rm -f $(bindir)/grdraster$(EXE)
  
  grdraster:    grdraster.o
 -              $(CC) $(CFLAGS) $(LDFLAGS) grdraster.o -L.. -L$(libdir) -lgmt -lpsl $(CDF) $(LIBS) -o grdraster
-+              @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) grdraster.lo -L$(libdir) ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster
++              @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) grdraster.lo -L$(libdir) ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster
  
  spotless:     clean
  
@@ -23,4 +23,4 @@
  
  .c.o:
 -              $(CC) -c $(CFLAGS) $<
-+              @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++              @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff -r 48c1448ba5e3 -r 022168c5375e graphics/GMT/patches/patch-al
--- a/graphics/GMT/patches/patch-al     Wed Jun 22 02:31:36 2005 +0000
+++ b/graphics/GMT/patches/patch-al     Wed Jun 22 08:34:54 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.3 2001/04/20 17:16:19 jtb Exp $
+$NetBSD: patch-al,v 1.4 2005/06/22 08:34:54 jlam Exp $
 
 --- src/mgg/makefile.orig      Wed Apr 11 19:58:09 2001
 +++ src/mgg/makefile
@@ -26,10 +26,10 @@
 -                      if [ -f libgmt_mgg.$(SL) ]; then \
 -                              $(INSTALL) -m 444 libgmt_mgg.$(SL) $(libdir); \
 -                      fi; \
-+                      $(LIBTOOL) $(INSTALL_DATA) libgmt_mgg.la $(libdir); \
++                      $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt_mgg.la $(libdir); \
                fi
 +              for i in $(MGG); do \
-+                      $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++                      $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
 +              done
  
  uninstall:
@@ -40,7 +40,7 @@
  libgmt_mgg.a: gmt_mgg.o
 -              $(AR) cvr libgmt_mgg.a $?
 -              $(RANLIB) libgmt_mgg.a
-+              @$(LIBTOOL) $(CC) -o libgmt_mgg.la gmt_mgg.lo --version-info 0:0  -rpath $(libdir)
++              @$(LIBTOOL) --mode=link $(CC) -o libgmt_mgg.la gmt_mgg.lo --version-info 0:0  -rpath $(libdir)
  
  gmt_mgg.o:    $(MGG_H)
  
@@ -49,8 +49,8 @@
  
  $(MGG):               libgmt_mgg.a $(MGG_O)
 -              $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@
-+              @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
++              @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
  
  .c.o:
 -              $(CC) -c $(CFLAGS) $<
-+              @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++              @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff -r 48c1448ba5e3 -r 022168c5375e graphics/GMT/patches/patch-am
--- a/graphics/GMT/patches/patch-am     Wed Jun 22 02:31:36 2005 +0000
+++ b/graphics/GMT/patches/patch-am     Wed Jun 22 08:34:54 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-am,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- src/cps/makefile.orig      Wed Oct 18 03:01:09 2000



Home | Main Index | Thread Index | Old Index