sci-geosciences/mapserver: drop unused old patches

Package-Manager: portage-2.2.26

6 files changed, 0 insertions, 330 deletions

diff --git a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch b/sci-geosciences/mapserver/files/5.4.2-ldflags.patch
deleted file mode 100644
index d202b8d4692f..000000000000
--- a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 56cb209..46a8a4c 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -252,7 +252,7 @@ SUP_LIBS =  $(GD_LIB) $(AGG_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \
- # STATIC_LIBS is full filename with path of libs that will be statically linked
- STATIC_LIBS= $(GD_STATIC)
- 
--EXE_LDFLAGS =	$(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
-+EXE_LIBS =	$(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
- 
- RM= /bin/rm -f
- 
-@@ -316,59 +316,59 @@ $(LIBMAP_SHARED):	$(LIBMAP_STATIC)
- 	&& ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED)
- 
- shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h
--	$(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf
-+	$(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS)
- 
- shp2img: $(LIBMAP_STATIC)  shp2img.o mapserver.h
--	$(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img
-+	$(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS)
- 
- sym2img: $(LIBMAP_STATIC)   sym2img.o mapserver.h
--	$(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img
-+	$(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS)
- 
- legend: $(LIBMAP_STATIC)  legend.o mapserver.h
--	$(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend
-+	$(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS)
- 
- scalebar: $(LIBMAP_STATIC)  scalebar.o mapserver.h
--	$(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar
-+	$(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS)
- 
- mapserv: mapserv.h maptile.h $(LIBMAP_STATIC)  mapserv.o cgiutil.o maptile.o mapserver.h
--	$(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv
-+	$(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS)
- 
- shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h
--	$(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex
-+	$(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS)
- 
- shptree: $(LIBMAP_STATIC) shptree.o mapserver.h
--	$(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree
-+	$(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS)
- 
- shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h
--	$(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis
-+	$(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS)
- 
- shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h
--	$(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst
-+	$(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS)
- 
- sortshp: sortshp.o
--	$(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp
-+	$(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS)
- 
- tile4ms: tile4ms.o
--	$(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms
-+	$(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS)
- 
- msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h
--	$(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt
-+	$(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS)
- 
- testexpr: testexpr.o mapparser.o maplexer.o
--	$(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr
-+	$(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS)
- 
- testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h
--	$(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy
-+	$(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS)
- 
- test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c
--	$(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto
-+	$(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS)
- 
- mapscriptvars:	Makefile
- 	touch mapscriptvars
- 	pwd > mapscriptvars
- 	echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
- 	echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(TIFF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
--	echo $(EXE_LDFLAGS) >> mapscriptvars
-+	echo $(LDFLAGS) >> mapscriptvars
- 	echo $(STATIC_LIBS) >> mapscriptvars
- 	grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
- 
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch
deleted file mode 100644
index 8016961b515b..000000000000
--- a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN mapserver-6.0.0-rc1.old/mapscript/php/bool.h mapserver-6.0.0-rc1/mapscript/php/bool.h
---- mapserver-6.0.0-rc1.old/mapscript/php/bool.h	1970-01-01 01:00:00.000000000 +0100
-+++ mapserver-6.0.0-rc1/mapscript/php/bool.h	2011-05-02 22:00:00.000000000 +0200
-@@ -0,0 +1,8 @@
-+#ifndef BOOL_H
-+#define BOOL_H
-+
-+#define bool_t  int
-+#define TRUE    1
-+#define FALSE   0
-+
-+#endif /* BOOL_H */
-diff -urN mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h
---- mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h	2011-05-02 12:10:03.000000000 +0200
-+++ mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h	2011-05-02 22:00:11.000000000 +0200
-@@ -32,6 +32,7 @@
- #ifndef PHP_MAPSCRIPT_H
- #define PHP_MAPSCRIPT_H
- 
-+#include "bool.h"
- #include "php.h"
- #include "zend_interfaces.h"
- #include "php_mapscript_util.h"
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch
deleted file mode 100644
index 336fb2eff4f7..000000000000
--- a/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN mapserver-6.0.0-rc1.old/Makefile.in mapserver-6.0.0-rc1/Makefile.in
---- mapserver-6.0.0-rc1.old/Makefile.in	2011-05-02 12:10:03.000000000 +0200
-+++ mapserver-6.0.0-rc1/Makefile.in	2011-05-02 16:29:31.000000000 +0200
-@@ -264,7 +264,7 @@
- # STATIC_LIBS is full filename with path of libs that will be statically linked
- STATIC_LIBS= $(GD_STATIC)
- 
--EXE_LDFLAGS =	$(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
-+EXE_LIBS =	$(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
- 
- RM= /bin/rm -f
- 
-@@ -351,59 +351,59 @@
- 	&& ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED)
- 
- shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h
--	$(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf
-+	$(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS)
- 
- shp2img: $(LIBMAP_STATIC)  shp2img.o mapserver.h
--	$(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img
-+	$(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS)
- 
- sym2img: $(LIBMAP_STATIC)   sym2img.o mapserver.h
--	$(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img
-+	$(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS)
- 
- legend: $(LIBMAP_STATIC)  legend.o mapserver.h
--	$(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend
-+	$(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS)
- 
- scalebar: $(LIBMAP_STATIC)  scalebar.o mapserver.h
--	$(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar
-+	$(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS)
- 
- mapserv: mapserv.h maptile.h $(LIBMAP_STATIC)  mapserv.o cgiutil.o maptile.o mapserver.h
--	$(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv
-+	$(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS)
- 
- shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h
--	$(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex
-+	$(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS)
- 
- shptree: $(LIBMAP_STATIC) shptree.o mapserver.h
--	$(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree
-+	$(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS)
- 
- shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h
--	$(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis
-+	$(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS)
- 
- shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h
--	$(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst
-+	$(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS)
- 
- sortshp: $(LIBMAP_STATIC) sortshp.o mapserver.h
--	$(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp
-+	$(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS)
- 
- tile4ms: $(LIBMAP_STATIC) tile4ms.o mapserver.h
--	$(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms
-+	$(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS)
- 
- msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h
--	$(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt
-+	$(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS)
- 
- testexpr: $(LIBMAP_STATIC) testexpr.o mapparser.o maplexer.o mapserver.h
--	$(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr
-+	$(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS)
- 
- testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h
--	$(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy
-+	$(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS)
- 
- test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c mapserver.h
--	$(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto
-+	$(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS)
- 
- mapscriptvars:	Makefile
- 	touch mapscriptvars
- 	pwd > mapscriptvars
- 	echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
- 	echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
--	echo $(EXE_LDFLAGS) >> mapscriptvars
-+	echo $(EXE_LIBS) >> mapscriptvars
- 	echo $(STATIC_LIBS) >> mapscriptvars
- 	grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
- 
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch
deleted file mode 100644
index 706bae4ce7b1..000000000000
--- a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mapserver-6.0.0-rc1.old/mapscript/php/Makefile.in	2011-05-02 12:10:03.000000000 +0200
-+++ mapserver-6.0.0-rc1/mapscript/php/Makefile.in	2011-05-02 23:43:15.000000000 +0200
-@@ -86,10 +86,10 @@
- 
- 
- php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a
--	$(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
-+	$(LD) -o $@ $(LDFLAGS) $(PHPMS_OBJS) $(MS_LIBS)
- 
- php_proj.so:  $(PHPPROJ_OBJS)
--	$(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
-+	$(LD) -o $@ $(LDFLAGS) $(PHPPROJ_OBJS) $(MS_LIBS)
- 
- %.o: %.c php_mapscript_util.h php_mapscript.h
- 	$(CC) $(CFLAGS112) -c -o $@ $<
diff --git a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch b/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch
deleted file mode 100644
index e81fd90195f9..000000000000
--- a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -aurN mapserver-6.0.1.orig/mapscript/php/image.c mapserver-6.0.1/mapscript/php/image.c
---- mapserver-6.0.1.orig/mapscript/php/image.c	2011-04-05 11:15:06.000000000 -0400
-+++ mapserver-6.0.1/mapscript/php/image.c	2015-02-04 14:29:03.164357015 -0500
-@@ -303,10 +303,18 @@
-     /* no filename - read stdout */
- 
-     /* if there is no output buffer active, set the header */
--    if (OG(ob_nesting_level)<=0)
--    {
--        php_header(TSRMLS_C);
--    }
-+    //handle changes in PHP 5.4.x
-+    #if PHP_VERSION_ID < 50399
-+      if (OG(ob_nesting_level)<=0)
-+      {
-+          php_header(TSRMLS_C);
-+      }
-+    #else
-+      if (php_output_get_level(TSRMLS_C)<=0)
-+      {
-+          php_header(TSRMLS_C);
-+      }
-+    #endif
-    
- 
-     if (MS_RENDERER_PLUGIN(php_image->image->format))
-diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript.c mapserver-6.0.1/mapscript/php/php_mapscript.c
---- mapserver-6.0.1.orig/mapscript/php/php_mapscript.c	2011-04-05 23:05:02.000000000 -0400
-+++ mapserver-6.0.1/mapscript/php/php_mapscript.c	2015-02-04 14:27:52.296567202 -0500
-@@ -899,7 +899,7 @@
- 
- }
- 
--function_entry mapscript_functions[] = {
-+zend_function_entry mapscript_functions[] = {
-     PHP_FE(ms_GetVersion, NULL)
-     PHP_FE(ms_GetVersionInt,  NULL)
-     PHP_FE(ms_newLineObj, NULL)
-diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c mapserver-6.0.1/mapscript/php/php_mapscript_util.c
---- mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c	2011-04-04 13:50:20.000000000 -0400
-+++ mapserver-6.0.1/mapscript/php/php_mapscript_util.c	2015-02-04 14:27:27.477341249 -0500
-@@ -42,7 +42,12 @@
-     zobj->ce = ce;
-     ALLOC_HASHTABLE(zobj->properties);
-     zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
--    zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+    //handle changes in PHP 5.4.x
-+    #if PHP_VERSION_ID < 50399
-+      zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+    #else
-+      object_properties_init(zobj, ce);
-+    #endif
-     retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
-     retval.handlers = &mapscript_std_object_handlers;
-     return retval;
-@@ -59,7 +64,12 @@
-     zobj->ce = ce;
-     ALLOC_HASHTABLE(zobj->properties);
-     zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
--    zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+    //handle changes in PHP 5.4.x
-+    #if PHP_VERSION_ID < 50399
-+      zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+    #else
-+      object_properties_init(zobj, ce);
-+    #endif
-     retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
-     retval.handlers = object_handlers;
-     return retval;
diff --git a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 b/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1
deleted file mode 100644
index 845cad6e3bd1..000000000000
--- a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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 */
- 
- /*