Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Aug 2001 21:08:48 -0700 (PDT)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/29449: Update port: x11-wm/spager to 0.15
Message-ID:  <200108040408.f7448mQ56148@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         29449
>Category:       ports
>Synopsis:       Update port: x11-wm/spager to 0.15
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 03 21:10:06 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.15

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11-wm/spager/Makefile x11-wm/spager/Makefile
--- /usr/ports/x11-wm/spager/Makefile	Sun Apr  1 20:49:22 2001
+++ x11-wm/spager/Makefile	Sat Aug  4 02:07:23 2001
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	spager
-PORTVERSION=	0.14
-PORTREVISION=	1
+PORTVERSION=	0.15
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.stanford.edu/~satyakid/
 
@@ -21,19 +20,19 @@
 ALL_TARGET=	spager
 
 post-extract:
-	${RM} -f ${WRKSRC}/spager
+	@${RM} -f ${WRKSRC}/spager
 
 post-patch:
-	${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.rc
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.rc
 
 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
+	${INSTALL_PROGRAM} ${WRKSRC}/spager ${PREFIX}/bin
+	@${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 -urN /usr/ports/x11-wm/spager/distinfo x11-wm/spager/distinfo
--- /usr/ports/x11-wm/spager/distinfo	Sun Apr  1 20:28:27 2001
+++ x11-wm/spager/distinfo	Sat Aug  4 02:05:33 2001
@@ -1 +1 @@
-MD5 (spager-0.14.tar.gz) = 797a28dd4703c528301a5f4d43241fb1
+MD5 (spager-0.15.tar.gz) = 50a89747d092cad151d423aed1fde87c
diff -urN /usr/ports/x11-wm/spager/files/patch-aa x11-wm/spager/files/patch-aa
--- /usr/ports/x11-wm/spager/files/patch-aa	Sun Apr  1 20:49:24 2001
+++ x11-wm/spager/files/patch-aa	Sat Aug  4 02:16:33 2001
@@ -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 $^ 

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108040408.f7448mQ56148>