From tkato432@yahoo.com  Wed Mar  5 18:00:57 2014
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 8EC407E7
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed,  5 Mar 2014 18:00:57 +0000 (UTC)
Received: from omta03.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17])
	by mx1.freebsd.org (Postfix) with ESMTP id 35623995
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed,  5 Mar 2014 18:00:57 +0000 (UTC)
Received: from coppermine.my.domain (ZT030001.ppp.dion.ne.jp [59.128.30.1])
	by omta03.auone-net.jp (au one net mail) with ESMTP id 3F212188004B
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu,  6 Mar 2014 03:00:54 +0900 (JST)
Message-Id: <20140306025057.fd6b7328559f9b800374ab49@yahoo.com>
Date: Thu, 6 Mar 2014 02:50:57 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: graphics/gmt: Update to version 4.5.12

>Number:         187290
>Category:       ports
>Synopsis:       graphics/gmt: Update to version 4.5.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 05 18:10:00 UTC 2014
>Closed-Date:    Tue Mar 11 02:32:25 UTC 2014
>Last-Modified:  Tue Mar 11 02:40:04 UTC 2014
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 4.5.12

Remove file:
files/patch-src__grdvector.c
files/patch-src__ps2raster.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/gmt/Makefile graphics/gmt/Makefile
--- /usr/ports/graphics/gmt/Makefile	2014-02-27 22:13:50.000000000 +0900
+++ graphics/gmt/Makefile	2014-03-06 00:00:00.000000000 +0900
@@ -2,8 +2,7 @@
 # $FreeBSD: head/graphics/gmt/Makefile 346258 2014-02-27 08:41:12Z miwi $
 
 PORTNAME=	gmt
-PORTVERSION=	4.5.11
-PORTREVISION=	1
+PORTVERSION=	4.5.12
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \
 		ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \
@@ -81,7 +80,8 @@
 		psxy psxyz sample1d spectrum1d splitxyz \
 		surface trend1d trend2d triangulate xyz2grd
 
-GSHHG_DISTNAME=	gshhg-gmt-nc4-2.2.4
+# http://www.soest.hawaii.edu/pwessel/gshhg/
+GSHHG_DISTNAME=	gshhg-gmt-2.3.0
 
 .include <bsd.port.options.mk>
 
