9 files changed, 36 insertions, 58 deletions
diff --git a/gnustep-libs/gsweb/files/1.1.1_pre-build-fixes.patch b/gnustep-libs/gsweb/files/1.1.1_pre-build-fixes.patch
deleted file mode 100644
index 5f3adef3eab6..000000000000
--- a/gnustep-libs/gsweb/files/1.1.1_pre-build-fixes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- GSWAction.h.orig	2004-11-19 01:00:10.682762424 -0500
-+++ GSWAction.h	2004-11-19 01:00:14.788138312 -0500
-@@ -56,7 +56,6 @@
- /** Returns YES if self reponds to actionName **/
- -(BOOL)isActionNamed:(NSString*)actionName;
- 
---(id)existingSession;
- -(NSString*)sessionIDForRequest:(GSWRequest*)aRequest;
- -(void)_initializeRequestSessionIDInContext:(GSWContext*)aContext;
- 
diff --git a/gnustep-libs/gsweb/files/1.1.1_pre20041119-build-fixes.patch b/gnustep-libs/gsweb/files/1.1.1_pre20041119-build-fixes.patch
deleted file mode 100644
index 5f3adef3eab6..000000000000
--- a/gnustep-libs/gsweb/files/1.1.1_pre20041119-build-fixes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- GSWAction.h.orig	2004-11-19 01:00:10.682762424 -0500
-+++ GSWAction.h	2004-11-19 01:00:14.788138312 -0500
-@@ -56,7 +56,6 @@
- /** Returns YES if self reponds to actionName **/
- -(BOOL)isActionNamed:(NSString*)actionName;
- 
---(id)existingSession;
- -(NSString*)sessionIDForRequest:(GSWRequest*)aRequest;
- -(void)_initializeRequestSessionIDInContext:(GSWContext*)aContext;
- 
diff --git a/gnustep-libs/gsweb/files/1.1.1_pre20050312-build-fixes.patch b/gnustep-libs/gsweb/files/1.1.1_pre20050312-build-fixes.patch
new file mode 100644
index 000000000000..d8a2d5192e74
--- /dev/null
+++ b/gnustep-libs/gsweb/files/1.1.1_pre20050312-build-fixes.patch
@@ -0,0 +1,33 @@
+diff -ur gsweb/GSWAdaptors/Apache/GNUmakefile-Apache2x gsweb-test/GSWAdaptors/Apache/GNUmakefile-Apache2x
+--- gsweb/GSWAdaptors/Apache/GNUmakefile-Apache2x	2003-04-04 13:24:19.000000000 -0500
++++ gsweb-test/GSWAdaptors/Apache/GNUmakefile-Apache2x	2005-03-23 23:18:33.552474840 -0500
+@@ -39,7 +39,7 @@
+ 	ifeq ("FreeBSD",$(strip $(OSNAME)))
+ 		APXS = /usr/local/sbin/apxs
+ 	else
+-		APXS = /usr/apache/sbin/apxs
++		APXS = /usr/sbin/apxs2
+ 	endif
+ else
+ 	ifneq (,$(findstring no apxs,$(APXS)))
+@@ -65,9 +65,9 @@
+ LOADBALANCING = roundrobin
+ COMMON = $(SRCROOT)/common
+ 
+-INCLUDE = -I. -I$(COMMON) $(APACHEHEADERS) -I/usr/X11R6/include
++INCLUDE = -I. -I$(COMMON) $(APACHEHEADERS) -I/usr/X11R6/include $(shell apr-config --includes) $(shell apu-config --includes)
+ 
+-CFLAGS = $(APACHE_CFLAGS) -fpic $(RC_CFLAGS) $(INCLUDE) -D$(SERVERAPI) -DREENTRANT -DEAPI
++CFLAGS = $(APACHE_CFLAGS) -fpic $(RC_CFLAGS) $(INCLUDE) -D$(SERVERAPI) -DREENTRANT -DEAPI $(shell apr-config --cflags --cppflags)
+ 
+ include $(COMMON)/common.make
+ OFILES = $(COMMONOBJS) $(OBJROOT)/mod_gsweb.o
+@@ -78,7 +78,7 @@
+ RANLIB = ranlib
+ 
+ LDFLAGS = -rdynamic
+-LIBS = -ldl -lcrypt -lm -lPropList
++LIBS = -ldl -lcrypt -lm -lPropList $(apr-config --link-ld --libs) $(shell apu-config --link-ld --libs)
+ LDSHARED = $(LD) -shared  $(CFLAGS)
+ INSTALL = /usr/bin/install -c
+ INSTALL_PROGRAM = $(INSTALL)
diff --git a/gnustep-libs/gsweb/files/1/90_mod_gsweb.conf b/gnustep-libs/gsweb/files/1/90_mod_gsweb.conf
deleted file mode 100644
index ad89ceec4dbf..000000000000
--- a/gnustep-libs/gsweb/files/1/90_mod_gsweb.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<IfDefine GSWeb>
-
-	# Load the module first
-#	<IfModule !sapi_apache2.c>
-		LoadModule GSWeb_Module	extramodules/mod_gsweb.so
-		GSWeb_ConfigFilePath /etc/apache/conf/gsweb.conf
-#	</IfModule>
-
-	<Location /GSWeb*>
-		SetHandler GSWeb
-	</Location>
-
-</IfDefine>
-
diff --git a/gnustep-libs/gsweb/files/2/90_mod_gsweb.conf b/gnustep-libs/gsweb/files/2/42_mod_gsweb.conf
index 67e0520cca42..5d95a639ea3d 100644
--- a/gnustep-libs/gsweb/files/2/90_mod_gsweb.conf
+++ b/gnustep-libs/gsweb/files/2/42_mod_gsweb.conf
@@ -2,8 +2,9 @@
 
 	# Load the module first
 	<IfModule !sapi_apache2.c>
