From owner-svn-ports-all@FreeBSD.ORG  Thu Apr 24 15:11:01 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D466A344;
 Thu, 24 Apr 2014 15:11:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C1C6316C4;
 Thu, 24 Apr 2014 15:11:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OFB1BI087363;
 Thu, 24 Apr 2014 15:11:01 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OFB15B087362;
 Thu, 24 Apr 2014 15:11:01 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201404241511.s3OFB15B087362@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 24 Apr 2014 15:11:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r352010 - head/net/openh323
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2014 15:11:01 -0000

Author: amdmi3
Date: Thu Apr 24 15:11:01 2014
New Revision: 352010
URL: http://svnweb.freebsd.org/changeset/ports/352010
QAT: https://qat.redports.org/buildarchive/r352010/

Log:
  - Optionize

Modified:
  head/net/openh323/Makefile

Modified: head/net/openh323/Makefile
==============================================================================
--- head/net/openh323/Makefile	Thu Apr 24 15:01:05 2014	(r352009)
+++ head/net/openh323/Makefile	Thu Apr 24 15:11:01 2014	(r352010)
@@ -29,19 +29,15 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${WR
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	BUILDTIME="YES"
 
-.include <bsd.port.pre.mk>
-
-.ifdef (WITH_FFMPEG)
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=	--enable-rfc2190avcodec=${LOCALBASE}/include/ffmpeg
-.endif
+OPTIONS_DEFINE=		FFMPEG SPEEX
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_CONFIGURE_ON=	--enable-rfc2190avcodec=${LOCALBASE}/include/ffmpeg
+
+SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_CONFIGURE_ON=	--enable-localspeex=no
+SPEEX_CONFIGURE_OFF=	--enable-localspeex=yes
 
-.ifdef (WITH_SPEEX)
-LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
-CONFIGURE_ARGS+=	--enable-localspeex=no
-.else
-CONFIGURE_ARGS+=	--enable-localspeex=yes
-.endif
+.include <bsd.port.pre.mk>
 
 .if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "powerpc") || (${ARCH} == "sparc64")
 CFLAGS+=	-fPIC