diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2005-04-19 08:46:49 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2005-04-19 08:46:49 +0000 |
| commit | 8f38219171d61128865db2e643ebaf068e96a80b (patch) | |
| tree | 92c3c34e14a889517f3af9a28ee4307f5aac43d2 /astro/wmsun | |
| parent | 8d822ec341c7d3eaa6c0400e446f16ca4bb43ee4 (diff) | |
| download | ports-8f38219171d61128865db2e643ebaf068e96a80b.tar.gz ports-8f38219171d61128865db2e643ebaf068e96a80b.zip | |
Avoid excessive Makefile-patching
Notes
Notes:
svn path=/head/; revision=133644
Diffstat (limited to 'astro/wmsun')
| -rw-r--r-- | astro/wmsun/Makefile | 8 | ||||
| -rw-r--r-- | astro/wmsun/files/patch-aa | 23 |
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 - |