diff -urN /usr/ports/graphics/gmt/distinfo graphics/gmt/distinfo
--- /usr/ports/graphics/gmt/distinfo	2014-02-27 22:13:50.000000000 +0900
+++ graphics/gmt/distinfo	2014-03-06 00:00:00.000000000 +0900
@@ -1,4 +1,4 @@
-SHA256 (gmt-4.5.11-src.tar.bz2) = ec12b1206a8c91843587b241a478690bf61eb9350ff7458e28302a9f431a598e
-SIZE (gmt-4.5.11-src.tar.bz2) = 39410288
-SHA256 (gshhg-gmt-nc4-2.2.4.tar.gz) = 6ad702c67b2113fc5805f9901a070c963d93429c42c0b4ef253fd21025176e9f
-SIZE (gshhg-gmt-nc4-2.2.4.tar.gz) = 55184708
+SHA256 (gmt-4.5.12-src.tar.bz2) = f0ae83fe52842b1425341c0a3fb664e7270cba410253647bdea2e98e10a553c2
+SIZE (gmt-4.5.12-src.tar.bz2) = 39390743
+SHA256 (gshhg-gmt-2.3.0.tar.gz) = 123a969cf700c0d2607408af63f91c334e97bc456fa2deb3a51de0f50b1c911e
+SIZE (gshhg-gmt-2.3.0.tar.gz) = 57005361
diff -urN /usr/ports/graphics/gmt/files/patch-src__grdvector.c graphics/gmt/files/patch-src__grdvector.c
--- /usr/ports/graphics/gmt/files/patch-src__grdvector.c	2014-02-27 22:13:50.000000000 +0900
+++ graphics/gmt/files/patch-src__grdvector.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,27 +0,0 @@
---- src/grdvector.c.orig
-+++ src/grdvector.c
-@@ -388,15 +388,7 @@
-         if (!Ctrl->N.active) GMT_map_clip_on (GMT_no_rgb, 3);
- 
- 	if (Ctrl->I.xinc != 0.0 && Ctrl->I.yinc != 0.0) {	/* Gave a coarser grid spacing, we hope */
--		struct GRD_HEADER tmp_h;
--		double val;
--		tmp_h = h[0];
--		tmp_h.x_inc = Ctrl->I.xinc;
--		tmp_h.y_inc = Ctrl->I.yinc;
--		GMT_RI_prepare (&tmp_h);	/* Convert to make sure we have correct increments */
--		Ctrl->I.xinc = tmp_h.x_inc;
--		Ctrl->I.yinc = tmp_h.y_inc;
--		val = Ctrl->I.yinc / h[0].y_inc;
-+		double val = Ctrl->I.yinc / h[0].y_inc;
- 		dj = irint (val);
- 		if (dj == 0 || fabs (val - dj) > GMT_CONV_LIMIT) {
- 			fprintf (stderr, "%s: Error: New y grid increment (%g) is not a multiple of actual grid increment (%g).\n", GMT_program, Ctrl->I.xinc, h[0].x_inc);
-@@ -408,6 +400,7 @@
- 			fprintf (stderr, "%s: Error: New x grid increment (%g) is not a multiple of actual grid increment (%g).\n", GMT_program, Ctrl->I.xinc, h[0].x_inc);
- 			exit (EXIT_FAILURE);
- 		}
-+		/* Determine starting point for straddled access */
- 		tmp = ceil (h[0].y_max / Ctrl->I.yinc) * Ctrl->I.yinc;
- 		if (tmp > h[0].y_max) tmp -= Ctrl->I.yinc;
- 		j0 = irint ((h[0].y_max - tmp) / h[0].y_inc);
diff -urN /usr/ports/graphics/gmt/files/patch-src__ps2raster.c graphics/gmt/files/patch-src__ps2raster.c
--- /usr/ports/graphics/gmt/files/patch-src__ps2raster.c	2014-02-27 22:13:50.000000000 +0900
+++ graphics/gmt/files/patch-src__ps2raster.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- src/ps2raster.c.orig
-+++ src/ps2raster.c
-@@ -505,7 +505,7 @@
- 	for (k = 0; k < n_files; k++) {
- 		excessK = FALSE;
- 		memset ((void *)out_file, 0, BUFSIZ);
--		strcpy(ps_file,ps_names[k]);
-+		if (ps_file != ps_names[k]) strcpy(ps_file,ps_names[k]);
- 		if ((fp = fopen (ps_file, "r")) == NULL) {
- 			fprintf (stderr, "%s: Cannot to open file %s\n", GMT_program, ps_file);
- 			continue;
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Mar 5 18:10:48 UTC 2014 
Responsible-Changed-Why:  
miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187290 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Tue Mar 11 02:32:25 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187290 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187290: commit references a PR
Date: Tue, 11 Mar 2014 02:32:24 +0000 (UTC)

 Author: miwi
 Date: Tue Mar 11 02:32:16 2014
 New Revision: 347828
 URL: http://svnweb.freebsd.org/changeset/ports/347828
 QAT: https://qat.redports.org/buildarchive/r347828/
 
 Log:
   - Update to 4.5.12
   
   PR:		187290
 
 Deleted:
   head/graphics/gmt/files/patch-src__grdvector.c
   head/graphics/gmt/files/patch-src__ps2raster.c
 Modified:
   head/graphics/gmt/Makefile
   head/graphics/gmt/distinfo
 
 Modified: head/graphics/gmt/Makefile
 ==============================================================================
 --- head/graphics/gmt/Makefile	Tue Mar 11 02:07:28 2014	(r347827)
 +++ head/graphics/gmt/Makefile	Tue Mar 11 02:32:16 2014	(r347828)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	gmt
 -PORTVERSION=	4.5.11
 -PORTREVISION=	1
 +PORTVERSION=	4.5.12
  CATEGORIES=	graphics
  MASTER_SITES=	ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \
  		ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \
 @@ -81,7 +80,8 @@ STRIP_FILES=	blockmean blockmedian block
  		psxy psxyz sample1d spectrum1d splitxyz \
  		surface trend1d trend2d triangulate xyz2grd
  
 -GSHHG_DISTNAME=	gshhg-gmt-nc4-2.2.4
 +# http://www.soest.hawaii.edu/pwessel/gshhg/
 +GSHHG_DISTNAME=	gshhg-gmt-2.3.0
  
  .include <bsd.port.options.mk>
  
 
 Modified: head/graphics/gmt/distinfo
 ==============================================================================
 --- head/graphics/gmt/distinfo	Tue Mar 11 02:07:28 2014	(r347827)
 +++ head/graphics/gmt/distinfo	Tue Mar 11 02:32:16 2014	(r347828)
 @@ -1,4 +1,4 @@
 -SHA256 (gmt-4.5.11-src.tar.bz2) = ec12b1206a8c91843587b241a478690bf61eb9350ff7458e28302a9f431a598e
 -SIZE (gmt-4.5.11-src.tar.bz2) = 39410288
 -SHA256 (gshhg-gmt-nc4-2.2.4.tar.gz) = 6ad702c67b2113fc5805f9901a070c963d93429c42c0b4ef253fd21025176e9f
 -SIZE (gshhg-gmt-nc4-2.2.4.tar.gz) = 55184708
 +SHA256 (gmt-4.5.12-src.tar.bz2) = f0ae83fe52842b1425341c0a3fb664e7270cba410253647bdea2e98e10a553c2
 +SIZE (gmt-4.5.12-src.tar.bz2) = 39390743
 +SHA256 (gshhg-gmt-2.3.0.tar.gz) = 123a969cf700c0d2607408af63f91c334e97bc456fa2deb3a51de0f50b1c911e
 +SIZE (gshhg-gmt-2.3.0.tar.gz) = 57005361
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
