svn commit: r344026 - in head/graphics/gmt: . files

Wed Feb 12 22:37:13 UTC 2014

Author: marino
Date: Wed Feb 12 22:37:12 2014
New Revision: 344026
URL: http://svnweb.freebsd.org/changeset/ports/344026
QAT: https://qat.redports.org/buildarchive/r344026/

Log:
  graphics/gmt: Update to latest 4.x version (4.5.11), Undeprecate
  
  The distfiles weren't actually removed, they were placed in a
  subfolder called "legacy".  However, a second distfile wasn't
  available in the exact specified name.
  
  The easiest fix was to upgrade to the latest 4.x version.
  Version 5.1 is currently available though, in cases somebody
  wants to take over the port and bring it to the very latest.
  The EPS option mispelling was also fixed.  While here, fix
  DragonFly support too.

Added:
  head/graphics/gmt/files/patch-configure.ac   (contents, props changed)
Deleted:
  head/graphics/gmt/files/patch-configure-ac
Modified:
  head/graphics/gmt/Makefile
  head/graphics/gmt/distinfo
  head/graphics/gmt/pkg-plist

Modified: head/graphics/gmt/Makefile
==============================================================================

--- head/graphics/gmt/Makefile	Wed Feb 12 22:11:35 2014	(r344025)
+++ head/graphics/gmt/Makefile	Wed Feb 12 22:37:12 2014	(r344026)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmt
-PORTVERSION=	4.5.9
+PORTVERSION=	4.5.11
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \
 		ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \
@@ -11,15 +11,12 @@ MASTER_SITES=	ftp://ftp.soest.hawaii.edu
 		http://gd.tuwien.ac.at/graphics/visual/%SUBDIR%/ \
 		http://gmt.mirror.ac.za/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${GSHHG_DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
+		${GSHHG_DISTNAME}.tar.gz
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Generic Mapping Tools - data processing and display software package
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2014-03-10
-
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	multi
 LICENSE_DISTFILES_GPLv2=	${DISTNAME}${EXTRACT_SUFX}
@@ -37,8 +34,6 @@ IMPERIAL_DESC=	Choose Imperial (inch) un
 GDAL_DESC=	Compile in experimental GDAL support
 OCTAVE_DESC=	Build GMT-octave interface
 
-WRKSRC=		${WRKDIR}/${PORTNAME:U}${DISTVERSION}
-
 USE_BZIP2=	yes
 USES=		gmake shebangfix
 SHEBANG_FILES=	gmtswitch
@@ -53,7 +48,7 @@ PORTDOCS=	*
 DEBUG_CONFIGURE_ON=	--enable-debug --enable-devdebug
 SHARED_CONFIGURE_ON=	--enable-shared
 IMPERIAL_CONFIGURE_ON=	--enable-US
-EPS_CONFNIGURE_ON=	--enable-eps
+EPS_CONFIGURE_ON=	--enable-eps
 GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
 GDAL_CONFIGURE_ON=	--enable-gdal
 OCTAVE_RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
@@ -75,7 +70,7 @@ STRIP_FILES=	blockmean blockmedian block
 		psxy psxyz sample1d spectrum1d splitxyz \
 		surface trend1d trend2d triangulate xyz2grd
 
-GSHHG_DISTNAME=	gshhg-gmt-nc3-2.2.2
+GSHHG_DISTNAME=	gshhg-gmt-2.3.0
 
 .include <bsd.port.options.mk>
 

