From 32548e86ee0f0a4b3097762e34875798d874c913 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 12 Jan 2008 13:11:20 +0000
Subject: [PATCH] - Update to 4.6.0 - Update datum grid files to
 proj-datumgrid-1.3 - Pass maintainership to submitter

PR:		119362
Submitted by:	TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
---
 graphics/proj/Makefile  | 14 +++++++-------
 graphics/proj/distinfo  | 12 ++++++------
 graphics/proj/pkg-plist |  1 +
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index fe70ca03c9ef..f2c301de5a24 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -4,17 +4,17 @@
 #
 # $FreeBSD$
 
-PORTNAME=       proj
-PORTVERSION=	4.5.0
+PORTNAME=	proj
+PORTVERSION=	4.6.0
 CATEGORIES=	graphics geography
-MASTER_SITES=	ftp://ftp.remotesensing.org/pub/proj/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${NADFILES}
+MASTER_SITES=	ftp://ftp.remotesensing.org/proj/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	fmysh@iijmio-mail.jp
 COMMENT=	Cartographic Projections library
 
-NADFILES=	proj-nad27-1.2.tar.gz
+DATUM_GRID_FILES=	proj-datumgrid-1.3.tar.gz
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -24,7 +24,7 @@ MAN1=		cs2cs.1 geod.1 nad2nad.1 proj.1
 MAN3=		pj_init.3
 
 post-extract:
-.for file in ${NADFILES}
+.for file in ${DATUM_GRID_FILES}
 	@cd ${WRKSRC}/nad && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${file} ${EXTRACT_AFTER_ARGS}
 .endfor
 
diff --git a/graphics/proj/distinfo b/graphics/proj/distinfo
index 48f0cdd732ee..849fb414478c 100644
--- a/graphics/proj/distinfo
+++ b/graphics/proj/distinfo
@@ -1,6 +1,6 @@
-MD5 (proj-4.5.0.tar.gz) = 336fc8a12abbc4709e0bc1fb88a77436
-SHA256 (proj-4.5.0.tar.gz) = 1b535719028cdbd8fa381fcb4597804ef0b4205d139eaf9e9b7084fb36f858b4
-SIZE (proj-4.5.0.tar.gz) = 655450
-MD5 (proj-nad27-1.2.tar.gz) = 2965faa5a137de9813cc9bb51d159cb3
-SHA256 (proj-nad27-1.2.tar.gz) = 52f2401389d3e71c8a1322a7642a2020839adeb2491f5040b46ac97b48ac7047
-SIZE (proj-nad27-1.2.tar.gz) = 1830374
+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
diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist
index dccb14b14e4e..7b93dee90af2 100644
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -30,6 +30,7 @@ lib/libproj.so.5
 %%DATADIR%%/nad83
 %%DATADIR%%/ntv1_can.dat
 %%DATADIR%%/null
+%%DATADIR%%/nzgd2kgrid0005.gsb
 %%DATADIR%%/other.extra
 %%DATADIR%%/proj_def.dat
 %%DATADIR%%/prvi