10 files changed, 13 insertions, 50 deletions

diff --git a/audio/tomahawk/Makefile b/audio/tomahawk/Makefile
index ead643fa3d2a..b928f96779e1 100644
--- a/audio/tomahawk/Makefile
+++ b/audio/tomahawk/Makefile
@@ -23,9 +23,7 @@ LIB_DEPENDS=	attica:${PORTSDIR}/x11-toolkits/attica \
 		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
diff --git a/audio/tomahawk/pkg-plist b/audio/tomahawk/pkg-plist
index 18395ffc6181..ba896705921b 100644
--- a/audio/tomahawk/pkg-plist
+++ b/audio/tomahawk/pkg-plist
@@ -301,7 +301,7 @@ include/libtomahawk/widgets/searchlineedit/SearchLineEdit.h
 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
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 1fdb1002f113..d261fff8915d 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -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>
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 4e8facd3ebfa..28cb2327411f 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -44,9 +44,6 @@ EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 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}"
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 7e46c35e6fee..c67e19e3ba6e 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -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}
diff --git a/devel/freeocl/Makefile b/devel/freeocl/Makefile
index 922cbdb6541d..e5e12f454af1 100644
--- a/devel/freeocl/Makefile
+++ b/devel/freeocl/Makefile
@@ -21,15 +21,10 @@ WRKSRC=		${WRKDIR}/FreeOCL-${PORTVERSION}-Source
 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>
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index c358b2fbd466..bdf067ac1ded 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -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
 
diff --git a/graphics/opencollada/pkg-plist b/graphics/opencollada/pkg-plist
index 22c5693bae08..213570175161 100644
--- a/graphics/opencollada/pkg-plist
+++ b/graphics/opencollada/pkg-plist
@@ -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
diff --git a/lang/hiphop-php/Makefile b/lang/hiphop-php/Makefile
index 40e226a5a708..38af9389b687 100644
--- a/lang/hiphop-php/Makefile
+++ b/lang/hiphop-php/Makefile
@@ -46,8 +46,7 @@ LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu \
 		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/bison \
 
 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>
diff --git a/math/armadillo/pkg-plist b/math/armadillo/pkg-plist
index 7a97a02e4b50..9de72012a190 100644
--- a/math/armadillo/pkg-plist
+++ b/math/armadillo/pkg-plist
@@ -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