- Update to 0.6.6

- Preserve vendor non-optimization compiler flags
- Reformat the Makefile

3 files changed, 159 insertions, 176 deletions

diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index af83adaf1671..c0b8f2bd0db1 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -5,35 +5,33 @@
 # $FreeBSD$
 #
 
-PORTNAME=		beast
-PORTVERSION=		0.6.4
-PORTREVISION=	2
-CATEGORIES=		audio
-MASTER_SITES=		ftp://beast.gtk.org/pub/beast/v0.6/ \
-			http://beast.gtk.org/beast-ftp/v0.6/
-
-MAINTAINER=		jylefort@FreeBSD.org
-COMMENT=		A powerful music composition and modular synthesis application
-
-LIB_DEPENDS=		vorbisfile:${PORTSDIR}/audio/libvorbis \
-			mad:${PORTSDIR}/audio/libmad \
-			guile:${PORTSDIR}/lang/guile
-
-USE_X_PREFIX=		yes
-USE_GMAKE=		yes
-USE_GCC=		3.4
-USE_REINPLACE=		yes
-USE_GNOME=		gnomehack gnomeprefix intlhack libgnomecanvas
-USE_INC_LIBTOOL_VER=	15
-INSTALLS_SHLIB=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=		--disable-debug \
-			--enable-osspcm=/dev/dsp \
-			--enable-ossmidi=/dev/midi
-
-MAN1=			beast.1 bsesh.1 sfidl.1
-MAN3=			beast-gxk.3 bse-procs.3 bse-structs.3 bse.3 sfi.3
+PORTNAME=	beast
+PORTVERSION=	0.6.6
+CATEGORIES=	audio
+MASTER_SITES=	ftp://beast.gtk.org/pub/beast/v0.6/ \
+		http://beast.gtk.org/beast-ftp/v0.6/
+
+MAINTAINER=	jylefort@FreeBSD.org
+COMMENT=	A powerful music composition and modular synthesis application
+
+LIB_DEPENDS=	vorbisfile:${PORTSDIR}/audio/libvorbis \
+		mad:${PORTSDIR}/audio/libmad \
+		guile:${PORTSDIR}/lang/guile
+
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
+USE_GNOME=	gnomehack gnomeprefix intlhack libgnomecanvas
+USE_LIBTOOL_VER=	15
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DENODATA=255" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-debug \
+		--enable-osspcm=/dev/dsp \
+		--enable-ossmidi=/dev/midi
+
+MAN1=		beast.1 bsesh.1 sfidl.1
+MAN3=		beast-gxk.3 bse-procs.3 bse-structs.3 bse.3 sfi.3
 
 .include <bsd.port.pre.mk>
 
@@ -41,15 +39,10 @@ MAN3=			beast-gxk.3 bse-procs.3 bse-structs.3 bse.3 sfi.3
 IGNORE=	does not compile on FreeBSD 4.x, missing library function isfinite
 .endif
 
-.if ${ARCH} == "sparc64" || ${ARCH} == "ia64"
-BROKEN=		"Does not compile on sparc64 or ia64"
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's|(bseladspapath=)\$${libdir}/ladspa|\1"${LOCALBASE}/lib/ladspa"|' \
-		-e 's/(FLAGS) (-g.*|-pipe|-O2|-f.*)"/\1"/g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -Ee 's|$${libdir}/ladspa|${LOCALBASE}/lib/ladspa|; \
+		/FLAGS=/ s/(-g|-ggdb3|-pipe|-O2|-ftracer|-finline-functions|-fno-keep-static-consts)//' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/bse/Makefile.in \
 		${WRKSRC}/bse/zintern/Makefile.in
diff --git a/audio/beast/distinfo b/audio/beast/distinfo
index c10bdf39c37f..42db6bdcde79 100644
--- a/audio/beast/distinfo
+++ b/audio/beast/distinfo
@@ -1,2 +1,2 @@
-MD5 (beast-0.6.4.tar.gz) = be72fe4215b70e8bbf6aca8e0dcef52f
-SIZE (beast-0.6.4.tar.gz) = 5772010
+MD5 (beast-0.6.6.tar.gz) = b79337930476c7a19f211b91857c4b4c
+SIZE (beast-0.6.6.tar.gz) = 6098356
diff --git a/audio/beast/pkg-plist b/audio/beast/pkg-plist
index 48e8c3e10111..ac9bc2f6eff0 100644
--- a/audio/beast/pkg-plist
+++ b/audio/beast/pkg-plist
@@ -1,7 +1,7 @@
 bin/beast
