From owner-freebsd-ports  Mon Feb 21  6: 0: 8 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 7CB0F37BD57
	for <freebsd-ports@FreeBSD.org>; Mon, 21 Feb 2000 06:00:03 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id GAA19086;
	Mon, 21 Feb 2000 06:00:03 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 3692037BA8C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 21 Feb 2000 05:55:31 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id FAA18765;
	Mon, 21 Feb 2000 05:55:30 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Message-Id: <200002211355.FAA18765@freefall.freebsd.org>
Date: Mon, 21 Feb 2000 05:55:30 -0800 (PST)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/16866: Update port: astro/wmglobe
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         16866
>Category:       ports
>Synopsis:       Update port: astro/wmglobe
>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:   Mon Feb 21 06:00:02 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Support get-wraster-flags
- Remove redundant LIB_DEPENDS

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/astro/wmglobe/Makefile astro/wmglobe/Makefile
--- /usr/ports/astro/wmglobe/Makefile	Thu Feb 17 20:12:16 2000
+++ astro/wmglobe/Makefile	Mon Feb 21 20:51:33 2000
@@ -14,12 +14,7 @@
 
 MAINTAINER=	andrews@technologist.com
 
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		ungif.5:${PORTSDIR}/graphics/libungif \
-		wraster.3:${PORTSDIR}/x11-wm/windowmaker
+LIB_DEPENDS=	wraster.3:${PORTSDIR}/x11-wm/windowmaker
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -27,7 +22,7 @@
 MAN1=		wmglobe.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmglobe ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/wmglobe ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/wmglobe.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff -urN /usr/ports/astro/wmglobe/patches/patch-aa astro/wmglobe/patches/patch-aa
--- /usr/ports/astro/wmglobe/patches/patch-aa	Thu Feb 17 20:12:17 2000
+++ astro/wmglobe/patches/patch-aa	Mon Feb 21 20:51:14 2000
@@ -1,12 +1,11 @@
---- Makefile.orig	Tue Feb  2 12:11:37 1999
-+++ Makefile	Sat Jun 26 01:23:37 1999
-@@ -1,12 +1,12 @@
+--- Makefile.orig	Wed Feb  3 05:11:37 1999
++++ Makefile	Mon Feb 21 20:49:54 2000
+@@ -1,12 +1,11 @@
 -INC	=	-I/usr/X11R6/include
 -LIBS	=	-lXext -lX11 -lm -L/usr/X11R6/lib \
 -		-ltiff  -lXpm -lpng -lz -ljpeg -lungif -lwraster
-+INC	=	-I${X11BASE}/include
-+LIBS	=	-lXext -lX11 -lm -L${X11BASE}/lib -L${LOCALBASE}/lib \
-+		-ltiff  -lXpm -lpng -lz -ljpeg -lungif -lwraster
++INC	=	`get-wraster-flags --cflags`
++LIBS	=	`get-wraster-flags --libs`
  OBJS	=	src/wmglobe.o src/rend.o src/wmgutil.o \
  		src/sunpos.o src/myconvert.o src/mycontext.o 
  
@@ -17,12 +16,13 @@
  
  all:  wmglobe
  
-@@ -14,7 +14,7 @@
+@@ -14,8 +13,7 @@
  	rm -f src/*.o wmglobe
  	
  wmglobe :	$(OBJS)
 -		gcc -O2 -Wall $(OBJS) -o wmglobe $(LIBS)
+-		strip wmglobe 
 +		${CC} ${CFLAGS} -Wall $(OBJS) -o wmglobe $(LIBS)
- 		strip wmglobe 
  
  install :	
+ 		install wmglobe /usr/local/bin


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


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