CVS commit: pkgsrc/multimedia/gnash

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep 26 09:44:08 UTC 2017

Modified Files:
        pkgsrc/multimedia/gnash: PLIST options.mk

Log Message:
gnash: remove kde3 option


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/gnash/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/multimedia/gnash/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gnash/PLIST
diff -u pkgsrc/multimedia/gnash/PLIST:1.10 pkgsrc/multimedia/gnash/PLIST:1.11
--- pkgsrc/multimedia/gnash/PLIST:1.10  Thu Feb 16 10:44:53 2012
+++ pkgsrc/multimedia/gnash/PLIST       Tue Sep 26 09:44:08 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/02/16 10:44:53 obache Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/09/26 09:44:08 wiz Exp $
 ${PLIST.gstreamer}bin/findmicrophones
 ${PLIST.gstreamer}bin/findwebcams
 bin/gnash
@@ -6,7 +6,6 @@ ${PLIST.gtk}bin/gnash-gtk-launcher
 ${PLIST.kde4}bin/gnash-qt-launcher
 bin/gprocessor
 ${PLIST.gtk}bin/gtk-gnash
-${PLIST.kde3}bin/kde3-gnash
 ${PLIST.kde4}bin/kde4-gnash
 bin/rtmpget
 include/gnash/AMF.h
@@ -185,7 +184,6 @@ lib/gnash/libgnashdevice.la
 lib/gnash/libgnashmedia.la
 lib/gnash/libgnashrender.la
 lib/gnash/libgnashsound.la
-${PLIST.kde3}lib/kde3/libklashpart.la
 ${PLIST.kde4}lib/kde4/libklashpart.la
 ${PLIST.plugin}lib/netscape/plugins/libgnashplugin.so
 lib/pkgconfig/gnash.pc
@@ -213,7 +211,6 @@ share/gnash/gnash-splash.swf
 share/gnash/gnash_128_96.ico
 ${PLIST.kde}share/kde/apps/klash/klashpartui.rc
 ${PLIST.kde}share/kde/apps/klash/pluginsinfo
-${PLIST.kde3}share/kde/services/klash_part.desktop
 ${PLIST.kde4}share/kde4/services/klash_part.desktop
 ${PLIST.gtk}share/icons/hicolor/32x32/apps/gnash.xpm
 ${PLIST.kde4}share/icons/hicolor/32x32/apps/klash.xpm

Index: pkgsrc/multimedia/gnash/options.mk
diff -u pkgsrc/multimedia/gnash/options.mk:1.20 pkgsrc/multimedia/gnash/options.mk:1.21
--- pkgsrc/multimedia/gnash/options.mk:1.20     Mon Aug 11 23:09:45 2014
+++ pkgsrc/multimedia/gnash/options.mk  Tue Sep 26 09:44:08 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2014/08/11 23:09:45 wiz Exp $
+# $NetBSD: options.mk,v 1.21 2017/09/26 09:44:08 wiz Exp $
 #
 
 #
@@ -10,13 +10,13 @@ PKG_OPTIONS_OPTIONAL_GROUPS=        gnash-media
 PKG_OPTIONS_GROUP.gnash-media= ffmpeg gstreamer
 PKG_OPTIONS_REQUIRED_GROUPS=   gnash-gui gnash-renderer
 # XXX: add support for SDL or FLTK GUIs?
-PKG_OPTIONS_GROUP.gnash-gui=   gtk kde kde3
+PKG_OPTIONS_GROUP.gnash-gui=   gtk kde
 PKG_OPTIONS_GROUP.gnash-renderer=      agg cairo opengl
 PKG_SUGGESTED_OPTIONS+=                agg gstreamer gtk
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   gtk kde kde3 kde4 plugin gstreamer
+PLIST_VARS+=   gtk kde kde4 plugin gstreamer
 
 ###
 ### Select GUIs.
@@ -54,22 +54,6 @@ CONFIGURE_ARGS+=     --with-plugins-install=
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../meta-pkgs/kde4/kde4.mk"
 
-.elif !empty(PKG_OPTIONS:Mkde3)
-GNASH_GUIS+=           kde3
-PLIST.kde=             yes
-PLIST.kde3=            yes
-CONFIGURE_ARGS+=       --with-plugins-install=system
-# broken, not wroked as expected.
-#CONFIGURE_ARGS+=      --with-kde3-plugindir=${PREFIX}/lib/kde3
-#CONFIGURE_ARGS+=      --with-kde-appsdatadir=${PREFIX}/share/kde/apps
-#CONFIGURE_ARGS+=      --with-kde3-configdir=${PREFIX}/share/kde/config
-#CONFIGURE_ARGS+=      --with-kde3-servicesdir=${PREFIX}/share/kde/services
-.include "../../x11/kdebase3/buildlink3.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
-# overwrite, or not kde ralated files also will be installed in share/kde.
-CONFIGURE_ARGS+=       --datadir=${PREFIX}/share
-.endif
-
 CONFIGURE_ARGS+=       --enable-gui=${GNASH_GUIS:tW:S/ /,/}
 
 ###