diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2007-05-29 13:38:23 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2007-05-29 13:38:23 +0000 |
| commit | fa229165be7c68e65c9535b7c5af41e2829dd564 (patch) | |
| tree | 583659c25aac70f35be7bbc9b2ce11711e6de82b | |
| parent | 04ba337129df4afa046156fa96a7809f195da4ec (diff) | |
| download | ports-fa229165be7c68e65c9535b7c5af41e2829dd564.tar.gz ports-fa229165be7c68e65c9535b7c5af41e2829dd564.zip | |
Fix DVB support after 0.8.4 update [1]
Remove WITH_DVB knob and build with DVB support per default
Reported by: Lars Engels [1]
Notes
Notes:
svn path=/head/; revision=192302
| -rw-r--r-- | multimedia/kaffeine/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/kaffeine/pkg-plist | 14 |
2 files changed, 8 insertions, 15 deletions
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 5e10f60ad91d..fd6f3fd14236 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} -I${WRKSRC}" +CONFIGURE_ENV= CXXFLAGS="${CFLAGS} -I${WRKSRC}" CFLAGS="${CFLAGS} -I${WRKSRC}" CONFIGURE_TARGET= DVB_HEADERS= ca.h dmx.h frontend.h net.h @@ -40,11 +40,6 @@ PLIST_SUB+= NOLAME="" CONFIGURE_ARGS+= --without-lame PLIST_SUB+= NOLAME="@comment " .endif -.ifdef (WITH_DVB) -PLIST_SUB+= NODVB="" -.else -PLIST_SUB+= NODVB="@comment " -.endif .include <bsd.port.pre.mk> @@ -60,10 +55,8 @@ post-patch: ${REINPLACE_CMD} -e "s,xx,," ${WRKSRC}/po/Makefile.in ${REINPLACE_CMD} "s,#include <endian.h>,," \ ${WRKSRC}/kaffeine/src/input/disc/paranoia.cpp -.ifdef (WITH_DVB) ${MKDIR} ${WRKSRC}/linux/dvb cd ${FILESDIR}; ${CP} ${DVB_HEADERS} ${WRKSRC}/linux/dvb -.endif post-install: ${RM} ${PREFIX}/share/doc/HTML/en/doc/CMakeLists.txt diff --git a/multimedia/kaffeine/pkg-plist b/multimedia/kaffeine/pkg-plist index a16ae509d948..fcbd026ef413 100644 --- a/multimedia/kaffeine/pkg-plist +++ b/multimedia/kaffeine/pkg-plist @@ -4,7 +4,7 @@ include/kaffeine/mrl.h include/kaffeine/kaffeinepart.h include/kaffeine/xine_part.h include/kaffeine/xine_part_iface.h -%%NODVB%%include/kaffeine/kaffeinedvbplugin.h +include/kaffeine/kaffeinedvbplugin.h %%NOGSTREAMER%%lib/kde3/libgstreamerpart.a %%NOGSTREAMER%%lib/kde3/libgstreamerpart.so %%NOGSTREAMER%%lib/kde3/libgstreamerpart.la @@ -21,10 +21,10 @@ lib/libkaffeineaudioencoder.so.0 lib/libkaffeinepart.so lib/libkaffeinepart.la lib/libkaffeinepart.a -%%NODVB%%lib/libkaffeinedvbplugin.so.0 -%%NODVB%%lib/libkaffeinedvbplugin.so -%%NODVB%%lib/libkaffeinedvbplugin.la -%%NODVB%%lib/libkaffeinedvbplugin.a +lib/libkaffeinedvbplugin.so.0 +lib/libkaffeinedvbplugin.so +lib/libkaffeinedvbplugin.la +lib/libkaffeinedvbplugin.a lib/kde3/libxinepart.so lib/kde3/libxinepart.la lib/kde3/libxinepart.a @@ -41,7 +41,7 @@ share/apps/kaffeine/rtsp.protocol share/apps/kaffeine/dvbdata.tar.gz share/apps/kaffeine/xine_part.rc share/apps/kaffeine/pics/playing.png -%%NODVB%%share/apps/kaffeine/kaffeinedvb.rc +share/apps/kaffeine/kaffeinedvb.rc share/apps/konqueror/servicemenus/kaffeine_open_directory.desktop share/apps/konqueror/servicemenus/kaffeine_append_file.desktop share/apps/konqueror/servicemenus/kaffeine_play_audiocd.desktop @@ -136,7 +136,7 @@ share/mimelnk/application/x-kaffeine.desktop share/services/kaffeineoggvorbis.desktop share/services/xine_part.desktop share/servicetypes/kaffeineaudioencoder.desktop -%%NODVB%%share/servicetypes/kaffeinedvbplugin.desktop +share/servicetypes/kaffeinedvbplugin.desktop @dirrm include/kaffeine @dirrm share/apps/kaffeine/pics @dirrm share/apps/kaffeine |