Upgrade to GNOME 1.0. The following are the details:

 ports/audio/esound			0.2.7    ->  0.2.8	PR ports/10422
 ports/audio/gnomeaudio			0.99.8   ->  1.0.0	PR ports/10426
 ports/audio/libaudiofile		0.1.5    ->  0.1.6	PR ports/10421
 ports/deskutils/gnomepim		0.99.8.1 ->  1.0.1	PR ports/10435
 ports/devel/ORBit			0.3.98   ->  0.4.0	PR ports/10423
 ports/devel/gettext			shared libs now		PR ports/10293
 ports/devel/glib12			1.1.16   ->  1.2.0	PR ports/10419
 ports/devel/libgtop			0.99.8   ->  1.0.1	PR ports/10430
 ports/games/gnomegames			0.99.8   ->  1.0.1	PR ports/10436
 ports/graphics/electriceyes		distfile moved		PR ports/10437
 ports/graphics/imlib			1.9.3    ->  1.9.4	PR ports/10424
 ports/lang/gnomeobjc			0.99.3   ->  1.0.1	PR ports/10441
 ports/math/gnumeric			0.6      ->  0.15	PR ports/10439
 ports/misc/gnomeutils			0.99.5   ->  1.0.1	PR ports/10442
 ports/sysutils/gnomeadmin		0.99.1   ->  1.0.1	PR ports/10445
 ports/sysutils/gnomecontrolcenter	0.99.3.1 ->  1.0.1	PR ports/10446
 ports/sysutils/gtop			0.99.2   ->  1.0.1	PR ports/10477
 ports/textproc/libxml			0.99.8   ->  1.0.0	PR ports/10438
 ports/www/libghttp			distfile moved		PR ports/10429
 ports/x11/gnome			0.99.3   ->  1.0.0	PR ports/10450
 ports/x11/gnomecore			0.99.8.1 ->  1.0.1	PR ports/10432
 ports/x11/gnomelibs			0.99.8.1 ->  1.0.1	PR ports/10425
 ports/x11-fm/gnomemc			4.5.10   ->  4.5.23	PR ports/10448
 ports/x11-toolkits/gtk-engines		0.1      ->  0.5	PR ports/10427
 ports/x11-toolkits/gtk12		1.1.6    ->  1.2.0	PR ports/10420

Note that repository copies were made before this commit, as follows:

 ports/devel/glib11-devel       -> ports/devel/glib12
 ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12

Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

19 files changed, 70 insertions, 144 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index a9f95dc..f9a8687 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	esound
-# Version required:	0.2.7
+# Version required:	0.2.8
 # Date created:		19 July 1998
 # Whom:			Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1998/12/26 05:56:52 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/01/27 08:31:46 fenner Exp $
 #
 
-DISTNAME=	esound-0.2.7
+DISTNAME=	esound-0.2.8
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	esound
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 #MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 #		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
 #		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 68d8e0d..3abca1c 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1 +1 @@
-MD5 (esound-0.2.7.tar.gz) = 3a530a942880268f8b9aaf3df38fd478
+MD5 (esound-0.2.8.tar.gz) = fa22beaa64d9da82858762cf1fc76de3
diff --git a/audio/esound/files/patch-aa b/audio/esound/files/patch-aa
index 1bcc83d..8c44e4f 100644
--- a/audio/esound/files/patch-aa
+++ b/audio/esound/files/patch-aa
@@ -1,19 +1,19 @@
---- Makefile.in.orig	Tue Dec 15 01:22:45 1998
-+++ Makefile.in	Wed Dec 23 04:57:49 1998
-@@ -110,14 +110,14 @@
- 	esdfile.c	\
- 	audio.c
+--- Makefile.in.orig	Wed Feb 24 22:23:07 1999
++++ Makefile.in	Mon Mar  1 19:45:21 1999
+@@ -104,14 +104,14 @@
+ libesd_la_SOURCES =  	esdlib.c		esdmgr.c		esdfile.c		audio.c
+ 
  
 -libesd_la_LDFLAGS = -version-info @ESD_VERSION_INFO@
 +libesd_la_LDFLAGS = -version-info 1:0:0
  
  libesd_la_LIBADD = @AUDIOFILE_LIBS@ -lm
  
