Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Jan 2016 13:04:47 +0000 (UTC)
From:      Wen Heping <wen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r406684 - in head/graphics/gmt: . files
Message-ID:  <201601191304.u0JD4lIF091029@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wen
Date: Tue Jan 19 13:04:47 2016
New Revision: 406684
URL: https://svnweb.freebsd.org/changeset/ports/406684

Log:
  - Update to 4.5.14
  
  PR:		204445
  Submitted by:	tkato432@yahoo.com

Modified:
  head/graphics/gmt/Makefile
  head/graphics/gmt/distinfo
  head/graphics/gmt/files/patch-configure.ac

Modified: head/graphics/gmt/Makefile
==============================================================================
--- head/graphics/gmt/Makefile	Tue Jan 19 12:33:06 2016	(r406683)
+++ head/graphics/gmt/Makefile	Tue Jan 19 13:04:47 2016	(r406684)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gmt
-PORTVERSION=	4.5.13
-PORTREVISION=	2
+PORTVERSION=	4.5.14
+DISTVERSIONSUFFIX=	-src
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \
 		ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.soest.hawaii.edu
 		ftp://ftp.soest.hawaii.edu/gshhg/:gshhg \
 		ftp://ftp.scc.u-tokai.ac.jp/pub/gmt/:gshhg
 MASTER_SITE_SUBDIR=	${PORTNAME} ${PORTNAME}/legacy
-DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${GSHHG_DISTNAME}.tar.gz:gshhg
 
 MAINTAINER=	ports@FreeBSD.org
@@ -30,11 +30,11 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bas
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		gmake shebangfix tar:bzip2
+USES=		autoreconf:build gmake pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	gmtswitch doc/examples/*/*.sh src/GMT.in \
 		src/gmt_shell_functions.sh.in src/gmtget.in \
 		src/gmtlogo.in src/isogmt.in
-USE_AUTOTOOLS=	autoconf
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--with-gshhg-dir=${DATADIR}/coast
 INSTALL_TARGET=	install-gmt install-data install-man install-doc
@@ -50,7 +50,7 @@ OPTIONS_SUB=		yes
 
 DEBUG_CONFIGURE_ON=	--enable-debug --enable-devdebug
 EPS_DESC=		Set .eps as default output format, otherwise .ps
-EPS_CONFNIGURE_ON=	--enable-eps
+EPS_CONFIGURE_ON=	--enable-eps
 GDAL_DESC=		Compile in experimental GDAL support
 GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
 GDAL_CONFIGURE_ON=	--enable-gdal
@@ -66,7 +66,7 @@ SHARED_USE=		LDCONFIG=yes
 X11_USE=		XORG=x11,xaw,xmu,xt
 X11_CONFIGURE_OFF=	--disable-xgrid
 
-STRIP_FILES=	blockmean blockmedian blockmode filter1d fitcircle \
+STRIP_BINS=	blockmean blockmedian blockmode filter1d fitcircle \
 		gmt2rgb gmtconvert gmtdefaults gmtmath gmtselect \
 		gmtset grd2cpt grd2xyz grdblend grdclip \
 		grdcontour grdcut grdedit grdfft grdfilter \
@@ -79,23 +79,30 @@ STRIP_FILES=	blockmean blockmedian block
 		psmask psrose psscale pstext pswiggle \
 		psxy psxyz sample1d spectrum1d splitxyz \
 		surface trend1d trend2d triangulate xyz2grd
+STRIP_LIBS=	libgmt.so.4 libgmtps.so.4 libpsl.so.4
 
 # http://www.soest.hawaii.edu/pwessel/gshhg/
-GSHHG_DISTNAME=	gshhg-gmt-2.3.0
+GSHHG_DISTNAME=	gshhg-gmt-2.3.4
 
-.include <bsd.port.options.mk>
+pre-configure:
+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} AUTOHEADER="${TRUE}" \
+		${AUTORECONF} -f -i)
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so
 	@${MKDIR} ${STAGEDIR}${DATADIR}/coast
 	(cd ${WRKDIR}/${GSHHG_DISTNAME} && ${INSTALL_DATA} README.TXT *.nc \
 		${STAGEDIR}${DATADIR}/coast)
-.if ${PORT_OPTIONS:MX11}
+.for i in ${STRIP_BINS}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
+.endfor
+
+post-install-X11-on:
 	(cd ${WRKSRC}/src/xgrid && ${INSTALL_PROGRAM} xgridedit \
 		${STAGEDIR}${PREFIX}/bin)
-.endif
-.for i in ${STRIP_FILES}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
+
+post-install-SHARED-on:
+.for i in ${STRIP_LIBS}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${i}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/graphics/gmt/distinfo
==============================================================================
--- head/graphics/gmt/distinfo	Tue Jan 19 12:33:06 2016	(r406683)
+++ head/graphics/gmt/distinfo	Tue Jan 19 13:04:47 2016	(r406684)
@@ -1,4 +1,4 @@
-SHA256 (gmt-4.5.13-src.tar.bz2) = 406259646f5726584a7a341481fd7589c6dfe580a0d9cac5b37f64ae021dd102
-SIZE (gmt-4.5.13-src.tar.bz2) = 39410381
-SHA256 (gshhg-gmt-2.3.0.tar.gz) = 123a969cf700c0d2607408af63f91c334e97bc456fa2deb3a51de0f50b1c911e
-SIZE (gshhg-gmt-2.3.0.tar.gz) = 57005361
+SHA256 (gmt-4.5.14-src.tar.bz2) = b34ab9bcfdc6b85036546372f1c6ef6138420d12a343052fc95fed40962adfe3
+SIZE (gmt-4.5.14-src.tar.bz2) = 39235411
+SHA256 (gshhg-gmt-2.3.4.tar.gz) = 420c6c0df9170015ac0f7c7d472c5a58f8b70a7bf89f162c59dcd70735389110
+SIZE (gshhg-gmt-2.3.4.tar.gz) = 57009749

Modified: head/graphics/gmt/files/patch-configure.ac
==============================================================================
--- head/graphics/gmt/files/patch-configure.ac	Tue Jan 19 12:33:06 2016	(r406683)
+++ head/graphics/gmt/files/patch-configure.ac	Tue Jan 19 13:04:47 2016	(r406684)
@@ -1,4 +1,4 @@
---- configure.ac.orig	2013-11-05 19:44:32.000000000 +0000
+--- configure.ac.orig	2013-11-05 19:44:32 UTC
 +++ configure.ac
 @@ -640,10 +640,10 @@ else
  	if test "$os" = "Darwin" ; then



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601191304.u0JD4lIF091029>