From owner-freebsd-ports Tue Feb 22 5:44:17 2000 Delivered-To: freebsd-ports@freebsd.org Received: from mailgw2.prontomail.com (mailgw2.prontomail.com [209.185.149.198]) by hub.freebsd.org (Postfix) with ESMTP id 5874137B691 for ; Tue, 22 Feb 2000 05:44:14 -0800 (PST) (envelope-from tkato@prontomail.ne.jp) Received: from mail46.prontomail.com (209.185.149.146) by mailgw2.prontomail.com (NPlex 2.0.123) for freebsd-ports@FreeBSD.ORG; Tue, 22 Feb 2000 05:37:28 -0800 Received: from web20 (209.185.149.220) by mail46.prontomail.com (NPlex 2.0.123); Tue, 22 Feb 2000 05:43:40 -0800 From: "KATO Tsuguru" Message-Id: <2803E416EB8E3D1178D100807C33133D@tkato.prontomail.ne.jp> Date: Tue, 22 Feb 2000 22:44:08 +0900 X-Priority: Normal Content-Type: text/plain; charset=ISO-2022-JP To: andrews@technologist.com, taoka@infonets.hiroshima-u.ac.jp Subject: Re: ports/16866: Update port: astro/wmglobe Cc: freebsd-ports@FreeBSD.ORG X-Mailer: Web Based Pronto Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org > Yes, this is correct. I've reviewed KATO's patches. Ah, that's right. I missed adding it. Very sorry. > Also, KATO's patch to the Makefile includes a hardcoded install of the > binary to /usr/local/bin. This is not necessary since the port Makefile > already does the job (and it puts it in the right location, normally /usr/X11R6/bin). OK, I made improved patch. Please review this instead. --- >Description: - Remove obsolete MASTER_SITES - Support get-wraster-flags - Remove USE_GMAKE - Remove do-install target and let WRKSRC/Makefile do the job >Fix: diff -urN /usr/ports/astro/wmglobe/Makefile astro/wmglobe/Makefile --- /usr/ports/astro/wmglobe/Makefile Thu Feb 17 20:12:16 2000 +++ astro/wmglobe/Makefile Tue Feb 22 22:22:43 2000 @@ -8,26 +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= 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 MAN1= wmglobe.1 - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wmglobe ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/wmglobe.1 ${PREFIX}/man/man1 .include diff -urN /usr/ports/astro/wmglobe/patches/patch-aa astro/wmglobe/patches/patch-aa --- /usr/ports/astro/wmglobe/patches/patch-aa Thu Feb 17 20:12:17 2000 +++ astro/wmglobe/patches/patch-aa Tue Feb 22 22:23:07 2000 @@ -1,28 +1,31 @@ ---- 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 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 = -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 --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,7 +14,7 @@ +@@ -14,9 +13,8 @@ rm -f src/*.o wmglobe wmglobe : $(OBJS) - gcc -O2 -Wall $(OBJS) -o wmglobe $(LIBS) -+ ${CC} ${CFLAGS} -Wall $(OBJS) -o wmglobe $(LIBS) - strip wmglobe +- strip wmglobe ++ ${CC} ${CFLAGS} $(OBJS) -o wmglobe $(LIBS) install : +- 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 -- KATO Tsuguru / tkato@prontomail.ne.jp Sent by Japanese ProntoMail To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message