From owner-svn-ports-all@FreeBSD.ORG Sat Oct 19 16:03:49 2013 Return-Path: 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 ESMTP id 2DFFB550; Sat, 19 Oct 2013 16:03:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 01DE721B1; Sat, 19 Oct 2013 16:03:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9JG3mvW034128; Sat, 19 Oct 2013 16:03:48 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9JG3mvO034126; Sat, 19 Oct 2013 16:03:48 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201310191603.r9JG3mvO034126@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 19 Oct 2013 16:03:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330897 - head/multimedia/ogmtools 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.14 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: Sat, 19 Oct 2013 16:03:49 -0000 Author: bapt Date: Sat Oct 19 16:03:48 2013 New Revision: 330897 URL: http://svnweb.freebsd.org/changeset/ports/330897 Log: Enable stage Use options helpers Modified: head/multimedia/ogmtools/Makefile head/multimedia/ogmtools/pkg-plist Modified: head/multimedia/ogmtools/Makefile ============================================================================== --- head/multimedia/ogmtools/Makefile Sat Oct 19 16:03:07 2013 (r330896) +++ head/multimedia/ogmtools/Makefile Sat Oct 19 16:03:48 2013 (r330897) @@ -10,20 +10,24 @@ MASTER_SITES= http://www.bunkus.org/vide MAINTAINER= multimedia@FreeBSD.org COMMENT= Tools to extract from/get info about/create OGG media streams -LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ogg-prefix=${LOCALBASE} \ --with-vorbis-prefix=${LOCALBASE} -MAN1= ogmcat.1 ogmdemux.1 ogminfo.1 ogmmerge.1 ogmsplit.1 - OPTIONS_DEFINE= DVDREAD OPTIONS_DEFAULT= DVDREAD DVDREAD_DESC= DVD title chapter extraction via libdvdread -NO_STAGE= yes +DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread +DVDREAD_CONFIGURE_ON= --with-dvdread \ + --with-dvdread-includes=${LOCALBASE} \ + --with-dvdread-libs=${LOCALBASE} +DVDREAD_CONFIGURE_OFF= --without-dvdread +OPTIONS_SUB= yes + post-patch: # disable GNU auto* tools @${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \ @@ -46,20 +50,4 @@ post-configure: 's!malloc.h!stdlib.h!; \ s|stdint.h|inttypes.h|' -.include - -.if ${PORT_OPTIONS:MDVDREAD} -LIB_DEPENDS+= dvdread.4:${PORTSDIR}/multimedia/libdvdread - -CONFIGURE_ARGS+= --with-dvdread \ - --with-dvdread-includes=${LOCALBASE} \ - --with-dvdread-libs=${LOCALBASE} -PLIST_SUB+= DVDREAD="" - -MAN1+= dvdxchap.1 -.else -CONFIGURE_ARGS+= --without-dvdread -PLIST_SUB+= DVDREAD="@comment " -.endif - .include Modified: head/multimedia/ogmtools/pkg-plist ============================================================================== --- head/multimedia/ogmtools/pkg-plist Sat Oct 19 16:03:07 2013 (r330896) +++ head/multimedia/ogmtools/pkg-plist Sat Oct 19 16:03:48 2013 (r330897) @@ -4,3 +4,9 @@ bin/ogmdemux bin/ogminfo bin/ogmmerge bin/ogmsplit +man/man1/ogmcat.1.gz +man/man1/ogmdemux.1.gz +man/man1/ogminfo.1.gz +man/man1/ogmmerge.1.gz +man/man1/ogmsplit.1.gz +%%DVDREAD%%man/man1/dvdxchap.1.gz