From 8f38219171d61128865db2e643ebaf068e96a80b Mon Sep 17 00:00:00 2001
From: Volker Stolz <vs@FreeBSD.org>
Date: Tue, 19 Apr 2005 08:46:49 +0000
Subject: Avoid excessive Makefile-patching

---
 astro/wmsun/Makefile       |  8 +++++++-
 astro/wmsun/files/patch-aa | 23 -----------------------
 2 files changed, 7 insertions(+), 24 deletions(-)

(limited to 'astro/wmsun')

diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile
index 522a9173fa8e..90544a6cddd5 100644
--- a/astro/wmsun/Makefile
+++ b/astro/wmsun/Makefile
@@ -18,8 +18,14 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/wmSun
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 ALL_TARGET=	clean all
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
+		INCDIR="-I${X11BASE}/include" LIBDIR="-L${X11BASE}/lib"
 
-MAN1=	wmSun.1
+MAN1=		wmSun.1
 PLIST_FILES=	bin/wmSun
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wmSun ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/wmSun.1 ${MAN1PREFIX}/man/man1
+
 .include <bsd.port.mk>
diff --git a/astro/wmsun/files/patch-aa b/astro/wmsun/files/patch-aa
index 3969d920e8f1..3814e6d078a8 100644
--- a/astro/wmsun/files/patch-aa
+++ b/astro/wmsun/files/patch-aa
@@ -1,19 +1,5 @@
 --- 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
-+INCDIR = -I${X11BASE}/include
-+DESTDIR= ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
- 
- 
- 
 @@ -22,14 +22,14 @@
  
  
@@ -31,12 +17,3 @@
  
  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 
- 
-- 
cgit v1.2.3