From owner-svn-ports-head@freebsd.org Sat Feb 20 13:06:51 2016 Return-Path: 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 1AE46AAEA35; Sat, 20 Feb 2016 13:06:51 +0000 (UTC) (envelope-from amdmi3@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 C83081354; Sat, 20 Feb 2016 13:06:50 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1KD6nnc017124; Sat, 20 Feb 2016 13:06:49 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1KD6n1j017123; Sat, 20 Feb 2016 13:06:49 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602201306.u1KD6n1j017123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 20 Feb 2016 13:06:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409236 - head/math/eukleides 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: Sat, 20 Feb 2016 13:06:51 -0000 Author: amdmi3 Date: Sat Feb 20 13:06:49 2016 New Revision: 409236 URL: https://svnweb.freebsd.org/changeset/ports/409236 Log: - Fix LICENSE - Switch to options helpers - Do not stage unneeded files properly to fix stage-qa: Error: '/bin/bash' is an invalid shebang you need USES=shebangfix for 'bin/euktoeps.orig.bak' Approved by: portmgr blanket Modified: head/math/eukleides/Makefile Modified: head/math/eukleides/Makefile ============================================================================== --- head/math/eukleides/Makefile Sat Feb 20 12:40:52 2016 (r409235) +++ head/math/eukleides/Makefile Sat Feb 20 13:06:49 2016 (r409236) @@ -10,7 +10,7 @@ MASTER_SITES= http://www.eukleides.org/f MAINTAINER= ashish@FreeBSD.org COMMENT= Euclidean geometry drawing language -LICENSE= GPLv3 +LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libreadline.so:${PORTSDIR}/devel/readline @@ -21,19 +21,15 @@ USE_TEX= latex USES= bison gettext iconv gmake tar:bzip2 INSTALL_TARGET= install PREFIX=${STAGEDIR}${PREFIX} -OPTIONS_DEFINE= DOCS EXAMPLES - -.include - -.if ${PORT_OPTIONS:MDOCS} -USES+= makeinfo -USE_TEX+= pdftex:build -INFO= eukleides -.endif - PORTDOCS= de.pdf fr.pdf PORTEXAMPLES= greenwich.euk sundial.euk vonkoch.euk +OPTIONS_DEFINE= DOCS EXAMPLES + +DOCS_USES= makeinfo +DOCS_USE= TEX=pdftex:build +DOCS_INFO= eukleides + post-patch: @${GREP} -lR "#!/bin/bash" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|#!/bin/bash|#!/bin/sh|g' @@ -46,21 +42,18 @@ post-patch: -e "s|%%DOCSDIR%%|\$${PREFIX}/${DOCSDIR_REL}|g" @${GREP} -lFR "gcc" ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \ -e "s|gcc|${CC}|g" -.if ! ${PORT_OPTIONS:MDOCS} + +post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^install:/ s/install_doc//g' \ -e '/^all:/ s/doc//g' ${WRKSRC}/Makefile -.endif -.if ! ${PORT_OPTIONS:MEXAMPLES} +post-patch-EXAMPLES-off: @${REINPLACE_CMD} -e 's/install_exm$$//g' ${WRKSRC}/Makefile -.endif -pre-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +pre-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} post-install: - for i in euktoeps euktopdf euktotex; do \ - ${RM} ${STAGEDIR}${PREFIX}/bin/$${i}.bak; \ - done + @${RM} -f ${STAGEDIR}${PREFIX}/bin/*.bak* .include