Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Aug 2015 13:20:22 +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: r395473 - head/math/jama
Message-ID:  <201508281320.t7SDKMMY081527@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Aug 28 13:20:21 2015
New Revision: 395473
URL: https://svnweb.freebsd.org/changeset/ports/395473

Log:
  - Fix build with DOCS disabled (port tried to install nonexistinent files)
  - Switch to options helpers
  
  Approved by:	portmgr blanket

Modified:
  head/math/jama/Makefile

Modified: head/math/jama/Makefile
==============================================================================
--- head/math/jama/Makefile	Fri Aug 28 13:13:17 2015	(r395472)
+++ head/math/jama/Makefile	Fri Aug 28 13:20:21 2015	(r395473)
@@ -7,7 +7,8 @@ CATEGORIES=	math devel
 MASTER_SITES=	http://math.nist.gov/tnt/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 DIST_SUBDIR=	tnt
-EXTRACT_ONLY=
+EXTRACT_ONLY=	# empty
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Java-like Matrix C++ Templates
@@ -20,17 +21,15 @@ NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES=${DISTNAME}${EXTRACT_SUFX} jama102doc.zip
-.endif
+DOCS_DISTFILES=	jama102doc.zip
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/tnt
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		-d ${STAGEDIR}${PREFIX}/include/tnt
 	${MKDIR} ${WRKDIR}/doc ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/jama102doc.zip \
 		-d ${WRKDIR}/doc
 	(cd ${WRKDIR}/doc/doxygen && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})



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