summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-03-02 08:26:45 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-03-02 08:26:45 +0000
commitb653d2ca00aa0630bc3be97c2d2802c0c6730e11 (patch)
treef9b4d71ea2a4e2c242f00d69812af86fe80da444 /sci-geosciences
parentadd pkgconfig dep (bug #206124) (diff)
downloadgentoo-2-b653d2ca00aa0630bc3be97c2d2802c0c6730e11.tar.gz
gentoo-2-b653d2ca00aa0630bc3be97c2d2802c0c6730e11.tar.bz2
gentoo-2-b653d2ca00aa0630bc3be97c2d2802c0c6730e11.zip
add missing tcl patch
(Portage version: 2.1.4.4)
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/mapserver/ChangeLog6
-rw-r--r--sci-geosciences/mapserver/files/mapserver_tcl.patch-r144
-rw-r--r--sci-geosciences/mapserver/metadata.xml2
3 files changed, 50 insertions, 2 deletions
diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 57603b4d75e8..d3350c3a8490 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/mapserver
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.10 2008/02/06 21:12:25 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.11 2008/03/02 08:26:44 hollow Exp $
+
+ 02 Mar 2008; Benedikt Böhm <hollow@gentoo.org>
+ +files/mapserver_tcl.patch-r1, metadata.xml:
+ add missing tcl patch
06 Feb 2008; Benedikt Böhm <hollow@gentoo.org> mapserver-5.0.0.ebuild:
use APACHE_BIN instead of broken APACHECTL logic
diff --git a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 b/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1
new file mode 100644
index 000000000000..845cad6e3bd1
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1
@@ -0,0 +1,44 @@
+--- mapscript/tcl/Makefile.in.orig 2001-10-26 00:56:39.000000000 +0200
++++ mapscript/tcl/Makefile.in 2008-02-04 11:04:22.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@/@libdir@:@TCL_EXEC_PREFIX@/@libdir@/$(PACKAGEDIR):@TCL_PREFIX@/@libdir@:@MAPSERVERHOME@
+
+ MAPSERVERHOME = @MAPSERVERHOME@
+ MAPSERVERDEFS = @MAPSERVERDEFS@
+@@ -69,14 +69,14 @@
+ $(DLTARGET)$(TCL_SHLIB_SUFFIX): mapscript_wrap.o
+
+ install: $(DLTARGET)$(TCL_SHLIB_SUFFIX)
+- -mkdir $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
+- cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
++ -mkdir $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
++ cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
+ chmod +x \
+- $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX)
+- cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
+- cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
+- cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
+- cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
++ $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX)
++ cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
++ cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
++ cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
++ cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
+
+
+ useprebuilt:
+--- 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 */
+
+ /*
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index d21d11884553..3190fbf9c377 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-geosciences</herd>
+ <herd>sci-geosciences</herd>
</pkgmetadata>