From 97a23f9701a2739531adfc846c22c000f1581981 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 12 Oct 2009 00:29:26 +0000 Subject: [PATCH] Update to sound-theme-freedesktop-0.7 --- audio/sound-theme-freedesktop/Makefile | 21 ++++- audio/sound-theme-freedesktop/distinfo | 10 +- .../patches/patch-Makefile_am | 12 +++ .../patches/patch-Makefile_in | 17 ---- audio/sound-theme-freedesktop/pkg/PLIST | 94 +++++++------------ 5 files changed, 69 insertions(+), 85 deletions(-) create mode 100644 audio/sound-theme-freedesktop/patches/patch-Makefile_am delete mode 100644 audio/sound-theme-freedesktop/patches/patch-Makefile_in diff --git a/audio/sound-theme-freedesktop/Makefile b/audio/sound-theme-freedesktop/Makefile index 8701f9b1503..e16d289a689 100644 --- a/audio/sound-theme-freedesktop/Makefile +++ b/audio/sound-theme-freedesktop/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2009/09/17 17:36:12 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.5 2009/10/12 00:29:26 ajacoutot Exp $ COMMENT= XDG sound theme -DISTNAME= sound-theme-freedesktop-0.6 +DISTNAME= sound-theme-freedesktop-0.7 CATEGORIES= audio EXTRACT_SUFX= .tar.bz2 @@ -18,12 +18,23 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= http://0pointer.de/public/ +MASTER_SITES= http://cgit.freedesktop.org/sound-theme-freedesktop/snapshot/ MODULES= textproc/intltool -USE_GMAKE= Yes +BUILD_DEPENDS= :autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \ + :${_AUTOMAKE_SPEC}:devel/automake/${AUTOMAKE_VERSION} -CONFIGURE_STYLE=gnu +USE_GMAKE= Yes +NO_REGRESS= Yes + +AUTOMAKE_VERSION=1.9 +AUTOCONF_VERSION=2.62 + +do-configure: + cd ${WRKSRC} && \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + ./autogen.sh \ .include diff --git a/audio/sound-theme-freedesktop/distinfo b/audio/sound-theme-freedesktop/distinfo index b770863c23f..0211e875353 100644 --- a/audio/sound-theme-freedesktop/distinfo +++ b/audio/sound-theme-freedesktop/distinfo @@ -1,5 +1,5 @@ -MD5 (sound-theme-freedesktop-0.6.tar.bz2) = nACyGxPc65R7Sjf2KAyhow== -RMD160 (sound-theme-freedesktop-0.6.tar.bz2) = Bv1gE+MeQ6zr929E7+CV90pDNig= -SHA1 (sound-theme-freedesktop-0.6.tar.bz2) = CQNvA0Qb0j5QuYOgRXnbroZU8Dg= -SHA256 (sound-theme-freedesktop-0.6.tar.bz2) = ucBS7CjBzab8zKbBOJNKJSfon4YpM+q4SyEUNmaPR9k= -SIZE (sound-theme-freedesktop-0.6.tar.bz2) = 1695846 +MD5 (sound-theme-freedesktop-0.7.tar.bz2) = tWzLW3r70pQ0KJwpQj7ldw== +RMD160 (sound-theme-freedesktop-0.7.tar.bz2) = TbvqnhJ6t4xvd0e+837W7BdB1w4= +SHA1 (sound-theme-freedesktop-0.7.tar.bz2) = YbY8urnu8fOwC4MPJCPG5biq4DI= +SHA256 (sound-theme-freedesktop-0.7.tar.bz2) = FPVr2QxmzfZRY3YYopjPK43tcuoBNSNu121WeN3GXVU= +SIZE (sound-theme-freedesktop-0.7.tar.bz2) = 413167 diff --git a/audio/sound-theme-freedesktop/patches/patch-Makefile_am b/audio/sound-theme-freedesktop/patches/patch-Makefile_am new file mode 100644 index 00000000000..576dadf7af0 --- /dev/null +++ b/audio/sound-theme-freedesktop/patches/patch-Makefile_am @@ -0,0 +1,12 @@ +$OpenBSD: patch-Makefile_am,v 1.1 2009/10/12 00:29:26 ajacoutot Exp $ +--- Makefile.am.orig Mon Oct 12 02:25:24 2009 ++++ Makefile.am Mon Oct 12 02:25:41 2009 +@@ -11,7 +11,7 @@ theme_DATA = index.theme + THEME_IN_FILES = index.theme.in + + %.theme: %.theme.in +- $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache ++ $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + + EXTRA_DIST = \ + README \ diff --git a/audio/sound-theme-freedesktop/patches/patch-Makefile_in b/audio/sound-theme-freedesktop/patches/patch-Makefile_in deleted file mode 100644 index 1a384740939..00000000000 --- a/audio/sound-theme-freedesktop/patches/patch-Makefile_in +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2009/09/17 17:36:12 ajacoutot Exp $ - -There is not potfile yet, so the intltool-merge command is started -without argument which gives an error ; it does not break the build -itself although it looks like it does. - ---- Makefile.in.orig Fri Aug 28 02:36:09 2009 -+++ Makefile.in Thu Sep 17 19:31:31 2009 -@@ -761,7 +761,7 @@ uninstall-am: uninstall-themeDATA - - - %.theme: %.theme.in -- $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache -+ $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - - # Creating ChangeLog from git log (taken from cairo/Makefile.am): - diff --git a/audio/sound-theme-freedesktop/pkg/PLIST b/audio/sound-theme-freedesktop/pkg/PLIST index 3d47bf387dd..c62cb318360 100644 --- a/audio/sound-theme-freedesktop/pkg/PLIST +++ b/audio/sound-theme-freedesktop/pkg/PLIST @@ -1,62 +1,40 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/09/17 17:36:12 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.3 2009/10/12 00:29:27 ajacoutot Exp $ share/sounds/ share/sounds/freedesktop/ share/sounds/freedesktop/index.theme share/sounds/freedesktop/stereo/ -share/sounds/freedesktop/stereo/audio-channel-front-center.ogg -share/sounds/freedesktop/stereo/audio-channel-front-left.ogg -share/sounds/freedesktop/stereo/audio-channel-front-right.ogg -share/sounds/freedesktop/stereo/audio-channel-rear-center.ogg -share/sounds/freedesktop/stereo/audio-channel-rear-left.ogg -share/sounds/freedesktop/stereo/audio-channel-rear-right.ogg -share/sounds/freedesktop/stereo/audio-channel-side-left.ogg -share/sounds/freedesktop/stereo/audio-channel-side-right.ogg -share/sounds/freedesktop/stereo/audio-test-signal.ogg -share/sounds/freedesktop/stereo/audio-volume-change.ogg -share/sounds/freedesktop/stereo/battery-full.ogg -share/sounds/freedesktop/stereo/battery-low.ogg -share/sounds/freedesktop/stereo/bell.ogg -share/sounds/freedesktop/stereo/button-pressed.ogg -share/sounds/freedesktop/stereo/button-toggle.ogg -share/sounds/freedesktop/stereo/camera-shutter.ogg -share/sounds/freedesktop/stereo/complete.ogg -share/sounds/freedesktop/stereo/desktop-login.ogg -share/sounds/freedesktop/stereo/desktop-logout.ogg -share/sounds/freedesktop/stereo/desktop-switch-left.ogg -share/sounds/freedesktop/stereo/desktop-switch-right.ogg -share/sounds/freedesktop/stereo/device-added.ogg -share/sounds/freedesktop/stereo/device-removed.ogg -share/sounds/freedesktop/stereo/dialog-cancel.ogg -share/sounds/freedesktop/stereo/dialog-error.ogg -share/sounds/freedesktop/stereo/dialog-information.ogg -share/sounds/freedesktop/stereo/dialog-ok.ogg -share/sounds/freedesktop/stereo/dialog-question.ogg -share/sounds/freedesktop/stereo/dialog-warning.ogg -share/sounds/freedesktop/stereo/link-pressed.ogg -share/sounds/freedesktop/stereo/menu-click.ogg -share/sounds/freedesktop/stereo/menu-popup.ogg -share/sounds/freedesktop/stereo/message-new-email.ogg -share/sounds/freedesktop/stereo/message-new-instant.ogg -share/sounds/freedesktop/stereo/network-connectivity-established.ogg -share/sounds/freedesktop/stereo/network-connectivity-lost.ogg -share/sounds/freedesktop/stereo/phone-incoming-call.ogg -share/sounds/freedesktop/stereo/phone-outgoing-busy.ogg -share/sounds/freedesktop/stereo/power-plug.ogg -share/sounds/freedesktop/stereo/power-unplug.ogg -share/sounds/freedesktop/stereo/screen-capture.ogg -share/sounds/freedesktop/stereo/service-login.ogg -share/sounds/freedesktop/stereo/service-logout.ogg -share/sounds/freedesktop/stereo/suspend-error.ogg -share/sounds/freedesktop/stereo/system-ready.ogg -share/sounds/freedesktop/stereo/system-shutdown.ogg -share/sounds/freedesktop/stereo/tooltip-popup.ogg -share/sounds/freedesktop/stereo/trash-empty.ogg -share/sounds/freedesktop/stereo/window-attention.ogg -share/sounds/freedesktop/stereo/window-close.ogg -share/sounds/freedesktop/stereo/window-maximized.ogg -share/sounds/freedesktop/stereo/window-minimized.ogg -share/sounds/freedesktop/stereo/window-move-start.ogg -share/sounds/freedesktop/stereo/window-move-stop.ogg -share/sounds/freedesktop/stereo/window-slide.ogg -share/sounds/freedesktop/stereo/window-unmaximized.ogg -share/sounds/freedesktop/stereo/window-unminimized.ogg +share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga +share/sounds/freedesktop/stereo/audio-channel-front-center.oga +share/sounds/freedesktop/stereo/audio-channel-front-left.oga +share/sounds/freedesktop/stereo/audio-channel-front-right.oga +share/sounds/freedesktop/stereo/audio-channel-rear-center.oga +share/sounds/freedesktop/stereo/audio-channel-rear-left.oga +share/sounds/freedesktop/stereo/audio-channel-rear-right.oga +share/sounds/freedesktop/stereo/audio-channel-side-left.oga +share/sounds/freedesktop/stereo/audio-channel-side-right.oga +share/sounds/freedesktop/stereo/audio-test-signal.oga +share/sounds/freedesktop/stereo/audio-volume-change.oga +share/sounds/freedesktop/stereo/bell.oga +share/sounds/freedesktop/stereo/camera-shutter.oga +share/sounds/freedesktop/stereo/complete.oga +share/sounds/freedesktop/stereo/device-added.oga +share/sounds/freedesktop/stereo/device-removed.oga +share/sounds/freedesktop/stereo/dialog-error.oga +share/sounds/freedesktop/stereo/dialog-information.oga +share/sounds/freedesktop/stereo/dialog-warning.oga +share/sounds/freedesktop/stereo/message-new-instant.oga +share/sounds/freedesktop/stereo/message.oga +share/sounds/freedesktop/stereo/network-connectivity-established.oga +share/sounds/freedesktop/stereo/network-connectivity-lost.oga +share/sounds/freedesktop/stereo/phone-incoming-call.oga +share/sounds/freedesktop/stereo/phone-outgoing-busy.oga +share/sounds/freedesktop/stereo/phone-outgoing-calling.oga +share/sounds/freedesktop/stereo/power-plug.oga +share/sounds/freedesktop/stereo/power-unplug.oga +share/sounds/freedesktop/stereo/screen-capture.oga +share/sounds/freedesktop/stereo/service-login.oga +share/sounds/freedesktop/stereo/service-logout.oga +share/sounds/freedesktop/stereo/suspend-error.oga +share/sounds/freedesktop/stereo/trash-empty.oga +share/sounds/freedesktop/stereo/window-attention.oga +share/sounds/freedesktop/stereo/window-question.oga