-bin/beast-0.6.4
+bin/beast-0.6.6
 bin/bsesh
-bin/bsesh-0.6.4
+bin/bsesh-0.6.6
 bin/sfidl
 include/bse/bse.h
 include/bse/bse.idl
@@ -16,18 +16,18 @@ include/bse/bseconstant.h
 include/bse/bseconstvalues.h
 include/bse/bsecontainer.h
 include/bse/bsecontextmerger.h
-include/bse/bsecore.gen-idl.h
+include/bse/bsecore.genidl.hh
 include/bse/bsecore.idl
 include/bse/bsecsynth.h
-include/bse/bsecxxarg.h
-include/bse/bsecxxbase.h
+include/bse/bsecxxarg.hh
+include/bse/bsecxxbase.hh
 include/bse/bsecxxbase.idl
-include/bse/bsecxxclosure.h
-include/bse/bsecxxmodule.h
+include/bse/bsecxxclosure.hh
+include/bse/bsecxxmodule.hh
 include/bse/bsecxxmodule.idl
-include/bse/bsecxxplugin.h
-include/bse/bsecxxutils.h
-include/bse/bsecxxvalue.h
+include/bse/bsecxxplugin.hh
+include/bse/bsecxxutils.hh
+include/bse/bsecxxvalue.hh
 include/bse/bsedatapocket.h
 include/bse/bsedefs.h
 include/bse/bsedevice.h
@@ -53,6 +53,7 @@ include/bse/bseitem.h
 include/bse/bsejanitor.h
 include/bse/bseladspa.h
 include/bse/bseladspamodule.h
+include/bse/bseloader.h
 include/bse/bsemain.h
 include/bse/bsemath.h
 include/bse/bsemathsignal.h
@@ -116,7 +117,6 @@ include/bse/gsldefs.h
 include/bse/gslfft.h
 include/bse/gslfilehash.h
 include/bse/gslfilter.h
-include/bse/gslloader.h
 include/bse/gslmagic.h
 include/bse/gsloscillator.h
 include/bse/gslosctable.h
@@ -148,151 +148,141 @@ include/sfi/sfitypes.h
 include/sfi/sfiustore.h
 include/sfi/sfivalues.h
 include/sfi/sfivmarshal.h
