From e6119b936bd4f045bed538ccb940c3ec0ce08932 Mon Sep 17 00:00:00 2001
From: Chris Piazza <cpiazza@FreeBSD.org>
Date: Wed, 9 Aug 2000 16:45:28 +0000
Subject: Support X11BASE properly remove USE_GMAKE

PR:		20411
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
---
 astro/wmspaceweather/Makefile       |  8 +------
 astro/wmspaceweather/files/patch-aa | 45 +++++++++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 14 deletions(-)

(limited to 'astro')

diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index 83ad323452bd..c763c193aa8c 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -8,22 +8,16 @@ PORTNAME=	wmspaceweather
 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 --git a/astro/wmspaceweather/files/patch-aa b/astro/wmspaceweather/files/patch-aa
index 6416f6a3176d..6074c5940ce6 100644
--- a/astro/wmspaceweather/files/patch-aa
+++ b/astro/wmspaceweather/files/patch-aa
@@ -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 
+ 
-- 
cgit v1.2.3