summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorYukihiro Nakai <nakai@FreeBSD.org>2001-08-05 20:50:36 +0000
committerYukihiro Nakai <nakai@FreeBSD.org>2001-08-05 20:50:36 +0000
commit2e02d4439dfe42ad57fb7b469e257f18a7772ea6 (patch)
tree8cee754874a35ea02f2c08acec08bc56dacf6f8f /x11-wm
parentDelete outdated link (diff)
Update to 0.15
PR: ports/29449 Submitted by: KATO Tsuguru <tkato@prontomail.com>
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/spager/Makefile17
-rw-r--r--x11-wm/spager/distinfo2
-rw-r--r--x11-wm/spager/files/patch-aa27
3 files changed, 25 insertions, 21 deletions
diff --git a/x11-wm/spager/Makefile b/x11-wm/spager/Makefile
index b22f8fc9d9e8..4de68b520359 100644
--- a/x11-wm/spager/Makefile
+++ b/x11-wm/spager/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= spager
-PORTVERSION= 0.14
-PORTREVISION= 1
+PORTVERSION= 0.15
CATEGORIES= x11-wm
MASTER_SITES= http://www.stanford.edu/~satyakid/
@@ -28,12 +27,12 @@ post-patch:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/spager ${PREFIX}/bin/
- ${MKDIR} ${PREFIX}/share/spager
- ${INSTALL_SCRIPT} ${WRKSRC}/spager.jl ${PREFIX}/share/spager
- ${MKDIR} ${PREFIX}/share/spager/merlin
- ${INSTALL_SCRIPT} ${WRKSRC}/merlin/message.jl ${PREFIX}/share/spager/merlin
- ${INSTALL_SCRIPT} ${WRKSRC}/merlin/util.jl ${PREFIX}/share/spager/merlin
- ${INSTALL_DATA} ${WRKSRC}/sample.rc ${PREFIX}/share/spager
- @${CAT} ${PKGMESSAGE}
+ ${MKDIR} ${DATADIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/spager.jl ${DATADIR}
+ ${MKDIR} ${DATADIR}/merlin
+ ${INSTALL_SCRIPT} ${WRKSRC}/merlin/message.jl ${DATADIR}/merlin
+ ${INSTALL_SCRIPT} ${WRKSRC}/merlin/util.jl ${DATADIR}/merlin
+ ${INSTALL_DATA} ${WRKSRC}/sample.rc ${DATADIR}
+ ${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/x11-wm/spager/distinfo b/x11-wm/spager/distinfo
index 2ed569272b42..90838e7537f4 100644
--- a/x11-wm/spager/distinfo
+++ b/x11-wm/spager/distinfo
@@ -1 +1 @@
-MD5 (spager-0.14.tar.gz) = 797a28dd4703c528301a5f4d43241fb1
+MD5 (spager-0.15.tar.gz) = 50a89747d092cad151d423aed1fde87c
diff --git a/x11-wm/spager/files/patch-aa b/x11-wm/spager/files/patch-aa
index ca0ebcef1ebf..3b5f598ce9d1 100644
--- a/x11-wm/spager/files/patch-aa
+++ b/x11-wm/spager/files/patch-aa
@@ -1,25 +1,30 @@
---- Makefile.orig Sat Feb 24 08:46:51 2001
-+++ Makefile Sun Apr 1 20:51:21 2001
-@@ -21,18 +21,18 @@
+--- Makefile.orig Thu May 24 01:32:54 2001
++++ Makefile Sat Aug 4 02:14:03 2001
+@@ -22,10 +22,10 @@
- # SAWFISH_CLIENT_LIB should point to client.a distributed with sawfish
--SAWFISH_CLIENT_LIB = /usr/lib/rep/i386-redhat-linux/sawfish/client.a
+ SAWFISH_CLIENT_LIB_DIR = `rep-config --execdir`/sawfish
-CC = gcc
-+SAWFISH_CLIENT_LIB =
-+CC ?= gcc
- CFLAGS =
++#CC = gcc
+-CFLAGS = -DUSE_SAWFISH_LIBCLIENT
+-LDFLAGS = -Wl,-rpath $(SAWFISH_CLIENT_LIB_DIR) $(SAWFISH_CLIENT_LIB_DIR)/client.so
++#CFLAGS = -DUSE_SAWFISH_LIBCLIENT
++#LDFLAGS = -Wl,-rpath $(SAWFISH_CLIENT_LIB_DIR) $(SAWFISH_CLIENT_LIB_DIR)/client.so
+ # To not use libclient directly comment out the two above lines and
+ #instead use the following lines:
+ # CFLAGS =
+@@ -34,11 +34,11 @@
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
+- $(CC) -O6 -Wall spager.o $(LDFLAGS) `gtk-config --libs` -o spager
++ $(CC) -Wall spager.o $(LDFLAGS) `${GTK_CONFIG} --libs` -o spager
strip spager
spager.o: spager.c
- $(CC) -c -O6 -Wall $(CFLAGS) `gtk-config --cflags` spager.c
-+ $(CC) -c -O6 -Wall $(CFLAGS) `gtk12-config --cflags` spager.c
++ $(CC) -c -Wall $(CFLAGS) `${GTK_CONFIG} --cflags` spager.c
spager.jlc: spager.jl
sawfish --batch --no-rc compiler -f compile-batch $^