A diff between mapserver-6.0.1.ebuild and mapserver-6.2.1.ebuild

mapserver-6.0.1-to-6.2.1-ebuild.diff (text/plain), 2.33 KB, created by Sorin Panca on 2013-05-28 15:20:52 UTC

--- /var/lib/portage/repos/gentoo/sci-geosciences/mapserver/mapserver-6.0.1.ebuild	2013-04-14 00:31:28.000000000 +0300
+++ /var/lib/portage/repos/gentoo/sci-geosciences/mapserver/mapserver-6.2.1.ebuild	2013-05-28 18:11:26.000000000 +0300
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1.ebuild,v 1.3 2013/04/13 21:04:01 olemarkus Exp $
+# $Header: $
 
 EAPI=4
 
@@ -92,7 +92,7 @@
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
 		insinto "${EXT_DIR}"
-		newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
+		newins "${PHP_EXT_NAME}.lo" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
 	done
 	php-ext-source-r2_createinifiles
 }
@@ -115,9 +115,11 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
+	epatch \
+		"${FILESDIR}/6.2.1_rc1-ldflags.patch" \
 		"${FILESDIR}/6.0.0_rc1-bool.patch" \
-		"${FILESDIR}/6.0.0_rc1-php_ldflags.patch"
+		"${FILESDIR}/ax_jni_include_dir.patch" \
+		"${FILESDIR}/6.2.1_rc1-php_ldflags.patch"
 	eautoreconf
 }
 
@@ -135,7 +137,7 @@
 	fi
 
 	# some scripts require configure time options so place it here
-	use php && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.3/include/php/"
+	use php && myopts+=" --with-php=${EPREFIX}/usr/bin/php-config"
 
 	# sde is ESRI package that you have to buy first
 	# oraclespatial needs oracle server for testing/usage
@@ -143,6 +145,7 @@
 	econf \
 		--without-oraclespatial \
 		--without-sde \
+		--with-apache-module \
 		--with-libiconv \
 		--with-jpeg \
 		--with-gd \
@@ -150,8 +153,6 @@
 		--with-wms \
 		--with-kml \
 		--with-curl-config \
-		--with-agg-svg-symbols \
-		--with-httpd="${APACHE_BIN}" \
 		--with-fastcgi \
 		$(use_with opengl ogl) \
 		$(use_with opengl ftgl) \
@@ -187,8 +188,13 @@
 	local extra_dir="fonts tests tests/vera symbols"
 	local i
 
-	dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
-		sortshp tile4ms msencrypt mapserver-config
+	dobin .libs/shp2img .libs/legend .libs/shptree .libs/shptreevis \
+	.libs/shptreetst .libs/scalebar	.libs/sortshp .libs/tile4ms \
+	.libs/msencrypt mapserver-config
+
+	dolib.so .libs/libmapserver-${PV}.so
+
+	dolib.a libmapserver.la
 
 	dodoc INSTALL README HISTORY.TXT