[csw-devel] SF.net SVN: gar:[16130] csw/mgar/pkg/gmt/trunk

gadavis at users.sourceforge.net gadavis at users.sourceforge.net
Tue Nov 8 03:49:45 CET 2011


Revision: 16130
          http://gar.svn.sourceforge.net/gar/?rev=16130&view=rev
Author:   gadavis
Date:     2011-11-08 02:49:45 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
gmt/trunk: update for new upstream packaging

Modified Paths:
--------------
    csw/mgar/pkg/gmt/trunk/Makefile
    csw/mgar/pkg/gmt/trunk/checksums

Modified: csw/mgar/pkg/gmt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gmt/trunk/Makefile	2011-11-07 20:24:31 UTC (rev 16129)
+++ csw/mgar/pkg/gmt/trunk/Makefile	2011-11-08 02:49:45 UTC (rev 16130)
@@ -2,10 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-GMT_VERSION = 4.5.7
-
 NAME = gmt
-VERSION = $(GMT_VERSION)
+VERSION = 4.5.7
 CATEGORIES = apps
 DESCRIPTION = Generic Mapping Tools
 define BLURB
@@ -13,22 +11,17 @@
 endef
 
 SPKG_SOURCEURL = http://gmt.soest.hawaii.edu/
-MASTER_SITES += ftp://ftp.iris.washington.edu/pub/gmt/
-MASTER_SITES += ftp://ftp.soest.hawaii.edu/gmt/
-MASTER_SITES += ftp://gd.tuwien.ac.at/pub/gmt/
+MASTER_SITES += ftp://ftp.soest.hawaii.edu/gmt4/
 
-DISTFILES += GMT$(GMT_VERSION)_doc.tar.bz2
-DISTFILES += GMT$(GMT_VERSION)_share.tar.bz2
-DISTFILES += GMT$(GMT_VERSION)_src.tar.bz2
-DISTFILES += GMT$(GMT_VERSION)_suppl.tar.bz2
-UFILES_REGEX = GMT(\d+(?:\.\d+)*)_(.*).tar.gz
+DISTFILES += $(NAME)-$(VERSION).tar.bz2
+UFILES_REGEX = GMT(\d+(?:\.\d+)*)_(.*).tar.bz2
 
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnetcdf-devel CSWnetcdf
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnetcdf-dev CSWnetcdf
 
 PACKAGES += CSWgmt
 CATALOGNAME_CSWgmt = gmt
 SPKG_DESC_CSWgmt = Generic Mapping Tools
-RUNTIME_DEP_PKGS_CSWgmt += CSWlibnetcdf6
+RUNTIME_DEP_PKGS_CSWgmt += CSWlibnetcdf7
 RUNTIME_DEP_PKGS_CSWgmt += CSWsunmath
 
 PACKAGES += CSWgmt-doc
@@ -42,10 +35,6 @@
 ## GMT Includes no unit tests
 TEST_SCRIPTS =
 
-## GMT doesn't use the GNU convention for unpacked tarballs
-#WORKSRC = $(WORKDIR)/GMT$(VERSION)
-DISTNAME = GMT$(GMT_VERSION)
-
 ## Tell the build process where to find NETCDF for 32 and 64-bit builds
 NETCDF_LIBDIR=/opt/csw/lib/$(MM_LIBDIR)
 ## Tell the build process where to find libsunmath and libm
@@ -96,8 +85,12 @@
 
 include gar/category.mk
 
+# This post-install-modulated step must come after we "include gar/category.mk"
 post-install-modulated:
 	@echo Creating architecture symlinks
 	ln -s $(ISA_DEFAULT) $(DESTDIR)/opt/csw/lib/gmt/32
 	ln -s $(ISA_DEFAULT64) $(DESTDIR)/opt/csw/lib/gmt/64
 	@$(MAKECOOKIE)
+
+# TODO: post-merge, search for anything in /opt/csw/bin/64 that isn't a 
+# binary and nuke it so that things like shell scripts don't get ISAEXEC'd

Modified: csw/mgar/pkg/gmt/trunk/checksums
===================================================================
--- csw/mgar/pkg/gmt/trunk/checksums	2011-11-07 20:24:31 UTC (rev 16129)
+++ csw/mgar/pkg/gmt/trunk/checksums	2011-11-08 02:49:45 UTC (rev 16130)
@@ -1,4 +1 @@
-9a7b78d58311beff31d47b42d0d30bad  GMT4.5.6_doc.tar.bz2
-9b29e35a0c939345ae593dc6487c8b00  GMT4.5.6_share.tar.bz2
-79cdb798b48c0411483d9b1c60944163  GMT4.5.6_src.tar.bz2
-1519e3fdfd337a852d53f5ce819ac3cc  GMT4.5.6_suppl.tar.bz2
+fc8a4a546ff8572c225aa7bdb56bbdf8  gmt-4.5.7.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list