Update to 2.4.2

Changes:

	Overall
		+ Help updates

	AccessX applet
		+ Fix memory management and pixbuf handling

	Battstat
		+ Leak fixes
		+ Distribute the soundlist file
		+ Major improvements in cpu usage with ACPI
		+ Fix event handling after above patch

	Cdplayer
		+ Clean up and fix leaks
		+ Dist file for NetBSD

	Charpick
		+ Remove unneeded include that broke build on
		  some platforms

	Gweather
		+ Fix a whole bunch of locations and add some new ones
		+ Fix warning on help invocation

	Mailcheck
		+ Remove duplicate definitions causing build time
		  warnings

	Mini-commander
		+ Remove compiler warning

	Mixer
		+ Leak fixes

	Modemlights
		+ Leak fixes

	Multiload
		+ Fix memory reporting

9 files changed, 34 insertions, 430 deletions

diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index d5c55760c80..d57f9c04893 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/01/04 17:30:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/17 01:12:43 xtraeme Exp $
 #
 
-DISTNAME=		gnome-applets-2.4.1
-PKGREVISION=		2
+DISTNAME=		gnome-applets-2.4.2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -52,7 +51,7 @@ BUILD_DEFS+=		USE_INET6
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+.if ${OPSYS} == "Linux"
 GCONF2_SCHEMAS+=	battstat.schemas
 PLIST_SUBST+=		BATTSTAT=""
 CONF_FILES+=		${EGDIR}/sound/events/batt_stat_applet.soundlist \
@@ -74,4 +73,5 @@ INSTALL_EXTRA_TMPL+=	${FILESDIR}/install.tmpl
 .include "../../x11/gnome-panel/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 
+.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome2-applets/PLIST b/x11/gnome2-applets/PLIST
index 2796dbc7610..5f674a354ac 100644
--- a/x11/gnome2-applets/PLIST
+++ b/x11/gnome2-applets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
 bin/gkb_xmmap
 bin/gnome-keyboard-layout
 lib/bonobo/servers/GNOME_AccessxStatusApplet.server
@@ -813,12 +813,12 @@ share/omf/gnome-applets/gweather-C.omf
 share/omf/gnome-applets/gweather-de.omf
 share/omf/gnome-applets/gweather-es.omf
 share/omf/gnome-applets/gweather-fr.omf
+share/omf/gnome-applets/gweather-it.omf
 share/omf/gnome-applets/gweather-ja.omf
 share/omf/gnome-applets/gweather-ko.omf
 share/omf/gnome-applets/gweather-sv.omf
 share/omf/gnome-applets/gweather-zh_CN.omf
 share/omf/gnome-applets/gweather-zh_TW.omf
-share/omf/gnome-applets/gweather_applet-it.omf
 share/omf/gnome-applets/mailcheck-C.omf
 share/omf/gnome-applets/mailcheck-de.omf
 share/omf/gnome-applets/mailcheck-es.omf
diff --git a/x11/gnome2-applets/distinfo b/x11/gnome2-applets/distinfo
index 8f393cfd861..631803e8365 100644
--- a/x11/gnome2-applets/distinfo
+++ b/x11/gnome2-applets/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
 
-SHA1 (gnome-applets-2.4.1.tar.bz2) = 2427cff71e223f8b0a82e9831d623677c33633f3
-Size (gnome-applets-2.4.1.tar.bz2) = 4022786 bytes
-SHA1 (patch-aa) = 129c94a7b7614414be5f471789ab294829f2385c
-SHA1 (patch-ab) = 32dc492dd3502fed95b26ee2f9a572d462a84e29
-SHA1 (patch-ac) = b5a1b8da7bd30fae2d47ddf8e391087fea59d7b6
-SHA1 (patch-ad) = 24ab88d442f3f974d67b8d48bce0e9934743be05
-SHA1 (patch-ae) = 675bb1b89eb8fd3abec24020959ffbfa36ea5872
-SHA1 (patch-af) = 9532d2e30a375efc22194e92347b67aa876fee8e
+SHA1 (gnome-applets-2.4.2.tar.bz2) = bf752ae4caca9851bd4c1d64b244e3da24092b21
+Size (gnome-applets-2.4.2.tar.bz2) = 4057266 bytes
+SHA1 (patch-aa) = 675bb1b89eb8fd3abec24020959ffbfa36ea5872
+SHA1 (patch-ab) = 9532d2e30a375efc22194e92347b67aa876fee8e
diff --git a/x11/gnome2-applets/patches/patch-aa b/x11/gnome2-applets/patches/patch-aa
index 9b77702fbce..10fb0bec7c5 100644
--- a/x11/gnome2-applets/patches/patch-aa
+++ b/x11/gnome2-applets/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
 
