Date: Sat, 6 Jul 2013 16:33:21 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322399 - head/graphics/gnash Message-ID: <201307061633.r66GXLJB028322@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sat Jul 6 16:33:21 2013 New Revision: 322399 URL: http://svnweb.freebsd.org/changeset/ports/322399 Log: - remove option KDE3 PR: 180271 Submitted by: Rene Ladan Modified: head/graphics/gnash/Makefile head/graphics/gnash/pkg-plist Modified: head/graphics/gnash/Makefile ============================================================================== --- head/graphics/gnash/Makefile Sat Jul 6 15:45:10 2013 (r322398) +++ head/graphics/gnash/Makefile Sat Jul 6 16:33:21 2013 (r322399) @@ -39,6 +39,7 @@ CONFIGURE_ARGS= --with-boost-incl="${LOC --disable-testsuite \ --with-plugins-install=prefix \ --sysconfdir="${WRKDIR}/etc" \ + --disable-kparts3 \ --disable-jemalloc \ --disable-silent-rules @@ -56,7 +57,7 @@ MAN1= cygnal.1 findmicrophones.1 findwe 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,14 +109,6 @@ PLIST_SUB+= NPAPI="@comment " 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="" USE_LDCONFIG+= ${KDE4_PREFIX}/lib/kde4 @@ -139,14 +132,6 @@ MAN1+= gnash-gtk-launcher.1 gtk-gnash.1 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 +139,13 @@ USE_QT4= moc_build 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 +155,12 @@ CONFIGURE_ARGS+=--enable-gui=`${ECHO} ${ # 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 +169,8 @@ LIB_DEPENDS+= gtkglext-x11-1.0:${PORTSD .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 +187,7 @@ CONFIGURE_ARGS+= --enable-renderer=`${EC # .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 +199,7 @@ PLIST_SUB+= VAAPI="@comment " # # 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 +252,6 @@ post-install: @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 Modified: head/graphics/gnash/pkg-plist ============================================================================== --- head/graphics/gnash/pkg-plist Sat Jul 6 15:45:10 2013 (r322398) +++ head/graphics/gnash/pkg-plist Sat Jul 6 16:33:21 2013 (r322399) @@ -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 @@ -191,11 +190,6 @@ include/gnash/vm/SafeStack.h include/gnash/vm/VM.h include/gnash/vm/fn_call.h include/gnash/zlib_adapter.h -%%KPARTS3%%share/apps/klash/pluginsinfo -%%KPARTS3%%share/apps/klash/klashpartui.rc -%%KPARTS3%%share/services/klash_part.desktop -%%KPARTS3%%lib/kde3/libklashpart.la -%%KPARTS3%%lib/kde3/libklashpart.so %%KPARTS4%%kde4/share/apps/klash/pluginsinfo %%KPARTS4%%kde4/share/apps/klash/klashpartui.rc %%KPARTS4%%kde4/share/kde4/services/klash_part.desktop @@ -261,6 +255,5 @@ share/locale/zh_TW/LC_MESSAGES/gnash.mo @dirrm include/gnash/parser @dirrm include/gnash/asobj @dirrm include/gnash -%%KPARTS3%%@dirrm share/apps/klash %%KPARTS4%%@dirrm kde4/share/apps/klash %%NPAPI%%@dirrmtry %%WEBPLUGINS_DIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307061633.r66GXLJB028322>