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 DD7DE37B87B
	for <freebsd-ports@FreeBSD.org>; Fri,  4 Aug 2000 16:40:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id QAA42806;
	Fri, 4 Aug 2000 16:40:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8184537B859; Fri,  4 Aug 2000 16:36:26 -0700 (PDT)
Message-Id: <20000804233626.8184537B859@hub.freebsd.org>
Date: Fri,  4 Aug 2000 16:36:26 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/20411: Update port: astro/wmspaceweather
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20411
>Category:       ports
>Synopsis:       Update port: astro/wmspaceweather
>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/wmspaceweather/Makefile astro/wmspaceweather/Makefile
--- /usr/ports/astro/wmspaceweather/Makefile	Thu Aug  3 21:05:00 2000
+++ astro/wmspaceweather/Makefile	Thu Aug  3 21:29:56 2000
@@ -8,22 +8,16 @@
 PORTVERSION=	1.04
 CATEGORIES=	astro windowmaker
 MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
-DISTNAME=	wmSpaceWeather-1.04
+DISTNAME=	wmSpaceWeather-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmSpaceWeather
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 ALL_TARGET=	clean all
 
 MAN1=	wmSpaceWeather.1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmSpaceWeather ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/GetKp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wmSpaceWeather.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff -urN /usr/ports/astro/wmspaceweather/patches/patch-aa astro/wmspaceweather/patches/patch-aa
--- /usr/ports/astro/wmspaceweather/patches/patch-aa	Fri Apr 30 13:54:58 1999
+++ astro/wmspaceweather/patches/patch-aa	Thu Aug  3 21:29:47 2000
@@ -1,13 +1,44 @@
---- Makefile.orig	Fri Apr 16 15:05:58 1999
-+++ Makefile	Fri Apr 16 15:06:23 1999
-@@ -1,6 +1,7 @@
+--- Makefile.orig	Tue Jan  5 06:20:45 1999
++++ Makefile	Thu Aug  3 21:29:28 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
  # for linux
+ LIBS   = -lXpm -lX11 -lXext
+ # for Solaris
+@@ -12,14 +12,14 @@
+ 
+ 
+ .c.o:
+-	$(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
++	$(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)
+ 
+ 
+ all:	wmSpaceWeather.o wmSpaceWeather
+ 
+ wmSpaceWeather.o: wmSpaceWeather_master.xpm wmSpaceWeather_mask.xbm
+ wmSpaceWeather:	$(OBJS) 
+-	$(CC) $(COPTS) $(SYSTEM) -o wmSpaceWeather $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) $(SYSTEM) -o wmSpaceWeather $(OBJS) $(LIBDIR) $(LIBS)
+ 
+ clean:
+ 	for i in $(OBJS) ; do \
+@@ -28,7 +28,7 @@
+ 	rm -f wmSpaceWeather
+ 
+ install:: wmSpaceWeather
+-	install -s -m 0755 wmSpaceWeather $(DESTDIR)/bin
+-	install    -m 0755 GetKp $(DESTDIR)/bin
+-	install    -m 0644 wmSpaceWeather.1 $(DESTDIR)/man/man1 
++	${BSD_INSTALL_PROGRAM} wmSpaceWeather $(DESTDIR)/bin
++	${BSD_INSTALL_SCRIPT} GetKp $(DESTDIR)/bin
++	${BSD_INSTALL_MAN} wmSpaceWeather.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