---- charpick/charpick.c.orig	2003-10-26 20:07:40.000000000 +0000
-+++ charpick/charpick.c	2003-10-26 20:08:17.000000000 +0000
-@@ -3,7 +3,7 @@
-  */
+--- battstat/sounds/Makefile.in.orig	2003-12-13 15:42:24.000000000 -0600
++++ battstat/sounds/Makefile.in
+@@ -148,7 +148,7 @@ WARN_CXXFLAGS = @WARN_CXXFLAGS@
+ X_LIBS = @X_LIBS@
+ gnomelocaledir = @gnomelocaledir@
+ 
+-soundlistdir = $(sysconfdir)/sound/events
++soundlistdir = $(datadir)/examples/gnome-applets/sound/events
+ soundlist_in_files = battstat_applet.soundlist.in
+ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
  
- #include <config.h>
--#ifndef sun
-+#ifdef __Linux__
-   #include <tgmath.h>
- #endif
- #include <panel-applet.h>
diff --git a/x11/gnome2-applets/patches/patch-ab b/x11/gnome2-applets/patches/patch-ab
index 22c432ac8ce..f8e4b793310 100644
--- a/x11/gnome2-applets/patches/patch-ab
+++ b/x11/gnome2-applets/patches/patch-ab
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
+$NetBSD: patch-ab,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
 
