diff options
| author | cpiazza <cpiazza@FreeBSD.org> | 2000-08-10 00:46:48 +0800 |
|---|---|---|
| committer | cpiazza <cpiazza@FreeBSD.org> | 2000-08-10 00:46:48 +0800 |
| commit | 328304a35ebb2ddf24e81493ef42d05565900b30 (patch) | |
| tree | abd38b254a79e6ddd5068db1ab6e6d2abde3f33f /astro | |
| parent | 9e4ac28e3edca0b6123918e09a5b9e232788090c (diff) | |
| download | freebsd-ports-gnome-328304a35ebb2ddf24e81493ef42d05565900b30.tar.gz freebsd-ports-gnome-328304a35ebb2ddf24e81493ef42d05565900b30.tar.zst freebsd-ports-gnome-328304a35ebb2ddf24e81493ef42d05565900b30.zip | |
Support X11BASE properly
remove USE_GMAKE
PR: 20412
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/wmsun/Makefile | 5 | ||||
| -rw-r--r-- | astro/wmsun/files/patch-aa | 43 |
2 files changed, 36 insertions, 12 deletions
diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile index d43a364e6cd7..32f1cc600469 100644 --- a/astro/wmsun/Makefile +++ b/astro/wmsun/Makefile @@ -14,15 +14,10 @@ MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/${DISTNAME}/wmSun -USE_GMAKE= yes USE_X_PREFIX= yes USE_XPM= yes ALL_TARGET= clean all MAN1= wmSun.1 -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmSun ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/wmSun.1 ${PREFIX}/man/man1 - .include <bsd.port.mk> diff --git a/astro/wmsun/files/patch-aa b/astro/wmsun/files/patch-aa index c793620fd68f..3969d920e8f1 100644 --- a/astro/wmsun/files/patch-aa +++ b/astro/wmsun/files/patch-aa @@ -1,13 +1,42 @@ ---- Makefile.orig Fri Apr 16 15:27:34 1999 -+++ Makefile Fri Apr 16 15:27:56 1999 -@@ -1,6 +1,7 @@ +--- 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 -+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 + + + +@@ -22,14 +22,14 @@ + + + .c.o: +- $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) ++ $(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR) + + + all: wmSun.o wmSun + + wmSun.o: wmSun_master.xpm wmSun_mask.xbm + wmSun: $(OBJS) +- $(CC) $(COPTS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS) ++ $(CC) $(CFLAGS) $(SYSTEM) -lm -o wmSun $(OBJS) $(LIBDIR) $(LIBS) + + 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 |