ports/180271: graphics/gnash : remove KDE3 support

Rene Ladan rene at FreeBSD.org
Thu Jul 4 16:30:00 UTC 2013


>Number:         180271
>Category:       ports
>Synopsis:       graphics/gnash : remove KDE3 support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 04 16:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Rene Ladan
>Release:        FreeBSD 9.1-amd64
>Organization:
>Environment:
FreeBSD 9.1-amd64
FreeBSD Ports r322216
>Description:
Remove support for the expired KDE3
While here pet portlint by removing trailing spaces in Makefile
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 322216)
+++ Makefile	(working copy)
@@ -56,7 +56,7 @@
 
 OPTIONS_DEFINE=	PLUGIN CYGNAL VAAPI FFMPEG GSTREAMER
 OPTIONS_SINGLE=	GUI RENDERER
-OPTIONS_SINGLE_GUI=	GTK2 KDE3 KDE4
+OPTIONS_SINGLE_GUI=	GTK2 KDE4
 OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO
 #OPTIONS_SINGLE_MEDIA=	FFMPEG GSTREAMER
 OPTIONS_DEFAULT=GTK2 PLUGIN AGG FFMPEG VAAPI
@@ -108,13 +108,8 @@
 CONFIGURE_ARGS+=	--disable-npapi
 .endif
 
-.if ${PORT_OPTIONS:MKDE3} && ${PORT_OPTIONS:MPLUGIN}
-PLIST_SUB+=	KPARTS3=""
-USE_LDCONFIG+=	${PREFIX}/lib/kde3
-.else
 PLIST_SUB+=	KPARTS3="@comment "
 CONFIGURE_ARGS+=	--disable-kparts3
-.endif
 
 .if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MPLUGIN}
 PLIST_SUB+=	KPARTS4=""
@@ -139,14 +134,6 @@
 PLIST_SUB+=	GTK="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MKDE3} 
-GNASH_GUIS+=	kde3
-PLIST_SUB+=	KDE=""
-USE_KDELIBS_VER=3
-.else
-PLIST_SUB+=	KDE="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MKDE4}
 GNASH_GUIS+=	kde4
 PLIST_SUB+=	KDE4=""
@@ -154,20 +141,13 @@
 QT_NONSTANDARD=	yes
 USE_KDE4=	kdehier kdelibs
 CONFIGURE_ENV+=	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
-.if exists(${LOCALBASE}/lib/libkdeui.so)
-IGNORE=		KDE4 GUI can't be built when KDE3 is installed. Please rerun 'make config' and disable KDE4 GUI or deinstall kdelibs-3
-.endif
 MAN1+=		gnash-qt-launcher.1 kde4-gnash.1
 .else
 PLIST_SUB+=	KDE4="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MKDE3} && ${PORT_OPTIONS:MKDE4}
-IGNORE=		KDE3 and KDE4 GUIs are mutually exclusive. Please rerun 'make config' and disable one of these
-.endif
-
 .if ${GNASH_GUIS} == ""
-IGNORE=		needs at least one GUI enabled. Please rerun 'make config' and enable GTK, KDE or KDE4
+IGNORE=		needs at least one GUI enabled. Please rerun 'make config' and enable GTK or KDE4
 .endif
 
 CONFIGURE_ARGS+=--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
@@ -177,12 +157,12 @@
 #
 GNASH_RENDERERS=
 
-.if ${PORT_OPTIONS:MAGG} 
+.if ${PORT_OPTIONS:MAGG}
 LIB_DEPENDS+=		agg:${PORTSDIR}/graphics/agg
 GNASH_RENDERERS+=	agg
 .endif
 
-.if ${PORT_OPTIONS:MOPENGL} 
+.if ${PORT_OPTIONS:MOPENGL}
 USE_GL=			yes
 GNASH_RENDERERS+=	ogl
 .if ${PORT_OPTIONS:MGTK2}
@@ -191,8 +171,8 @@
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO}
-.if ${PORT_OPTIONS:MKDE3} || ${PORT_OPTIONS:MKDE4}
-IGNORE=			doesn't support Cairo renderer with KDE/KDE4 gui. Please rerun 'make config' and select different renderer or disable KDE/KDE4 GUIs
+.if ${PORT_OPTIONS:MKDE4}
+IGNORE=			doesn't support Cairo renderer with KDE4 gui. Please rerun 'make config' and select different renderer or disable KDE4 GUI
 .endif
 LIB_DEPENDS+=		cairo.2:${PORTSDIR}/graphics/cairo
 GNASH_RENDERERS+=	cairo
@@ -209,7 +189,7 @@
 #
 .if ${PORT_OPTIONS:MVAAPI}
 .if empty(PORT_OPTIONS:MFFMPEG)
-IGNORE=			VAAPI currently works only with FFMPEG. Please rerun 'make config' and enable FFMPEG.
+IGNORE=			VAAPI currently works only with FFMPEG. Please rerun 'make config' and enable FFMPEG
 .endif
 LIB_DEPENDS+=		va:${PORTSDIR}/multimedia/libva
 PLIST_SUB+=		VAAPI=""
@@ -221,7 +201,7 @@
 #
 # Media handler options processing
 #
-.if ${PORT_OPTIONS:MFFMPEG} && empty(PORT_OPTIONS:MGSTREAMER) 
+.if ${PORT_OPTIONS:MFFMPEG} && empty(PORT_OPTIONS:MGSTREAMER)
 LIB_DEPENDS+=		avcodec:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=	--enable-media=ffmpeg
 USE_SDL+=		sdl
@@ -274,10 +254,6 @@
 	@cd ${INSTALL_WRKSRC}/plugin && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
 .endif
-.if ${PORT_OPTIONS:MKDE3}
-	@cd ${INSTALL_WRKSRC}/plugin/klash && \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
-.endif
 .if ${PORT_OPTIONS:MKDE4}
 	@cd ${INSTALL_WRKSRC}/plugin/klash4 && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 322216)
+++ pkg-plist	(working copy)
@@ -1,7 +1,6 @@
 bin/gnash
 %%GTK%%bin/gnash-gtk-launcher
 %%GTK%%bin/gtk-gnash
-%%KDE%%bin/kde3-gnash
 %%KDE4%%bin/gnash-qt-launcher
 %%KDE4%%bin/kde4-gnash
 bin/gprocessor


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list