---- configure.orig	2003-10-26 20:27:25.000000000 +0000
-+++ configure	2003-10-26 20:29:06.000000000 +0000
-@@ -22265,7 +22265,8 @@
- case "$host" in
- *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
- *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
--*netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
-+*freebsd*) CDROM_HOST=bsd;cd_device_path="/dev/acd0";;
-+*netbsd*|*openbsd*) CDROM_HOST=bsd;cd_device_path="/dev/rcd0d";;
- *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
- esac
- case "$host" in
+--- mailcheck/Makefile.in.orig	2003-12-13 15:40:45.000000000 -0600
++++ mailcheck/Makefile.in
+@@ -198,7 +198,7 @@ MAILCHECK_BITMAPS = \
+ mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck
+ mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)
+ 
+-soundlistdir = $(sysconfdir)/sound/events
++soundlistdir = $(datadir)/examples/gnome-applets/sound/events
+ soundlist_in_files = mailcheck.soundlist.in
+ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
+ 
diff --git a/x11/gnome2-applets/patches/patch-ac b/x11/gnome2-applets/patches/patch-ac
deleted file mode 100644
index 7efe1438d4f..00000000000
--- a/x11/gnome2-applets/patches/patch-ac
+++ /dev/null
@@ -1,352 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
-
---- /dev/null	2003-10-26 20:58:41.000000000 +0000
-+++ cdplayer/cdrom-bsd.c	2003-10-26 20:58:37.000000000 +0000
-@@ -0,0 +1,347 @@
-+#include <stdlib.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <glib.h>
-+#include <sys/ioctl.h>
-+#include <unistd.h>
-+
-+#include <sys/types.h>
-+#include <sys/cdio.h>
-+#include "cdrom-interface.h"
-+
-+#define ASSIGN_MSF(dest, src) \
-+{ \
-+  (dest).minute = (src).minute; \
-+  (dest).second = (src).second; \
-+  (dest).frame = (src).frame; \
-+}
-+
-+int
-+cdrom_play(cdrom_device_t cdp, int start, int stop)
-+{
-+	struct ioc_play_track ti;
-+
-+	ti.start_track = start;
-+	ti.start_index = 1;
-+	ti.end_track = stop;
-+	ti.end_index = 1;
-+
-+	if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
-+	    (ioctl(cdp->device, CDIOCPLAYTRACKS, &ti) == -1)) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_play_msf(cdrom_device_t cdp, cdrom_msf_t * start)
-+{
-+	struct ioc_play_msf msf;
-+
-+	if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
-+		return DISC_IO_ERROR;
-+	msf.start_m = start->minute;
-+	msf.start_s = start->second;
-+	msf.start_f = start->frame;
-+
-+	msf.end_m = cdp->track_info[cdp->nr_track].address.minute;
-+	msf.end_s = cdp->track_info[cdp->nr_track].address.second;
-+	msf.end_f = cdp->track_info[cdp->nr_track].address.frame;
-+
-+	if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
-+	    (ioctl(cdp->device, CDIOCPLAYMSF, &msf) == -1)) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_pause(cdrom_device_t cdp)
-+{
-+	if (ioctl(cdp->device, CDIOCPAUSE) == -1) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_IO_ERROR;
-+}
-+
-+int
-+cdrom_resume(cdrom_device_t cdp)
-+{
-+	if (ioctl(cdp->device, CDIOCRESUME) == -1) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+
-+int
-+cdrom_stop(cdrom_device_t cdp)
-+{
-+	if ((ioctl(cdp->device, CDIOCSTOP) == -1) ||
-+	    (ioctl(cdp->device, CDIOCALLOW) == -1)) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_read_track_info(cdrom_device_t cdp)
-+{
-+	struct ioc_toc_header toc;
-+#ifdef __FreeBSD__
-+	struct ioc_read_toc_single_entry tocentry;
-+#else
-+	struct ioc_read_toc_entry tocentry;
-+#endif
-+	int i, j, nr_track;
-+
-+	if (ioctl(cdp->device, CDIOREADTOCHEADER, &toc) == -1) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	cdp->track0 = toc.starting_track;
-+	cdp->track1 = toc.ending_track;
-+	nr_track = cdp->track1 - cdp->track0;
-+	if (nr_track <= 0)
-+		return DISC_IO_ERROR;
-+
-+	if (nr_track != cdp->nr_track) {
-+		if (cdp->track_info)
-+			g_free(cdp->track_info);
-+		cdp->nr_track = nr_track;
-+		cdp->track_info = g_malloc((cdp->nr_track) * sizeof(track_info_t));
-+	}
-+	for (i = 0, j = cdp->track0; i < cdp->nr_track; i, j) {
-+		tocentry.starting_track = j;
-+		tocentry.address_format = CD_MSF_FORMAT;
-+
-+#ifdef __FreeBSD__
-+		if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
-+#else
-+		if (ioctl(cdp->device, CDIOREADTOCENTRYS, &tocentry) == -1) {
-+#endif
-+			cdp->my_errno = errno;
-+			ioctl(cdp->device, CDIOCALLOW);
-+			return DISC_IO_ERROR;
-+		}
-+		/* fill the trackinfo field */
-+		cdp->track_info[i].track = j;
-+		cdp->track_info[i].audio_track = tocentry.data->control !=
-+		    0x04 ? 1 : 0;
-+		ASSIGN_MSF(cdp->track_info[i].address, tocentry.data->addr.msf);
-+	}
-+
-+	tocentry.starting_track = 0xAA;
-+	tocentry.address_format = CD_MSF_FORMAT;
-+#ifdef __FreeBSD__
-+	if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
-+#else
-+	if (ioctl(cdp->device, CDIOREADTOCENTRYS, &tocentry) == -1) {
-+#endif
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	cdp->track_info[i].track = j;
-+	cdp->track_info[i].audio_track = 0;
-+	ASSIGN_MSF(cdp->track_info[i].address, tocentry.data->addr.msf);
-+
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_get_status(cdrom_device_t cdp, cdrom_device_status_t * stat)
-+{
-+	struct ioc_read_subchannel subchnl;
-+	struct cd_sub_channel_info subchnlinfo;
-+	
-+	subchnl.address_format = CD_MSF_FORMAT;
-+	subchnl.data_format = CD_CURRENT_POSITION;
-+	subchnl.track = 0;
-+	subchnl.data_len = sizeof(subchnlinfo);
-+	subchnl.data = &subchnlinfo;
-+	if (ioctl(cdp->device, CDIOCREADSUBCHANNEL, &subchnl) == -1) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	stat->track = subchnlinfo.what.position.track_number;
-+     	ASSIGN_MSF(stat->relative_address, subchnlinfo.what.position.reladdr.msf);
-+     	ASSIGN_MSF(stat->absolute_address, subchnlinfo.what.position.absaddr.msf);
-+	switch (subchnlinfo.header.audio_status) {
-+	case CD_AS_PLAY_IN_PROGRESS:
-+		ioctl(cdp->device, CDIOCPREVENT);
-+		stat->audio_status = DISC_PLAY;
-+		break;
-+	case CD_AS_PLAY_PAUSED:
-+		ioctl(cdp->device, CDIOCPREVENT);
-+		stat->audio_status = DISC_PAUSED;
-+		break;
-+	case CD_AS_PLAY_COMPLETED:
-+		if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
-+			return DISC_IO_ERROR;
-+		stat->track = cdp->nr_track;
-+	     	ASSIGN_MSF(stat->relative_address, 
-+		     		cdp->track_info[cdp->nr_track].address);
-+	     	ASSIGN_MSF(stat->absolute_address,
-+		     		cdp->track_info[cdp->nr_track].address);
-+		ioctl(cdp->device, CDIOCALLOW);
-+		stat->audio_status = DISC_COMPLETED;
-+		break;
-+	case CD_AS_AUDIO_INVALID:
-+	case CD_AS_NO_STATUS:
-+	case CD_AS_PLAY_ERROR:
-+		ioctl(cdp->device, CDIOCALLOW);
-+		stat->audio_status = DISC_STOP;
-+		break;
-+	default:
-+		ioctl(cdp->device, CDIOCALLOW);
-+		stat->audio_status = DISC_ERROR;
-+	}
-+	return (stat->audio_status == DISC_ERROR ?
-+			DISC_IO_ERROR : DISC_NO_ERROR);
-+}
-+
-+cdrom_device_t
-+cdrom_open(char *device, int *errcode)
-+{
-+	cdrom_device_t cdp;
-+
-+	cdp = g_malloc(sizeof(struct cdrom_device));
-+
-+	cdp->device = open(device, O_RDONLY);
-+	if (cdp->device == -1) {
-+		*errcode = errno;
-+		g_free(cdp);
-+		return NULL;
-+	}
-+	cdp->nr_track = 0;
-+	cdp->track_info = NULL;
-+	return cdp;
-+}
-+
-+void
-+cdrom_close(cdrom_device_t cdp)
-+{
-+	if (cdp->nr_track)
-+		g_free(cdp->track_info);
-+	close(cdp->device);
-+	g_free(cdp);
-+}
-+
-+int
-+cdrom_load(cdrom_device_t cdp)
-+{
-+	if ((ioctl(cdp->device, CDIOCCLOSE) == -1) ||
-+	    (ioctl(cdp->device, CDIOCALLOW) == -1)) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_eject(cdrom_device_t cdp)
-+{
-+	if ((ioctl(cdp->device, CDIOCEJECT) == -1) ||
-+	    (ioctl(cdp->device, CDIOCALLOW) == -1)) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int 
-+cdrom_next(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	return cdrom_play(cdp, stat.track, cdp->track1);
-+}
-+
-+int 
-+cdrom_prev(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	return cdrom_play(cdp, stat.track - 1, cdp->track1);
-+}
-+
-+int
-+cdrom_rewind(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+	int track;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	if (stat.absolute_address.second != 0)
-+		stat.absolute_address.second--;
-+	else {
-+		stat.absolute_address.second = 0;
-+		if (stat.absolute_address.minute > 0)
-+			stat.absolute_address.minute--;
-+	}
-+	stat.absolute_address.frame = 0;
-+	return cdrom_play_msf(cdp, &stat.absolute_address);
-+}
-+
-+int
-+cdrom_ff(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+	int track;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	stat.absolute_address.second;
-+	if (stat.absolute_address.second >= 60) {
-+		stat.absolute_address.minute;
-+		stat.absolute_address.second = 0;
-+	}
-+	stat.absolute_address.frame = 0;
-+	return cdrom_play_msf(cdp, &stat.absolute_address);
-+}
-+
-+int
-+cdrom_track_length(cdrom_device_t cdp, int track, cdrom_msf_t * length)
-+{
-+	int index, s1, s2, i;
-+
-+	if ((track < cdp->track0) || (track > cdp->track1))
-+		return DISC_INDEX_OUT_OF_RANGE;
-+	index = track - cdp->track0;
-+
-+	s1 = cdp->track_info[index].address.second;
-+	s2 = cdp->track_info[index].address.second;
-+	length->second = s1 = s1 - s2;
-+	if (s1 < 0) {
-+		i = 1;
-+		length->second = s1;
-+	} else
-+		i = 0;
-+
-+	length->minute = cdp->track_info[index].address.minute -
-+	    cdp->track_info[index].address.minute - i;
-+
-+	return 0;
-+}
-+
diff --git a/x11/gnome2-applets/patches/patch-ad b/x11/gnome2-applets/patches/patch-ad
deleted file mode 100644
index 17d77e2aa66..00000000000
--- a/x11/gnome2-applets/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
-
---- mini-commander/src/Makefile.in.orig	2003-12-12 11:35:41.000000000 -0600
-+++ mini-commander/src/Makefile.in
-@@ -646,7 +646,7 @@ $(server_in_files): $(server_in_files:.s
- 
- install-data-local:
- 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schemas_DATA) ;
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(top_builddir)/mini-commander/src/mc-install-default-macros
-+#	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(top_builddir)/mini-commander/src/mc-install-default-macros
- 
- @INTLTOOL_SERVER_RULE@
- 
diff --git a/x11/gnome2-applets/patches/patch-ae b/x11/gnome2-applets/patches/patch-ae
deleted file mode 100644
index 51cc82e8296..00000000000
--- a/x11/gnome2-applets/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
-
---- battstat/sounds/Makefile.in.orig	2003-12-13 15:42:24.000000000 -0600
-+++ battstat/sounds/Makefile.in
-@@ -148,7 +148,7 @@ WARN_CXXFLAGS = @WARN_CXXFLAGS@
- X_LIBS = @X_LIBS@
- gnomelocaledir = @gnomelocaledir@
- 
--soundlistdir = $(sysconfdir)/sound/events
-+soundlistdir = $(datadir)/examples/gnome-applets/sound/events
- soundlist_in_files = battstat_applet.soundlist.in
- soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
- 
diff --git a/x11/gnome2-applets/patches/patch-af b/x11/gnome2-applets/patches/patch-af
deleted file mode 100644
index 61e6f89be15..00000000000
--- a/x11/gnome2-applets/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
-
---- mailcheck/Makefile.in.orig	2003-12-13 15:40:45.000000000 -0600
-+++ mailcheck/Makefile.in
-@@ -198,7 +198,7 @@ MAILCHECK_BITMAPS = \
- mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck
- mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)
- 
--soundlistdir = $(sysconfdir)/sound/events
-+soundlistdir = $(datadir)/examples/gnome-applets/sound/events
- soundlist_in_files = mailcheck.soundlist.in
- soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
-