- EXTRA_LTLIBRARIES = \
- 	libesddsp.la
+ EXTRA_LTLIBRARIES =  	libesddsp.la
+ 
  
 -libesddsp_la_LDFLAGS = -rpath $(libdir) -version-info @ESD_VERSION_INFO@
 +libesddsp_la_LDFLAGS = -rpath $(libdir) -version-info 1:0:0
  
- libesddsp_la_LIBADD = -ldl -lm
+ libesddsp_la_LIBADD = @DL_LIB@ -lm
  
diff --git a/audio/esound/files/patch-ab b/audio/esound/files/patch-ab
deleted file mode 100644
index 8a0d2ff..0000000
--- a/audio/esound/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
---- ltmain.sh.orig	Thu Dec 31 19:15:49 1998
-+++ ltmain.sh	Thu Dec 31 19:17:02 1998
-@@ -923,6 +923,16 @@
-         versuffix="$current.$revision"
-         ;;
- 
-+      freebsd)
-+        version_vars="$version_vars major versuffix"
-+        major="$current"
-+	if [ $PORTOBJFORMAT = elf ]; then
-+        versuffix="$current"
-+	else
-+        versuffix="$current.$revision"
-+	fi
-+        ;;
-+
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
diff --git a/audio/esound/files/patch-ac b/audio/esound/files/patch-ac
index 05cd51b..a8b2cfa 100644
--- a/audio/esound/files/patch-ac
+++ b/audio/esound/files/patch-ac
@@ -1,34 +1,20 @@
---- ltconfig.orig	Tue Dec 15 01:22:13 1998
-+++ ltconfig	Tue Feb  2 02:40:07 1999
-@@ -767,7 +767,7 @@
+--- ltconfig.orig	Thu Jan 21 21:28:41 1999
++++ ltconfig	Mon Mar  1 19:23:29 1999
+@@ -1201,7 +1201,7 @@
      ;;
  
    # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
 -  freebsd3*)
 +  freebsd*)
-     archive_cmds='$CC -shared -o $lib$libobjs'
+     archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
-@@ -1105,10 +1105,21 @@
-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "$lib" | sed '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+@@ -1606,7 +1606,7 @@
+   shlibpath_var=PATH
    ;;
  
 -freebsd2* | freebsd3*)
-+freebsd2*)
-   version_type=sunos
-   library_names_spec='$libname.so.$versuffix $libname.so'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
 +freebsd*)
-+  version_type=freebsd
-+  library_names_spec='$libname.so.$versuffix $libname.so'
-+  if [ $PORTOBJFORMAT = elf ]; then
-+  finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+  else
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   library_names_spec='${libname}${release}.so$versuffix $libname.so'
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 0a8127c..24c8568 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	gnomeaudio
-# Version required:			0.99.8
+# Version required:			1.0.0
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/01/31 19:08:54 vanilla Exp $
+# $Id: Makefile,v 1.5 1999/02/19 04:24:59 vanilla Exp $
 #
 
-DISTNAME=	gnome-audio-0.99.8
-PKGNAME=	gnomeaudio-0.99.8
+DISTNAME=	gnome-audio-1.0.0
+PKGNAME=	gnomeaudio-1.0.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-audio
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -23,4 +23,7 @@ NO_BUILD=	yes
 
 INSTALL_TARGET=	INSTALL_DATA="${INSTALL_DATA}" install
 
+post-extract:
+	@${RM} -r ${WRKSRC}/sounds/sounds
+
 .include <bsd.port.mk>
diff --git a/audio/gnome-audio/distinfo b/audio/gnome-audio/distinfo
index b284f75..b6a971e 100644
--- a/audio/gnome-audio/distinfo
+++ b/audio/gnome-audio/distinfo
@@ -1 +1 @@
-MD5 (gnome-audio-0.99.8.tar.gz) = 68dc71c2317fc5ac5ba9dbfc7ac0f121
+MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec
diff --git a/audio/gnome-audio/files/patch-aa b/audio/gnome-audio/files/patch-aa
index 7a342f5..f503576 100644
--- a/audio/gnome-audio/files/patch-aa
+++ b/audio/gnome-audio/files/patch-aa
@@ -1,5 +1,5 @@
---- sounds/Makefile.orig	Tue Feb 16 01:07:51 1999
-+++ sounds/Makefile	Fri Feb 19 03:28:42 1999
+--- sounds/Makefile.orig	Wed Feb 24 22:19:09 1999
++++ sounds/Makefile	Sat Mar  6 15:20:39 1999
 @@ -6,10 +6,10 @@
  
  install-files:
