diff options
-rw-r--r-- | sci-geosciences/mapserver/files/mapserver_php4.patch | 11 | ||||
-rw-r--r-- | sci-geosciences/mapserver/files/mapserver_tcl.patch | 22 | ||||
-rw-r--r-- | sci-geosciences/mapserver/mapserver-4.10.0.ebuild | 29 |
3 files changed, 48 insertions, 14 deletions
diff --git a/sci-geosciences/mapserver/files/mapserver_php4.patch b/sci-geosciences/mapserver/files/mapserver_php4.patch new file mode 100644 index 000000000000..51179035f335 --- /dev/null +++ b/sci-geosciences/mapserver/files/mapserver_php4.patch @@ -0,0 +1,11 @@ +--- mapscript/php3/php_mapscript.c 2006-09-06 18:42:36.000000000 +0200 ++++ mapscript/php3/php_mapscript.c 2007-03-07 03:36:47.000000000 +0100 +@@ -6078,7 +6078,7 @@ + retVal = 0; + + +- php_header(TSRMLS_C); ++ php_header(); + + #if !defined(USE_GD_GIF) || defined(GD_HAS_GDIMAGEGIFPTR) + if( MS_DRIVER_GD(im->format) ) diff --git a/sci-geosciences/mapserver/files/mapserver_tcl.patch b/sci-geosciences/mapserver/files/mapserver_tcl.patch index dab7db05ea3d..b86733bcecc1 100644 --- a/sci-geosciences/mapserver/files/mapserver_tcl.patch +++ b/sci-geosciences/mapserver/files/mapserver_tcl.patch @@ -20,3 +20,25 @@ #endif /* SWIGTCL8 */ /* +--- mapscript/tcl/Makefile.in 2007-03-07 04:23:42.000000000 +0100 ++++ mapscript/tcl/Makefile.in 2007-03-07 04:28:06.000000000 +0100 +@@ -48,8 +48,7 @@ + $(TCL_SHLIB_LD) -o $(DLTARGET)$(TCL_SHLIB_SUFFIX) mapscript_wrap.o \ + $(TCL_LD_SEARCH_FLAGS) \ + $(TCL_STUB_LIB_SPEC) \ +- $(TCL_LIBS) \ +- -L$(MAPSERVERHOME) $(MAPSERVERLIBS) ++ $(TCL_LIBS) + + mapscript_wrap.c: + swig -tcl8 -dhtml -namespace $(MAPSERVERDEFS) $(MAPSERVERINCS) \ +@@ -63,8 +62,7 @@ + $(TCL_SHLIB_LD) -o $(DLTARGET)$(TCL_SHLIB_SUFFIX) mapscript_wrap.o \ + $(TCL_LD_SEARCH_FLAGS) \ + $(TCL_LIB_SPEC) \ +- $(TCL_LIBS) \ +- -L$(MAPSERVERHOME) $(MAPSERVERLIBS) ++ $(TCL_LIBS) + + $(DLTARGET)$(TCL_SHLIB_SUFFIX): mapscript_wrap.o + diff --git a/sci-geosciences/mapserver/mapserver-4.10.0.ebuild b/sci-geosciences/mapserver/mapserver-4.10.0.ebuild index d4147d87313c..98ab7452e707 100644 --- a/sci-geosciences/mapserver/mapserver-4.10.0.ebuild +++ b/sci-geosciences/mapserver/mapserver-4.10.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-4.10.0.ebuild,v 1.2 2006/11/25 04:28:19 djay Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-4.10.0.ebuild,v 1.3 2007/02/07 07:43:55 djay Exp $ PHP_EXT_NAME="php_mapscript php_proj" RUBY_OPTIONAL="yes" @@ -19,7 +19,7 @@ KEYWORDS="~x86" #I must check for mygis use flag availability #"mono" -IUSE="xml pdf proj geos tiff gdal xpm postgis ming php python perl ruby tcl java" +IUSE="xml pdf proj geos tiff gdal xpm postgis flash php python perl ruby tcl java" DEPEND="media-libs/libpng @@ -31,11 +31,11 @@ DEPEND="media-libs/libpng geos? ( sci-libs/geos ) proj? ( sci-libs/proj net-misc/curl ) xml? ( dev-libs/libxml2 ) - gdal? ( sci-libs/gdal ) + gdal? ( >sci-libs/gdal-1.2.6 ) postgis? ( dev-db/postgis ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) xpm? ( x11-libs/libXpm ) - ming? ( media-libs/ming ) + flash? ( media-libs/ming ) pdf? ( media-libs/pdflib ) php? ( dev-lang/php dev-lang/swig ) ruby? ( dev-lang/ruby dev-lang/swig ) @@ -64,6 +64,7 @@ pkg_setup(){ fi if has_version '=dev-lang/php-4*' ; then np="$(expr ${np} + 1)" + myphp4=true fi toD="$(if [ ${np} -gt 1 ]; then echo s; fi)" einfo "Using ${np} PHP version${toD}" @@ -86,6 +87,9 @@ src_unpack() { epatch "${FILESDIR}"/${PF}_php.patch fi fi + if [ ! -z "${myphp4}" ]; then + epatch "${FILESDIR}"/${PN}_php4.patch + fi } src_compile() { @@ -102,25 +106,22 @@ src_compile() { myconf="${myconf} --with-geos=$(which geos-config)" fi - local MYPUSE="wmsserver wmsclient" - local MYGPUSE="wfs wcs wmsclient wfsclient" + local MYGPUSE="wfs wcs wfsclient" if (use gdal && use proj); then myconf="--with-ogr ${myconf}"; for i in ${MYGPUSE}; do myconf="${myconf} --with-${i}" done - fi - - if (use proj); then - for i in ${MYPUSE}; do - myconf="${myconf} --with-${i}" - done if (use xml); then myconf="${myconf} --with-sos" fi fi + if (use proj); then + myconf="${myconf} --with-wmsclient" + fi + if (use php); then ewarn "You use ${np} version of php" if [ ${np} -eq 2 ] ; then @@ -147,7 +148,7 @@ src_compile() { $(use_with postgis)\ $(use_with tiff)\ $(use_with pdf)\ - $(use_with ming)\ + $(use_with flash ming)\ $(use_with java)\ ${myconf}\ || die "econf failed" |