ports/128584: [Update]graphics/gdal:update to 1.5.3
Wen Heping
wenheping at gmail.com
Tue Nov 4 14:20:01 UTC 2008
>Number: 128584
>Category: ports
>Synopsis: [Update]graphics/gdal:update to 1.5.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 04 14:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Wen Heping
>Release: FreeBSD-8.0 Current
>Organization:
ChangAn Middle School
>Environment:
FreeBSD fb8.wenjing.com 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Sep 21 18:56:51 HKT 2008 root at fb8.wenjing.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
update to 1.5.3 from 1.5.0
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -curN gdal/Makefile gdal.new/Makefile
--- gdal/Makefile 2008-11-03 19:02:10.000000000 +0800
+++ gdal.new/Makefile 2008-11-05 02:50:25.000000000 +0800
@@ -2,12 +2,11 @@
# Date created: 27 Aug 2001
# Whom: Randall Hopper
#
-# $FreeBSD: ports/graphics/gdal/Makefile,v 1.28 2008/10/22 20:32:24 stefan Exp $
+# $FreeBSD: ports/graphics/gdal/Makefile,v 1.26 2008/02/24 08:45:42 rafan Exp $
#
PORTNAME= gdal
-PORTVERSION= 1.5.0
-PORTREVISION= 1
+PORTVERSION= 1.5.3
CATEGORIES= graphics geography
MASTER_SITES= ftp://ftp.remotesensing.org/pub/gdal/ \
http://www.gdal.org/dl/ \
@@ -20,10 +19,13 @@
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_PYTHON= yes
+USE_RUBY= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${DATADIR} --with-libz=/usr
MAKEFILE= GNUmakefile
INSTALL_TARGET= install install-man
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAN1= gdal-config.1 gdal2tiles.1 gdal_contour.1 gdal_grid.1 \
gdal_merge.1 gdal_rasterize.1 gdal_retile.1 gdal_translate.1 \
@@ -177,29 +179,12 @@
.endif
.if !defined(WITHOUT_PYTHON)
-USE_PYTHON= yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-CONFIGURE_ARGS+= --with-python
-
-BUILD_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-
-# We can not use USE_PYDISTUTILS, so copy these from bsd.python.mk.
-PYEASYINSTALL_CMD= ${LOCALBASE}/bin/easy_install-${PYTHON_VER}
+BUILD_DEPENDS+= ${LOCALBASE}/bin/f2py:${PORTSDIR}/math/py-numpy
+RUN_DEPENDS+= ${BUILD_DEPENDS}
PYDISTUTILS_PKGNAME= ${PORTNAME:U}
PYDISTUTILS_PKGVERSION= ${PORTVERSION}
-_OSRELEASE!= ${UNAME} -r
-PYEASYINSTALL_OSARCH= -${OPSYS:L}-${_OSRELEASE}-${ARCH}
-PYEASYINSTALL_EGG= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg
-PYEASYINSTALL_BINDIR= ${PREFIX}/bin
-PYEASYINSTALL_SITELIBDIR= ${PYTHONPREFIX_SITELIBDIR}
-
-PLIST_SUB+= PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG} \
- PYEASYINSTALL_CMD=${PYEASYINSTALL_CMD} \
- PYEASYINSTALL_BINDIR=${PYEASYINSTALL_BINDIR} \
- PYEASYINSTALL_SITELIBDIR=${PYEASYINSTALL_SITELIBDIR} \
- PYDISTUTILS_PKGNAME=${PYDISTUTILS_PKGNAME} \
- PYDISTUTILS_PKGVERSION=${PYDISTUTILS_PKGVERSION}
+EGG_NAME= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}
+PLIST_SUB+= EGG_NAME=${EGG_NAME}
.endif
.if !defined(WITHOUT_PNG)
@@ -208,7 +193,7 @@
.endif
.if defined(WITH_RUBY)
-USE_RUBY= yes
+#USE_RUBY= yes
.include "${PORTSDIR}/Mk/bsd.ruby.mk"
CONFIGURE_ARGS+= --with-ruby
.endif
@@ -243,31 +228,17 @@
.endif
.if defined(WITH_HDF4) && defined(WITH_HDF5)
-IGNORE= "You can't use HDF4 with HDF5."
+IGNORE= you can't use HDF4 with HDF5
.endif
-pre-build:
+post-install:
.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/^-//}; \
- ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-temp -s temp.${PYEASYINSTALL_OSARCH:S/^-//}-${PYTHON_VER}; \
- ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist_egg -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//}; \
- ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//})
+ @cd ${BUILD_WRKSRC}/swig/python && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install
.endif
post-patch:
.if !defined(WITHOUT_GIF)
@${REINPLACE_CMD} -e 's|lgif|lungif|' ${WRKSRC}/configure
.endif
-.if defined(WITH_PYTHON)
- @${REINPLACE_CMD} -e '\
- s,%%MAKE_ENV%%,${MAKE_ENV},; \
- s,%%PYTHON_SITELIBDIR%%,${PYTHON_SITELIBDIR},; \
- s,%%PYEASYINSTALL_BINDIR%%,${PYEASYINSTALL_BINDIR},; \
- s,%%PYEASYINSTALL_SITELIBDIR%%,${PYEASYINSTALL_SITELIBDIR},; \
- s,%%PYEASYINSTALL_EGG%%,${PYEASYINSTALL_EGG},; \
- s,%%WRKSRC%%,${WRKSRC},; \
- ' ${WRKSRC}/swig/python/GNUmakefile
-.endif
.include <bsd.port.post.mk>
diff -curN gdal/distinfo gdal.new/distinfo
--- gdal/distinfo 2008-02-17 13:59:54.000000000 +0800
+++ gdal.new/distinfo 2008-11-05 00:26:20.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (gdal-1.5.0.tar.gz) = ffbb024db521a002018cb5666bd6e60d
-SHA256 (gdal-1.5.0.tar.gz) = 9ac75f8928aa649a70e2aa3ebda86e71e18acc295cd874c43d33a84ac11c1e91
-SIZE (gdal-1.5.0.tar.gz) = 6167411
+MD5 (gdal-1.5.3.tar.gz) = 33f15af9b0d8c7d094c7f3c70f8c8ab7
+SHA256 (gdal-1.5.3.tar.gz) = 8f68386582d178842bf990e2e94473ec72c3fd69de2ca757542888f1c95bbf4d
+SIZE (gdal-1.5.3.tar.gz) = 6194379
diff -curN gdal/files/patch-ogr-GNUmakefile gdal.new/files/patch-ogr-GNUmakefile
--- gdal/files/patch-ogr-GNUmakefile 2008-02-17 13:59:54.000000000 +0800
+++ gdal.new/files/patch-ogr-GNUmakefile 2008-11-05 00:26:29.000000000 +0800
@@ -1,11 +1,11 @@
---- ogr/GNUmakefile.orig Fri Nov 9 11:11:24 2007
-+++ ogr/GNUmakefile Wed Dec 26 12:30:59 2007
+--- ogr/GNUmakefile.orig 2008-10-14 18:27:49.000000000 +0800
++++ ogr/GNUmakefile 2008-10-14 18:28:02.000000000 +0800
@@ -15,7 +15,7 @@
default: lib
-all: sublibs apps test_ogrsf$(EXE)
-+all: sublibs
++all: sublibs
clean:
rm -f html/*
diff -curN gdal/files/patch-swig-python-GNUmakefile gdal.new/files/patch-swig-python-GNUmakefile
--- gdal/files/patch-swig-python-GNUmakefile 2008-07-25 06:29:33.000000000 +0800
+++ gdal.new/files/patch-swig-python-GNUmakefile 1970-01-01 08:00:00.000000000 +0800
@@ -1,20 +0,0 @@
---- swig/python/GNUmakefile.orig 2007-11-26 16:02:20.000000000 +0800
-+++ swig/python/GNUmakefile 2008-02-13 14:27:20.000000000 +0800
-@@ -43,7 +43,7 @@
- generate: ${WRAPPERS}
-
- build:
-- python setup.py build
-+ CXX="" python setup.py bdist_egg
-
- egg:
- python setup.py bdist_egg
-@@ -51,7 +51,7 @@
- install:
-
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
-- python setup.py install
-+ env %%MAKE_ENV%% python setup.py easy_install -O 1 -N -S %%PYTHON_SITELIBDIR%% -d %%PYEASYINSTALL_SITELIBDIR%% -s %%PYEASYINSTALL_BINDIR%% %%WRKSRC%%/swig/python/dist/%%PYEASYINSTALL_EGG%%
- else
- python setup.py install --prefix=$(DESTDIR)$(prefix)
- endif
diff -curN gdal/files/patch-swig-python-setup.py gdal.new/files/patch-swig-python-setup.py
--- gdal/files/patch-swig-python-setup.py 1970-01-01 08:00:00.000000000 +0800
+++ gdal.new/files/patch-swig-python-setup.py 2008-11-05 00:26:29.000000000 +0800
@@ -0,0 +1,20 @@
+--- swig/python/setup.py.orig 2008-11-05 00:25:39.000000000 +0800
++++ swig/python/setup.py 2008-11-05 00:25:52.000000000 +0800
+@@ -51,16 +51,7 @@
+ except ImportError:
+ pass
+
+-
+-
+-try:
+- from setuptools import setup
+- from setuptools import Extension
+- HAVE_SETUPTOOLS = True
+-except ImportError:
+- from distutils.core import setup, Extension
+-
+-
++from distutils.core import setup, Extension
+ from distutils.command.build_ext import build_ext
+ from distutils.ccompiler import get_default_compiler
+ from distutils.sysconfig import get_python_inc
diff -curN gdal/pkg-plist gdal.new/pkg-plist
--- gdal/pkg-plist 2008-11-03 19:02:10.000000000 +0800
+++ gdal.new/pkg-plist 2008-11-05 01:39:46.000000000 +0800
@@ -1,33 +1,20 @@
-bin/epsg_tr.py
-bin/esri2wkt.py
-bin/gcps2vec.py
-bin/gcps2wld.py
+bin/testepsg
bin/gdal-config
-bin/gdal2tiles.py
-bin/gdal2xyz.py
bin/gdal_contour
bin/gdal_grid
-bin/gdal_merge.py
bin/gdal_rasterize
-bin/gdal_retile.py
bin/gdal_translate
bin/gdaladdo
-bin/gdalchksum.py
bin/gdalenhance
-bin/gdalident.py
-bin/gdalimport.py
bin/gdalinfo
bin/gdalmanage
bin/gdaltindex
bin/gdaltransform
bin/gdalwarp
-bin/mkgraticule.py
bin/nearblack
bin/ogr2ogr
bin/ogrinfo
bin/ogrtindex
-bin/pct2rgb.py
-bin/rgb2pct.py
include/cpl_config.h
include/cpl_conv.h
include/cpl_csv.h
@@ -72,64 +59,37 @@
lib/libgdal.la
lib/libgdal.so
lib/libgdal.so.13
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdalconst.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdalconst.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdalconst.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ogr.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ogr.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ogr.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal_array.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal_array.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal_array.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalconst.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalconst.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalconst.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalnumeric.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalnumeric.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalnumeric.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/ogr.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/ogr.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/ogr.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/osr.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/osr.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/osr.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.pyo
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+%%PYTHON_SITELIBDIR%%/gdal.py
+%%PYTHON_SITELIBDIR%%/ogr.py
+%%PYTHON_SITELIBDIR%%/osr.py
+%%PYTHON_SITELIBDIR%%/gdalconst.py
+%%PYTHON_SITELIBDIR%%/gdalnumeric.py
+%%PYTHON_SITELIBDIR%%/gdalnumeric.pyc
+%%PYTHON_SITELIBDIR%%/gdal.pyc
+%%PYTHON_SITELIBDIR%%/ogr.pyc
+%%PYTHON_SITELIBDIR%%/osr.pyc
+%%PYTHON_SITELIBDIR%%/gdalconst.pyc
+%%PYTHON_SITELIBDIR%%/osgeo/ogr.py
+%%PYTHON_SITELIBDIR%%/osgeo/gdal.py
+%%PYTHON_SITELIBDIR%%/osgeo/gdalnumeric.py
+%%PYTHON_SITELIBDIR%%/osgeo/osr.py
+%%PYTHON_SITELIBDIR%%/osgeo/gdalconst.py
+%%PYTHON_SITELIBDIR%%/osgeo/gdal_array.py
+%%PYTHON_SITELIBDIR%%/osgeo/__init__.py
+%%PYTHON_SITELIBDIR%%/osgeo/__init__.pyc
+%%PYTHON_SITELIBDIR%%/osgeo/_gdal.so
+%%PYTHON_SITELIBDIR%%/osgeo/_gdalconst.so
+%%PYTHON_SITELIBDIR%%/osgeo/_gdal_array.so
+%%PYTHON_SITELIBDIR%%/osgeo/_ogr.so
+%%PYTHON_SITELIBDIR%%/osgeo/_osr.so
+%%PYTHON_SITELIBDIR%%/osgeo/gdal.pyc
+%%PYTHON_SITELIBDIR%%/osgeo/gdal_array.pyc
+%%PYTHON_SITELIBDIR%%/osgeo/gdalconst.pyc
+%%PYTHON_SITELIBDIR%%/osgeo/gdalnumeric.pyc
+%%PYTHON_SITELIBDIR%%/osgeo/ogr.pyc
+%%PYTHON_SITELIBDIR%%/osgeo/osr.pyc
+%%PYTHON_SITELIBDIR%%/%%EGG_NAME%%.egg-info
+ at dirrm %%PYTHON_SITELIBDIR%%/osgeo
%%DATADIR%%/GDALLogoBW.svg
%%DATADIR%%/GDALLogoColor.svg
%%DATADIR%%/GDALLogoGS.svg
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list