ports/127068: Update port: graphics/proj to 4.6.1

[TAOKA Fumiyoshi]

>Number:         127068
>Category:       ports
>Synopsis:       Update port: graphics/proj to 4.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 03 14:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     TAOKA Fumiyoshi
>Release:        
>Organization:
>Environment:
>Description:
	Update to proj-4.6.1 and proj-datumgrid-1.4.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/proj/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	12 Jan 2008 13:11:20 -0000	1.14
+++ Makefile	3 Sep 2008 13:49:55 -0000
@@ -5,16 +5,17 @@
 # $FreeBSD: ports/graphics/proj/Makefile,v 1.14 2008/01/12 13:11:20 miwi Exp $
 
 PORTNAME=	proj
-PORTVERSION=	4.6.0
+PORTVERSION=	4.6.1
 CATEGORIES=	graphics geography
-MASTER_SITES=	ftp://ftp.remotesensing.org/proj/
+MASTER_SITES=	ftp://ftp.remotesensing.org/proj/ \
+		http://download.osgeo.org/proj/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	fmysh at iijmio-mail.jp
 COMMENT=	Cartographic Projections library
 
-DATUM_GRID_FILES=	proj-datumgrid-1.3.tar.gz
+DATUM_GRID_FILES=	proj-datumgrid-1.4.tar.gz
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -24,8 +25,6 @@
 MAN3=		pj_init.3
 
 post-extract:
-.for file in ${DATUM_GRID_FILES}
-	@cd ${WRKSRC}/nad && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${file} ${EXTRACT_AFTER_ARGS}
-.endfor
+	@${TAR} -xof ${DISTDIR}/${DATUM_GRID_FILES} -C ${WRKSRC}/nad
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/proj/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	12 Jan 2008 13:11:20 -0000	1.7
+++ distinfo	3 Sep 2008 13:51:25 -0000
@@ -1,6 +1,6 @@
-MD5 (proj-4.6.0.tar.gz) = 975d9b5954869e53523726a9c0e0e070
-SHA256 (proj-4.6.0.tar.gz) = 2aec7111d286edb225bb51953f240f391ce74575585a64b4158ebae54b05e127
-SIZE (proj-4.6.0.tar.gz) = 674411
-MD5 (proj-datumgrid-1.3.tar.gz) = 0c3163fb89f8fed41bdf372456a12641
-SHA256 (proj-datumgrid-1.3.tar.gz) = 520f04087cbbe92f62b821c544330efd4677285fb10e573f3e500e8f7961b62f
-SIZE (proj-datumgrid-1.3.tar.gz) = 2116782
+MD5 (proj-4.6.1.tar.gz) = 7dbaab8431ad50c25669fd3fb28dc493
+SHA256 (proj-4.6.1.tar.gz) = 76d174edd4fdb4c49c1c0ed8308a469216c01e7177a4510b1b303ef3c5f97b47
+SIZE (proj-4.6.1.tar.gz) = 686045
+MD5 (proj-datumgrid-1.4.tar.gz) = d0a2930b5e26d139d6c851a798f909fa
+SHA256 (proj-datumgrid-1.4.tar.gz) = 2f1b2029b403c7b5695b2198fb3e3e5d6c15943cba4e41fc4d7d505eb5da3034
+SIZE (proj-datumgrid-1.4.tar.gz) = 2252273
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/proj/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	12 Jan 2008 13:11:20 -0000	1.4
+++ pkg-plist	3 Sep 2008 13:58:42 -0000
@@ -15,6 +15,7 @@
 lib/libproj.so.5
 %%DATADIR%%/FL
 %%DATADIR%%/GL27
+%%DATADIR%%/IGNF
 %%DATADIR%%/MD
 %%DATADIR%%/TN
 %%DATADIR%%/WI
@@ -28,6 +29,7 @@
 %%DATADIR%%/nad.lst
 %%DATADIR%%/nad27
 %%DATADIR%%/nad83
+%%DATADIR%%/ntf_r93.gsb
 %%DATADIR%%/ntv1_can.dat
 %%DATADIR%%/null
 %%DATADIR%%/nzgd2kgrid0005.gsb

>Release-Note:
>Audit-Trail:
>Unformatted: