From owner-svn-src-stable@FreeBSD.ORG  Wed Aug 13 12:37:00 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1CD43FA9;
 Wed, 13 Aug 2014 12:37:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 092F32172;
 Wed, 13 Aug 2014 12:37:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7DCaxD5007152;
 Wed, 13 Aug 2014 12:36:59 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7DCaxZ0007151;
 Wed, 13 Aug 2014 12:36:59 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201408131236.s7DCaxZ0007151@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gavin set sender to
 gavin@FreeBSD.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Wed, 13 Aug 2014 12:36:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r269933 - stable/10/games/fortune/fortune
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Aug 2014 12:37:00 -0000

Author: gavin
Date: Wed Aug 13 12:36:59 2014
New Revision: 269933
URL: http://svnweb.freebsd.org/changeset/base/269933

Log:
  Merge r268637 from head:
  
    fortune(8): Search fortune files installed by ports/packages as well as
    those supplied by the base system.
  
  PR:		191800
  Submitted by:	Andy Kosela

Modified:
  stable/10/games/fortune/fortune/pathnames.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/games/fortune/fortune/pathnames.h
==============================================================================
--- stable/10/games/fortune/fortune/pathnames.h	Wed Aug 13 12:35:39 2014	(r269932)
+++ stable/10/games/fortune/fortune/pathnames.h	Wed Aug 13 12:36:59 2014	(r269933)
@@ -30,4 +30,5 @@
  *	$FreeBSD$
  */
 
-#define	FORTDIR		"/usr/share/games/fortune"
+#define	FORTDIR		"/usr/share/games/fortune:" \
+			"/usr/local/share/games/fortune"