aboutsummaryrefslogtreecommitdiff
path: root/astro
diff options
context:
space:
mode:
authorChris D. Faulhaber <jedgar@FreeBSD.org>2000-02-23 00:14:07 +0000
committerChris D. Faulhaber <jedgar@FreeBSD.org>2000-02-23 00:14:07 +0000
commit3071213070b8e1dd09baf883ca3f2eb5254d5319 (patch)
treea5312d3c8504b7d0f718108126cd6648a679b861 /astro
parentdb5e2eb3b0fda45482630ea6bc9812f34e2ca7d3 (diff)
downloadports-3071213070b8e1dd09baf883ca3f2eb5254d5319.tar.gz
ports-3071213070b8e1dd09baf883ca3f2eb5254d5319.zip
Notes
Diffstat (limited to 'astro')
-rw-r--r--astro/wmglobe/Makefile9
-rw-r--r--astro/wmglobe/files/patch-aa16
2 files changed, 10 insertions, 15 deletions
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile
index 7696d6456e8b..e01f9f4e0891 100644
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@@ -14,12 +14,7 @@ MASTER_SITES= http://perso.linuxfr.org/jdumont/wmg/ \
MAINTAINER= andrews@technologist.com
-LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff \
- ungif.5:${PORTSDIR}/graphics/libungif \
- wraster.3:${PORTSDIR}/x11-wm/windowmaker
+LIB_DEPENDS= wraster.3:${PORTSDIR}/x11-wm/windowmaker
USE_X_PREFIX= yes
USE_GMAKE= yes
@@ -27,7 +22,7 @@ USE_GMAKE= yes
MAN1= wmglobe.1
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/wmglobe ${PREFIX}/bin/
+ ${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 055020c6d1a5..7f7e8ceaab42 100644
--- a/astro/wmglobe/files/patch-aa
+++ b/astro/wmglobe/files/patch-aa
@@ -1,12 +1,11 @@
---- Makefile.orig Tue Feb 2 12:11:37 1999
-+++ Makefile Sat Jun 26 01:23:37 1999
-@@ -1,12 +1,12 @@
+--- Makefile.orig Wed Feb 3 05:11:37 1999
++++ Makefile Mon Feb 21 20:49:54 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 = -I${X11BASE}/include
-+LIBS = -lXext -lX11 -lm -L${X11BASE}/lib -L${LOCALBASE}/lib \
-+ -ltiff -lXpm -lpng -lz -ljpeg -lungif -lwraster
++INC = `get-wraster-flags --cflags`
++LIBS = `get-wraster-flags --libs` -L${PREFIX}/lib -L${LOCALBASE}/lib
OBJS = src/wmglobe.o src/rend.o src/wmgutil.o \
src/sunpos.o src/myconvert.o src/mycontext.o
@@ -17,12 +16,13 @@
all: wmglobe
-@@ -14,7 +14,7 @@
+@@ -14,8 +13,7 @@
rm -f src/*.o wmglobe
wmglobe : $(OBJS)
- gcc -O2 -Wall $(OBJS) -o wmglobe $(LIBS)
+- strip wmglobe
+ ${CC} ${CFLAGS} -Wall $(OBJS) -o wmglobe $(LIBS)
- strip wmglobe
install :
+ install wmglobe /usr/local/bin