5 files changed, 39 insertions, 17 deletions

diff --git a/x11-wm/spager/Makefile b/x11-wm/spager/Makefile
index 64cd61db261e..703e9bec19e9 100644
--- a/x11-wm/spager/Makefile
+++ b/x11-wm/spager/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spager
-PORTVERSION=	0.12
+PORTVERSION=	0.14
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.stanford.edu/~satyakid/
 
@@ -24,6 +24,8 @@ post-extract:
 
 post-patch:
 	${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.rc
+	${PERL} -pi -e "s|%%GNUHOST%%|${CONFIGURE_TARGET}|g" \
+		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spager ${PREFIX}/bin/
diff --git a/x11-wm/spager/distinfo b/x11-wm/spager/distinfo
index 83176fd29d66..2ed569272b42 100644
--- a/x11-wm/spager/distinfo
+++ b/x11-wm/spager/distinfo
@@ -1 +1 @@
-MD5 (spager-0.12.tar.gz) = 4704ee267e776d3a8974027ab1eb4c73
+MD5 (spager-0.14.tar.gz) = 797a28dd4703c528301a5f4d43241fb1
diff --git a/x11-wm/spager/files/patch-aa b/x11-wm/spager/files/patch-aa
index a7f7840fb5f8..acc2f2f88035 100644
--- a/x11-wm/spager/files/patch-aa
+++ b/x11-wm/spager/files/patch-aa
@@ -1,15 +1,25 @@
---- Makefile.orig	Mon May 22 04:36:02 2000
-+++ Makefile	Sat Jul  1 17:39:37 2000
-@@ -18,10 +18,10 @@
- # along with spager; see the file COPYING.  If not, write to
- # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+--- Makefile.orig	Sat Feb 24 08:46:51 2001
++++ Makefile	Sun Apr  1 19:57:57 2001
+@@ -21,18 +21,18 @@
  
+ # SAWFISH_CLIENT_LIB should point to client.a distributed with sawfish
+ 
+-SAWFISH_CLIENT_LIB = /usr/lib/rep/i386-redhat-linux/sawfish/client.a
 -CC = gcc
++SAWFISH_CLIENT_LIB = /usr/X11R6/libexec/rep/%%GNUHOST%%/sawfish/client.so
 +CC ?= gcc
+ CFLAGS = 
+ 
+ all: spager spager.jlc merlin/message.jlc merlin/util.jlc
+ 
+ spager: spager.o
+-	$(CC) -O6 -Wall spager.o $(SAWFISH_CLIENT_LIB) `gtk-config --libs` -o spager
++	$(CC) -O6 -Wall spager.o $(SAWFISH_CLIENT_LIB) `gtk12-config --libs` -o spager
+ 	strip spager
  
- spager: spager.c 
--	$(CC) -O6 -Wall `gtk-config --cflags`  spager.c -o spager `gtk-config --libs`
-+	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags`  spager.c -o spager `$(GTK_CONFIG) --libs`
+ spager.o: spager.c
+-	$(CC) -c -O6 -Wall $(CFLAGS) `gtk-config --cflags` spager.c
++	$(CC) -c -O6 -Wall $(CFLAGS) `gtk12-config --cflags` spager.c
  
- clean: 
- 	rm -f *.o spager
+ spager.jlc: spager.jl
+ 	sawfish --batch --no-rc compiler -f compile-batch $^ 
diff --git a/x11-wm/spager/files/patch-ab b/x11-wm/spager/files/patch-ab
index 1b8942d74ae0..20ba59536d31 100644
--- a/x11-wm/spager/files/patch-ab
+++ b/x11-wm/spager/files/patch-ab
@@ -1,10 +1,10 @@
---- sample.rc.orig	Mon Jun  5 12:52:12 2000
-+++ sample.rc	Mon Jun  5 13:06:32 2000
+--- sample.rc.orig	Sat Feb 24 08:46:51 2001
++++ sample.rc	Sun Apr  1 19:53:03 2001
 @@ -4,11 +4,12 @@
  ;;;
  
  ;; This is the directory where the archive is untarred.
--(setq spager-directory "/home/satyaki/spager")
+-(setq spager-directory "/sprout/sprout3/satyaki/spager")
 +(setq spager-directory "%%PREFIX%%/share/spager")
 +(setq spager-bin-directory "%%PREFIX%%/bin")
  
@@ -13,5 +13,5 @@
 -(setq spager-executable (format nil "%s/spager" spager-directory))
 +(setq spager-executable (format nil "%s/spager" spager-bin-directory))
  
- (load "spager.jl")
- (spager-start)
+ (defun spager-reload-lisp nil
+ ;; If we are re-loading, we need to remove the hooks before the
diff --git a/x11-wm/spager/files/patch-ac b/x11-wm/spager/files/patch-ac
new file mode 100644
index 000000000000..4fd7175b4501
--- /dev/null
+++ b/x11-wm/spager/files/patch-ac
@@ -0,0 +1,10 @@
+--- spager.c.orig	Sun Apr  1 20:13:09 2001
++++ spager.c	Sun Apr  1 20:13:13 2001
+@@ -20,7 +20,6 @@
+  *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>