Attachment #92424 for bug #130073

View | Details | Raw Unified | Return to bug 130073
Collapse All | Expand All




# Date created:		27 Aug 2001
# Whom:			Randall Hopper
#
# $FreeBSD: ports/graphics/gdal/Makefile,v 1.26 2008/02/24 08:45:42 rafan Exp $
#

PORTNAME=	gdal
PORTVERSION=	1.6.0
PORTREVISION=	1
CATEGORIES=	graphics geography
MASTER_SITES=	ftp://ftp.remotesensing.org/pub/gdal/ \
		http://www.gdal.org/dl/ \

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 \
		gdal_utilities.1 gdaladdo.1 gdalinfo.1 gdaltindex.1 \
		gdaltransform.1 nearblack.1 ogr2ogr.1 \
		ogr_utilities.1 ogrinfo.1 ogrtindex.1 pct2rgb.1 rgb2pct.1

.if !defined(NOPORTDOCS)

.endif

.if !defined(WITHOUT_PYTHON)
BUILD_DEPENDS+=	${LOCALBASE}/bin/f2py:${PORTSDIR}/math/py-numpy
RUN_DEPENDS+=	${BUILD_DEPENDS}
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}
PYDISTUTILS_PKGNAME=	${PORTNAME:U}
PYDISTUTILS_PKGVERSION=	${PORTVERSION}
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}
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}
.endif

.if !defined(WITHOUT_PNG)

.endif

.if defined(WITH_RUBY)
#USE_RUBY=		yes
.include "${PORTSDIR}/Mk/bsd.ruby.mk"
CONFIGURE_ARGS+=	--with-ruby
.endif

.endif

.if defined(WITH_HDF4) && defined(WITH_HDF5)
IGNORE=			you can't use HDF4 with HDF5
.endif

