Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Dec 2016 08:18:50 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429148 - in head: databases/libodbc++ graphics/code-eli
Message-ID:  <201612220818.uBM8IoWt027723@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Dec 22 08:18:50 2016
New Revision: 429148
URL: https://svnweb.freebsd.org/changeset/ports/429148

Log:
  Fix packaging.
  
  Reported by:	antoine
  Pointy hat:	mat (for changing things after testing)
  Sponsored by:	Absolight

Modified:
  head/databases/libodbc++/Makefile   (contents, props changed)
  head/graphics/code-eli/Makefile   (contents, props changed)

Modified: head/databases/libodbc++/Makefile
==============================================================================
--- head/databases/libodbc++/Makefile	Thu Dec 22 08:06:19 2016	(r429147)
+++ head/databases/libodbc++/Makefile	Thu Dec 22 08:18:50 2016	(r429148)
@@ -25,7 +25,7 @@ LIB_DEPENDS=	libodbc.so:databases/unixOD
 CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-DOXYGEN_PORTDOCS=	progref
+PORTDOCS=	progref
 
 post-extract:
 	${RM} ${WRKSRC}/doc/progref/progref-stamp

Modified: head/graphics/code-eli/Makefile
==============================================================================
--- head/graphics/code-eli/Makefile	Thu Dec 22 08:06:19 2016	(r429147)
+++ head/graphics/code-eli/Makefile	Thu Dec 22 08:18:50 2016	(r429148)
@@ -20,7 +20,6 @@ GH_ACCOUNT=	ddmarshall
 
 USES=		cmake:outsource compiler:c++11-lib
 PORTEXAMPLES=	AirfoilFitExample VSPPodExample test
-PORTDOCS=	html latex
 ALL_TARGET=	all
 
 # Some useful variables
@@ -32,6 +31,7 @@ OPTIONS_DEFINE=		DOXYGEN EXAMPLES
 EXAMPLES_LIB_DEPENDS=	libcpptest.so:devel/cpptest
 DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	doc
+DOXYGEN_PORTDOCS=	html latex
 
 # The code uses std::cbrt(). Even if one passes some additional macros for
 # libstdc++ to enable additional math functions in math.h some of them, such as
@@ -45,16 +45,15 @@ post-patch-EXAMPLES-off:
 		${WRKSRC}/CMakeLists.txt
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/eli \
-		${STAGEDIR}${EXAMPLESDIR}${TEST_SUBDIR} \
-		${STAGEDIR}${EXAMPLESDIR} \
-		${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/eli
 	${INSTALL_DATA} ${BUILD_WRKSRC}/include/eli/code_eli.hpp \
 		${STAGEDIR}${PREFIX}/include/eli
 	(cd ${WRKSRC}/include/eli && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/eli "*")
 
 do-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}${TEST_SUBDIR} \
+		${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} \
 		${BUILD_WRKSRC}/example/${VSPPOD_DIR}/VSPPodExample \
 		${BUILD_WRKSRC}/example/${AIRFOIL_DIR}/AirfoilFitExample \
@@ -70,6 +69,7 @@ do-install-EXAMPLES-on:
 		${XARGS} ${STRIP_CMD}
 
 do-install-DOXYGEN-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${BUILD_WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>



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