- Update to 1.3.0

PR:		ports/146531
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> (maintainer)
Approved by:	wen@ (He is on vacation. I've his permission for commit your Pr)

4 files changed, 25 insertions, 50 deletions

diff --git a/graphics/libgeotiff/Makefile b/graphics/libgeotiff/Makefile
index cf4cdc30d361..43c8785eff36 100644
--- a/graphics/libgeotiff/Makefile
+++ b/graphics/libgeotiff/Makefile
@@ -6,25 +6,29 @@
 #
 
 PORTNAME=	libgeotiff
-PORTVERSION=	1.2.5
-PORTREVISION=	3
+PORTVERSION=	1.3.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.osgeo.org/geotiff/libgeotiff/ \
-		ftp://ftp.remotesensing.org/geotiff/libgeotiff/
+		ftp://ftp.remotesensing.org/geotiff/libgeotiff/ \
+		http://sunpoet.net/distfiles/
 
 MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	Library for reading and writing GeoTIFF information tags
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		proj.6:${PORTSDIR}/graphics/proj \
-		tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	jbig:${PORTSDIR}/graphics/jbigkit \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		proj:${PORTSDIR}/graphics/proj \
+		tiff:${PORTSDIR}/graphics/tiff
 
-USE_GNOME=	gnometarget
-USE_AUTOTOOLS=	automake:15:env autoconf:262:env
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-jpeg=${LOCALBASE} \
+CONFIGURE_ARGS=	--disable-doxygen-doc \
+		--disable-doxygen-dot \
+		--disable-doxygen-html \
+		--disable-doxygen-man \
+		--with-jpeg=${LOCALBASE} \
 		--with-proj=${LOCALBASE} \
-		--with-libtiff=${LOCALBASE}
+		--with-libtiff=${LOCALBASE} \
+		--with-zlib=/usr
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/libgeotiff/distinfo b/graphics/libgeotiff/distinfo
index 6144b2d74150..6b79f56fe54b 100644
--- a/graphics/libgeotiff/distinfo
+++ b/graphics/libgeotiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgeotiff-1.2.5.tar.gz) = 000f247a88510f1b38d4b314d1e47048
-SHA256 (libgeotiff-1.2.5.tar.gz) = f27b1758d6899805107e4c5bea17eb19e8d2dae7942cc06040fa837acfe95e7c
-SIZE (libgeotiff-1.2.5.tar.gz) = 1057705
+MD5 (libgeotiff-1.3.0.tar.gz) = 6ac3c22e44711e9a3add9044e40b9527
+SHA256 (libgeotiff-1.3.0.tar.gz) = 0fa2e9130281c5867ada551ef757fd81f54c760d9f3039d33e349f992f440d27
+SIZE (libgeotiff-1.3.0.tar.gz) = 1287837
diff --git a/graphics/libgeotiff/files/patch-Makefile.in b/graphics/libgeotiff/files/patch-Makefile.in
deleted file mode 100644
index 5b85eb187343..000000000000
--- a/graphics/libgeotiff/files/patch-Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.in.orig	Wed Aug 17 00:21:20 2005
-+++ Makefile.in	Fri Nov  2 21:25:30 2007
-@@ -93,7 +93,7 @@
- 
- TARGETS = libgeotiff.a
- 
--all:    Makefile ${TARGETS} ${GEOTIFF_SO} Progs
-+all:    ${TARGETS} ${GEOTIFF_SO} Progs
- 
- libgeotiff.a: ${OBJS}
- 	${AR} ${AROPTS} libgeotiff.a $?
-@@ -201,20 +201,7 @@
- 	$(INSTALL) csv/*.csv $(DESTDIR)$(datadir)
- 	$(INSTALL) -d $(DESTDIR)$(bindir)
- 	$(INSTALL) bin/listgeo$(EXEEXT) bin/geotifcp$(EXEEXT) $(DESTDIR)$(bindir)
--	if test ! -z "$(GEOTIFF_SO)" ; then \
--		if test ! -z "$(GEOTIFF_DLL)" ; then \
--			$(INSTALL) $(GEOTIFF_SO) $(DESTDIR)${bindir}; \
--		else \
--			$(INSTALL) $(GEOTIFF_SO) $(DESTDIR)${libdir}; \
--			(cd $(DESTDIR)${libdir} ; \
--			rm -f libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR); \
--			${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR); \
--			rm -f libgeotiff.$(SO_EXT).$(VERSION_MAJOR); \
--			${LN} libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR) \
--			libgeotiff.$(SO_EXT).$(VERSION_MAJOR); \
--			rm -f libgeotiff.$(SO_EXT); \
--			${LN} libgeotiff.$(SO_EXT).$(VERSION_MAJOR) libgeotiff.$(SO_EXT); );\
--		fi;\
--	fi
-+	$(INSTALL) $(GEOTIFF_SO) $(DESTDIR)$(libdir)/libgeotiff.so.$(VERSION_MAJOR)
-+	${LN} libgeotiff.so.$(VERSION_MAJOR) $(DESTDIR)/$(libdir)/libgeotiff.so
- 
- 
diff --git a/graphics/libgeotiff/pkg-plist b/graphics/libgeotiff/pkg-plist
index 0ba97331b9b3..da7d486673b3 100644
--- a/graphics/libgeotiff/pkg-plist
+++ b/graphics/libgeotiff/pkg-plist
@@ -1,5 +1,8 @@
+bin/applygeo
+bin/csv2html
 bin/geotifcp
 bin/listgeo
+bin/makegeo
 include/cpl_serv.h
 include/epsg_datum.inc
 include/epsg_ellipse.inc
@@ -11,6 +14,7 @@ include/epsg_units.inc
 include/epsg_vertcs.inc
 include/geo_config.h
 include/geo_ctrans.inc
+include/geo_incode_defs.h
 include/geo_keyp.h
 include/geo_normalize.h
 include/geo_simpletags.h
@@ -23,8 +27,9 @@ include/geotiffio.h
 include/geovalues.h
 include/xtiffio.h
 lib/libgeotiff.a
+lib/libgeotiff.la
 lib/libgeotiff.so
-lib/libgeotiff.so.1
+lib/libgeotiff.so.2
 share/epsg_csv/alias.csv
 share/epsg_csv/area.csv
 share/epsg_csv/change.csv
@@ -39,8 +44,8 @@ share/epsg_csv/coordinate_operation_path.csv
 share/epsg_csv/coordinate_reference_system.csv
 share/epsg_csv/coordinate_system.csv
 share/epsg_csv/datum.csv
-share/epsg_csv/deprecation.csv
 share/epsg_csv/ellipsoid.csv
+share/epsg_csv/esri_datum_override.csv
 share/epsg_csv/gcs.csv
 share/epsg_csv/gcs.override.csv
 share/epsg_csv/naming_system.csv