-lib/bse/v0.6.4/plugins/artscompressor.la
-lib/bse/v0.6.4/plugins/artscompressor.so
-lib/bse/v0.6.4/plugins/bseadder.la
-lib/bse/v0.6.4/plugins/bseadder.so
-lib/bse/v0.6.4/plugins/bseatandistort.la
-lib/bse/v0.6.4/plugins/bseatandistort.so
-lib/bse/v0.6.4/plugins/bsebalance.la
-lib/bse/v0.6.4/plugins/bsebalance.so
-lib/bse/v0.6.4/plugins/bsecontribsampleandhold.la
-lib/bse/v0.6.4/plugins/bsecontribsampleandhold.so
-lib/bse/v0.6.4/plugins/bseevaluator.la
-lib/bse/v0.6.4/plugins/bseevaluator.so
-lib/bse/v0.6.4/plugins/bseiirfilter.la
-lib/bse/v0.6.4/plugins/bseiirfilter.so
-lib/bse/v0.6.4/plugins/bsemixer.la
-lib/bse/v0.6.4/plugins/bsemixer.so
-lib/bse/v0.6.4/plugins/bsemult.la
-lib/bse/v0.6.4/plugins/bsemult.so
-lib/bse/v0.6.4/plugins/bsenoise.la
-lib/bse/v0.6.4/plugins/bsenoise.so
-lib/bse/v0.6.4/plugins/bsesequencer.la
-lib/bse/v0.6.4/plugins/bsesequencer.so
-lib/bse/v0.6.4/plugins/bsesimpleadsr.la
-lib/bse/v0.6.4/plugins/bsesimpleadsr.so
-lib/bse/v0.6.4/plugins/davbassfilter.la
-lib/bse/v0.6.4/plugins/davbassfilter.so
-lib/bse/v0.6.4/plugins/davcanyondelay.la
-lib/bse/v0.6.4/plugins/davcanyondelay.so
-lib/bse/v0.6.4/plugins/davchorus.la
-lib/bse/v0.6.4/plugins/davchorus.so
-lib/bse/v0.6.4/plugins/davorgan.la
-lib/bse/v0.6.4/plugins/davorgan.so
-lib/bse/v0.6.4/plugins/davsyndrum.la
-lib/bse/v0.6.4/plugins/davsyndrum.so
-lib/bse/v0.6.4/plugins/davxtalstrings.la
-lib/bse/v0.6.4/plugins/davxtalstrings.so
-lib/bse/v0.6.4/plugins/freeverb.la
-lib/bse/v0.6.4/plugins/freeverb.so
+lib/bse/v0.6.6/plugins/artscompressor.so
+lib/bse/v0.6.6/plugins/bseadder.so
+lib/bse/v0.6.6/plugins/bseatandistort.so
+lib/bse/v0.6.6/plugins/bsebalance.so
+lib/bse/v0.6.6/plugins/bsecontribsampleandhold.so
+lib/bse/v0.6.6/plugins/bseevaluator.so
+lib/bse/v0.6.6/plugins/bseiirfilter.so
+lib/bse/v0.6.6/plugins/bsemixer.so
+lib/bse/v0.6.6/plugins/bsemult.so
+lib/bse/v0.6.6/plugins/bsenoise.so
+lib/bse/v0.6.6/plugins/bsesequencer.so
+lib/bse/v0.6.6/plugins/bsesimpleadsr.so
+lib/bse/v0.6.6/plugins/davbassfilter.so
+lib/bse/v0.6.6/plugins/davcanyondelay.so
+lib/bse/v0.6.6/plugins/davchorus.so
+lib/bse/v0.6.6/plugins/davorgan.so
+lib/bse/v0.6.6/plugins/davsyndrum.so
+lib/bse/v0.6.6/plugins/davxtalstrings.so
+lib/bse/v0.6.6/plugins/freeverb.so
+lib/bse/v0.6.6/plugins/standardguspatchenvelope.so
+lib/bse/v0.6.6/plugins/standardsaturator.so
 lib/libbse-0.6.so
-lib/libbse-0.6.so.4
-lib/libbse.la
+lib/libbse-0.6.so.6
+lib/libbse.a
 lib/libbse.so
 lib/libsfi-0.6.so
-lib/libsfi-0.6.so.4
-lib/libsfi.la
+lib/libsfi-0.6.so.6
+lib/libsfi.a
 lib/libsfi.so
 libdata/pkgconfig/bse.pc
 libdata/pkgconfig/sfi.pc
 share/gnome/application-registry/beast.applications
 share/gnome/applications/beast.desktop
