diff options
| -rw-r--r-- | astro/wmglobe/Makefile | 9 | ||||
| -rw-r--r-- | astro/wmglobe/files/patch-aa | 15 |
2 files changed, 10 insertions, 14 deletions
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile index e01f9f4e0891..fb6806ea353a 100644 --- a/astro/wmglobe/Makefile +++ b/astro/wmglobe/Makefile @@ -8,21 +8,14 @@ DISTNAME= wmglobe-1.0 CATEGORIES= astro windowmaker -MASTER_SITES= http://perso.linuxfr.org/jdumont/wmg/ \ - http://www.cana.net/~acme/wmglobe/ \ - http://www.psn.net/~andrews/wmglobe/ +MASTER_SITES= http://perso.linuxfr.org/jdumont/wmg/ MAINTAINER= andrews@technologist.com LIB_DEPENDS= wraster.3:${PORTSDIR}/x11-wm/windowmaker USE_X_PREFIX= yes -USE_GMAKE= yes MAN1= wmglobe.1 -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmglobe ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/wmglobe.1 ${PREFIX}/man/man1 - .include <bsd.port.mk> diff --git a/astro/wmglobe/files/patch-aa b/astro/wmglobe/files/patch-aa index e280996a8645..3b917fbb5b9e 100644 --- a/astro/wmglobe/files/patch-aa +++ b/astro/wmglobe/files/patch-aa @@ -1,28 +1,31 @@ --- Makefile.orig Wed Feb 3 05:11:37 1999 -+++ Makefile Mon Feb 21 20:49:54 2000 ++++ Makefile Tue Feb 22 22:22:20 2000 @@ -1,12 +1,11 @@ -INC = -I/usr/X11R6/include -LIBS = -lXext -lX11 -lm -L/usr/X11R6/lib \ - -ltiff -lXpm -lpng -lz -ljpeg -lungif -lwraster +INC = `get-wraster-flags --cflags` -+LIBS = `get-wraster-flags --libs` `get-wraster-flags --ldflags` ++LIBS = `get-wraster-flags --ldflags` `get-wraster-flags --libs` OBJS = src/wmglobe.o src/rend.o src/wmgutil.o \ src/sunpos.o src/myconvert.o src/mycontext.o .c.o : - gcc -c -O2 -Wall $(INC) $< -o $*.o -+ ${CC} -c ${CFLAGS} -Wall $(INC) $< -o $*.o ++ ${CC} -c ${CFLAGS} $(INC) $< -o $@ all: wmglobe -@@ -14,8 +13,7 @@ +@@ -14,9 +13,8 @@ rm -f src/*.o wmglobe wmglobe : $(OBJS) - gcc -O2 -Wall $(OBJS) -o wmglobe $(LIBS) - strip wmglobe -+ ${CC} ${CFLAGS} -Wall $(OBJS) -o wmglobe $(LIBS) ++ ${CC} ${CFLAGS} $(OBJS) -o wmglobe $(LIBS) install : - install wmglobe /usr/local/bin +- install wmglobe /usr/local/bin +- install wmglobe.1 /usr/local/man/man1 ++ ${BSD_INSTALL_PROGRAM} wmglobe ${PREFIX}/bin ++ ${BSD_INSTALL_MAN} wmglobe.1 ${PREFIX}/man/man1 |