From owner-svn-src-head@FreeBSD.ORG  Tue Mar 12 12:35:03 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0C801899;
 Tue, 12 Mar 2013 12:35:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C474F267;
 Tue, 12 Mar 2013 12:35:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CCZ2L8075217;
 Tue, 12 Mar 2013 12:35:02 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2CCZ2k7075216;
 Tue, 12 Mar 2013 12:35:02 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201303121235.r2CCZ2k7075216@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 12 Mar 2013 12:35:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248200 - head/games/fortune/datfiles
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Mar 2013 12:35:03 -0000

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>