-share/gnome/beast/v0.6.4/docs/architecture.markup
-share/gnome/beast/v0.6.4/docs/beast-gxk.3.markup
-share/gnome/beast/v0.6.4/docs/beast-index.markup
-share/gnome/beast/v0.6.4/docs/beast.1.markup
-share/gnome/beast/v0.6.4/docs/bse-procs.3.markup
-share/gnome/beast/v0.6.4/docs/bse-structs.3.markup
-share/gnome/beast/v0.6.4/docs/bse.3.markup
-share/gnome/beast/v0.6.4/docs/bsesh.1.markup
-share/gnome/beast/v0.6.4/docs/engine-mplan.markup
-share/gnome/beast/v0.6.4/docs/faq.markup
-share/gnome/beast/v0.6.4/docs/objdoc.markup
-share/gnome/beast/v0.6.4/docs/plugin-devel.markup
-share/gnome/beast/v0.6.4/docs/quickstart.markup
-share/gnome/beast/v0.6.4/docs/release-news.markup
-share/gnome/beast/v0.6.4/docs/release-notes.markup
-share/gnome/beast/v0.6.4/docs/sfi.3.markup
-share/gnome/beast/v0.6.4/docs/sfidl-manual.markup
-share/gnome/beast/v0.6.4/docs/sfidl.1.markup
-share/gnome/beast/v0.6.4/images/beast-components.png
-share/gnome/beast/v0.6.4/images/beast-mime.png
-share/gnome/beast/v0.6.4/images/beast-progs.png
-share/gnome/beast/v0.6.4/images/beast-splash.png
-share/gnome/beast/v0.6.4/images/bse-mime.png
-share/gnome/beast/v0.6.4/images/module-voices.png
-share/gnome/beast/v0.6.4/keys/keyrc.de
-share/gnome/beast/v0.6.4/keys/keyrc.us
-share/gnome/beast/v0.6.4/skins/biogreen.skin
-share/gnome/beast/v0.6.4/skins/blueimpress.skin
-share/gnome/beast/v0.6.4/skins/brownforms.skin
-share/gnome/beast/v0.6.4/skins/images/biogreen.jpg
-share/gnome/beast/v0.6.4/skins/images/blueimpress.jpg
-share/gnome/beast/v0.6.4/skins/images/brownforms.jpg
-share/gnome/beast/v0.6.4/skins/images/moonpaper.png
-share/gnome/beast/v0.6.4/skins/images/silvervein.png
-share/gnome/beast/v0.6.4/skins/moonpaper.skin
-share/gnome/beast/v0.6.4/skins/silvervein.skin
-share/gnome/beast/v0.6.4/skins/white.skin
-share/gnome/bse/v0.6.4/demo/partymonster.bse
-share/gnome/bse/v0.6.4/demo/stereo-through.bse
-share/gnome/bse/v0.6.4/demo/x2-midi-test.bse
-share/gnome/bse/v0.6.4/effects/atan-canyon.bse
-share/gnome/bse/v0.6.4/instruments/synth-lead.bse
-share/gnome/bse/v0.6.4/instruments/test-string.bse
-share/gnome/bse/v0.6.4/scripts/bse-scm-glue.boot
-share/gnome/bse/v0.6.4/scripts/modules2grid.scm
-share/gnome/bse/v0.6.4/scripts/part-harmonic-transposer.scm
-share/gnome/bse/v0.6.4/scripts/progressor-example.scm
-share/gnome/bse/v0.6.4/scripts/song-parts-operations.scm
+share/gnome/beast/v0.6.6/docs/architecture.markup
+share/gnome/beast/v0.6.6/docs/beast-gxk.3.markup
+share/gnome/beast/v0.6.6/docs/beast-index.markup
+share/gnome/beast/v0.6.6/docs/beast.1.markup
+share/gnome/beast/v0.6.6/docs/bse-procs.3.markup
+share/gnome/beast/v0.6.6/docs/bse-structs.3.markup
+share/gnome/beast/v0.6.6/docs/bse.3.markup
+share/gnome/beast/v0.6.6/docs/bsesh.1.markup
+share/gnome/beast/v0.6.6/docs/engine-mplan.markup
+share/gnome/beast/v0.6.6/docs/faq.markup
+share/gnome/beast/v0.6.6/docs/objdoc.markup
+share/gnome/beast/v0.6.6/docs/plugin-devel.markup
+share/gnome/beast/v0.6.6/docs/quickstart.markup
+share/gnome/beast/v0.6.6/docs/release-news.markup
+share/gnome/beast/v0.6.6/docs/release-notes.markup
+share/gnome/beast/v0.6.6/docs/sfi.3.markup
+share/gnome/beast/v0.6.6/docs/sfidl-manual.markup
+share/gnome/beast/v0.6.6/docs/sfidl.1.markup
+share/gnome/beast/v0.6.6/images/beast-components.png
+share/gnome/beast/v0.6.6/images/beast-mime.png
+share/gnome/beast/v0.6.6/images/beast-progs.png
+share/gnome/beast/v0.6.6/images/beast-splash.png
+share/gnome/beast/v0.6.6/images/bse-mime.png
+share/gnome/beast/v0.6.6/images/module-voices.png
+share/gnome/beast/v0.6.6/keys/keyrc.de
+share/gnome/beast/v0.6.6/keys/keyrc.us
+share/gnome/beast/v0.6.6/skins/biogreen.skin
+share/gnome/beast/v0.6.6/skins/blueimpress.skin
+share/gnome/beast/v0.6.6/skins/brownforms.skin
+share/gnome/beast/v0.6.6/skins/images/biogreen.jpg
+share/gnome/beast/v0.6.6/skins/images/blueimpress.jpg
+share/gnome/beast/v0.6.6/skins/images/brownforms.jpg
+share/gnome/beast/v0.6.6/skins/images/moonpaper.png
+share/gnome/beast/v0.6.6/skins/images/silvervein.png
+share/gnome/beast/v0.6.6/skins/moonpaper.skin
+share/gnome/beast/v0.6.6/skins/silvervein.skin
+share/gnome/beast/v0.6.6/skins/white.skin
+share/gnome/bse/v0.6.6/demo/partymonster.bse
+share/gnome/bse/v0.6.6/demo/stereo-through.bse
+share/gnome/bse/v0.6.6/demo/x2-midi-test.bse
+share/gnome/bse/v0.6.6/effects/atan-canyon.bse
+share/gnome/bse/v0.6.6/instruments/synth-lead.bse
+share/gnome/bse/v0.6.6/instruments/test-string.bse
+share/gnome/bse/v0.6.6/scripts/bse-scm-glue.boot
+share/gnome/bse/v0.6.6/scripts/mixer-splitup-by-track.scm
+share/gnome/bse/v0.6.6/scripts/modules2grid.scm
+share/gnome/bse/v0.6.6/scripts/part-harmonic-transposer.scm
+share/gnome/bse/v0.6.6/scripts/progressor-example.scm
+share/gnome/bse/v0.6.6/scripts/record-midi.scm
+share/gnome/bse/v0.6.6/scripts/song-parts-operations.scm
 share/gnome/mime-info/bse.keys
 share/gnome/mime-info/bse.mime
 share/gnome/pixmaps/beast-audio-x-bse.png
 share/gnome/pixmaps/beast.png
-share/locale/az/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/ca/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/cs/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/de/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/el/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/en_CA/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/en_GB/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/eo/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/es/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/fr/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/hr/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/it/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/ja/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/mn/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/nl/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/pa/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/pt/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/pt_BR/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/ru/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/sq/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/sr/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/sr@Latn/LC_MESSAGES/beast-v0.6.4.mo
-share/locale/sv/LC_MESSAGES/beast-v0.6.4.mo
+share/locale/az/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/bg/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/ca/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/cs/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/de/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/el/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/en_CA/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/en_GB/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/eo/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/es/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/eu/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/fr/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/hr/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/it/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/ja/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/mn/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/nl/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/pa/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/pt/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/pt_BR/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/ru/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/rw/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/sq/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/sr/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/sr@Latn/LC_MESSAGES/beast-v0.6.6.mo
+share/locale/sv/LC_MESSAGES/beast-v0.6.6.mo
 share/mime/audio/x-bse.xml
 share/mime/audio/x-bsewave.xml
 share/mime/packages/beast.xml
 @dirrm include/bse
 @dirrm include/sfi
-@dirrm lib/bse/v0.6.4/plugins
-@dirrm lib/bse/v0.6.4
+@dirrm lib/bse/v0.6.6/plugins
+@dirrm lib/bse/v0.6.6
 @dirrm lib/bse
-@dirrm share/gnome/beast/v0.6.4/docs
-@dirrm share/gnome/beast/v0.6.4/images
-@dirrm share/gnome/beast/v0.6.4/keys
-@dirrm share/gnome/beast/v0.6.4/skins/images
-@dirrm share/gnome/beast/v0.6.4/skins
-@dirrm share/gnome/beast/v0.6.4
+@dirrm share/gnome/beast/v0.6.6/docs
+@dirrm share/gnome/beast/v0.6.6/images
+@dirrm share/gnome/beast/v0.6.6/keys
+@dirrm share/gnome/beast/v0.6.6/skins/images
+@dirrm share/gnome/beast/v0.6.6/skins
+@dirrm share/gnome/beast/v0.6.6
 @dirrm share/gnome/beast
-@dirrm share/gnome/bse/v0.6.4/demo
-@dirrm share/gnome/bse/v0.6.4/effects
-@dirrm share/gnome/bse/v0.6.4/instruments
-@dirrm share/gnome/bse/v0.6.4/scripts
-@dirrm share/gnome/bse/v0.6.4
+@dirrm share/gnome/bse/v0.6.6/demo
+@dirrm share/gnome/bse/v0.6.6/effects
+@dirrm share/gnome/bse/v0.6.6/instruments
+@dirrm share/gnome/bse/v0.6.6/scripts
+@dirrm share/gnome/bse/v0.6.6
 @dirrm share/gnome/bse
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/rw 2>/dev/null || true
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime