svn commit: r330510 - head/multimedia/gmerlin-avdecoder

[William Grzybowski]

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 <bsd.port.options.mk>
 

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