diff options
author | Steve Price <steve@FreeBSD.org> | 1999-12-25 01:43:15 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1999-12-25 01:43:15 +0000 |
commit | 0cc1560689d8396b33aec2585956a05231b02585 (patch) | |
tree | 3fd2404ceb849c54429cc1315805a87827e17e3f /x11/xbanner | |
parent | Update to version 1.26. (diff) |
* 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
PR: 15539
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=24019
Diffstat (limited to 'x11/xbanner')
-rw-r--r-- | x11/xbanner/Makefile | 27 | ||||
-rw-r--r-- | x11/xbanner/files/patch-aa | 38 | ||||
-rw-r--r-- | x11/xbanner/files/patch-ae | 19 | ||||
-rw-r--r-- | x11/xbanner/pkg-descr | 2 | ||||
-rw-r--r-- | x11/xbanner/pkg-plist | 4 |
5 files changed, 53 insertions, 37 deletions
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile index 6a23ec6d1a29..ae9e802281ca 100644 --- a/x11/xbanner/Makefile +++ b/x11/xbanner/Makefile @@ -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 --git a/x11/xbanner/files/patch-aa b/x11/xbanner/files/patch-aa index bd05fd450945..ec588239ad50 100644 --- a/x11/xbanner/files/patch-aa +++ b/x11/xbanner/files/patch-aa @@ -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 - -! 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 + xb_check: xb_check.o + $(CC) $(CFLAGS) -o xb_check xb_check.o + +! 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 --git a/x11/xbanner/files/patch-ae b/x11/xbanner/files/patch-ae new file mode 100644 index 000000000000..bcb35f5e0649 --- /dev/null +++ b/x11/xbanner/files/patch-ae @@ -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 --git a/x11/xbanner/pkg-descr b/x11/xbanner/pkg-descr index d9418b037980..fe34de842d24 100644 --- a/x11/xbanner/pkg-descr +++ b/x11/xbanner/pkg-descr @@ -10,3 +10,5 @@ Ra'anana, 43700 ISRAEL Email - amitm@netvision.net.il + +WWW: http://chaos.fullerton.edu/XBanner/ diff --git a/x11/xbanner/pkg-plist b/x11/xbanner/pkg-plist index afbeb03d0083..b428750e1e5b 100644 --- a/x11/xbanner/pkg-plist +++ b/x11/xbanner/pkg-plist @@ -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 |