diff options
| author | jedgar <jedgar@FreeBSD.org> | 2000-02-23 08:14:07 +0800 |
|---|---|---|
| committer | jedgar <jedgar@FreeBSD.org> | 2000-02-23 08:14:07 +0800 |
| commit | 695b61d9cd3d3a3da74e4ce69bd67a9f017eed26 (patch) | |
| tree | acc1ab1c356a2dd463d4f8ec52f151222e021aa2 /astro | |
| parent | 0803bbd8c4338a6dde02c4926a63cf8d4b451927 (diff) | |
| download | freebsd-ports-gnome-695b61d9cd3d3a3da74e4ce69bd67a9f017eed26.tar.gz freebsd-ports-gnome-695b61d9cd3d3a3da74e4ce69bd67a9f017eed26.tar.zst freebsd-ports-gnome-695b61d9cd3d3a3da74e4ce69bd67a9f017eed26.zip | |
- Support get-wraster-flags
- Remove redundant LIB_DEPENDS
PR: 16866
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Approved by: Maintainer
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/wmglobe/Makefile | 9 | ||||
| -rw-r--r-- | astro/wmglobe/files/patch-aa | 16 |
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 |