From owner-svn-src-all@FreeBSD.ORG Mon Jun 3 17:33:12 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id CD547612;
Mon, 3 Jun 2013 17:33:12 +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 BF9251C3C;
Mon, 3 Jun 2013 17:33:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r53HXCt6092648;
Mon, 3 Jun 2013 17:33:12 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r53HXCYE092647;
Mon, 3 Jun 2013 17:33:12 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201306031733.r53HXCYE092647@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 3 Jun 2013 17:33:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251319 - stable/9/games/fortune/datfiles
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jun 2013 17:33:12 -0000
Author: jhb
Date: Mon Jun 3 17:33:12 2013
New Revision: 251319
URL: http://svnweb.freebsd.org/changeset/base/251319
Log:
MFC 248200: Remove fortunes-o from the base system.
Deleted:
stable/9/games/fortune/datfiles/fortunes-o.fake
stable/9/games/fortune/datfiles/fortunes-o.real
stable/9/games/fortune/datfiles/fortunes-o.sp.ok
Modified:
stable/9/games/fortune/datfiles/Makefile
Directory Properties:
stable/9/games/fortune/ (props changed)
Modified: stable/9/games/fortune/datfiles/Makefile
==============================================================================
--- stable/9/games/fortune/datfiles/Makefile Mon Jun 3 17:30:40 2013 (r251318)
+++ stable/9/games/fortune/datfiles/Makefile Mon Jun 3 17:33:12 2013 (r251319)
@@ -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>