Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Apr 2013 10:04:50 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r315664 - head/textproc/zorba
Message-ID:  <201304021004.r32A4oXo043088@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Tue Apr  2 10:04:49 2013
New Revision: 315664
URL: http://svnweb.freebsd.org/changeset/ports/315664

Log:
  - Fix DOCSDIR
  - Use OPTIONS for DOCS
  
  Approved by:	portmgr

Modified:
  head/textproc/zorba/Makefile

Modified: head/textproc/zorba/Makefile
==============================================================================
--- head/textproc/zorba/Makefile	Tue Apr  2 10:02:19 2013	(r315663)
+++ head/textproc/zorba/Makefile	Tue Apr  2 10:04:49 2013	(r315664)
@@ -36,7 +36,7 @@ CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS=	-DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
 
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
 PLIST_SUB+=	FULLVERSION=${PORTVERSION} \
 		MIDVERSION=${PORTVERSION:R} \
@@ -97,14 +97,14 @@ PLIST_SUB+=	WITH_JAVA="@comment "
 BUILD_DEPENDS+=	swig2.0:${PORTSDIR}/devel/swig20
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	   ${WRKSRC}/CMakeLists.txt ${WRKSRC}/cmake_modules/FindPHP5.cmake
-.if defined(NOPORTDOCS)
+.if !${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '531s|^|#|' ${WRKSRC}/CMakeLists.txt
 .endif
 



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