@@ -11,7 +11,7 @@
  	done
  
  install-default-links:
--	ln -sf startup2.wav $(prefix)/share/sounds/login.wav
+-	ln -sf startup3.wav $(prefix)/share/sounds/login.wav
 -	ln -sf shutdown1.wav $(prefix)/share/sounds/logout.wav
-+	ln -sf startup1.wav $(prefix)/share/gnome/sounds/startup.wav
++	ln -sf startup3.wav $(prefix)/share/gnome/sounds/startup.wav
 +	ln -sf shutdown1.wav $(prefix)/share/gnome/sounds/logout.wav
diff --git a/audio/gnome-audio/pkg-plist b/audio/gnome-audio/pkg-plist
index b3927a2..806f964 100644
--- a/audio/gnome-audio/pkg-plist
+++ b/audio/gnome-audio/pkg-plist
@@ -1,33 +1,16 @@
-share/gnome/sounds/applause.wav
 share/gnome/sounds/card_shuffle.wav
-share/gnome/sounds/duck.wav
-share/gnome/sounds/gnibbles/appear.wav
-share/gnome/sounds/gnibbles/bonus.wav
-share/gnome/sounds/gnibbles/crash.wav
-share/gnome/sounds/gnibbles/gobble.wav
-share/gnome/sounds/gnibbles/laughter.wav
-share/gnome/sounds/gnibbles/life.wav
-share/gnome/sounds/gnibbles/pop.wav
-share/gnome/sounds/gnibbles/reverse.wav
-share/gnome/sounds/gnibbles/start.wav
-share/gnome/sounds/gnibbles/teleport.wav
-share/gnome/sounds/gnothello/flip-piece.wav
-share/gnome/sounds/gnothello/gameover.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/impact-streak.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/ricochet.wav
 share/gnome/sounds/shutdown1.wav
 share/gnome/sounds/startup.wav
 share/gnome/sounds/startup1.wav
 share/gnome/sounds/startup2.wav
-@dirrm share/gnome/sounds/gnibbles
-@dirrm share/gnome/sounds/gnothello
+share/gnome/sounds/startup3.wav
 @dirrm share/gnome/sounds/gtk-events
 @dirrm share/gnome/sounds/panel
 @dirrm share/gnome/sounds
diff --git a/audio/gnomeaudio/Makefile b/audio/gnomeaudio/Makefile
index 0a8127c..24c8568 100644
--- a/audio/gnomeaudio/Makefile
+++ b/audio/gnomeaudio/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	gnomeaudio
-# Version required:			0.99.8
+# Version required:			1.0.0
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/01/31 19:08:54 vanilla Exp $
+# $Id: Makefile,v 1.5 1999/02/19 04:24:59 vanilla Exp $
 #
 
-DISTNAME=	gnome-audio-0.99.8
-PKGNAME=	gnomeaudio-0.99.8
+DISTNAME=	gnome-audio-1.0.0
+PKGNAME=	gnomeaudio-1.0.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-audio
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -23,4 +23,7 @@ NO_BUILD=	yes
 
 INSTALL_TARGET=	INSTALL_DATA="${INSTALL_DATA}" install
 
+post-extract:
+	@${RM} -r ${WRKSRC}/sounds/sounds
+
 .include <bsd.port.mk>