Modified: head/graphics/gmt/distinfo
==============================================================================
--- head/graphics/gmt/distinfo	Wed Feb 12 22:11:35 2014	(r344025)
+++ head/graphics/gmt/distinfo	Wed Feb 12 22:37:12 2014	(r344026)
@@ -1,4 +1,4 @@
-SHA256 (gmt-4.5.9.tar.bz2) = 9b13be96ccf4bbd38c14359c05dfa7eeeb4b5f06d6f4be9c33d6c3ea276afc86
-SIZE (gmt-4.5.9.tar.bz2) = 39325492
-SHA256 (gshhg-gmt-nc3-2.2.2.tar.bz2) = 463460e429a98901accc119629e327dfece217760cda8eddc9fd5afcbc7f1919
-SIZE (gshhg-gmt-nc3-2.2.2.tar.bz2) = 46982087
+SHA256 (gmt-4.5.11-src.tar.bz2) = ec12b1206a8c91843587b241a478690bf61eb9350ff7458e28302a9f431a598e
+SIZE (gmt-4.5.11-src.tar.bz2) = 39410288
+SHA256 (gshhg-gmt-2.3.0.tar.gz) = 123a969cf700c0d2607408af63f91c334e97bc456fa2deb3a51de0f50b1c911e
+SIZE (gshhg-gmt-2.3.0.tar.gz) = 57005361

Added: head/graphics/gmt/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/gmt/files/patch-configure.ac	Wed Feb 12 22:37:12 2014	(r344026)
@@ -0,0 +1,42 @@
+--- configure.ac.orig	2013-11-05 19:44:32.000000000 +0000
++++ configure.ac
+@@ -640,10 +640,10 @@ else
+ 	if test "$os" = "Darwin" ; then
+ 		LDFLAGS="$LDFLAGS -Wl,-x"
+ 	else
+-		LDFLAGS="$LDFLAGS -s"
++		LDFLAGS="$LDFLAGS"
+ 	fi
+ 	if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
+-		CFLAGS="$CFLAGS -O2"
++		CFLAGS="$CFLAGS"
+ 	elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then
+ 		CFLAGS="$CFLAGS"
+ 	else
+@@ -756,11 +756,15 @@ if test "X$enable_shared" = "Xyes" ; the
+ 		else				# Solaris
+ 			LD_OPT="-G"
+ 		fi
+-	elif test "$os" = "Linux" || test "$os" = "GNU/kFreeBSD" ; then	# Need optimization when doing shared
++	elif test "$os" = "DragonFly" ; then
+ 		LD='$(CC)'
+ 		SL_VERSION=$SL.$LIB_MAJOR_VERSION
+ 		LD_OPT='-shared -Wl,-soname=$*.'$SL_VERSION
+-	elif test "$os" = "FreeBSD" || test "$os" = "NetBSD" ; then
++	elif test "$os" = "Linux" || test "$os" = "FreeBSD" || test "$os" = "GNU/kFreeBSD" ; then	# Need optimization when doing shared
++		LD='$(CC)'
++		SL_VERSION=$SL.$LIB_MAJOR_VERSION
++		LD_OPT='-shared -Wl,-soname=$*.'$SL_VERSION
++	elif test "$os" = "NetBSD" ; then
+ 		SL_VERSION=$SL.$LIB_MAJOR_VERSION
+ 		LD_OPT='-shared -Wl,-soname=$*.'$SL_VERSION
+ 	elif test "$os" = "OSF1" ; then
+@@ -809,6 +813,8 @@ elif test "$os" = "SunOS" ; then
+ 	else
+ 		flag="-R,"
+ 	fi
++elif test "$os" = "DragonFly" ; then
++	flag="-rpath,"
+ elif test "$os" = "Linux" || test "$os" = "FreeBSD" || test "$os" = "NetBSD" || test "$os" = "OSF1" || test "$os" = "IRIX64" ; then
+ 	flag="-rpath,"
+ elif test "$os" = "HP-UX" ; then

Modified: head/graphics/gmt/pkg-plist
==============================================================================
--- head/graphics/gmt/pkg-plist	Wed Feb 12 22:11:35 2014	(r344025)
+++ head/graphics/gmt/pkg-plist	Wed Feb 12 22:37:12 2014	(r344026)
@@ -269,7 +269,6 @@ man/man5/gmtcolors.5.gz
 %%DATADIR%%/coast/binned_river_h.nc
 %%DATADIR%%/coast/binned_river_i.nc
 %%DATADIR%%/coast/binned_river_l.nc
-%%DATADIR%%/conf/gmt.conf
 %%DATADIR%%/conf/gmt_cpt.conf
 %%DATADIR%%/conf/gmt_custom_media.conf
 %%DATADIR%%/conf/gmt_custom_symbols.conf
