From owner-svn-ports-head@FreeBSD.ORG Sun Sep 22 09:12:31 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id DB759621; Sun, 22 Sep 2013 09:12:31 +0000 (UTC) (envelope-from danfe@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C76A823ED; Sun, 22 Sep 2013 09:12:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8M9CV5f097352; Sun, 22 Sep 2013 09:12:31 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8M9CVtN097350; Sun, 22 Sep 2013 09:12:31 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201309220912.r8M9CVtN097350@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 22 Sep 2013 09:12:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327855 - in head/security/bugs: . 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.14 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: Sun, 22 Sep 2013 09:12:31 -0000 Author: danfe Date: Sun Sep 22 09:12:31 2013 New Revision: 327855 URL: http://svnweb.freebsd.org/changeset/ports/327855 Log: - Fix parallel builds: call make(1) correctly, register dependencies - Drop LICENSE_FILE for a standard license (GPLv2) - Respect CC and CFLAGS without patching of makefile (use MAKE_ARGS) - Convert NOPORTDOCS -> PORT_OPTIONS:MDOCS, add OPTIONS_DEFINE - Move "make test" under the wing of our standard regression-test target - Generally cleanup Makefile and port description while I am here Deleted: head/security/bugs/files/ Modified: head/security/bugs/Makefile head/security/bugs/pkg-descr Modified: head/security/bugs/Makefile ============================================================================== --- head/security/bugs/Makefile Sun Sep 22 06:48:45 2013 (r327854) +++ head/security/bugs/Makefile Sun Sep 22 09:12:31 2013 (r327855) @@ -1,4 +1,4 @@ -# Created by: Stephane Legrand +# Created by: Stephane Legrand # $FreeBSD$ PORTNAME= bugs @@ -9,42 +9,56 @@ MASTER_SITES= SUNSITE/apps/crypto EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= Great cryptography library and sample programs +COMMENT= Great cryptographic library and sample programs LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +NO_STAGE= yes USES= gmake - -MAKE_JOBS_UNSAFE= yes +MAKE_ARGS= CC="${CC}" BFLAG="${CFLAGS}" \ + INSTALL_PATH="${PREFIX}/${DISTNAME}" PLIST_SUB= PORTVERSION="${PORTVERSION}" DOCSDIR= ${PREFIX}/${DISTNAME}/doc -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + +.include + +post-patch: +# Sanitize permissions so "make clean" can work + @${CHMOD} +x ${WRKSRC}/lib/unix ${WRKSRC}/lib/windows +# Allow parallel builds (-jX): fix make(1) syntax, register dependencies + @${REINPLACE_CMD} -E 's+cd (.*); make+$$(MAKE) -C \1+' \ + ${WRKSRC}/Makefile.bsd + @${ECHO_CMD} 'apps: lib' >> ${WRKSRC}/Makefile.bsd + @${REINPLACE_CMD} -E '/^(bcrypt|bchat|bpass|blogin|bkey|bpassdel|bmore|block|bunlock|shell):/s+ *$$+ extra.o+' \ + ${WRKSRC}/apps/Makefile.bsd + post-configure: - (cd ${WRKSRC}; ${MAKE} bsd); - ${REINPLACE_CMD} -e 's:^INSTALL_PATH = "/usr/local/bugs-.*":INSTALL_PATH = "${PREFIX}/${DISTNAME}":' ${WRKSRC}/Makefile; - ${REINPLACE_CMD} -e 's/^install: instchoice all/install: instchoice/' ${WRKSRC}/Makefile; - # Comment the docs installation - ${REINPLACE_CMD} -e 's+\(@echo "Copying docs.*\)+# \1+' ${WRKSRC}/Makefile; - ${REINPLACE_CMD} -e 's+\(@cp -rf ./doc/.*\)+# \1+' ${WRKSRC}/Makefile; + ${MAKE_CMD} -C ${WRKSRC} bsd + @${REINPLACE_CMD} -e 's/^install: instchoice all/install: instchoice/' ${WRKSRC}/Makefile; + @${REINPLACE_CMD} -e 's+\(@echo "Copying docs.*\)+# \1+' ${WRKSRC}/Makefile; + @${REINPLACE_CMD} -e 's+\(@cp -rf ./doc/.*\)+# \1+' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's+\(@cp -rf ./doc/.*\)+# \1+' ${WRKSRC}/Makefile post-build: @${LN} -sf ${WRKSRC}/lib/unix/*.a ${WRKSRC}/lib/ -pre-install: - (cd ${WRKSRC}; ${MAKE} test) - post-install: @${MKDIR} ${PREFIX}/${DISTNAME}/include ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/${DISTNAME}/include .for file in bchat bcrypt bhide bkey block blogin bmore bpass bpassdel bunlock @${STRIP_CMD} ${PREFIX}/${DISTNAME}/${file} .endfor -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}) .endif +test: build + ${MAKE_CMD} -C ${WRKSRC} test + +regression-test: test + .include Modified: head/security/bugs/pkg-descr ============================================================================== --- head/security/bugs/pkg-descr Sun Sep 22 06:48:45 2013 (r327854) +++ head/security/bugs/pkg-descr Sun Sep 22 09:12:31 2013 (r327855) @@ -1,13 +1,11 @@ -This package include a C library and some samples program that -demonstrate that this library is powerful. +This package include a C library and some sample programs that demonstrate +the library's power. -It is a cryptography library, you can crypt any type of data. -Your key length to crypt is unlimited. -You can generate password, manage users, hide text in file, etc. - - -ATTENTION !!! IN SOME COUNTRIES THIS SOFTWARE MAY BE ILLEGAL SO DON'T USE -IT IF YOU ARE NOT ALLOWED... +It is a cryptographic library: you can crypt any type of data. Key length +is unlimited. You can generate password, manage users, hide text in file, +etc. +ATTENTION!!! IN SOME COUNTRIES THIS SOFTWARE MAY BE ILLEGAL, SO DON'T USE +IT IF YOU ARE NOT ALLOWED. WWW: http://www.encryptsolutions.com/