Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Sep 2015 15:12:17 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397986 - head/multimedia/openh264
Message-ID:  <201509261512.t8QFCHkI027956@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Sep 26 15:12:17 2015
New Revision: 397986
URL: https://svnweb.freebsd.org/changeset/ports/397986

Log:
  multimedia/openh264: convert to new option helpers

Modified:
  head/multimedia/openh264/Makefile

Modified: head/multimedia/openh264/Makefile
==============================================================================
--- head/multimedia/openh264/Makefile	Sat Sep 26 14:59:34 2015	(r397985)
+++ head/multimedia/openh264/Makefile	Sat Sep 26 15:12:17 2015	(r397986)
@@ -25,6 +25,9 @@ OPTIONS_DEFINE=	DEBUG PLUGINS TEST
 OPTIONS_DEFAULT=PLUGINS
 OPTIONS_SUB=	yes
 
+DEBUG_BUILD_DEPENDS_OFF=	${DEBUG_BUILD_DEPENDS_OFF_${ARCH}}
+DEBUG_BUILD_DEPENDS_OFF_amd64=	nasm:${PORTSDIR}/devel/nasm
+DEBUG_BUILD_DEPENDS_OFF_i386=	nasm:${PORTSDIR}/devel/nasm
 DEBUG_MAKE_ARGS=BUILDTYPE=Debug
 PLUGINS_BUILD_DEPENDS=gmp-api>=34.0:${PORTSDIR}/multimedia/gmp-api
 #			gmp-api<36.0:${PORTSDIR}/multimedia/gmp-api
@@ -42,14 +45,6 @@ TEST_CFLAGS=	-I${LOCALBASE}/include
 TEST_MAKE_ARGS=	HAVE_GTEST=Yes
 TEST_ALL_TARGET=test
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MDEBUG}
-. if ${ARCH} == amd64 || ${ARCH} == i386
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-. endif
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e '/gtest-targets\.mk/d' \
 		-e '/pkgconfig/s/lib/libdata/' \
@@ -62,11 +57,11 @@ pre-build:
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.0
-.if ${PORT_OPTIONS:MPLUGINS}
+
+post-install-PLUGINS-on:
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_DATA} ${WRKSRC}/gmp${PORTNAME}.info ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_LIB} ${WRKSRC}/libgmp${PORTNAME}.so ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_DATA} ${WRKDIR}/gmp${PORTNAME}.js ${STAGEDIR}${WEBPLUGIN_DIR}
-.endif
 
 .include <bsd.port.mk>



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