ports/179221: misc/gctpc: Update to version 2.0

[KATO Tsuguru]

>Number:         179221
>Category:       ports
>Synopsis:       misc/gctpc: Update to version 2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 02 18:10:05 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.0

Remove file:
files/patch-ac
files/patch-ad

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/misc/gctpc/Makefile misc/gctpc/Makefile
--- /usr/ports/misc/gctpc/Makefile	2013-05-31 04:56:07.000000000 +0900
+++ misc/gctpc/Makefile	2013-06-03 00:00:00.000000000 +0900
@@ -2,21 +2,23 @@
 # $FreeBSD: head/misc/gctpc/Makefile 319446 2013-05-30 18:45:05Z antoine $
 
 PORTNAME=	gctpc
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	misc geography
 MASTER_SITES=	http://edcftp.cr.usgs.gov/pub/software/gctpc/
-DISTNAME=	gctpc
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	USGS General Cartographic Transformation Package (GCTP)
 
+OPTIONS_DEFINE=	DOCS
+
 WRKSRC=		${WRKDIR}/${PORTNAME}/source
+
 USE_GMAKE=	yes
 ALL_TARGET=	libgctpc.so.1
 USE_LDCONFIG=	yes
-CFLAGS+=	-Wno-error=return-type
+MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.options.mk>
 
diff -urN /usr/ports/misc/gctpc/distinfo misc/gctpc/distinfo
--- /usr/ports/misc/gctpc/distinfo	2012-11-08 09:13:25.000000000 +0900
+++ misc/gctpc/distinfo	2013-06-03 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (gctpc.tar.Z) = 714d20893ab9b901ffa92e0b181b4ab8a92d025fecc6cbf5b5fa02c4e7c07e1e
-SIZE (gctpc.tar.Z) = 11090665
+SHA256 (gctpc20.tar.Z) = 217eae42f580175a04bae11b87afc59fde4f770aeccc16c90ef9f826a94fa66b
+SIZE (gctpc20.tar.Z) = 10381911
diff -urN /usr/ports/misc/gctpc/files/patch-aa misc/gctpc/files/patch-aa
--- /usr/ports/misc/gctpc/files/patch-aa	2012-11-08 09:13:24.000000000 +0900
+++ misc/gctpc/files/patch-aa	2013-06-03 00:00:00.000000000 +0900
@@ -18,7 +18,7 @@
  
  OBJECTS=		\
  		$(ARCHIVE)(alberfor.o) $(ARCHIVE)(alberinv.o) \
-@@ -56,8 +58,13 @@
+@@ -56,6 +58,11 @@
  	  cproj.c report.c lamccfor.c lamccinv.c paksz.c untfz.c sphdz.c \
  	  br_gctp.c Makefile cproj.h proj.h
  
@@ -28,8 +28,5 @@
 +	rm -rf objs
 +
  $(ARCHIVE):	$(OBJECTS)
--		ranlib geolib.a
-+		ranlib libgctpc.a
  
  
- $(ARCHIVE)(gctp.o):	 	$(INCS)
diff -urN /usr/ports/misc/gctpc/files/patch-ac misc/gctpc/files/patch-ac
--- /usr/ports/misc/gctpc/files/patch-ac	2012-11-08 09:13:24.000000000 +0900
+++ misc/gctpc/files/patch-ac	1970-01-01 09:00:00.000000000 +0900
@@ -1,8 +0,0 @@
---- ORIG/cproj.c	Mon Nov 22 16:39:46 1993
-+++ cproj.c	Thu Apr 26 18:40:10 2001
-@@ -408,4 +408,4 @@
- 
- /* Function to calculate UTM zone number--NOTE Longitude entered in DEGREES!!!
-   ---------------------------------------------------------------------------*/
--calc_utm_zone(lon) double lon; { return((long)(((lon + 180.0) / 6.0) + 1.0)); }
-+long calc_utm_zone(lon) double lon; { return((long)(((lon + 180.0) / 6.0) + 1.0)); }
diff -urN /usr/ports/misc/gctpc/files/patch-ad misc/gctpc/files/patch-ad
--- /usr/ports/misc/gctpc/files/patch-ad	2012-11-08 09:13:24.000000000 +0900
+++ misc/gctpc/files/patch-ad	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- ORIG/gctp.c	Fri Feb 24 16:06:16 1995
-+++ gctp.c	Thu Apr 26 18:42:52 2001
-@@ -95,7 +95,6 @@
- double lon;		/* longitude					*/
- double lat;		/* latitude					*/
- double temp;		/* dummy variable				*/
--double sign();
- double pakr2dm();
- long i,j;		/* loop counters				*/
- long ininit_flag;	/* input initilization flag			*/
diff -urN /usr/ports/misc/gctpc/pkg-plist misc/gctpc/pkg-plist
--- /usr/ports/misc/gctpc/pkg-plist	2012-11-08 09:13:25.000000000 +0900
+++ misc/gctpc/pkg-plist	2013-06-03 00:00:00.000000000 +0900
@@ -16,6 +16,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/appendixB.txt
 %%PORTDOCS%%%%DOCSDIR%%/appendixC.txt
 %%PORTDOCS%%%%DOCSDIR%%/for_init.ps
+%%PORTDOCS%%%%DOCSDIR%%/error_codes.txt
 %%PORTDOCS%%%%DOCSDIR%%/gctp.ps
 %%PORTDOCS%%%%DOCSDIR%%/inv_init.ps
 %%PORTDOCS%%%%DOCSDIR%%/overview.ps
>Release-Note:
>Audit-Trail:
>Unformatted: