Date: Fri, 17 Dec 1999 12:00:50 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org Subject: ports/15539: Update port: x11/xbanner Message-ID: <19991217200050.40DCA14F6A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 15539 >Category: ports >Synopsis: Update port: x11/xbanner >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Dec 17 12:10:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.3-RELEASE i386 >Organization: >Environment: >Description: * Fixed MASTER_SITES * Modified patches to support CFLAGS/X11BASE properly * Modified patches to support install macros * Sorted pkg/PLIST * Added WWW: line into pkg/DESCR New file: patches/patch-ae >How-To-Repeat: >Fix: diff -urN /usr/ports/x11/xbanner/Makefile x11/xbanner/Makefile --- /usr/ports/x11/xbanner/Makefile Tue Aug 31 19:19:04 1999 +++ x11/xbanner/Makefile Sat Dec 18 02:59:38 1999 @@ -9,31 +9,32 @@ DISTNAME= XBanner1.31 PKGNAME= xbanner-1.31 CATEGORIES= x11 -MASTER_SITES= ftp://physics.fullerton.edu/pub/Linux/XBanner/ \ +MASTER_SITES= ftp://ftp.digital.com/pub/linux/XBanner/ \ ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \ ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR=X11/xutils +MASTER_SITE_SUBDIR= X11/xutils -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm USE_X_PREFIX= yes #USE_IMAKE= yes + post-patch: - ${MV} ${WRKSRC}/xres.c ${WRKSRC}/xres.c.input - ${SED} "s:%%X11BASE%%:${X11BASE}:" ${WRKSRC}/xres.c.input > ${WRKSRC}/xres.c - ${RM} -f ${WRKSRC}/xres.c.input + @${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/xres.c + @${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/samples/XBanner.ad post-install: - ${INSTALL_DATA} ${WRKSRC}/samples/XBanner.ad \ - $(X11BASE)/lib/X11/app-defaults/XBanner + ${INSTALL_DATA} ${WRKSRC}/samples/XBanner.ad \ + ${PREFIX}/lib/X11/app-defaults/XBanner .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/XBanner - $(CP) ${WRKSRC}/QuickStart ${PREFIX}/share/doc/XBanner - ${CP} ${WRKSRC}/docs/* ${PREFIX}/share/doc/XBanner - ${MKDIR} ${PREFIX}/share/examples/XBanner - $(CP) ${WRKSRC}/samples/_other_ideas/* ${PREFIX}/share/examples/XBanner + @${MKDIR} ${PREFIX}/share/doc/XBanner + ${INSTALL_DATA} ${WRKSRC}/QuickStart ${PREFIX}/share/doc/XBanner + ${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/XBanner + @${MKDIR} ${PREFIX}/share/examples/XBanner + ${INSTALL_DATA} ${WRKSRC}/samples/_other_ideas/* \ + ${PREFIX}/share/examples/XBanner .endif .include <bsd.port.mk> diff -urN /usr/ports/x11/xbanner/patches/patch-aa x11/xbanner/patches/patch-aa --- /usr/ports/x11/xbanner/patches/patch-aa Mon Jun 7 07:49:53 1999 +++ x11/xbanner/patches/patch-aa Sat Dec 18 03:26:05 1999 @@ -1,7 +1,7 @@ -*** Makefile.orig Mon May 12 17:55:59 1997 ---- Makefile Tue May 18 21:22:21 1999 +*** Makefile.orig Tue May 13 00:55:59 1997 +--- Makefile Sat Dec 18 03:25:54 1999 *************** -*** 6,30 **** +*** 6,27 **** .SUFFIXES: .c .o @@ -23,11 +23,8 @@ ! #INCDIR =-I/usr/X11R6/include # Library directories for the Ultrix (probably most Unixes) -! #XLIBDIR =/usr/lib/X11 - - # Comment out the following line if you do not have the XPM library. - XPM =-DHAS_XPM ---- 6,30 ---- + #XLIBDIR =/usr/lib/X11 +--- 6,27 ---- .SUFFIXES: .c .o @@ -49,10 +46,7 @@ ! INCDIR =-I$(X11BASE)/include # Library directories for the Ultrix (probably most Unixes) -! XLIBDIR =$(X11BASE)/lib - - # Comment out the following line if you do not have the XPM library. - XPM =-DHAS_XPM + #XLIBDIR =/usr/lib/X11 *************** *** 34,40 **** $(CC) $(INCDIR) $(CFLAGS) $(XPM) -c $*.c @@ -66,7 +60,7 @@ $(CC) $(INCDIR) $(CFLAGS) $(XPM) -c $*.c # Linux CFLAGS (actually generic gcc) -! CFLAGS+= -O2 +! #CFLAGS=-Wall -O2 # Want static binaries? #CFLAGS=-Wall -O2 -static @@ -85,7 +79,7 @@ # Just change it to wherever your libX11.a resides. ! LDFLAGS+=-L$(XLIBDIR) - all: xbanner freetemp random_effect xb_check + all: xbanner freetemp random_effect xb_check *************** *** 70,79 **** @@ -100,14 +94,14 @@ strip: exe strip xbanner freetemp xb_check random_effect --- 70,80 ---- - xb_check: xb_check.o - $(CC) $(CFLAGS) -o xb_check xb_check.o + xb_check: xb_check.o + $(CC) $(CFLAGS) -o xb_check xb_check.o -! install: freetemp xbanner xb_check random_effect -! $(INSTALL) -cs -g bin -m "0755" -o root freetemp $(BINDIR)/freetemp -! $(INSTALL) -cs -g bin -m "0755" -o root xbanner $(BINDIR)/xbanner -! $(INSTALL) -cs -g bin -m "0755" -o root xb_check $(BINDIR)/xb_check -! $(INSTALL) -cs -g bin -m "0755" -o root random_effect $(BINDIR)/random_effect +! install: freetemp xbanner xb_check random_effect +! ${BSD_INSTALL_PROGRAM} freetemp $(BINDIR)/freetemp +! ${BSD_INSTALL_PROGRAM} xbanner $(BINDIR)/xbanner +! ${BSD_INSTALL_PROGRAM} xb_check $(BINDIR)/xb_check +! ${BSD_INSTALL_PROGRAM} random_effect $(BINDIR)/random_effect strip: exe strip xbanner freetemp xb_check random_effect diff -urN /usr/ports/x11/xbanner/patches/patch-ae x11/xbanner/patches/patch-ae --- /usr/ports/x11/xbanner/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ x11/xbanner/patches/patch-ae Sat Dec 18 01:50:36 1999 @@ -0,0 +1,19 @@ +*** samples/XBanner.ad.orig Tue May 13 00:55:58 1997 +--- samples/XBanner.ad Sat Dec 18 01:50:18 1999 +*************** +*** 96,102 **** + XBanner.BarSize: 12 + + ! Name of the pixmap file to tile over the root window +! !XBanner.BgPixFile: /usr/include/X11/pixmaps/xdm_bg.xpm + + ! The number of ripples for the Ripples BG style + XBanner.Ripples: 3 +--- 96,102 ---- + XBanner.BarSize: 12 + + ! Name of the pixmap file to tile over the root window +! !XBanner.BgPixFile: %%X11BASE%%/include/X11/pixmaps/xdm_bg.xpm + + ! The number of ripples for the Ripples BG style + XBanner.Ripples: 3 diff -urN /usr/ports/x11/xbanner/pkg/DESCR x11/xbanner/pkg/DESCR --- /usr/ports/x11/xbanner/pkg/DESCR Wed Jan 20 17:18:57 1999 +++ x11/xbanner/pkg/DESCR Sat Dec 18 01:20:59 1999 @@ -10,3 +10,5 @@ ISRAEL Email - amitm@netvision.net.il + +WWW: http://chaos.fullerton.edu/XBanner/ diff -urN /usr/ports/x11/xbanner/pkg/PLIST x11/xbanner/pkg/PLIST --- /usr/ports/x11/xbanner/pkg/PLIST Mon Jun 7 07:49:53 1999 +++ x11/xbanner/pkg/PLIST Sat Dec 18 01:14:07 1999 @@ -1,7 +1,7 @@ bin/freetemp -bin/xbanner -bin/xb_check bin/random_effect +bin/xb_check +bin/xbanner lib/X11/app-defaults/XBanner share/doc/XBanner/COPYING-2.0 share/doc/XBanner/Changes.txt @@ -25,5 +25,5 @@ share/examples/XBanner/FgGrad_Idea_2 share/examples/XBanner/Just_an_Idea share/examples/XBanner/My_Home_Setup.tar -@dirrm share/doc/XBanner @dirrm share/examples/XBanner +@dirrm share/doc/XBanner >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991217200050.40DCA14F6A>