From owner-svn-ports-all@freebsd.org Thu Jul 16 20:30:22 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C4DE9A305F; Thu, 16 Jul 2015 20:30:22 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.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 1722E1B0C; Thu, 16 Jul 2015 20:30:22 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6GKULR0068198; Thu, 16 Jul 2015 20:30:21 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6GKULBc068197; Thu, 16 Jul 2015 20:30:21 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507162030.t6GKULBc068197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 16 Jul 2015 20:30:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392319 - branches/2015Q3/multimedia/libav X-SVN-Group: ports-branches 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.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jul 2015 20:30:22 -0000 Author: feld Date: Thu Jul 16 20:30:21 2015 New Revision: 392319 URL: https://svnweb.freebsd.org/changeset/ports/392319 Log: MFH: r391811 - Use = instead of += - Convert to new options helper - Convert to new options target helper Approved by: ports-secteam (with hat) Modified: branches/2015Q3/multimedia/libav/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/multimedia/libav/Makefile ============================================================================== --- branches/2015Q3/multimedia/libav/Makefile Thu Jul 16 20:24:08 2015 (r392318) +++ branches/2015Q3/multimedia/libav/Makefile Thu Jul 16 20:30:21 2015 (r392319) @@ -18,27 +18,26 @@ WANT_SDL= yes USE_PERL5= build CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS+= --prefix="${PREFIX}" \ - --libdir="${PREFIX}/lib/${PORTNAME}" \ - --shlibdir="${PREFIX}/lib/${PORTNAME}" \ - --incdir="${PREFIX}/include/${PORTNAME}" \ - --mandir="${PREFIX}/man" \ - --datadir="${DATADIR}" \ - --extra-ldflags="-L${LOCALBASE}/lib" \ - --enable-pthreads \ - --enable-shared \ - --enable-runtime-cpudetect \ - --disable-debug \ - --cc="${CC}" +CONFIGURE_ARGS= --prefix="${PREFIX}" \ + --libdir="${PREFIX}/lib/${PORTNAME}" \ + --shlibdir="${PREFIX}/lib/${PORTNAME}" \ + --incdir="${PREFIX}/include/${PORTNAME}" \ + --mandir="${PREFIX}/man" \ + --datadir="${DATADIR}" \ + --extra-ldflags="-L${LOCALBASE}/lib" \ + --enable-pthreads \ + --enable-shared \ + --enable-runtime-cpudetect \ + --disable-debug \ + --cc="${CC}" OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DOCS FREETYPE \ FREI0R GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL \ OPUS PULSEAUDIO RTMP SCHROEDINGER SPEEX THEORA V4L VAAPI \ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX WAVPACK WEBP X11GRAB \ X264 XVID ZLIB - -OPTIONS_DEFAULT= BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ - THEORA VO_AACENC VORBIS VPX X264 XVID ZLIB +OPTIONS_DEFAULT=BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ + THEORA VO_AACENC VORBIS VPX X264 XVID ZLIB FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK ILBC_DESC= iLBC en/decoding via libilbc @@ -64,6 +63,8 @@ CDIO_CONFIGURE_ENABLE= libcdio # DC1394_LIB_DEPENDS= libdc1394.so:${PORTSDIR}/multimedia/libdc1394 # DC1394_CONFIGURE_ENABLE= libdc1394 +DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html + FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r @@ -99,6 +100,7 @@ OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${ OPENJPEG_CONFIGURE_ENABLE= libopenjpeg OPENSSL_CONFIGURE_ENABLE= openssl +OPENSSL_USE= OPENSSL=yes OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= libopus @@ -156,16 +158,6 @@ XVID_CONFIGURE_ENABLE= libxvid ZLIB_CONFIGURE_ENABLE= zlib -.include - -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html -.endif - -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -.endif - .include .if ${ARCH} == "armv6" @@ -230,10 +222,8 @@ post-patch: @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/library.mak -post-configure: -.if !${PORT_OPTIONS:MDOCS} +post-configure-DOCS-off: @${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak -.endif post-stage: .for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\