svn commit: r335626 - in head: audio/tomahawk cad/brlcad cad/kicad-devel databases/tarantool devel/freeocl emulators/dolphin-emu graphics/opencollada lang/hiphop-php math/armadillo

Max Brazhnikov makc at FreeBSD.org
Wed Dec 4 18:48:51 UTC 2013 

Author: makc
Date: Wed Dec  4 18:48:48 2013
New Revision: 335626
URL: http://svnweb.freebsd.org/changeset/ports/335626

Log:
  - Respect CMAKE_BUILD_TYPE
  
  Approved by:	portmgr (bapt)

Modified:
  head/audio/tomahawk/Makefile
  head/audio/tomahawk/pkg-plist
  head/cad/brlcad/Makefile
  head/cad/kicad-devel/Makefile
  head/databases/tarantool/Makefile
  head/devel/freeocl/Makefile
  head/emulators/dolphin-emu/Makefile
  head/graphics/opencollada/pkg-plist
  head/lang/hiphop-php/Makefile
  head/math/armadillo/pkg-plist   (contents, props changed)

Modified: head/audio/tomahawk/Makefile
==============================================================================
--- head/audio/tomahawk/Makefile	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/audio/tomahawk/Makefile	Wed Dec  4 18:48:48 2013	(r335626)
@@ -23,9 +23,7 @@ LIB_DEPENDS=	attica:${PORTSDIR}/x11-tool
 		tag:${PORTSDIR}/audio/taglib
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3_4:${PORTSDIR}/security/qca-ossl
 
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING="Release" \
-		-DWITH_BREAKPAD:BOOL="OFF" \
-		-DWITH_BUILD:STRING="Release" \
+CMAKE_ARGS+=	-DWITH_BREAKPAD:BOOL="OFF" \
 		-DCLUCENE_CONFIG_PATH:PATH="${LOCALBASE}/share/clucene"
 
 GH_ACCOUNT=	tomahawk-player

Modified: head/audio/tomahawk/pkg-plist
==============================================================================
--- head/audio/tomahawk/pkg-plist	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/audio/tomahawk/pkg-plist	Wed Dec  4 18:48:48 2013	(r335626)
@@ -301,7 +301,7 @@ include/libtomahawk/widgets/searchlineed
 lib/cmake/Tomahawk/TomahawkAddPlugin.cmake
 lib/cmake/Tomahawk/TomahawkConfig.cmake
 lib/cmake/Tomahawk/TomahawkConfigVersion.cmake
-lib/cmake/Tomahawk/TomahawkLibraryDepends-release.cmake
+lib/cmake/Tomahawk/TomahawkLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Tomahawk/TomahawkLibraryDepends.cmake
 lib/cmake/Tomahawk/TomahawkUse.cmake
 lib/libtomahawk_account_google.so

Modified: head/cad/brlcad/Makefile
==============================================================================
--- head/cad/brlcad/Makefile	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/cad/brlcad/Makefile	Wed Dec  4 18:48:48 2013	(r335626)
@@ -39,21 +39,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 CMAKE_ARGS=	-DBRLCAD_ENABLE_STRICT:BOOL=OFF
 MANPREFIX=	${PREFIX}/share
 
-OPTIONS_DEFINE=		OPTIMIZATION
-OPTIMIZATION_DESC=	Build with optimizations
-OPTIONS_DEFAULT=	OPTIMIZATION
-
-.include <bsd.port.pre.mk>
-
-EXTRA_LIBS=	-pthread
-
-.if ${PORT_OPTIONS:MOPTIMIZATION}
-CMAKE_BUILD_TYPE=Release
-.endif
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64: invokes i386 assembler
-.endif
+BROKEN_sparc64=	does not compile: invokes i386 assembler
 
 post-patch:
 	@${REINPLACE_CMD} "s+-exact Tcl 8\.5\.1+Tcl 8.5+" ${WRKSRC}/src/other/tcl/library/init.tcl
@@ -73,4 +59,4 @@ post-install:
 regression-test: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} test)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/cad/kicad-devel/Makefile
==============================================================================
--- head/cad/kicad-devel/Makefile	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/cad/kicad-devel/Makefile	Wed Dec  4 18:48:48 2013	(r335626)
@@ -44,9 +44,6 @@ EXTRAS2RM=	linux-non_unicode linux wings
 USE_GCC=	yes
 USES=		cmake gettext
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
-		-DCMAKE_C_COMPILER=gcc \
-		-DCMAKE_CXX_COMPILER=g++ \
-		-DCMAKE_BUILD_TYPE=Release \
 		-DKICAD_TESTING_VERSION=ON \
 		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}"

Modified: head/databases/tarantool/Makefile
==============================================================================
--- head/databases/tarantool/Makefile	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/databases/tarantool/Makefile	Wed Dec  4 18:48:48 2013	(r335626)
@@ -47,11 +47,11 @@ PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-		-DENABLE_BACKTRACE=ON
+CMAKE_BUILD_TYPE=	RelWithDebugInfo
+CMAKE_ARGS+=	-DENABLE_BACKTRACE=ON
 .else
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Rel \
-		-DENABLE_BACKTRACE=OFF
+CMAKE_BUILD_TYPE=	Rel
+CMAKE_ARGS+=	-DENABLE_BACKTRACE=OFF
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}

