Bug 136825 - [update] graphics/gdal: update to 1.6.1
Summary: [update] graphics/gdal: update to 1.6.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Dmitry Marakasov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-07-16 19:30 UTC by Anderson S. Ferreira
Modified: 2009-09-14 18:35 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Anderson S. Ferreira 2009-07-16 19:30:09 UTC
This patch updates gdal to 1.6.1 and adds support to java bindings build.

Fix: 

---
Aviso de confidencialidade:

Esta mensagem da Empresa Brasileira de Pesquisa Agropecuária (Embrapa), 
empresa pública federal regida pelo disposto na Lei Federal nº 5.851, 
de 7 de dezembro de 1972, é enviada exclusivamente a seu destinatário 
e pode conter informações confidenciais, protegidas por sigilo profissional. 
Sua utilização desautorizada é ilegal e sujeita o infrator às penas da lei. 
Se você a recebeu indevidamente, queira, por gentileza, reenviá-la ao emitente, 
esclarecendo o equívoco.

Confidentiality note:

This message from Empresa Brasileira de Pesquisa Agropecuária (Embrapa), 
a government company established under Brazilian law (5.851/72), 
is directed exclusively to its addressee and may contain confidential data, 
protected under professional secrecy rules. Its unauthorized use is illegal 
and may subject the transgressor to the law's penalties. 
If you are not the addressee, please send it back, elucidating the failure.--fsqCN7G11hivh0RcZdZ0cHxJt7f43qQbTWGJOyGWdVDz2Zuy
Content-Type: text/plain; name="gdal.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="gdal.patch"

diff -Nru gdal.old/Makefile gdal/Makefile
--- gdal.old/Makefile	2009-06-22 17:29:44.000000000 -0300
+++ gdal/Makefile	2009-07-16 13:04:18.000000000 -0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdal
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.1
 CATEGORIES=	graphics geography
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/ \
 		http://www.gdal.org/dl/ \
@@ -45,6 +45,7 @@
 		HDF4	"HDF4 support"			off \
 		HDF5	"HDF5 support"			off \
 		JASPER	"JPEG 2000 support via jasper"	on \
+		JAVA	"Java support"			on \
 		JPEG	"JPEG support"			on \
 		MYSQL	"MySQL support"			off \
 		NETCDF	"NetCDF support"		off \
@@ -126,6 +127,19 @@
 CONFIGURE_ARGS+=	--with-jasper=${LOCALBASE}
 .endif
 
+.if defined(WITH_JAVA)
+USE_JAVA=	yes
+JAVA_VERSION=	1.5+
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+BUILD_DEPENDS+=		swig:${PORTSDIR}/devel/swig13 \
+			ant:${PORTSDIR}/devel/apache-ant
+PLIST_FILES+=		lib/libgdalconstjni.so \
+			lib/libgdaljni.so \
+			lib/libogrjni.so \
+			lib/libosrjni.so \
+			%%JAVAJARDIR%%/gdal.jar
+.endif
+
 .if !defined(WITHOUT_JPEG)
 LIB_DEPENDS+=		jpeg.9:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=	--with-libjpeg=${LOCALBASE}
@@ -246,6 +260,11 @@
 .endif
 
 pre-build:
+.if defined(WITH_JAVA)
+	@(${ECHO} "JAVA_HOME = ${JAVA_HOME}"; \
+		${ECHO} 'JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd' ) > ${WRKSRC}/swig/java/java.opt
+
+.endif
 .if defined(WITH_PYTHON)
 	@(cd ${BUILD_WRKSRC}/swig/python; \
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-platlib -s lib.${PYEASYINSTALL_OSARCH:S/^-//}; \
@@ -254,6 +273,13 @@
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//})
 .endif
 
+post-build:
+.if defined(WITH_JAVA)
+	@${ECHO} "Building Java bindings"
+	@(cd ${BUILD_WRKSRC}/swig/java; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} )
+.endif
+
 post-patch:
 .if !defined(WITHOUT_GIF)
 	@${REINPLACE_CMD} -e 's|lgif|lungif|' ${WRKSRC}/configure
@@ -268,8 +294,16 @@
 		s,%%WRKSRC%%,${WRKSRC},; \
 		' ${WRKSRC}/swig/python/GNUmakefile
 .endif
+ 
 
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/gdalwarp.1 ${PREFIX}/man/man1/
+.if defined(WITH_JAVA)
+	$(INSTALL_PROGRAM) ${WRKSRC}/swig/java/libgdalconstjni.so ${PREFIX}/lib
+	$(INSTALL_PROGRAM) ${WRKSRC}/swig/java/libgdaljni.so ${PREFIX}/lib
+	$(INSTALL_PROGRAM) ${WRKSRC}/swig/java/libogrjni.so ${PREFIX}/lib
+	$(INSTALL_PROGRAM) ${WRKSRC}/swig/java/libosrjni.so ${PREFIX}/lib
+	${INSTALL} ${WRKSRC}/swig/java/gdal.jar ${JAVAJARDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff -Nru gdal.old/distinfo gdal/distinfo
--- gdal.old/distinfo	2009-03-17 12:09:06.000000000 -0300
+++ gdal/distinfo	2009-07-16 12:51:15.000000000 -0300
@@ -1,3 +1,3 @@
-MD5 (gdal-1.6.0.tar.gz) = 0c53697511f489455f8b60e843986568
-SHA256 (gdal-1.6.0.tar.gz) = acdc2faf7496f8d8f4680347ce30fd3a2139b5c050f13dcd6ca8a3d7f6e418a4
-SIZE (gdal-1.6.0.tar.gz) = 7072689
+SIZE (gdal-1.6.1.tar.gz) = 6999411 
+MD5 (gdal-1.6.1.tar.gz) = 4059285a5cef41ff975ed0ec02a97009
+SHA256 (gdal-1.6.1.tar.gz) = e9876a5a6e80d0b078b10aeb29e7dc01df8be38f13d836257190c9ca48a998ad
diff -Nru gdal.old/pkg-plist gdal/pkg-plist
--- gdal.old/pkg-plist	2009-03-17 12:09:06.000000000 -0300
+++ gdal/pkg-plist	2009-07-16 14:27:21.000000000 -0300
@@ -16,6 +16,7 @@
 bin/gdal_sieve.py
 bin/gdal_translate
 bin/gdaladdo
+bin/gdalbuildvrt
 bin/gdalchksum.py
 bin/gdalenhance
 bin/gdalident.py
@@ -139,8 +140,8 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 %%DATADIR%%/GDALLogoBW.svg
 %%DATADIR%%/GDALLogoColor.svg
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2009-07-16 19:30:24 UTC
Maintainer of graphics/gdal,

Please note that PR ports/136825 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/136825

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2009-07-16 19:30:26 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Dmitry Marakasov freebsd_committer freebsd_triage 2009-07-16 20:55:02 UTC
Responsible Changed
From-To: freebsd-ports-bugs->amdmi3

I'll take it.
Comment 4 Dmitry Marakasov freebsd_committer freebsd_triage 2009-08-06 15:01:28 UTC
State Changed
From-To: feedback->open

Maintainer timeout
Comment 5 Dmitry Marakasov freebsd_committer freebsd_triage 2009-08-06 15:01:44 UTC
State Changed
From-To: open->feedback

Does not build: http://people.freebsd.org/~amdmi3/gdal-java-1.6.1.log
Comment 6 Dmitry Marakasov freebsd_committer freebsd_triage 2009-09-14 18:35:48 UTC
State Changed
From-To: feedback->closed

Submitter timeout. The port does not build.