-		LoadModule GSWeb_Module	extramodules/mod_gsweb.so
-		GSWeb_ConfigFilePath /etc/apache2/conf/gsweb.conf
+		LoadModule GSWeb_Module	modules/mod_gsweb.so
+		GSWeb_ConfigFilePath /etc/gsweb/gsweb.conf
+		GSWeb_Alias /GSWeb
 	</IfModule>
 
 	<Location /GSWeb*>
diff --git a/gnustep-libs/gsweb/files/apache1-make.patch b/gnustep-libs/gsweb/files/apache1-make.patch
deleted file mode 100644
index 6d47707594f8..000000000000
--- a/gnustep-libs/gsweb/files/apache1-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GNUmakefile-Apache1x.orig	2004-11-20 13:02:56.907271024 -0500
-+++ GNUmakefile-Apache1x	2004-11-20 13:04:01.134507000 -0500
-@@ -34,7 +34,7 @@
- 	ifeq ("FreeBSD",$(strip $(OSNAME)))
- 		APXS = /usr/local/sbin/apxs
- 	else
--		APXS = /usr/apache/sbin/apxs
-+		APXS = /usr/sbin/apxs
- 	endif
- else
- 	ifneq (,$(findstring no apxs,$(APXS)))
diff --git a/gnustep-libs/gsweb/files/apache2-make.patch b/gnustep-libs/gsweb/files/apache2-make.patch
deleted file mode 100644
index 407608df6640..000000000000
--- a/gnustep-libs/gsweb/files/apache2-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GNUmakefile-Apache2x.orig	2004-11-19 01:21:16.000000000 -0500
-+++ GNUmakefile-Apache2x	2004-11-19 01:22:19.000000000 -0500
-@@ -39,7 +39,7 @@
- 	ifeq ("FreeBSD",$(strip $(OSNAME)))
- 		APXS = /usr/local/sbin/apxs
- 	else
--		APXS = /usr/apache/sbin/apxs
-+		APXS = /usr/sbin/apxs2
- 	endif
- else
- 	ifneq (,$(findstring no apxs,$(APXS)))
diff --git a/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050106 b/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050106
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050106
+++ /dev/null
diff --git a/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20041203 b/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20041203
+++ b/gnustep-libs/gsweb/files/digest-gsweb-1.1.1_pre20050312