Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sci-geosciences
diff options
context:
space:
mode:
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/mapserver/ChangeLog8
-rw-r--r--sci-geosciences/mapserver/Manifest18
-rw-r--r--sci-geosciences/mapserver/files/mapserver-5.0.0_php.patch246
-rw-r--r--sci-geosciences/mapserver/files/mapserver_php4.patch11
-rw-r--r--sci-geosciences/mapserver/files/mapserver_tcl.patch44
-rw-r--r--sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild294
-rw-r--r--sci-geosciences/mapserver/mapserver-5.0.0.ebuild354
7 files changed, 18 insertions, 957 deletions
diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 5c9821934f47..3bcf165fb5ef 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-geosciences/mapserver
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.18 2009/08/08 14:15:43 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.19 2009/08/13 16:00:01 a3li Exp $
+
+ 13 Aug 2009; Alex Legler <a3li@gentoo.org> -mapserver-5.0.0.ebuild,
+ -mapserver-5.0.0-r1.ebuild, -files/mapserver-5.0.0_php.patch,
+ -files/mapserver_php4.patch, -files/mapserver_tcl.patch:
+ Non-maintainer commit: Removing vulnerable versions and unneeded patches
+ for security bug 264563.
*mapserver-5.4.2 (08 Aug 2009)
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index e55a0c448cc8..70b5515e9a61 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,11 +1,15 @@
-AUX mapserver-5.0.0_php.patch 9010 RMD160 53d60a59560b59dce7bab0aefc696f6271378c1a SHA1 7a516c46ab4526cdb981074cd79afa3181bb8fcf SHA256 b245d69e03bb2e0afd638d5a264da6cccca2e9cc2dc90b95bc407417511f39e7
-AUX mapserver_php4.patch 344 RMD160 c39884c956cff7286e1dbe5d5f1929441583250d SHA1 2bc2ce88cefee9738aba890e4f98c38c7689bd2f SHA256 02da3ebfd7bd1f93eb183093c00fc0b1e974c4485d427ecb8b03d6d93cc77304
-AUX mapserver_tcl.patch 1499 RMD160 ad98752a52c42446fa01ad1781b5d0f4daf36379 SHA1 24c8a7a306fbb7bd5bb27b33658a45156f7e6515 SHA256 d2a692e1c34fb8a509d7fc5755bc900dc3cfc886dab35e41298c69642452ba09
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX mapserver_tcl.patch-r1 1985 RMD160 bb4d766526f7c29535915bb87c0c5199251a2c3a SHA1 2415b6b792be100f2e5a6a936ef77260352f718b SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f
-DIST mapserver-5.0.0.tar.gz 1803416 RMD160 82b505bf59139afc4a581543c6b4789a52ac1b2c SHA1 156987dbb5b19aaa310a391737a9e649fbc08ea1 SHA256 c754b87a62776d7cd9e781df7523a0560f0773ece5faefb8acc6c030f776b5b7
DIST mapserver-5.4.2.tar.gz 1877995 RMD160 05634355e1a74b87ffa3fba0741911b34550321e SHA1 4afe4719ad37c77aeeed83f33059e4ba053dcfa1 SHA256 a7005a809c7494cf2ca1648350eab601cc1af34709b127587679bce349e5e185
-EBUILD mapserver-5.0.0-r1.ebuild 7585 RMD160 c34f4a99150a3c25135e11e194d7f4e460b98804 SHA1 1132eda483c36d796ba50617b3bb804be364bdd5 SHA256 35898f8d2bbb693f58e02afb881f28279b6db72a5325968926a428f53e19753a
-EBUILD mapserver-5.0.0.ebuild 8796 RMD160 c3fe8327dfbf076bc0eef47a28b5c7b634eebb68 SHA1 33d371d2b916889b7d32ec5c1e20891595401a4d SHA256 35ba85eee514c8ed9f6cc3640b021d0f79676e327cfc6ead09f3f6e79a4d28e0
EBUILD mapserver-5.4.2.ebuild 7467 RMD160 09394dc53e3baf4c83b5a0a5ea0bd3332263412f SHA1 6b16a0789cc8247cece18e6c8954e3b69a0cf6b8 SHA256 948887dad8359adcbbe531a0c299da06e215de9d43cb56d0451fdd7f447be897
-MISC ChangeLog 3990 RMD160 289ee148541efccd17aa4d7d9410bac2ed8e36dc SHA1 890915415ba0f5567e22b92c99592812d5c9789e SHA256 8420267b6101e9c223ae761f15912666a3aeced8e2e9606b76f2c344e42ac869
+MISC ChangeLog 4280 RMD160 e494b375f3b7a2e637a02bb3d5f561c96a8806b9 SHA1 89eb75fb22448059a8182312de2f5976f1ebf5af SHA256 0d7e0590495964042ba4afb2ac0555c34a6978f1c67d0daaa2cf9d2a9ca63647
MISC metadata.xml 679 RMD160 55082f40f29cfb34e0b2ea2aea585f762dadd275 SHA1 1d9f0482ad577e1a48e738a252abfea71273899b SHA256 0e01b0d981e8a2ebcc0f10566d6f9c94d44c081b0c1bbfa4704ba2580df9f697
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqEOHwACgkQaGsKqSU7eCSZ4QCfUszKyj33592/lZpO1/rywn63
++34AmwYoa2YzOjKYzGKl0P74lx5Lbngp
+=ge0E
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/files/mapserver-5.0.0_php.patch b/sci-geosciences/mapserver/files/mapserver-5.0.0_php.patch
deleted file mode 100644
index 2dd97e475192..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-5.0.0_php.patch
+++ /dev/null
@@ -1,246 +0,0 @@
---- ./mapserver-5.0.0/configure.in 2007-09-06 15:02:32.000000000 +0200
-+++ ./configure.in 2007-11-21 23:37:44.000000000 +0100
-@@ -2020,14 +2020,20 @@
- [CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
- PHP_LD_XTRAFLAGS="$PHP_LD_XTRAFLAGS -fprofile-arcs -ftest-coverage"])
-
--
- dnl ---------------------------------------------------------------------
- dnl PHP/MapScript module options
- dnl ---------------------------------------------------------------------
-
--AC_CHECKING(for PHP/MapScript module options)
--AC_ARG_WITH(php,
--[ --with-php=DIR Specify directory where PHP4's include files are
-+AC_CHECKING(for PHP4/MapScript module options)
-+AC_ARG_WITH(php4,
-+[ --with-php4=DIR Specify directory where PHP4's include files are
-+ installed (or a pointer to the full source tree)
-+ Required in order to compile the PHP/MapScript
-+ module.],,)
-+
-+AC_CHECKING(for PHP5/MapScript module options)
-+AC_ARG_WITH(php5,
-+[ --with-php5=DIR Specify directory where PHP5's include files are
- installed (or a pointer to the full source tree)
- Required in order to compile the PHP/MapScript
- module.],,)
-@@ -2038,8 +2044,11 @@
- link php_mapscript.so. Try this only if the default
- internal macro didn't work.],,)
-
--if test -n "$with_php" -a -d "$with_php" ; then
-- AC_EXPAND_PATH($with_php, PHP_SRC_DIR)
-+dnl --------------------------------------------------------------------------
-+dnl No php version specific
-+dnl --------------------------------------------------------------------------
-+
-+if test -n "$with_php4" -o -n "$with_php5" ; then
- dnl
- dnl Checks for shared library linking.
- dnl
-@@ -2072,6 +2081,102 @@
- PHP_LD="$PHP_LD_SHARED $PHP_LD_XTRAFLAGS"
- fi
-
-+fi
-+
-+if test -n "$with_php5" -a -d "$with_php5" ; then
-+ AC_EXPAND_PATH($with_php5, PHP5_SRC_DIR)
-+
-+ dnl
-+ dnl Look for PHP4's config.h or PHP5's php_config.h.
-+ dnl We'll need the config file to find info about the PHP configuration
-+ dnl
-+ AC_MSG_CHECKING([for location of config.h or php_config.h])
-+ dnl In PHP3, it was called config.h
-+ test -f "$PHP5_SRC_DIR/config.h" && PHP5_CONFIG_H="$PHP5_SRC_DIR/config.h"
-+
-+ dnl In PHP 4.0.1 to 4.0.3, it was php-4.0.x/php_config.h
-+ test -f "$PHP5_SRC_DIR/php_config.h" && PHP5_CONFIG_H="$PHP5_SRC_DIR/php_config.h"
-+
-+ dnl Starting with PHP 4.0.4, it's php-4.0.x/main/php_config.h
-+ test -f "$PHP5_SRC_DIR/main/php_config.h" && PHP5_CONFIG_H="$PHP5_SRC_DIR/main/php_config.h"
-+
-+ dnl If php was installed, then the headers are under $prefix/include/php/*
-+ test -f "$PHP5_SRC_DIR/include/php/main/php_config.h" && PHP5_SRC_DIR="$PHP5_SRC_DIR/include/php/" && PHP5_CONFIG_H="$PHP5_SRC_DIR/main/php_config.h"
-+
-+ if test -n "$PHP5_CONFIG_H" ; then
-+ AC_MSG_RESULT([$PHP5_CONFIG_H])
-+ else
-+ AC_MSG_ERROR([
-+!!! Could not find config.h or php_config.h in $PHP5_SRC_DIR. !!!
-+!!! Has PHP5 been configured yet? !!!])
-+ fi
-+
-+ dnl
-+ dnl Check which PHP5 version we're using.
-+ dnl Default is PHP3, and if ZEND_API is set then we assume that we have PHP4.
-+ dnl
-+ AC_MSG_CHECKING([whether we have PHP3 or PHP4])
-+ if test -n "`grep 'ZEND_API' $PHP5_CONFIG_H`" ; then
-+ PHP5_VERSION_FLAG="-DPHP4"
-+ else
-+ PHP5_VERSION_FLAG="-DPHP3"
-+ AC_MSG_ERROR([
-+!!! PHP MapScript now requires PHP 4.1.2 or more recent. !!!
-+!!! Support for PHP3 has been dropped after MapServer version 3.5. !!!])
-+ fi
-+ AC_MSG_RESULT([$PHP5_VERSION_FLAG])
-+
-+ dnl
-+ dnl Check if PHP was compiled with the bundled regex, and if so then
-+ dnl use the same version to compile MapServer.
-+ dnl
-+ AC_MSG_CHECKING([whether we should use PHP5's regex])
-+ if test -n "`grep 'define REGEX 1' $PHP5_CONFIG_H`" ; then
-+ AC_MSG_RESULT(yes)
-+
-+ dnl We'll check for regex_extra.h - that might let use build
-+ dnl without the source using libphp_common.so
-+ test -f "$PHP5_SRC_DIR/regex/regex_extra.h" && PHP5_NO_SOURCE="1"
-+ if test -n "$PHP5_NO_SOURCE" ; then
-+ dnl Found regex_extra.h
-+ USE_PHP5_REGEX="-DUSE_PHP_REGEX"
-+ PHP5_REGEX_OBJ=php_regex.o
-+ AC_MSG_RESULT([ found regex_extra.h - building PHP5 MapScript with PHP's bundled regex ])
-+ else
-+ AC_MSG_ERROR([
-+!!! PHP uses its bundled regex library but regex/regex_extra.h cannot be !!!
-+!!! found. !!!])
-+ fi
-+
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+
-+ PHP5MS_MAKEFILE=mapscript/php5/Makefile
-+ MAKE_PHP5MS=php5_mapscript
-+ MAKE_PHP5MS_CLEAN=php_mapscript_clean
-+
-+ AC_SUBST(PHP5_VERSION_FLAG, $PHP5_VERSION_FLAG)
-+ AC_SUBST(PHP5_SRC_DIR, $PHP5_SRC_DIR)
-+ AC_SUBST(PHP_CC, $PHP_CC)
-+ AC_SUBST(PHP_LD, $PHP_LD)
-+ AC_SUBST(PHP5_REGEX_INC, $PHP5_REGEX_INC)
-+ AC_SUBST(PHP5_REGEX_OBJ, $PHP5_REGEX_OBJ)
-+ AC_SUBST(USE_PHP5_REGEX, $USE_PHP5_REGEX)
-+
-+ AC_MSG_RESULT([ PHP5/MapScript module configured.])
-+elif test -n "$with_php5" -a "$with_php5" != "no" ; then
-+ AC_MSG_ERROR([Missing or invalid PHP5 source directory in --with-php5=DIR.])
-+else
-+ AC_MSG_RESULT([ PHP5/MapScript module not configured.])
-+fi
-+
-+AC_SUBST(MAKE_PHP5MS, $MAKE_PHP5MS)
-+AC_SUBST(MAKE_PHP5MS_CLEAN, $MAKE_PHP5MS_CLEAN)
-+
-+if test -n "$with_php4" -a -d "$with_php4" ; then
-+ AC_EXPAND_PATH($with_php4, PHP_SRC_DIR)
-+
- dnl
- dnl Look for PHP3's config.h or PHP4's php_config.h.
- dnl We'll need the config file to find info about the PHP configuration
-@@ -2318,7 +2423,7 @@
- AC_SUBST(ALL_STATIC_LIB, $ALL_STATIC_LIB)
- AC_SUBST(RPATHS, [$RPATHS])
-
--AC_OUTPUT(Makefile $PHPMS_MAKEFILE mapscript/java/Makefile mapscript/csharp/Makefile)
-+AC_OUTPUT(Makefile $PHPMS_MAKEFILE $PHP5MS_MAKEFILE mapscript/java/Makefile mapscript/csharp/Makefile)
-
- dnl ---------------------------------------------------------------------------
- dnl Display configuration status
---- ./mapserver-5.0.0/Makefile.in 2007-08-22 18:27:43.000000000 +0200
-+++ ./Makefile.in 2007-11-21 23:37:44.000000000 +0100
-@@ -185,6 +185,8 @@
- #
- PHP_REGEX_OBJ=@PHP_REGEX_OBJ@
- PHP_REGEX_INC=@PHP_REGEX_INC@
-+PHP5_REGEX_OBJ=@PHP5_REGEX_OBJ@
-+PHP5_REGEX_INC=@PHP5_REGEX_INC@
-
- #
- # Multithreading support.
-@@ -259,7 +261,7 @@
- #
- # --- You shouldn't have to edit anything else. ---
- #
--all: $(MAKE_GD) libmapserver.a $(EXTRA_DEFAULT) $(EXE_LIST) @MAKE_PHPMS@
-+all: $(MAKE_GD) libmapserver.a $(EXTRA_DEFAULT) $(EXE_LIST) @MAKE_PHPMS@ @MAKE_PHP5MS@
-
- #
- # Non-gnumake's don't seem to use this pattern rule,
-@@ -277,6 +279,9 @@
-
- php3_mapscript:: $(LIBMAP_STATIC)
- cd mapscript/php3; $(MAKE); cd ../..
-+php5_mapscript:: $(LIBMAP_STATIC)
-+ cd mapscript/php5; $(MAKE); cd ../..
-+
-
- maplexer.o: maplexer.c mapserver.h mapfile.h
-
---- ./mapserver-5.0.0/mapscript/php3/Makefile.in 2007-06-11 17:38:12.000000000 +0200
-+++ ./mapscript/php3/Makefile.in 2007-11-21 23:37:37.000000000 +0100
-@@ -77,7 +77,7 @@
-
- CFLAGS112 = $(CFLAGS) $(MS_DEFINE) $(MS_INC) $(PHP_INC) $(PHP_REGEX_INC)
-
--all: php_mapscript.so
-+all: php_mapscript.so php_proj.so
-
- PHPMS_OBJS = php_mapscript_util.o php_mapscript.o mapscript_i.o $(PHP_REGEX_OBJ)
-
---- ./mapserver-5.0.0/mapscript/php5/Makefile.in 2007-11-22 10:19:13.000000000 +0100
-+++ ./mapscript/php5/Makefile.in 2007-11-22 21:48:54.000000000 +0100
-@@ -35,13 +35,13 @@
-
- CC = @PHP_CC@
- LD = @PHP_LD@
--CFLAGS = @CFLAGS@ @USE_PHP_REGEX@ -DCOMPILE_DL=1 @PHP_VERSION_FLAG@
-+CFLAGS = @CFLAGS@ @USE_PHP5_REGEX@ -DCOMPILE_DL=1 @PHP5_VERSION_FLAG@
- RUNPATHS= @RPATHS@
-
- #
- # Set PHP_SRC_DIR to point to the root of the PHP source tree
- #
--PHP_SRC_DIR = @PHP_SRC_DIR@
-+PHP_SRC_DIR = @PHP5_SRC_DIR@
-
- PHP_INC = -I$(PHP_SRC_DIR) -I$(PHP_SRC_DIR)/dl -I$(PHP_SRC_DIR)/main \
- -I$(PHP_SRC_DIR)/Zend -I$(PHP_SRC_DIR)/include \
-@@ -53,8 +53,8 @@
- # In order to compile the PHP_MAPSCRIPT module, we have to make MapServer
- # uses the same version of the REGEX library that PHP was compiled with:
- #
--PHP_REGEX_OBJ=@PHP_REGEX_OBJ@
--PHP_REGEX_INC=@PHP_REGEX_INC@
-+PHP_REGEX_OBJ=@PHP5_REGEX_OBJ@
-+PHP_REGEX_INC=@PHP5_REGEX_INC@
-
-
- #
-@@ -77,17 +77,17 @@
-
- CFLAGS112 = $(CFLAGS) $(MS_DEFINE) $(MS_INC) $(PHP_INC) $(PHP_REGEX_INC)
-
--all: php_mapscript.so
-+all: php_mapscript.so php_proj.so
-
--PHPMS_OBJS = php_mapscript_util.o php_mapscript.o mapscript_i.o $(PHP_REGEX_OBJ)
-+PHP5MS_OBJS = php_mapscript_util.o php_mapscript.o mapscript_i.o $(PHP_REGEX_OBJ)
-
--PHPPROJ_OBJS = php_mapscript_util.o php_proj.o $(PHP_REGEX_OBJ)
-+PHP5PROJ_OBJS = php_mapscript_util.o php_proj.o $(PHP_REGEX_OBJ)
-
-
--php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a
-+php_mapscript.so: $(PHP5MS_OBJS) ../../libmapserver.a
- $(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
-
--php_proj.so: $(PHPPROJ_OBJS)
-+php_proj.so: $(PHP5PROJ_OBJS)
- $(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
-
- %.o: %.c php_mapscript_util.h php_mapscript.h
diff --git a/sci-geosciences/mapserver/files/mapserver_php4.patch b/sci-geosciences/mapserver/files/mapserver_php4.patch
deleted file mode 100644
index 51179035f335..000000000000
--- a/sci-geosciences/mapserver/files/mapserver_php4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index b86733bcecc1..000000000000
--- a/sci-geosciences/mapserver/files/mapserver_tcl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mapscript/tcl/Makefile.in 2001-10-26 00:56:39.000000000 +0200
-+++ mapscript/tcl/Makefile.in 2006-03-11 13:21:12.000000000 +0100
-@@ -25,7 +25,7 @@
- TCL_LIBS = @TCL_LIBS@
- LIBS = @TCL_LIBS@
- TCL_DBGX = @TCL_DBGX@
--LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/lib:@TCL_EXEC_PREFIX@/lib/$(PACKAGEDIR):@TCL_PREFIX@/lib:@MAPSERVERHOME@
-+LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/lib:@TCL_EXEC_PREFIX@/lib/$(PACKAGEDIR):@TCL_PREFIX@/lib
-
- MAPSERVERHOME = @MAPSERVERHOME@
- MAPSERVERDEFS = @MAPSERVERDEFS@
---- mapscript/mapscript.i 2005-11-22 22:44:48.000000000 +0100
-+++ mapscript/mapscript.i 2006-04-12 23:47:23.000000000 +0200
-@@ -206,7 +206,7 @@
-
- /* Tcl */
- #ifdef SWIGTCL8
--%include "tclmodule.i"
-+/* %include "tclmodule.i" */
- #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-5.0.0-r1.ebuild b/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild
deleted file mode 100644
index 9e4a421e5792..000000000000
--- a/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0-r1.ebuild,v 1.6 2009/07/29 20:30:45 flameeyes Exp $
-
-PHP_EXT_NAME="php_mapscript php_proj"
-RUBY_OPTIONAL="yes"
-
-inherit eutils autotools confutils multilib distutils depend.php perl-module php-ext-source-r1 depend.apache webapp ruby java-pkg-opt-2
-
-WEBAPP_MANUAL_SLOT=yes
-
-DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications."
-HOMEPAGE="http://mapserver.gis.umn.edu/"
-SRC_URI="http://download.osgeo.org/mapserver/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-# I must check for mygis use flag availability
-IUSE="agg doc flash gdal geos java pdf perl php postgis proj python ruby tcl threads tiff unicode xml xpm" # mono
-
-# compilation fails with jdk > 1.4 on some native part probably
-RDEPEND="media-libs/libpng
- media-libs/jpeg
- media-libs/freetype
- >=media-libs/gd-2.0.12
- sys-libs/zlib
- agg? ( x11-libs/agg )
- flash? ( media-libs/ming )
- gdal? ( >sci-libs/gdal-1.2.6 )
- geos? ( sci-libs/geos )
- java? ( >=virtual/jdk-1.4 )
- pdf? ( media-libs/pdflib )
- perl? ( dev-perl/DBI )
- php? ( dev-lang/php )
- postgis? ( dev-db/postgis )
- proj? ( sci-libs/proj net-misc/curl )
- python? ( dev-lang/python )
- ruby? ( dev-lang/ruby )
- tcl? ( dev-lang/tcl )
- tiff? ( media-libs/tiff sci-libs/libgeotiff )
- unicode? ( virtual/libiconv )
- xml? ( dev-libs/libxml2 )
- xpm? ( x11-libs/libXpm )"
-
-DEPEND="${RDEPEND}
- java? ( dev-lang/swig )
- perl? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- python? ( dev-lang/swig )
- php? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-want_apache2
-
-cd_script() {
- einfo "$2 the mapserver $1-mapscript"
- cd "${S}"/mapscript/$1 || die "Unable to go into $1 mapscript dir"
-}
-
-pkg_setup() {
- depend.apache_pkg_setup
- webapp_pkg_setup
- use java && java-pkg-opt-2_pkg_setup
- use perl && perl-module_pkg_setup
- use php && has_php
-
- einfo "Checking for gd compiled with truetype support..."
- if built_with_use media-libs/gd truetype ; then
- einfo "Found truetype support; continuing..."
- else
- eerror "media-libs/gd must be compiled with truetype support,"
- eerror "and you probably want jpeg and png support also."
- eerror "Please re-emerge gd with the truetype USE flag."
- die "gd not merged with truetype USE flag"
- fi
-
- confutils_use_conflict gdal tiff
- confutils_use_depend_all java threads
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- if use tcl ; then
- epatch "${FILESDIR}"/${PN}_tcl.patch-r1
- sed -i -e "s:@libdir@:$(get_libdir):g" mapscript/tcl/Makefile.in \
- || die "failed to fix libdir in Makefile.in"
- fi
- AT_GNUCONF_UPDATE="no" eautoreconf
-}
-
-src_compile() {
- local step="Building"
-
- local myconf="--with-png --with-jpeg --with-zlib --with-freetype"
- use apache2 && myconf="${myconf} --with-httpd=${APACHE_BIN}"
- use geos && myconf="${myconf} --with-geos=$(type -P geos-config)"
-
- 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
- use xml && myconf="${myconf} --with-sos"
- fi
-
- use proj && myconf="${myconf} --with-wmsclient"
- use php && myconf="${myconf} --with-php=${PHPPREFIX}/include/php"
-
- if use perl || use python || use ruby || use tcl || use php ; then
- myconf="${myconf} --with-mapscript"
- fi
-
- cd "${S}"
- econf $(use_with gdal) \
- $(use_with agg) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with ruby) \
- $(use_with tcl) \
- $(use_with proj) \
- $(use_with postgis) \
- $(use_with tiff) \
- $(use_with pdf) \
- $(use_with flash ming) \
- $(use_with java) \
- $(use_with unicode iconv) \
- $(use_with threads) \
- ${myconf}
-
- # bug #279627
- emake -j1 || die "make failed"
-
- if use perl; then
- cd_script perl ${step}
- perl-module_src_compile
- fi
-
- if use php && use proj; then
- cd_script php3 ${step}
- emake php_proj.so || die "unable to built php_proj.so"
- fi
-
- if use python; then
- cd_script python ${step}
- distutils_src_compile || die "Unable to build python mapscript"
- fi
-
- if use ruby; then
- cd_script ruby ${step}
- RUBY_ECONF="-I${D}"
- ruby_econf
- cp ../mapscript.i . || die "Unable to find mapscript.i"
- sed -e "s:ruby.h defines.h::g" -i ./Makefile
- ruby_emake
- fi
-
- if use tcl; then
- cd_script tcl ${step}
- sed "s:perlvars:mapscriptvars:" -i configure
- sed -e "s:tail -:tail -n :g" -e "s:head -:head -n :g" -i configure ||\
- die "Unable to modify the configure file"
- econf --with-tcl=/usr
- touch tclmodule.i
- # do not comment this sed out again because it will plain break build otherwise
- # thanks in advance
- sed -e "s:-DTCL_WIDE_INT_TYPE=long long:-DTCL_WIDE_INT_TYPE=long\\\ long:g" \
- -i Makefile || die "Unable to modify Makefile"
- emake || die "Unable to build tcl mapscript"
- fi
-
- if use java; then
- cd_script java ${step}
- emake interface || die "Unable to build java mapscript"
- emake all || die "Unable to build java mapscript"
- fi
-
-}
-
-src_test(){
- if use java ; then
- cd_script java test
- emake test || die "Test failed"
- # We need to fix the tests to make them pass
- sed -i -e "s:setTransparency:setOpacity:g" \
- "${S}"/mapscript/java/tests/threadtest/MapThread.java \
- || die "fixing of tests failed"
- emake threadtests || die "Threadtests failed"
- fi
-}
-
-mapscript_install_examples() {
- elog "$1-mapscript examples could be found in the following directory"
- elog "/usr/share/doc/${PF}/mapscript/examples/$1"
- insinto /usr/share/doc/${PF}/mapscript/examples/$1/
- doins examples/* || die "Unable to install specified sample data"
-}
-
-src_install() {
- local step
- step="Installing"
- extra_dir="fonts tests tests/vera symbols"
-
- dodir /usr /usr/bin
-
- into /usr
-
- if use php ; then
- cd_script php3 ${step}
- for i in *.so ; do
- cp ${i} "${WORKDIR}"/${i/.so}-default.so || die "failed to copy php extension"
- PHP_EXT_NAME="${i/.so}"
- php-ext-source-r1_src_install
- done
-
- mapscript_install_examples php
- fi
-
- if use ruby ; then
- cd_script ruby ${step}
- ruby_einstall
- mapscript_install_examples ruby
- fi
-
- if use perl ; then
- cd_script perl ${step}
- perl-module_src_install
- mapscript_install_examples perl
- fi
-
- if use tcl ; then
- cd_script tcl ${step}
- sed "s:\$(TCL_EXEC_PREFIX):\$(DESTDIR)\$(TCL_EXEC_PREFIX):g" -i Makefile
- emake -j1 DESTDIR="${D}" install || \
- die "Unable to setup tcl mapscript support"
- mapscript_install_examples tcl
- fi
-
- if use python ; then
- cd_script python ${step}
- distutils_src_install
- mapscript_install_examples python
- fi
-
- if use java ; then
- cd_script java ${step}
- java-pkg_dojar mapscript.jar
- java-pkg_doso libmapscript.so
- mapscript_install_examples java
- fi
-
- cd "${S}"
- into /usr
-
- if use pdf ; then
- dobin shp2pdf || die "Unable to setup shp2pdf"
- fi
-
- dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
- sortshp tile4ms msencrypt mapserver-config \
- || die "Unable to setup mapserver tools"
-
- dodoc INSTALL README HISTORY.TXT || die "Unable to setup documentation"
-
- for i in ${extra_dir}; do
- insinto /usr/share/doc/${PF}/${i}
- doins ${i}/* || die "Unable to add extra_dir to document tree"
- done
-
- if use doc; then
- insinto /usr/share/doc/${PF}/rfc
- doins rfc/*
- fi
-
- webapp_src_preinst
- chmod +x "${S}"/mapserv || die "Unable to find mapserv"
- cp "${S}"/mapserv "${D}"/${MY_CGIBINDIR} || die "Unable to install mapserv"
- webapp_src_install
-}
-
-pkg_preinst() {
- perl-module_pkg_preinst
- java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
- webapp_pkg_postinst
-}
-
-pkg_prerm() {
- webapp_pkg_prerm
-}
diff --git a/sci-geosciences/mapserver/mapserver-5.0.0.ebuild b/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
deleted file mode 100644
index 81c7bfc81081..000000000000
--- a/sci-geosciences/mapserver/mapserver-5.0.0.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.0.0.ebuild,v 1.9 2009/05/26 17:06:14 arfrever Exp $
-
-PHP_EXT_NAME="php_mapscript php_proj"
-RUBY_OPTIONAL="yes"
-
-inherit eutils autotools distutils depend.php depend.apache webapp ruby java-pkg-opt-2
-
-DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications."
-HOMEPAGE="http://mapserver.gis.umn.edu/"
-SRC_URI="http://download.osgeo.org/mapserver/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-#I must check for mygis use flag availability
-#"mono"
-IUSE="agg xml pdf proj geos tiff gdal xpm postgis flash php python perl ruby tcl threads unicode java doc"
-
-# compilation fails with jdk > 1.4 on some native part probably
-RDEPEND="media-libs/libpng
- media-libs/jpeg
- media-libs/freetype
- sys-libs/zlib
- >=media-libs/gd-2.0.12
- unicode? ( virtual/libiconv )
- agg? ( x11-libs/agg )
- geos? ( sci-libs/geos )
- proj? ( sci-libs/proj net-misc/curl )
- xml? ( dev-libs/libxml2 )
- gdal? ( >sci-libs/gdal-1.2.6 )
- postgis? ( dev-db/postgis )
- tiff? ( media-libs/tiff sci-libs/libgeotiff )
- xpm? ( x11-libs/libXpm )
- flash? ( media-libs/ming )
- pdf? ( media-libs/pdflib )
- php? ( dev-lang/php )
- ruby? ( dev-lang/ruby )
- perl? ( dev-perl/DBI )
- python? ( dev-lang/python )
- java? ( >=virtual/jdk-1.4 )
- tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
- php? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
- perl? ( dev-lang/swig )
- python? ( dev-lang/swig )
- java? ( dev-lang/swig )
- tcl? ( dev-lang/swig )"
-
-WEBAPP_MANUAL_SLOT=yes
-
-want_apache
-
-cd_script() {
- einfo "$2 the mapserver $1-mapscript"
- cd "${S}"/mapscript/$1 || die "Unable to go into $1 mapscript dir"
-}
-
-pkg_setup(){
- depend.apache_pkg_setup
- webapp_pkg_setup
- java-pkg-opt-2_pkg_setup
- if use php; then
- # check how many versions of php was installed
- has_php
- np=0
- if has_version '=dev-lang/php-5*'; then
- np="$(expr ${np} + 1)"
- 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}"
- fi
-
- elog "Checking for gd compiled with truetype support..."
- if built_with_use media-libs/gd truetype; then
- elog "Found truetype support; continuing..."
- else
- ewarn "media-libs/gd must be compiled with truetype support,"
- ewarn "and you probably want jpeg and png support also."
- elog "Please re-emerge gd with the truetype USE flag."
- die "gd not merged with truetype USE flag"
- fi
-
- if use gdal && use tiff; then
- ewarn "The MapServer tiff support is not compatible"
- ewarn "with gdal tiff support."
- elog "Please disable tiff support for mapserver."
- die "mapserver has tiff USE flag enabled"
- fi
-
- if use java && ! use threads; then
- ewarn "The MapServer Java support needs threads."
- elog "Please enable thread support for mapserver."
- die "mapserver has threads USE flag disabled"
- fi
-
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- if (use tcl); then
- epatch "${FILESDIR}"/${PN}_tcl.patch
- fi
-
- if (use php); then
- if [ ${np} -eq 2 ]; then
- mkdir ./mapscript/php4
- cp -r ./mapscript/php3 ./mapscript/php5 ||\
- die "Unable to copy php mapscript directory"
- epatch "${FILESDIR}"/${PF}_php.patch
- fi
- fi
- if [ ! -z "${myphp4}" ]; then
- epatch "${FILESDIR}"/${PN}_php4.patch
- fi
-
-}
-
-src_compile() {
- local step
- step="Building"
- cd "${S}"
-
- AT_GNUCONF_UPDATE="no" eautoreconf
-
- local myconf
- myconf="--with-png --with-jpeg --with-zlib --with-freetype"
- if use apache2 ; then
- myconf="${myconf} --with-httpd=${APACHE_BIN}"
- fi
-
- if use geos; then
- myconf="${myconf} --with-geos=$(type -P geos-config)"
- fi
-
- 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
- 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
- for i in 4 5; do
- uses_php${i}
- myconf="${myconf} --with-php${i}=${PHPPREFIX}"
- done
- else
- myconf="${myconf} --with-php=${PHPPREFIX}/include/php"
- fi
- fi
-
- if (use perl || use python || use ruby || use tcl || use php) ; then
- myconf="${myconf} --with-mapscript";
- fi
-
- cd "${S}"
- econf $(use_with gdal)\
- $(use_with agg)\
- $(use_with perl)\
- $(use_with python)\
- $(use_with ruby)\
- $(use_with tcl)\
- $(use_with proj)\
- $(use_with postgis)\
- $(use_with tiff)\
- $(use_with pdf)\
- $(use_with flash ming)\
- $(use_with java)\
- $(use_with unicode iconv)\
- $(use_with threads)\
- ${myconf}\
- || die "econf failed"
-
- make || die "make failed"
-
- if (use php && use proj); then
- cd "${S}"/mapscript/php3/
- if [ ${np} -eq 2 ]; then
- cp *.so ../php4/ || die "Unable to copy php4 mapscript object files"
- fi
- fi
-
- if use perl; then
- cd_script perl ${step}
- perl Makefile.PL || die "Unable to build perl mapscript"
- emake || die "Unable to build perl mapscript"
- fi
-
- if use python; then
- cd_script python ${step}
- distutils_src_compile || die "Unable to build python mapscript"
- fi
-
- if use ruby; then
- cd_script ruby ${step}
- RUBY_ECONF="-I${D}"
- ruby_econf
- cp ../mapscript.i . || die "Unable to find mapscript.i"
- sed -e "s:ruby.h defines.h::g" -i ./Makefile
- ruby_emake
- fi
-
- if use tcl; then
- cd_script tcl ${step}
- sed "s:perlvars:mapscriptvars:" -i configure
- sed -e "s:tail -:tail -n :g" -e "s:head -:head -n :g" -i configure ||\
- die "Unable to modify the configure file"
- econf --with-tcl=/usr || die "Unable to configure tcl mapscript"
- touch tclmodule.i
- #sed -e "s:-DTCL_WIDE_INT_TYPE=long long:-DTCL_WIDE_INT_TYPE=long\\\ long:g" \
- # -i Makefile || die "Unable to modify Makefile"
- emake || die "Unable to build tcl mapscript"
- fi
-
- if use java; then
- cd_script java ${step}
- emake interface || die "Unable to build java mapscript"
- emake all || die "Unable to build java mapscript"
- fi
-
-}
-
-src_test(){
- if use java ; then
- cd_script java test
- emake test || die "Test failed"
- # We need to fix the tests to make them pass
- sed -i -e "s:setTransparency:setOpacity:g" \
- "${S}"/mapscript/java/tests/threadtest/MapThread.java \
- || die "fixing of tests failed"
- emake threadtests || die "Threadtests failed"
- fi
-}
-
-mapscript_install_examples() {
- einfo "$1-mapscript examples could be found in the following directory"
- einfo "/usr/share/doc/${PF}/mapscript/examples/$1"
- insinto /usr/share/doc/${PF}/mapscript/examples/$1/
- doins examples/* || die "Unable to install specified sample data"
-}
-
-src_install() {
- local step
- step="Installing"
- extra_dir="fonts tests tests/vera symbols"
-
- dodir /usr /usr/bin
-
- into /usr
-
- if use php; then
- if [ 2 -eq "${np}" ] ; then
- for i in 4 5; do
- cd_script php$i ${step}
- uses_php$i
- EXT_DIR="$(${PHPCONFIG} --extension-dir)"
- dodir ${EXT_DIR}
- cp *.so "${D}"/${EXT_DIR} || \
- die "Unable to setup php5 mapscript support"
- done
- else
- cd_script php3 ${step}
- EXT_DIR="$(${PHPCONFIG} --extension-dir)"
- dodir ${EXT_DIR}
- cp *.so "${D}"/${EXT_DIR} || \
- die "Unable to setup php4 mapscript support"
- fi
- mapscript_install_examples php
- fi
-
- if use ruby; then
- cd_script ruby ${step}
- ruby_einstall
- mapscript_install_examples ruby
- fi
-
- if use perl; then
- cd_script perl ${step}
- make DESTDIR="${D}" install || \
- die "Unable to setup perl mapscript support"
- mapscript_install_examples perl
- fi
-
- if use tcl; then
- cd_script tcl ${step}
- sed "s:\$(TCL_EXEC_PREFIX):\$(DESTDIR)\$(TCL_EXEC_PREFIX):g" -i Makefile
- make DESTDIR="${D}" install || \
- die "Unable to setup tcl mapscript support"
- mapscript_install_examples tcl
- fi
-
- if use python; then
- cd_script python ${step}
- distutils_src_install
- mapscript_install_examples python
- fi
-
- if (use java); then
- cd_script java ${step}
- java-pkg_dojar mapscript.jar
- java-pkg_doso libmapscript.so
- mapscript_install_examples java
- fi
-
- cd "${S}"
- into /usr
-
- if use pdf; then
- dobin shp2pdf || die "Unable to setup shp2pdf"
- fi
-
- dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar\
- sortshp tile4ms msencrypt mapserver-config \
- || die "Unable to setup mapserver tools"
-
- dodoc INSTALL README HISTORY.TXT || \
- die "Unable to setup documentation"
-
- for i in ${extra_dir}; do
- insinto /usr/share/doc/${PF}/$i
- doins $i/* || die "Unable to add extra_dir to document tree"
- done
-
- if use doc; then
- insinto /usr/share/doc/${PF}/rfc
- doins rfc/*
-
- fi
-
- webapp_src_preinst
- chmod +x "${S}"/mapserv || die "Unable to find mapserv"
- cp "${S}"/mapserv "${D}"/${MY_CGIBINDIR} || die "Unable to install mapserv"
- webapp_src_install
-}