Modified: head/devel/freeocl/Makefile
==============================================================================
--- head/devel/freeocl/Makefile	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/devel/freeocl/Makefile	Wed Dec  4 18:48:48 2013	(r335626)
@@ -21,15 +21,10 @@ WRKSRC=		${WRKDIR}/FreeOCL-${PORTVERSION
 USE_GCC=	yes
 USES=		cmake
 USE_LDCONFIG=	yes
-CMAKE_BUILD_TYPE=Release
 
 NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/src/icd/icd_loader.cpp \
 		${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 800000
-BROKEN=		this port does not compile at 7.x: "src/program.cpp:531:37: error: 'RTLD_NOLOAD' was not declared in this scope"
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/emulators/dolphin-emu/Makefile
==============================================================================
--- head/emulators/dolphin-emu/Makefile	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/emulators/dolphin-emu/Makefile	Wed Dec  4 18:48:48 2013	(r335626)
@@ -33,7 +33,6 @@ USE_GCC=	yes
 USES=		dos2unix cmake pkgconfig iconv
 DOS2UNIX_REGEX=	.*\.(h|c|cpp)
 
-CMAKE_BUILD_TYPE=	Release
 # Disable ALSA (emulated) and ao (buggy)
 CMAKE_ARGS+=	-DOPENMP:BOOL=OFF \
 		-DDISABLE_ALSA:BOOL=ON \
@@ -59,9 +58,6 @@ PLIST_SUB+=	NLS="@comment "
 
 .if ${PORT_OPTIONS:MDEBUG}
 CMAKE_ARGS+=	-DFASTLOG:BOOL=ON
-INSTALL_TARGET=	install
-CFLAGS+=	-g
-CXXFLAGS+=	-g
 MAKE_ENV+=	VERBOSE=yes
 .endif
 

Modified: head/graphics/opencollada/pkg-plist
==============================================================================
--- head/graphics/opencollada/pkg-plist	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/graphics/opencollada/pkg-plist	Wed Dec  4 18:48:48 2013	(r335626)
@@ -343,7 +343,7 @@ lib/opencollada/libbuffer.so
 lib/opencollada/libftoa.so
 share/cmake/Modules/OpenCOLLADAConfig.cmake
 share/cmake/Modules/OpenCOLLADAConfigVersion.cmake
-share/cmake/Modules/OpenCOLLADATargets-release.cmake
+share/cmake/Modules/OpenCOLLADATargets-%%CMAKE_BUILD_TYPE%%.cmake
 share/cmake/Modules/OpenCOLLADATargets.cmake
 @dirrm lib/opencollada
 @dirrm include/opencollada/GeneratedSaxParser

Modified: head/lang/hiphop-php/Makefile
==============================================================================
--- head/lang/hiphop-php/Makefile	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/lang/hiphop-php/Makefile	Wed Dec  4 18:48:48 2013	(r335626)
@@ -46,8 +46,7 @@ LIB_DEPENDS=	icudata:${PORTSDIR}/devel/i
 		unwind:${PORTSDIR}/devel/libunwind \
 		glog:${PORTSDIR}/devel/glog
 
-OPTIONS_DEFINE=		DEBUG DOCS
-OPTIONS_DEFAULT=	DOCS
+OPTIONS_DEFINE=		DOCS
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	This program is developed for amd64 only
@@ -64,7 +63,6 @@ BUILD_DEPENDS+=	bison:${PORTSDIR}/devel/
 
 WRKSRC=		${WRKDIR}/hiphop-php-HPHP-${PORTVERSION}
 
-GNU_CONFIGURE=	yes
 USES=		cmake gettext
 USE_MYSQL=	yes
 USE_GNOME=	libxml2
@@ -103,13 +101,6 @@ PORTDOCS=	*
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDEBUG}
-CMAKE_BUILD_TYPE=	Debug
-CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-.endif
-
-.include <bsd.port.pre.mk>
-
 _CFLAGS=	${CFLAGS} -DHAVE_POSIX_FALLOCATE=1
 _CXXFLAGS=	${CXXFLAGS} -D_GLIBCXX_USE_C99 -DHAVE_POSIX_FALLOCATE=1
 
@@ -153,4 +144,4 @@ do-install:
 	${CP} -rf ${WRKSRC}/hphp/doc/ ${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/math/armadillo/pkg-plist
==============================================================================
--- head/math/armadillo/pkg-plist	Wed Dec  4 17:48:26 2013	(r335625)
+++ head/math/armadillo/pkg-plist	Wed Dec  4 18:48:48 2013	(r335626)
@@ -346,7 +346,7 @@ lib/libarmadillo.so.3
 lib/libarmadillo.so.3.800.1
 share/Armadillo/CMake/ArmadilloConfig.cmake
 share/Armadillo/CMake/ArmadilloConfigVersion.cmake
-share/Armadillo/CMake/ArmadilloLibraryDepends-release.cmake
+share/Armadillo/CMake/ArmadilloLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
 share/Armadillo/CMake/ArmadilloLibraryDepends.cmake
 @dirrm share/Armadillo/CMake
 @dirrm share/Armadillo

More information about the svn-ports-all mailing list