4 files changed, 23 insertions, 27 deletions

diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 522e80bc8c0d..bc708d871cce 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeaudio
-PORTVERSION=	1.0.0
+PORTVERSION=	1.4.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-audio
@@ -15,11 +15,8 @@ DISTNAME=	gnome-audio-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
 USE_GNOMELIBS=	yes
 NO_BUILD=	yes
-
-post-extract:
-	@${RM} -fr ${WRKSRC}/sounds/sounds
+WRKSRC=		${WRKDIR}/${DISTNAME}/sounds
 
 .include <bsd.port.mk>
diff --git a/audio/gnome-audio/distinfo b/audio/gnome-audio/distinfo
index b6a971e4403e..ee448b39664d 100644
--- a/audio/gnome-audio/distinfo
+++ b/audio/gnome-audio/distinfo
@@ -1 +1 @@
-MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec
+MD5 (gnome-audio-1.4.0.tar.gz) = 412f279a4741b2b14227f1cc36a06d18
diff --git a/audio/gnome-audio/files/patch-aa b/audio/gnome-audio/files/patch-aa
index 13a86220f234..f5556e24f16d 100644
--- a/audio/gnome-audio/files/patch-aa
+++ b/audio/gnome-audio/files/patch-aa
@@ -1,22 +1,19 @@
---- sounds/Makefile.orig	Wed Feb 24 14:19:09 1999
-+++ sounds/Makefile	Mon Jul 12 11:24:27 1999
-@@ -1,15 +1,13 @@
+--- Makefile.orig	Thu Feb 15 14:40:33 2001
++++ Makefile	Mon Feb 26 19:24:22 2001
+@@ -1,3 +1 @@
 -prefix=$(shell gnome-config --prefix)
 -
- all:
- 
- install: install-files install-default-links
- 
- install-files:
- 	for I in $(shell find . -name '*.wav'); do \
--		install -d $(prefix)/share/sounds/`dirname $$I`; \
--		install -m444 $$I $(prefix)/share/sounds/$$I; \
-+		mkdir -p $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
-+		${BSD_INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
+ LN_S=ln -sf
+@@ -14,4 +12,4 @@
+ 	for I in *.wav */*.wav ; do \
+-		$(MKINSTALLDIRS) $(prefix)/share/sounds/`dirname $$I`; \
+-		$(INSTALL_DATA) $$I $(prefix)/share/sounds/$$I; \
++		$(MKINSTALLDIRS) $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
++		$(INSTALL_DATA) $$I $(PREFIX)/share/gnome/sounds/$$I; \
  	done
- 
+@@ -19,3 +17,3 @@
  install-default-links:
--	ln -sf startup3.wav $(prefix)/share/sounds/login.wav
--	ln -sf shutdown1.wav $(prefix)/share/sounds/logout.wav
-+	ln -sf startup3.wav $(PREFIX)/share/gnome/sounds/startup.wav
-+	ln -sf shutdown1.wav $(PREFIX)/share/gnome/sounds/logout.wav
+-	$(LN_S) startup3.wav $(prefix)/share/sounds/login.wav
+-	$(LN_S) shutdown1.wav $(prefix)/share/sounds/logout.wav
++	$(LN_S) startup3.wav $(PREFIX)/share/gnome/sounds/login.wav
++	$(LN_S) shutdown1.wav $(PREFIX)/share/gnome/sounds/logout.wav
diff --git a/audio/gnome-audio/pkg-plist b/audio/gnome-audio/pkg-plist
index 806f9647d5cd..e6c26480223f 100644
--- a/audio/gnome-audio/pkg-plist
+++ b/audio/gnome-audio/pkg-plist
@@ -1,16 +1,18 @@
 share/gnome/sounds/card_shuffle.wav
+share/gnome/sounds/email.wav
+share/gnome/sounds/error.wav
+share/gnome/sounds/generic.wav
 share/gnome/sounds/gtk-events/activate.wav
 share/gnome/sounds/gtk-events/clicked.wav
 share/gnome/sounds/gtk-events/toggled.wav
+share/gnome/sounds/info.wav
 share/gnome/sounds/login.wav
 share/gnome/sounds/logout.wav
 share/gnome/sounds/panel/slide.wav
 share/gnome/sounds/phone.wav
 share/gnome/sounds/shutdown1.wav
-share/gnome/sounds/startup.wav
-share/gnome/sounds/startup1.wav
-share/gnome/sounds/startup2.wav
 share/gnome/sounds/startup3.wav
+share/gnome/sounds/warning.wav
 @dirrm share/gnome/sounds/gtk-events
 @dirrm share/gnome/sounds/panel
 @dirrm share/gnome/sounds