From owner-svn-ports-head@freebsd.org  Mon Apr 18 06:43:13 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF02CB11ECD;
 Mon, 18 Apr 2016 06:43:13 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A12661159;
 Mon, 18 Apr 2016 06:43:13 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3I6hC1K046027;
 Mon, 18 Apr 2016 06:43:12 GMT (envelope-from matthew@FreeBSD.org)
Received: (from matthew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3I6hCcc046026;
 Mon, 18 Apr 2016 06:43:12 GMT (envelope-from matthew@FreeBSD.org)
Message-Id: <201604180643.u3I6hCcc046026@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: matthew set sender to
 matthew@FreeBSD.org using -f
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Mon, 18 Apr 2016 06:43:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413554 - head/security/apg/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Apr 2016 06:43:13 -0000

Author: matthew
Date: Mon Apr 18 06:43:12 2016
New Revision: 413554
URL: https://svnweb.freebsd.org/changeset/ports/413554

Log:
  Make the path to find cracklib dictionaries match what crackib uses
  nowadays.
  
  PR:		208881
  Submitted by:	freebsd@skinc.ru

Modified:
  head/security/apg/files/patch-Makefile

Modified: head/security/apg/files/patch-Makefile
==============================================================================
--- head/security/apg/files/patch-Makefile	Mon Apr 18 06:05:05 2016	(r413553)
+++ head/security/apg/files/patch-Makefile	Mon Apr 18 06:43:12 2016	(r413554)
@@ -9,7 +9,7 @@
 -#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
 -#APG_CLIBS += -lcrack
 +.if defined(WITH_CRACKLIB)
-+CRACKLIB_DICTPATH = "${LOCALBASE}/libdata/cracklib/pw_dict"
++CRACKLIB_DICTPATH = "${LOCALBASE}/libdata/cracklib/cracklib-words"
 +STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I${LOCALBASE}/include -L${LOCALBASE}/lib
 +CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I${LOCALBASE}/include -L${LOCALBASE}/lib
 +APG_CLIBS += -lcrack