diff --git a/audio/gnomeaudio/distinfo b/audio/gnomeaudio/distinfo
index b284f75..b6a971e 100644
--- a/audio/gnomeaudio/distinfo
+++ b/audio/gnomeaudio/distinfo
@@ -1 +1 @@
-MD5 (gnome-audio-0.99.8.tar.gz) = 68dc71c2317fc5ac5ba9dbfc7ac0f121
+MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec
diff --git a/audio/gnomeaudio/files/patch-aa b/audio/gnomeaudio/files/patch-aa
index 7a342f5..f503576 100644
--- a/audio/gnomeaudio/files/patch-aa
+++ b/audio/gnomeaudio/files/patch-aa
@@ -1,5 +1,5 @@
---- sounds/Makefile.orig	Tue Feb 16 01:07:51 1999
-+++ sounds/Makefile	Fri Feb 19 03:28:42 1999
+--- sounds/Makefile.orig	Wed Feb 24 22:19:09 1999
++++ sounds/Makefile	Sat Mar  6 15:20:39 1999
 @@ -6,10 +6,10 @@
  
  install-files:
@@ -11,7 +11,7 @@
  	done
  
  install-default-links:
--	ln -sf startup2.wav $(prefix)/share/sounds/login.wav
+-	ln -sf startup3.wav $(prefix)/share/sounds/login.wav
 -	ln -sf shutdown1.wav $(prefix)/share/sounds/logout.wav
-+	ln -sf startup1.wav $(prefix)/share/gnome/sounds/startup.wav
++	ln -sf startup3.wav $(prefix)/share/gnome/sounds/startup.wav
 +	ln -sf shutdown1.wav $(prefix)/share/gnome/sounds/logout.wav
diff --git a/audio/gnomeaudio/pkg-plist b/audio/gnomeaudio/pkg-plist
index b3927a2..806f964 100644
--- a/audio/gnomeaudio/pkg-plist
+++ b/audio/gnomeaudio/pkg-plist
@@ -1,33 +1,16 @@
-share/gnome/sounds/applause.wav
 share/gnome/sounds/card_shuffle.wav
-share/gnome/sounds/duck.wav
-share/gnome/sounds/gnibbles/appear.wav
-share/gnome/sounds/gnibbles/bonus.wav
-share/gnome/sounds/gnibbles/crash.wav
-share/gnome/sounds/gnibbles/gobble.wav
-share/gnome/sounds/gnibbles/laughter.wav
-share/gnome/sounds/gnibbles/life.wav
-share/gnome/sounds/gnibbles/pop.wav
-share/gnome/sounds/gnibbles/reverse.wav
-share/gnome/sounds/gnibbles/start.wav
-share/gnome/sounds/gnibbles/teleport.wav
-share/gnome/sounds/gnothello/flip-piece.wav
-share/gnome/sounds/gnothello/gameover.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/impact-streak.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/ricochet.wav
 share/gnome/sounds/shutdown1.wav
 share/gnome/sounds/startup.wav
 share/gnome/sounds/startup1.wav
 share/gnome/sounds/startup2.wav
-@dirrm share/gnome/sounds/gnibbles
-@dirrm share/gnome/sounds/gnothello
+share/gnome/sounds/startup3.wav
 @dirrm share/gnome/sounds/gtk-events
 @dirrm share/gnome/sounds/panel
 @dirrm share/gnome/sounds
diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile
index 0a8127c..24c8568 100644
--- a/audio/gnomeaudio2/Makefile
+++ b/audio/gnomeaudio2/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	gnomeaudio
-# Version required:			0.99.8
+# Version required:			1.0.0
 # Date created:				29 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/01/31 19:08:54 vanilla Exp $
+# $Id: Makefile,v 1.5 1999/02/19 04:24:59 vanilla Exp $
 #
 
-DISTNAME=	gnome-audio-0.99.8
-PKGNAME=	gnomeaudio-0.99.8
+DISTNAME=	gnome-audio-1.0.0
+PKGNAME=	gnomeaudio-1.0.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	gnome-audio
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -23,4 +23,7 @@ NO_BUILD=	yes
 
 INSTALL_TARGET=	INSTALL_DATA="${INSTALL_DATA}" install
 
+post-extract:
+	@${RM} -r ${WRKSRC}/sounds/sounds
+
 .include <bsd.port.mk>
