From owner-svn-ports-all@FreeBSD.ORG Wed Oct 16 13:06:18 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 1AF8FC09; Wed, 16 Oct 2013 13:06:18 +0000 (UTC) (envelope-from wg@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 E2D842BFB; Wed, 16 Oct 2013 13:06:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GD6HCq022499; Wed, 16 Oct 2013 13:06:17 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GD6Hq6022497; Wed, 16 Oct 2013 13:06:17 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310161306.r9GD6Hq6022497@svn.freebsd.org> From: William Grzybowski Date: Wed, 16 Oct 2013 13:06:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330510 - head/multimedia/gmerlin-avdecoder 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: Wed, 16 Oct 2013 13:06:18 -0000 Author: wg Date: Wed Oct 16 13:06:17 2013 New Revision: 330510 URL: http://svnweb.freebsd.org/changeset/ports/330510 Log: multimedia/gmerlin-avdecoder: fix pkg-plist - Fix pkg-plist with non-default options - Fix detection of libs Modified: head/multimedia/gmerlin-avdecoder/Makefile head/multimedia/gmerlin-avdecoder/pkg-plist Modified: head/multimedia/gmerlin-avdecoder/Makefile ============================================================================== --- head/multimedia/gmerlin-avdecoder/Makefile Wed Oct 16 13:03:53 2013 (r330509) +++ head/multimedia/gmerlin-avdecoder/Makefile Wed Oct 16 13:06:17 2013 (r330510) @@ -30,8 +30,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cpuflags=none --without-doxygen USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include/ffmpeg0 -LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 +CPPFLAGS+= -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib .include Modified: head/multimedia/gmerlin-avdecoder/pkg-plist ============================================================================== --- head/multimedia/gmerlin-avdecoder/pkg-plist Wed Oct 16 13:03:53 2013 (r330509) +++ head/multimedia/gmerlin-avdecoder/pkg-plist Wed Oct 16 13:06:17 2013 (r330510) @@ -5,12 +5,12 @@ include/gmerlin/bgavdefs.h include/gmerlin/bgav_version.h %%GMERLIN%%lib/gmerlin/plugins/i_avdec.la %%GMERLIN%%lib/gmerlin/plugins/i_avdec.so -%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.la -%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.so -lib/gmerlin/plugins/i_dvb.la -lib/gmerlin/plugins/i_dvb.so -%%CDIO%%lib/gmerlin/plugins/i_vcd.la -%%CDIO%%lib/gmerlin/plugins/i_vcd.so +%%GMERLIN%%%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.la +%%GMERLIN%%%%CDIO%%%%DVDREAD%%lib/gmerlin/plugins/i_dvd.so +%%GMERLIN%%lib/gmerlin/plugins/i_dvb.la +%%GMERLIN%%lib/gmerlin/plugins/i_dvb.so +%%GMERLIN%%%%CDIO%%lib/gmerlin/plugins/i_vcd.la +%%GMERLIN%%%%CDIO%%lib/gmerlin/plugins/i_vcd.so lib/libgmerlin_avdec.la lib/libgmerlin_avdec.so lib/libgmerlin_avdec.so.1 @@ -18,4 +18,6 @@ libdata/pkgconfig/gmerlin_avdec.pc %%PORTDOCS%%%%DOCSDIR%%/README share/locale/de/LC_MESSAGES/gmerlin-avdecoder.mo %%PORTDOCS%%@dirrm %%DOCSDIR%% +%%GMERLIN%%@dirrmtry lib/gmerlin/plugins +%%GMERLIN%%@dirrmtry lib/gmerlin @dirrmtry include/gmerlin