5 files changed, 31 insertions, 19 deletions

diff --git a/graphics/libgeotiff/Makefile b/graphics/libgeotiff/Makefile
index aded5099db48..cd09236c0a7a 100644
--- a/graphics/libgeotiff/Makefile
+++ b/graphics/libgeotiff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgeotiff
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/ \
 		http://dl1.maptools.org/dl/geotiff/libgeotiff/
@@ -18,13 +18,15 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		proj.5:${PORTSDIR}/graphics/proj \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+USE_GNOME=	gnometarget
+USE_AUTOTOOLS=	automake:15:env autoconf:261:env
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-jpeg=${LOCALBASE} \
 		--with-proj=${LOCALBASE} \
 		--with-libtiff=${LOCALBASE}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+CFLAGS+=	-L${LOCALBASE}/lib \
+		-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/libgeotiff/distinfo b/graphics/libgeotiff/distinfo
index 3d1e5e2a7fc7..a03fcd9d40d7 100644
--- a/graphics/libgeotiff/distinfo
+++ b/graphics/libgeotiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgeotiff-1.2.2.tar.gz) = 6e6bb47b6283dc63b83dcb5962e0f70a
-SHA256 (libgeotiff-1.2.2.tar.gz) = 36df81d1d741d46b805923e3519573b98a0d40a75793be0ceb2d0c31ba231d13
-SIZE (libgeotiff-1.2.2.tar.gz) = 821750
+MD5 (libgeotiff-1.2.3.tar.gz) = b0fa8c07232610a8ebf4213396581d00
+SHA256 (libgeotiff-1.2.3.tar.gz) = 8544bbef5eafb843ab1170ed4b2b952746311d004430a333976e678cd9ce3e53
+SIZE (libgeotiff-1.2.3.tar.gz) = 901702
diff --git a/graphics/libgeotiff/files/patch-Makefile.in b/graphics/libgeotiff/files/patch-Makefile.in
index f0976a1baeeb..5b85eb187343 100644
--- a/graphics/libgeotiff/files/patch-Makefile.in
+++ b/graphics/libgeotiff/files/patch-Makefile.in
@@ -1,6 +1,15 @@
---- Makefile.in.orig	Mon Jan 20 18:11:03 2003
-+++ Makefile.in	Fri Dec  9 17:10:37 2005
-@@ -200,20 +200,7 @@
+--- 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)
@@ -10,13 +19,13 @@
 -		else \
 -			$(INSTALL) $(GEOTIFF_SO) $(DESTDIR)${libdir}; \
 -			(cd $(DESTDIR)${libdir} ; \
--			rm -f libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR); \
--			${LN} $(GEOTIFF_SO) libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR); \
--			rm -f libgeotiff.so.$(VERSION_MAJOR); \
--			${LN} libgeotiff.so.$(VERSION_MAJOR).$(VERSION_MINOR) \
--			libgeotiff.so.$(VERSION_MAJOR); \
--			rm -f libgeotiff.so; \
--			${LN} libgeotiff.so.$(VERSION_MAJOR) libgeotiff.so; );\
+-			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)
diff --git a/graphics/libgeotiff/pkg-descr b/graphics/libgeotiff/pkg-descr
index b2c7074e3f4b..8d89eea5842a 100644
--- a/graphics/libgeotiff/pkg-descr
+++ b/graphics/libgeotiff/pkg-descr
@@ -1,4 +1,4 @@
 Libgeotiff is a library for reading and writing GeoTIFF information tags.
 GeoTIFF is a TIFF based interchange format for georeferenced raster imagery.
 
-WWW: http://www.remotesensing.org/geotiff/
+WWW: http://www.remotesensing.org/geotiff/geotiff.html
diff --git a/graphics/libgeotiff/pkg-plist b/graphics/libgeotiff/pkg-plist
index 66f9a78bdbf3..ff77a1c631a9 100644
--- a/graphics/libgeotiff/pkg-plist
+++ b/graphics/libgeotiff/pkg-plist
@@ -41,6 +41,7 @@ share/epsg_csv/datum.csv
 share/epsg_csv/deprecation.csv
 share/epsg_csv/ellipsoid.csv
 share/epsg_csv/gcs.csv
+share/epsg_csv/gcs.override.csv
 share/epsg_csv/naming_system.csv
 share/epsg_csv/pcs.csv
 share/epsg_csv/prime_meridian.csv