aboutsummaryrefslogtreecommitdiffstats
path: root/astro/wmsun
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2005-04-19 16:46:49 +0800
committervs <vs@FreeBSD.org>2005-04-19 16:46:49 +0800
commit6029333daeae37dcd1b4520492980e51104a57be (patch)
tree28d101b53d96f0340c192d7970fc38d6273f0aef /astro/wmsun
parent8217d5ccd6ee79aee092a4bdfdadcff2a48c32d1 (diff)
downloadfreebsd-ports-gnome-6029333daeae37dcd1b4520492980e51104a57be.tar.gz
freebsd-ports-gnome-6029333daeae37dcd1b4520492980e51104a57be.tar.zst
freebsd-ports-gnome-6029333daeae37dcd1b4520492980e51104a57be.zip
Avoid excessive Makefile-patching
Diffstat (limited to 'astro/wmsun')
-rw-r--r--astro/wmsun/Makefile8
-rw-r--r--astro/wmsun/files/patch-aa23
2 files changed, 7 insertions, 24 deletions
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
-