diff --git a/audio/gnomeaudio2/distinfo b/audio/gnomeaudio2/distinfo
index b284f75..b6a971e 100644
--- a/audio/gnomeaudio2/distinfo
+++ b/audio/gnomeaudio2/distinfo
@@ -1 +1 @@
-MD5 (gnome-audio-0.99.8.tar.gz) = 68dc71c2317fc5ac5ba9dbfc7ac0f121
+MD5 (gnome-audio-1.0.0.tar.gz) = 3ae217dfa20fc8fbb67595a32d6beeec
diff --git a/audio/gnomeaudio2/files/patch-aa b/audio/gnomeaudio2/files/patch-aa
index 7a342f5..f503576 100644
--- a/audio/gnomeaudio2/files/patch-aa
+++ b/audio/gnomeaudio2/files/patch-aa
@@ -1,5 +1,5 @@
---- sounds/Makefile.orig	Tue Feb 16 01:07:51 1999
-+++ sounds/Makefile	Fri Feb 19 03:28:42 1999
+--- sounds/Makefile.orig	Wed Feb 24 22:19:09 1999
++++ sounds/Makefile	Sat Mar  6 15:20:39 1999
 @@ -6,10 +6,10 @@
  
  install-files:
@@ -11,7 +11,7 @@
  	done
  
  install-default-links:
--	ln -sf startup2.wav $(prefix)/share/sounds/login.wav
+-	ln -sf startup3.wav $(prefix)/share/sounds/login.wav
 -	ln -sf shutdown1.wav $(prefix)/share/sounds/logout.wav
-+	ln -sf startup1.wav $(prefix)/share/gnome/sounds/startup.wav
++	ln -sf startup3.wav $(prefix)/share/gnome/sounds/startup.wav
 +	ln -sf shutdown1.wav $(prefix)/share/gnome/sounds/logout.wav
diff --git a/audio/gnomeaudio2/pkg-plist b/audio/gnomeaudio2/pkg-plist
index b3927a2..806f964 100644
--- a/audio/gnomeaudio2/pkg-plist
+++ b/audio/gnomeaudio2/pkg-plist
@@ -1,33 +1,16 @@
-share/gnome/sounds/applause.wav
 share/gnome/sounds/card_shuffle.wav
-share/gnome/sounds/duck.wav
-share/gnome/sounds/gnibbles/appear.wav
-share/gnome/sounds/gnibbles/bonus.wav
-share/gnome/sounds/gnibbles/crash.wav
-share/gnome/sounds/gnibbles/gobble.wav
-share/gnome/sounds/gnibbles/laughter.wav
-share/gnome/sounds/gnibbles/life.wav
-share/gnome/sounds/gnibbles/pop.wav
-share/gnome/sounds/gnibbles/reverse.wav
-share/gnome/sounds/gnibbles/start.wav
-share/gnome/sounds/gnibbles/teleport.wav
-share/gnome/sounds/gnothello/flip-piece.wav
-share/gnome/sounds/gnothello/gameover.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/impact-streak.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/ricochet.wav
 share/gnome/sounds/shutdown1.wav
 share/gnome/sounds/startup.wav
 share/gnome/sounds/startup1.wav
 share/gnome/sounds/startup2.wav
-@dirrm share/gnome/sounds/gnibbles
-@dirrm share/gnome/sounds/gnothello
+share/gnome/sounds/startup3.wav
 @dirrm share/gnome/sounds/gtk-events
 @dirrm share/gnome/sounds/panel
 @dirrm share/gnome/sounds
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index ac855d3..9457990 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	libaudiofile
-# Version required:			0.1.5
+# Version required:			0.1.6
 # Date created:				22 Dec 1998
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/12/23 19:08:50 vanilla Exp $
+# $Id: Makefile,v 1.2 1999/01/27 08:31:48 fenner Exp $
 #
 
-DISTNAME=	libaudiofile-0.1.5
+DISTNAME=	audiofile-0.1.6
+PKGNAME=	libaudiofile-0.1.6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	libaudiofile
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo
index 85b11de..ead33e6 100644
--- a/audio/libaudiofile/distinfo
+++ b/audio/libaudiofile/distinfo
@@ -1 +1 @@
-MD5 (libaudiofile-0.1.5.tar.gz) = 9eaf6631b47750c2c9cdedaa8da5546c
+MD5 (audiofile-0.1.6.tar.gz) = 787c59576393dfb7bdc1a2d2da67441e