From owner-svn-ports-head@FreeBSD.ORG Thu May 14 06:38:56 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38B432AB; Thu, 14 May 2015 06:38:56 +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 0C3F21358; Thu, 14 May 2015 06:38:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4E6ctDC096751; Thu, 14 May 2015 06:38:55 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4E6cto9096750; Thu, 14 May 2015 06:38:55 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201505140638.t4E6cto9096750@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Thu, 14 May 2015 06:38:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386292 - head/security/apg 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 May 2015 06:38:56 -0000 Author: matthew Date: Thu May 14 06:38:55 2015 New Revision: 386292 URL: https://svnweb.freebsd.org/changeset/ports/386292 Log: - Remove useless MASTER_SITE_SUBDIR - Fix description for CRACKLIB option - Use OPTIONS helpers - Simplify options handling, remove options.mk inclusion - Silence post-extract - Pet portlint PR: 200183 Submitted by: amdmi3 Modified: head/security/apg/Makefile Modified: head/security/apg/Makefile ============================================================================== --- head/security/apg/Makefile Thu May 14 06:05:35 2015 (r386291) +++ head/security/apg/Makefile Thu May 14 06:38:55 2015 (r386292) @@ -6,28 +6,23 @@ PORTVERSION= 2.3.0b PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://www.adel.nursat.kz/apg/download/ -MASTER_SITE_SUBDIR= UNIX/misc MAINTAINER= matthew@FreeBSD.org COMMENT= Automated password generator -OPTIONS_DEFINE= CRACKLIB DOCS -CRACKLIB_DESCR= CrackLib support for password quality - -.include - -.if ${PORT_OPTIONS:MCRACKLIB} -LIB_DEPENDS= libcrack.so:${PORTSDIR}/security/cracklib -MAKE_ARGS= -DWITH_CRACKLIB -.endif - LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING DOCS= APG_TIPS pronun.txt rfc0972.txt rfc1750.txt +OPTIONS_DEFINE= CRACKLIB DOCS +CRACKLIB_DESC= CrackLib support for password quality +CRACKLIB_LIB_DEPENDS= libcrack.so:${PORTSDIR}/security/cracklib +CRACKLIB_MAKE_ARGS= -DWITH_CRACKLIB + post-extract: - ${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} u+wx - ${FIND} ${WRKSRC} -type f | ${XARGS} ${CHMOD} u+w + @${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} u+wx + @${FIND} ${WRKSRC} -type f | ${XARGS} ${CHMOD} u+w do-install: ${INSTALL_PROGRAM} ${WRKSRC}/apg ${STAGEDIR}${PREFIX}/bin @@ -36,9 +31,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/doc/man/apg.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/man/apgbfm.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/man/apgd.8 ${STAGEDIR}${MANPREFIX}/man/man8 -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} -.endif .include