post-install:
.if defined(WITH_PYTHON)
	@cd ${BUILD_WRKSRC}/swig/python && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install
		${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/^-//})
.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>

Lines 1-3 Link Here

(-)gdal.new/distinfo (-3 / +3 lines)
1	MD5 (gdal-1.5.0.tar.gz) = ffbb024db521a002018cb5666bd6e60d	1	MD5 (gdal-1.6.0.tar.gz) = 0c53697511f489455f8b60e843986568
2	SHA256 (gdal-1.5.0.tar.gz) = 9ac75f8928aa649a70e2aa3ebda86e71e18acc295cd874c43d33a84ac11c1e91	2	SHA256 (gdal-1.6.0.tar.gz) = acdc2faf7496f8d8f4680347ce30fd3a2139b5c050f13dcd6ca8a3d7f6e418a4
3	SIZE (gdal-1.5.0.tar.gz) = 6167411	3	SIZE (gdal-1.6.0.tar.gz) = 7072689

Lines 1-11 Link Here

(-)gdal.new/files/patch-ogr-GNUmakefile (-3 / +3 lines)
1	--- ogr/GNUmakefile.orig Fri Nov 9 11:11:24 2007	1	--- ogr/GNUmakefile.orig 2008-10-14 18:27:49.000000000 +0800
2	+++ ogr/GNUmakefile Wed Dec 26 12:30:59 2007	2	+++ ogr/GNUmakefile 2008-10-14 18:28:02.000000000 +0800
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@
4		4
5	default: lib	5	default: lib
6		6
7	-all: sublibs apps test_ogrsf$(EXE)	7	-all: sublibs apps test_ogrsf$(EXE)
8	+all: sublibs	8	+all: sublibs
9		9
10	clean:	10	clean:
11	rm -f html/*	11	rm -f html/*




--- 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




--- 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




bin/testepsg
bin/esri2wkt.py
bin/gcps2vec.py
bin/gcps2wld.py
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
include/cpl_error.h
include/cpl_hash_set.h
include/cpl_http.h
include/cpl_list.h
include/cpl_minixml.h
include/cpl_minizip_ioapi.h
include/cpl_minizip_unzip.h
include/cpl_multiproc.h
include/cpl_odbc.h
include/cpl_port.h
include/cpl_quad_tree.h
include/cplkeywordparser.h
include/cpl_string.h
include/cpl_vsi.h
include/cpl_vsi_virtual.h

include/cpl_wince.h
include/gdal.h
include/gdal_alg.h
include/gdal_alg_priv.h
include/gdal_proxy.h
include/gdal_frmts.h
include/gdal_pam.h
include/gdal_priv.h

lib/libgdal.a
lib/libgdal.la
lib/libgdal.so
lib/libgdal.so.14
%%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
@dirrm %%PYTHON_SITELIBDIR%%/osgeo
%%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
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo
@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
%%DATADIR%%/GDALLogoBW.svg
%%DATADIR%%/GDALLogoColor.svg
%%DATADIR%%/GDALLogoGS.svg
%%DATADIR%%/LICENSE.TXT
%%DATADIR%%/cubewerx_extra.wkt
%%DATADIR%%/coordinate_axis.csv
%%DATADIR%%/ecw_cs.wkt
%%DATADIR%%/ellipsoid.csv
%%DATADIR%%/epsg.wkt

Return to bug 130073

Lines 2-13 Link Here

(-)gdal.new/Makefile (-43 / +14 lines)
2	# Date created: 27 Aug 2001	2	# Date created: 27 Aug 2001
3	# Whom: Randall Hopper	3	# Whom: Randall Hopper
4	#	4	#
5	# $FreeBSD: ports/graphics/gdal/Makefile,v 1.28 2008/10/22 20:32:24 stefan Exp $	5	# $FreeBSD: ports/graphics/gdal/Makefile,v 1.26 2008/02/24 08:45:42 rafan Exp $
6	#	6	#
7		7
8	PORTNAME= gdal	8	PORTNAME= gdal
9	PORTVERSION= 1.5.0	9	PORTVERSION= 1.6.0
10	PORTREVISION= 1
11	CATEGORIES= graphics geography	10	CATEGORIES= graphics geography
12	MASTER_SITES= ftp://ftp.remotesensing.org/pub/gdal/ \	11	MASTER_SITES= ftp://ftp.remotesensing.org/pub/gdal/ \
13	http://www.gdal.org/dl/ \	12	http://www.gdal.org/dl/ \
Lines 20-34 Link Here
20	USE_AUTOTOOLS= libtool:15	19	USE_AUTOTOOLS= libtool:15
21	USE_GMAKE= yes	20	USE_GMAKE= yes
22	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
		22	USE_PYTHON= yes
		23	USE_RUBY= yes
23	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
24	CONFIGURE_ARGS= --datadir=${DATADIR} --with-libz=/usr	25	CONFIGURE_ARGS= --datadir=${DATADIR} --with-libz=/usr
25	MAKEFILE= GNUmakefile	26	MAKEFILE= GNUmakefile
26	INSTALL_TARGET= install install-man	27	INSTALL_TARGET= install install-man
		28	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27		29
28	MAN1= gdal-config.1 gdal2tiles.1 gdal_contour.1 gdal_grid.1 \	30	MAN1= gdal-config.1 gdal2tiles.1 gdal_contour.1 gdal_grid.1 \
29	gdal_merge.1 gdal_rasterize.1 gdal_retile.1 gdal_translate.1 \	31	gdal_merge.1 gdal_rasterize.1 gdal_retile.1 gdal_translate.1 \
30	gdal_utilities.1 gdaladdo.1 gdalinfo.1 gdaltindex.1 \	32	gdal_utilities.1 gdaladdo.1 gdalinfo.1 gdaltindex.1 \
31	gdaltransform.1 gdalwarp.1 nearblack.1 ogr2ogr.1 \	33	gdaltransform.1 nearblack.1 ogr2ogr.1 \
32	ogr_utilities.1 ogrinfo.1 ogrtindex.1 pct2rgb.1 rgb2pct.1	34	ogr_utilities.1 ogrinfo.1 ogrtindex.1 pct2rgb.1 rgb2pct.1
33		35
34	.if !defined(NOPORTDOCS)	36	.if !defined(NOPORTDOCS)
Lines 177-205 Link Here
177	.endif	179	.endif
178		180
179	.if !defined(WITHOUT_PYTHON)	181	.if !defined(WITHOUT_PYTHON)
180	USE_PYTHON= yes	182	BUILD_DEPENDS+= ${LOCALBASE}/bin/f2py:${PORTSDIR}/math/py-numpy
181	.include "${PORTSDIR}/Mk/bsd.python.mk"	183	RUN_DEPENDS+= ${BUILD_DEPENDS}
182	CONFIGURE_ARGS+= --with-python
183
184	BUILD_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
185	RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
186
187	# We can not use USE_PYDISTUTILS, so copy these from bsd.python.mk.
188	PYEASYINSTALL_CMD= ${LOCALBASE}/bin/easy_install-${PYTHON_VER}
189	PYDISTUTILS_PKGNAME= ${PORTNAME:U}	184	PYDISTUTILS_PKGNAME= ${PORTNAME:U}
190	PYDISTUTILS_PKGVERSION= ${PORTVERSION}	185	PYDISTUTILS_PKGVERSION= ${PORTVERSION}
191	_OSRELEASE!= ${UNAME} -r	186	EGG_NAME= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}
192	PYEASYINSTALL_OSARCH= -${OPSYS:L}-${_OSRELEASE}-${ARCH}	187	PLIST_SUB+= EGG_NAME=${EGG_NAME}
193	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
194	PYEASYINSTALL_BINDIR= ${PREFIX}/bin
195	PYEASYINSTALL_SITELIBDIR= ${PYTHONPREFIX_SITELIBDIR}
196
197	PLIST_SUB+= PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG} \
198	PYEASYINSTALL_CMD=${PYEASYINSTALL_CMD} \
199	PYEASYINSTALL_BINDIR=${PYEASYINSTALL_BINDIR} \
200	PYEASYINSTALL_SITELIBDIR=${PYEASYINSTALL_SITELIBDIR} \
201	PYDISTUTILS_PKGNAME=${PYDISTUTILS_PKGNAME} \
202	PYDISTUTILS_PKGVERSION=${PYDISTUTILS_PKGVERSION}
203	.endif	188	.endif
204		189
205	.if !defined(WITHOUT_PNG)	190	.if !defined(WITHOUT_PNG)
Lines 208-214 Link Here
208	.endif	193	.endif
209		194
210	.if defined(WITH_RUBY)	195	.if defined(WITH_RUBY)
211	USE_RUBY= yes	196	#USE_RUBY= yes
212	.include "${PORTSDIR}/Mk/bsd.ruby.mk"	197	.include "${PORTSDIR}/Mk/bsd.ruby.mk"
213	CONFIGURE_ARGS+= --with-ruby	198	CONFIGURE_ARGS+= --with-ruby
214	.endif	199	.endif
Lines 243-273 Link Here
243	.endif	228	.endif
244		229
245	.if defined(WITH_HDF4) && defined(WITH_HDF5)	230	.if defined(WITH_HDF4) && defined(WITH_HDF5)
246	IGNORE= "You can't use HDF4 with HDF5."	231	IGNORE= you can't use HDF4 with HDF5
247	.endif	232	.endif
248		233
249	pre-build:	234	post-install:
250	.if defined(WITH_PYTHON)	235	.if defined(WITH_PYTHON)
251	@(cd ${BUILD_WRKSRC}/swig/python; \	236	@cd ${BUILD_WRKSRC}/swig/python && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install
252	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-platlib -s lib.${PYEASYINSTALL_OSARCH:S/^-//}; \
253	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-temp -s temp.${PYEASYINSTALL_OSARCH:S/^-//}-${PYTHON_VER}; \
254	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist_egg -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//}; \
255	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//})
256	.endif	237	.endif
257		238
258	post-patch:	239	post-patch:
259	.if !defined(WITHOUT_GIF)	240	.if !defined(WITHOUT_GIF)
260	@${REINPLACE_CMD} -e 's\|lgif\|lungif\|' ${WRKSRC}/configure	241	@${REINPLACE_CMD} -e 's\|lgif\|lungif\|' ${WRKSRC}/configure
261	.endif	242	.endif
262	.if defined(WITH_PYTHON)
263	@${REINPLACE_CMD} -e '\
264	s,%%MAKE_ENV%%,${MAKE_ENV},; \
265	s,%%PYTHON_SITELIBDIR%%,${PYTHON_SITELIBDIR},; \
266	s,%%PYEASYINSTALL_BINDIR%%,${PYEASYINSTALL_BINDIR},; \
267	s,%%PYEASYINSTALL_SITELIBDIR%%,${PYEASYINSTALL_SITELIBDIR},; \
268	s,%%PYEASYINSTALL_EGG%%,${PYEASYINSTALL_EGG},; \
269	s,%%WRKSRC%%,${WRKSRC},; \
270	' ${WRKSRC}/swig/python/GNUmakefile
271	.endif
272		243
273	.include <bsd.port.post.mk>	244	.include <bsd.port.post.mk>

Lines 1-20 Link Here

(-)gdal.new/files/patch-swig-python-GNUmakefile (-20 lines)
1	--- swig/python/GNUmakefile.orig 2007-11-26 16:02:20.000000000 +0800
2	+++ swig/python/GNUmakefile 2008-02-13 14:27:20.000000000 +0800
3	@@ -43,7 +43,7 @@
4	generate: ${WRAPPERS}
5
6	build:
7	- python setup.py build
8	+ CXX="" python setup.py bdist_egg
9
10	egg:
11	python setup.py bdist_egg
12	@@ -51,7 +51,7 @@
13	install:
14
15	ifeq ($(PY_HAVE_SETUPTOOLS),1)
16	- python setup.py install
17	+ 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%%
18	else
19	python setup.py install --prefix=$(DESTDIR)$(prefix)
20	endif

Line 0 Link Here

(-)gdal.new/files/patch-swig-python-setup.py (+20 lines)
	1	--- swig/python/setup.py.orig 2008-11-05 00:25:39.000000000 +0800
	2	+++ swig/python/setup.py 2008-11-05 00:25:52.000000000 +0800
	3	@@ -51,16 +51,7 @@
	4	except ImportError:
	5	pass
	6
	7	-
	8	-
	9	-try:
	10	- from setuptools import setup
	11	- from setuptools import Extension
	12	- HAVE_SETUPTOOLS = True
	13	-except ImportError:
	14	- from distutils.core import setup, Extension
	15	-
	16	-
	17	+from distutils.core import setup, Extension
	18	from distutils.command.build_ext import build_ext
	19	from distutils.ccompiler import get_default_compiler
	20	from distutils.sysconfig import get_python_inc

Lines 1-43 Link Here

(-)gdal.new/pkg-plist (-73 / +41 lines)
1	bin/epsg_tr.py	1	bin/testepsg
2	bin/esri2wkt.py
3	bin/gcps2vec.py
4	bin/gcps2wld.py
5	bin/gdal-config	2	bin/gdal-config
6	bin/gdal2tiles.py
7	bin/gdal2xyz.py
8	bin/gdal_contour	3	bin/gdal_contour
9	bin/gdal_grid	4	bin/gdal_grid
10	bin/gdal_merge.py
11	bin/gdal_rasterize	5	bin/gdal_rasterize
12	bin/gdal_retile.py
13	bin/gdal_translate	6	bin/gdal_translate
14	bin/gdaladdo	7	bin/gdaladdo
15	bin/gdalchksum.py
16	bin/gdalenhance	8	bin/gdalenhance
17	bin/gdalident.py
18	bin/gdalimport.py
19	bin/gdalinfo	9	bin/gdalinfo
20	bin/gdalmanage	10	bin/gdalmanage
21	bin/gdaltindex	11	bin/gdaltindex
22	bin/gdaltransform	12	bin/gdaltransform
23	bin/gdalwarp	13	bin/gdalwarp
24	bin/mkgraticule.py
25	bin/nearblack	14	bin/nearblack
26	bin/ogr2ogr	15	bin/ogr2ogr
27	bin/ogrinfo	16	bin/ogrinfo
28	bin/ogrtindex	17	bin/ogrtindex
29	bin/pct2rgb.py
30	bin/rgb2pct.py
31	include/cpl_config.h	18	include/cpl_config.h
32	include/cpl_conv.h	19	include/cpl_conv.h
33	include/cpl_csv.h	20	include/cpl_csv.h
34	include/cpl_error.h	21	include/cpl_error.h
		22	include/cpl_hash_set.h
35	include/cpl_http.h	23	include/cpl_http.h
36	include/cpl_list.h	24	include/cpl_list.h
37	include/cpl_minixml.h	25	include/cpl_minixml.h
		26	include/cpl_minizip_ioapi.h
		27	include/cpl_minizip_unzip.h
38	include/cpl_multiproc.h	28	include/cpl_multiproc.h
39	include/cpl_odbc.h	29	include/cpl_odbc.h
40	include/cpl_port.h	30	include/cpl_port.h
		31	include/cpl_quad_tree.h
		32	include/cplkeywordparser.h
41	include/cpl_string.h	33	include/cpl_string.h
42	include/cpl_vsi.h	34	include/cpl_vsi.h
43	include/cpl_vsi_virtual.h	35	include/cpl_vsi_virtual.h
Lines 45-50 Link Here
45	include/cpl_wince.h	37	include/cpl_wince.h
46	include/gdal.h	38	include/gdal.h
47	include/gdal_alg.h	39	include/gdal_alg.h
		40	include/gdal_alg_priv.h
		41	include/gdal_proxy.h
48	include/gdal_frmts.h	42	include/gdal_frmts.h
49	include/gdal_pam.h	43	include/gdal_pam.h
50	include/gdal_priv.h	44	include/gdal_priv.h
Lines 71-140 Link Here
71	lib/libgdal.a	65	lib/libgdal.a
72	lib/libgdal.la	66	lib/libgdal.la
73	lib/libgdal.so	67	lib/libgdal.so
74	lib/libgdal.so.13	68	lib/libgdal.so.14
75	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO	69	%%PYTHON_SITELIBDIR%%/gdal.py
76	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt	70	%%PYTHON_SITELIBDIR%%/ogr.py
77	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt	71	%%PYTHON_SITELIBDIR%%/osr.py
78	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt	72	%%PYTHON_SITELIBDIR%%/gdalconst.py
79	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe	73	%%PYTHON_SITELIBDIR%%/gdalnumeric.py
80	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt	74	%%PYTHON_SITELIBDIR%%/gdalnumeric.pyc
81	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdal.py	75	%%PYTHON_SITELIBDIR%%/gdal.pyc
82	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdal.pyc	76	%%PYTHON_SITELIBDIR%%/ogr.pyc
83	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdal.pyo	77	%%PYTHON_SITELIBDIR%%/osr.pyc
84	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdalconst.py	78	%%PYTHON_SITELIBDIR%%/gdalconst.pyc
85	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdalconst.pyc	79	%%PYTHON_SITELIBDIR%%/osgeo/ogr.py
86	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gdalconst.pyo	80	%%PYTHON_SITELIBDIR%%/osgeo/gdal.py
87	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ogr.py	81	%%PYTHON_SITELIBDIR%%/osgeo/gdalnumeric.py
88	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ogr.pyc	82	%%PYTHON_SITELIBDIR%%/osgeo/osr.py
89	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ogr.pyo	83	%%PYTHON_SITELIBDIR%%/osgeo/gdalconst.py
90	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/__init__.py	84	%%PYTHON_SITELIBDIR%%/osgeo/gdal_array.py
91	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/__init__.pyc	85	%%PYTHON_SITELIBDIR%%/osgeo/__init__.py
92	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/__init__.pyo	86	%%PYTHON_SITELIBDIR%%/osgeo/__init__.pyc
93	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.py	87	%%PYTHON_SITELIBDIR%%/osgeo/_gdal.so
94	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.pyc	88	%%PYTHON_SITELIBDIR%%/osgeo/_gdalconst.so
95	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.pyo	89	%%PYTHON_SITELIBDIR%%/osgeo/_gdal_array.so
96	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdal.so	90	%%PYTHON_SITELIBDIR%%/osgeo/_ogr.so
97	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.py	91	%%PYTHON_SITELIBDIR%%/osgeo/_osr.so
98	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.pyc	92	%%PYTHON_SITELIBDIR%%/osgeo/gdal.pyc
99	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.pyo	93	%%PYTHON_SITELIBDIR%%/osgeo/gdal_array.pyc
100	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_gdalconst.so	94	%%PYTHON_SITELIBDIR%%/osgeo/gdalconst.pyc
101	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.py	95	%%PYTHON_SITELIBDIR%%/osgeo/gdalnumeric.pyc
102	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.pyc	96	%%PYTHON_SITELIBDIR%%/osgeo/ogr.pyc
103	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.pyo	97	%%PYTHON_SITELIBDIR%%/osgeo/osr.pyc
104	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_ogr.so	98	%%PYTHON_SITELIBDIR%%/%%EGG_NAME%%.egg-info
105	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.py	99	@dirrm %%PYTHON_SITELIBDIR%%/osgeo
106	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.pyc
107	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.pyo
108	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/_osr.so
109	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal.py
110	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal.pyc
111	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal.pyo
112	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal_array.py
113	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal_array.pyc
114	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdal_array.pyo
115	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalconst.py
116	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalconst.pyc
117	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalconst.pyo
118	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalnumeric.py
119	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalnumeric.pyc
120	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/gdalnumeric.pyo
121	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/ogr.py
122	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/ogr.pyc
123	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/ogr.pyo
124	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/osr.py
125	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/osr.pyc
126	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo/osr.pyo
127	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.py
128	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.pyc
129	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osr.pyo
130	@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
131	@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/osgeo
132	@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
133	%%DATADIR%%/GDALLogoBW.svg	100	%%DATADIR%%/GDALLogoBW.svg
134	%%DATADIR%%/GDALLogoColor.svg	101	%%DATADIR%%/GDALLogoColor.svg
135	%%DATADIR%%/GDALLogoGS.svg	102	%%DATADIR%%/GDALLogoGS.svg
136	%%DATADIR%%/LICENSE.TXT	103	%%DATADIR%%/LICENSE.TXT
137	%%DATADIR%%/cubewerx_extra.wkt	104	%%DATADIR%%/cubewerx_extra.wkt
		105	%%DATADIR%%/coordinate_axis.csv
138	%%DATADIR%%/ecw_cs.wkt	106	%%DATADIR%%/ecw_cs.wkt
139	%%DATADIR%%/ellipsoid.csv	107	%%DATADIR%%/ellipsoid.csv
140	%%DATADIR%%/epsg.wkt	108	%%DATADIR%%/epsg.wkt