Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Feb 2016 13:06:49 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r409236 - head/math/eukleides
Message-ID:  <201602201306.u1KD6n1j017123@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602201306.u1KD6n1j017123>