From owner-freebsd-ports  Fri Aug  4 16:40:13 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 0EFAD37B96E
	for <freebsd-ports@FreeBSD.org>; Fri,  4 Aug 2000 16:40:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id QAA42815;
	Fri, 4 Aug 2000 16:40:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A46DF37B91D; Fri,  4 Aug 2000 16:37:11 -0700 (PDT)
Message-Id: <20000804233711.A46DF37B91D@hub.freebsd.org>
Date: Fri,  4 Aug 2000 16:37:11 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/20412: Update port: astro/wmsun
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20412
>Category:       ports
>Synopsis:       Update port: astro/wmsun
>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 04 16:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support X11BASE properly
- Remove USE_GMAKE

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/astro/wmsun/Makefile astro/wmsun/Makefile
--- /usr/ports/astro/wmsun/Makefile	Thu Aug  3 21:05:01 2000
+++ astro/wmsun/Makefile	Fri Aug  4 02:38:56 2000
@@ -14,15 +14,10 @@
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmSun
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 ALL_TARGET=	clean all
 
 MAN1=	wmSun.1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmSun ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wmSun.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff -urN /usr/ports/astro/wmsun/patches/patch-aa astro/wmsun/patches/patch-aa
--- /usr/ports/astro/wmsun/patches/patch-aa	Fri Apr 30 13:55:56 1999
+++ astro/wmsun/patches/patch-aa	Thu Aug  3 21:30:15 2000
@@ -1,13 +1,42 @@
---- Makefile.orig	Fri Apr 16 15:27:34 1999
-+++ Makefile	Fri Apr 16 15:27:56 1999
-@@ -1,6 +1,7 @@
+--- Makefile.orig	Wed Jan  6 11:28:39 1999
++++ Makefile	Thu Aug  3 21:28:34 2000
+@@ -1,8 +1,8 @@
 -CC     = gcc
 -CFLAGS = -O2 -Wall
 -INCDIR = -I/usr/X11R6/include/X11
+-DESTDIR= /usr/X11R6
+-LIBDIR = -L/usr/X11R6/lib
 +CC     ?= gcc
 +CFLAGS ?= -O2
-+CFLAGS += -Wall
-+INCDIR = -I/usr/X11R6/include
- DESTDIR= /usr/X11R6
- LIBDIR = -L/usr/X11R6/lib
++INCDIR = -I${X11BASE}/include
++DESTDIR= ${PREFIX}
++LIBDIR = -L${X11BASE}/lib
+ 
+ 
+ 
+@@ -22,14 +22,14 @@
+ 
+ 
+ .c.o:
+-	$(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
++	$(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)
+ 
+ 
+ all:	wmSun.o wmSun
+ 
+ wmSun.o: wmSun_master.xpm wmSun_mask.xbm 
+ wmSun:	$(OBJS) 
+-	$(CC) $(COPTS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) $(SYSTEM) -lm -o wmSun $(OBJS) $(LIBDIR) $(LIBS)
+ 
+ clean:
+ 	for i in $(OBJS) ; do \
+@@ -38,6 +38,6 @@
+ 	rm -f wmSun
+ 
+ install:: wmSun
+-	install -s -m 0755 wmSun $(DESTDIR)/bin
+-	install    -m 0644 wmSun.1 $(DESTDIR)/man/man1 
++	${BSD_INSTALL_PROGRAM} wmSun $(DESTDIR)/bin
++	${BSD_INSTALL_MAN} wmSun.1 $(DESTDIR)/man/man1 
  


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


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