Date: Tue, 12 Mar 2013 12:35:02 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248200 - head/games/fortune/datfiles Message-ID: <201303121235.r2CCZ2k7075216@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Tue Mar 12 12:35:02 2013 New Revision: 248200 URL: http://svnweb.freebsd.org/changeset/base/248200 Log: Remove fortunes-o from the base system. Debating what does or does not belong in this file is not a useful exercise or conducive to producing a high quality advanced operating system. While here, simplify the make rules to autocompute BLDS and FILES from a single DB variable. Approved by: core MFC after: 1 week Deleted: head/games/fortune/datfiles/fortunes-o.fake head/games/fortune/datfiles/fortunes-o.real head/games/fortune/datfiles/fortunes-o.sp.ok Modified: head/games/fortune/datfiles/Makefile Modified: head/games/fortune/datfiles/Makefile ============================================================================== --- head/games/fortune/datfiles/Makefile Tue Mar 12 12:33:50 2013 (r248199) +++ head/games/fortune/datfiles/Makefile Tue Mar 12 12:35:02 2013 (r248200) @@ -1,37 +1,22 @@ # @(#)Makefile 8.2 (Berkeley) 4/19/94 # $FreeBSD$ -FILES= fortunes freebsd-tips murphy startrek zippy -BLDS= fortunes.dat murphy.dat startrek.dat zippy.dat \ - fortunes-o fortunes-o.dat freebsd-tips.dat +DB= fortunes freebsd-tips murphy startrek zippy # TO AVOID INSTALLING THE POTENTIALLY OFFENSIVE FORTUNES, COMMENT OUT THE -# THREE LINES AND UNCOMMENT THE FOURTH LINE. +# NEXT LINE. +DB+= limerick murphy-o gerrold.limerick -# THE THREE LINES: -FILES+= limerick murphy-o gerrold.limerick -BLDS+= limerick.dat murphy-o.dat gerrold.limerick.dat -TYPE= real - -# THE FOURTH LINE: -#TYPE= fake - -FILES+= ${BLDS} +BLDS= ${DB:S/$/.dat/} +FILES= ${DB} ${BLDS} CLEANFILES+=${BLDS} FILESDIR= ${SHAREDIR}/games/fortune -.for f in fortunes freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy +.for f in ${DB} $f.dat: $f PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ strfile -Cs ${.ALLSRC} ${.TARGET} .endfor -fortunes-o.dat: fortunes-o - PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ - strfile -Csx ${.ALLSRC} ${.TARGET} - -fortunes-o: fortunes-o.${TYPE} - LC_ALL=C tr a-zA-Z n-za-mN-ZA-M < ${.ALLSRC} > ${.TARGET} - .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303121235.r2CCZ2k7075216>