Begin the de-orbit burn of the GNOME 1.4 desktop. This is phase I. All

core desktop components are being removed.
svn path=/head/; revision=84934
2024-11-27 00:57:50 +00:00 · 2003-07-15 19:10:59 +00:00 · 2003-07-15 19:10:59 +00:00 · cc6825cf28 · 2021-03-31 03:12:20 +00:00
commit cc6825cf28
parent c2de53da32
132 changed files with 0 additions and 9121 deletions
--- a/audio/Makefile
+++ b/audio/Makefile
@ -95,9 +95,7 @@
    SUBDIR += glame
    SUBDIR += gmixer
    SUBDIR += gnapster
-    SUBDIR += gnomeaudio
    SUBDIR += gnomeaudio2
-    SUBDIR += gnomemedia
    SUBDIR += gnomemedia2
    SUBDIR += gnowavcut
    SUBDIR += gnump3d
--- a/audio/gnomeaudio/Makefile
+++ b/audio/gnomeaudio/Makefile
@ -1,23 +0,0 @@
-# New ports collection makefile for:	gnomeaudio
-# Date created:				29 Dec 1998
-# Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomeaudio
-PORTVERSION=	1.4.0
-CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-audio/1.4
-DISTNAME=	gnome-audio-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Sound files for use with GNOME
-
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomehier
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}/sounds
-
-.include <bsd.port.mk>
--- a/audio/gnomeaudio/distinfo
+++ b/audio/gnomeaudio/distinfo
@ -1 +0,0 @@
-MD5 (gnome-audio-1.4.0.tar.gz) = 412f279a4741b2b14227f1cc36a06d18
--- a/audio/gnomeaudio/files/patch-aa
+++ b/audio/gnomeaudio/files/patch-aa
@ -1,19 +0,0 @@
--- 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)
-
- 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_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
--- a/audio/gnomeaudio/pkg-descr
+++ b/audio/gnomeaudio/pkg-descr
@ -1,3 +0,0 @@
-This module holds sound files for use with GNOME. Stick them in the
-'sounds' directory here, or a subdirectory thereof - the whole tree will
-be copied over into $(gnome_prefix)/share/gnome/sounds.
--- a/audio/gnomeaudio/pkg-plist
+++ b/audio/gnomeaudio/pkg-plist
@ -1,17 +0,0 @@
-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/startup3.wav
-share/gnome/sounds/warning.wav
-@dirrm share/gnome/sounds/gtk-events
-@dirrm share/gnome/sounds/panel
--- a/audio/gnomemedia/Makefile
+++ b/audio/gnomemedia/Makefile
@ -1,29 +0,0 @@
-# New ports collection makefile for:	gnomemedia
-# Date created:				20 January 1999
-# Whom:					Jeremy Lea <reg@shale.csir.co.za>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomemedia
-PORTVERSION=	1.2.3
-PORTREVISION=	1
-CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/1.2
-DISTNAME=	gnome-media-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Multimedia applications for the GNOME desktop
-
-RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
-
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomelibs
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--without-ncurses
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
--- a/audio/gnomemedia/distinfo
+++ b/audio/gnomemedia/distinfo
@ -1 +0,0 @@
-MD5 (gnome-media-1.2.3.tar.gz) = bcd99b4fe81141d36bbd40d74a9b448f
--- a/audio/gnomemedia/files/patch-ac
+++ b/audio/gnomemedia/files/patch-ac
@ -1,14 +0,0 @@
--- cddbslave/Makefile.in.orig	Wed May 24 14:53:10 2000
-+++ cddbslave/Makefile.in	Tue May 30 15:13:02 2000
-@@ -139,3 +139,3 @@
- 
-gnomedatadir = $(datadir)/gnome
-+gnomedatadir = $(datadir)
- 
--- tcd/Makefile.in.orig	Wed May 24 14:53:16 2000
-+++ tcd/Makefile.in	Tue May 30 15:12:38 2000
-@@ -147,3 +147,3 @@
- 
-tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS)
-+tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS)
- 
--- a/audio/gnomemedia/files/patch-ad
+++ b/audio/gnomemedia/files/patch-ad
@ -1,65 +0,0 @@
--- gmix/gmix.c.orig	Mon Jun 11 13:50:47 2001
-+++ gmix/gmix.c	Sat Apr  6 14:55:36 2002
-@@ -58,7 +58,7 @@
- #ifdef HAVE_LINUX_SOUNDCARD_H 
- #include <linux/soundcard.h>
- #else 
-#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- #endif
- 
-@@ -499,11 +499,7 @@
- 	/*
- 	 * open the mixer-device
- 	 */
-	if (num==0) {
-		sprintf(device_name, "/dev/mixer");
-	} else {
-		sprintf(device_name, "/dev/mixer%i", num);
-	}
-+	sprintf(device_name, "/dev/mixer%i", num);
- 	new_device->fd=open(device_name, O_RDWR, 0);
- 	if (new_device->fd<0) {
- 		g_free(new_device);
-@@ -535,6 +531,8 @@
- 		}			
- 	}
- #endif
-+
-+#if defined(OPEN_SOUND_SYSTEM)
- 	/*
- 	 * mixer-name
- 	 */
-@@ -545,6 +543,11 @@
- 	}
- 	if(!isalpha(new_device->info.name[0]))
- 		g_snprintf(new_device->info.name, 31, "Card %d", num+1);
-+#else
-+	g_snprintf(new_device->info.id, 15, "mixer%d", num);
-+	g_snprintf(new_device->info.name, 31, "Sound Card %d", num+1);
-+	new_device->info.modify_counter=0;
-+#endif
- 	/* 
- 	 * several bitmasks describing the mixer
- 	 */
-@@ -677,15 +680,16 @@
- {
- 	int cnt;
- 	device_info *new_device;
-	cnt=0; devices=NULL;
-+	cnt=0; num_mixers=0; devices=NULL;
- 	do {
- 		new_device=open_device(cnt++);
- 		if (new_device) {
- 			new_device->channels=make_channels(new_device);
- 			devices=g_list_append(devices, new_device);
-+			num_mixers++;
- 		}
-	} while (new_device);
-	num_mixers=cnt-1;
-+	} while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \
-+		 || new_device);
- }
- 
- #ifdef ALSA
--- a/audio/gnomemedia/files/patch-ae
+++ b/audio/gnomemedia/files/patch-ae
@ -1,23 +0,0 @@
-
-$FreeBSD$
-
--- tcd/callbacks.c	2001/07/13 07:48:12	1.1
-+++ tcd/callbacks.c	2001/07/13 07:50:36
-@@ -13,7 +13,7 @@
- {
-     if(!cd.isplayable)
- 	return;
-    if(cd.sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED)
-+    if(SC_AUDIOSTATUS(cd.sc)==CDROM_AUDIO_PAUSED)
- 	tcd_pausecd(&cd);
-     else
- 	tcd_playtracks(&cd, cd.first_t, cd.last_t, prefs->only_use_trkind);
-@@ -45,7 +45,7 @@
-     cd.play_method = NORMAL;
-     cd.repeat_track = -1;
-     /* SDH: Make sure play/pause state change is noticed */
-    cd.sc.cdsc_audiostatus = -1;
-+    SC_AUDIOSTATUS(cd.sc) = -1;
-     if(cd.isplayable)
-     {
- 	make_goto_menu();
--- a/audio/gnomemedia/files/patch-cddbslave::cddbsubmit.c
+++ b/audio/gnomemedia/files/patch-cddbslave::cddbsubmit.c
@ -1,11 +0,0 @@
--- cddbslave/cddbsubmit.c.orig	Tue Apr 16 15:53:12 2002
-+++ cddbslave/cddbsubmit.c	Tue Apr 16 15:53:20 2002
-@@ -210,7 +210,7 @@
-   poptFreeContext(gnomelib_parse_args(argc, argv, 0));
- 
-   /* config prefix points to cddb submission description file */
-  fname = gnome_datadir_file("gnome/cddb-submit-methods");
-+  fname = gnome_datadir_file("cddb-submit-methods");
-   prefix = g_strconcat("=", fname, "=/", service, "/", NULL);
-   g_free(fname);
-   gnome_config_push_prefix(prefix);
--- a/audio/gnomemedia/files/patch-cddbslave::socks4.c
+++ b/audio/gnomemedia/files/patch-cddbslave::socks4.c
@ -1,19 +0,0 @@
-
-$FreeBSD$
-
--- cddbslave/socks4.c	2001/12/06 08:10:34	1.1
-+++ cddbslave/socks4.c	2001/12/06 08:11:08
-@@ -33,12 +33,12 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <netinet/in.h>
- #include <unistd.h>
- #include <pwd.h>
-#include <sys/types.h>
- #include <sys/select.h>
- #include <dlfcn.h>
- 
--- a/audio/gnomemedia/files/patch-gmix::gmix.h
+++ b/audio/gnomemedia/files/patch-gmix::gmix.h
@ -1,22 +0,0 @@
-
-$FreeBSD$
-
--- gmix/gmix.h	2001/07/13 09:44:04	1.1
-+++ gmix/gmix.h	2001/07/13 09:44:44
-@@ -39,6 +39,16 @@
- /* 
-  * All, that is known about a mixer-device
-  */
-+#if !defined(OPEN_SOUND_SYSTEM)
-+typedef struct mixer_info
-+{
-+  char id[16];
-+  char name[32];
-+  int  modify_counter;
-+  int fillers[10];
-+} mixer_info;
-+#endif
-+
- typedef struct device_info {
- #ifdef ALSA
- 	snd_mixer_t *handle;
--- a/audio/gnomemedia/files/patch-gmix::prefs.c
+++ b/audio/gnomemedia/files/patch-gmix::prefs.c
@ -1,11 +0,0 @@
--- gmix/prefs.c.orig	Fri Apr 12 11:53:51 2002
-+++ gmix/prefs.c	Fri Apr 12 11:53:57 2002
-@@ -38,7 +38,7 @@
- #ifdef HAVE_LINUX_SOUNDCARD_H 
- #include <linux/soundcard.h>
- #else 
-#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- #endif
- 
--- a/audio/gnomemedia/files/patch-tcd::cddb.c
+++ b/audio/gnomemedia/files/patch-tcd::cddb.c
@ -1,65 +0,0 @@
-
-$FreeBSD$
-
--- tcd/cddb.c	2001/07/13 07:50:57	1.1
-+++ tcd/cddb.c	2001/07/13 07:55:41
-@@ -199,16 +199,16 @@
- 	{
- 		int min, sec;
- 		
-		min = cd->trk[trk].toc.cdte_addr.msf.minute;
-		sec = cd->trk[trk].toc.cdte_addr.msf.second;
-+		min = TOC_MINUTE(cd->trk[trk]);
-+		sec = TOC_SECOND(cd->trk[trk]);
- 	
- 		n = (min*60)+sec;
-		fprintf( fp, "# %u\n", (n*75)+cd->trk[trk].toc.cdte_addr.msf.frame );
-+		fprintf( fp, "# %u\n", (n*75)+TOC_FRAME(cd->trk[trk]) );
- 	}
- 	/* Print the number of seconds */
- 	fprintf( fp, "#\n# Disc length: %i seconds\n", 
-		(cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60)
-                +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) );
-+		(TOC_MINUTE(cd->trk[cd->last_t+1])*60)
-+		+(TOC_SECOND(cd->trk[cd->last_t+1])) );
- 
- 	fprintf( fp, "#\n# Revision: %lu\n", cd->cddb_rev );
- 	fprintf( fp, "# Submitted via: tcd 2.0b\n" );
-@@ -245,10 +245,10 @@
-     {
- 	int min, sec;
- 	
-	min = cd->trk[i].toc.cdte_addr.msf.minute;
-	sec = cd->trk[i].toc.cdte_addr.msf.second;
-+	min = TOC_MINUTE(cd->trk[i]);
-+	sec = TOC_SECOND(cd->trk[i]);
-         
-	l=sprintf( tmp, "%u ", calc_offset(min,sec,cd->trk[i].toc.cdte_addr.msf.frame));
-+	l=sprintf( tmp, "%u ", calc_offset(min,sec,TOC_FRAME(cd->trk[i])));
- 	
- 	if(blen>l)
- 	{
-@@ -257,8 +257,8 @@
- 	}
-     }
-     l=sprintf( tmp, "%i\n",
-	       (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60)
-	       +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) );
-+	       (TOC_MINUTE(cd->trk[cd->last_t+1])*60)
-+	       +(TOC_SECOND(cd->trk[cd->last_t+1])) );
-     if(blen>l)
- 	strcat( buf,tmp );
- 
-@@ -298,9 +298,9 @@
- 
- 	for( i=0; i <= cd->last_t+1; i++ )
- 	{
- 		cdtoc[i].frame = cd->trk[i+1].toc.cdte_addr.msf.frame;
- 		cdtoc[i].min = cd->trk[i+1].toc.cdte_addr.msf.minute;
- 		cdtoc[i].sec = cd->trk[i+1].toc.cdte_addr.msf.second;
-+ 		cdtoc[i].frame = TOC_FRAME(cd->trk[i+1]);
-+ 		cdtoc[i].min = TOC_MINUTE(cd->trk[i+1]);
-+ 		cdtoc[i].sec = TOC_SECOND(cd->trk[i+1]);
-  	}
-  	
- 
--- a/audio/gnomemedia/files/patch-tcd::gtcd.c
+++ b/audio/gnomemedia/files/patch-tcd::gtcd.c
@ -1,100 +0,0 @@
-
-$FreeBSD$
-
--- tcd/gtcd.c.orig	Mon Jun 11 20:50:57 2001
-+++ tcd/gtcd.c	Fri Jul 13 12:49:33 2001
-@@ -163,7 +163,11 @@
- gint release_timer(gpointer *data)
- {
- 	cd.time_lock = TRUE;
-+#ifdef TCD_BSD
-+	ioctl(cd.cd_dev, CDIOCPAUSE);
-+#else
- 	ioctl(cd.cd_dev, CDROMPAUSE);
-+#endif
- 
- 	roll_t = gtk_timeout_add(40, (GtkFunction)roll_timer, data);
- 	release_t = 0;
-@@ -206,7 +210,11 @@
- 			if(GPOINTER_TO_INT(data) > 0)
- 			{
- 				if((cd.cur_t < cd.last_t) &&
-+#ifdef TCD_BSD
-+				   cd.trk[cd.cur_t+1].toc.control == 0x04)
-+#else
- 				   (cd.trk[cd.cur_t+1].toc.cdte_ctrl != CDROM_DATA_TRACK))
-+#endif
- 				{
- 					cd.cur_t++;
- 					tcd_playtracks(&cd,cd.cur_t, cd.last_t, prefs->only_use_trkind);
-@@ -541,8 +549,8 @@
- 		break;
- 	case TRACK_R: /* track time decending */
- 		cur = cd.cur_pos_rel;
-		end = (cd.trk[cd.cur_t].tot_min*60)+
-			cd.trk[cd.cur_t].tot_sec;
-+		end = (TOC_MINUTE(cd.trk[cd.cur_t])*60)+
-+			TOC_SECOND(cd.trk[cd.cur_t]);
- 		pos = end-cur;
- 		min = pos/60;
- 		sec = pos-(pos/60)*60;
-@@ -555,8 +563,8 @@
- 		break;
- 	case DISC_R:
- 		cur = cd.cur_pos_abs;
-		end = (cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute
-		       *60)+cd.trk[cd.last_t+1].toc.cdte_addr.msf.second;
-+		end = (TOC_MINUTE(cd.trk[cd.last_t+1])*60
-+		       +TOC_SECOND(cd.trk[cd.last_t+1]));
- 		pos = end-cur;
- 		min = pos/60;
- 		sec = pos-(pos/60)*60;
-@@ -660,7 +668,7 @@
- 
- 	if( !cd.err )
- 	{
-		switch( cd.sc.cdsc_audiostatus )
-+		switch( SC_AUDIOSTATUS(cd.sc) )
- 		{
- 		case CDROM_AUDIO_INVALID:
- 			strcpy(tmp, _("No Disc"));
-@@ -756,8 +764,8 @@
- 	}
- 
- 	/* see if we need to repeat */
-	if( cd.sc.cdsc_audiostatus != CDROM_AUDIO_PLAY &&
-	    cd.sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED )
-+	if( SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PLAY &&
-+	    SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PAUSED )
- 	{
- 		if( cd.play_method == REPEAT_CD )
- 			tcd_playtracks( &cd, cd.first_t, cd.last_t, prefs->only_use_trkind);
-@@ -774,14 +782,14 @@
- 
- void status_changed(void)
- {
-	if(old_status != cd.sc.cdsc_audiostatus)
-+	if(old_status != SC_AUDIOSTATUS(cd.sc))
- 	{
- 		GtkWidget *pixmap;
- 		GtkSignalFunc func;
- 		char tmp[256];
- 		char *name;
- 	
-		old_status = cd.sc.cdsc_audiostatus;
-+		old_status = SC_AUDIOSTATUS(cd.sc);
- 		g_snprintf(tmp, 255, "tcd/%s.xpm", 
- 			   (old_status==CDROM_AUDIO_PLAY)?"pause":"play");
- 
-@@ -846,7 +854,11 @@
- 
- 	for(i=1; i <= cd.last_t; i++)
- 	{
-+#ifdef TCD_BSD
-+		data_track = (cd.trk[C(i)].toc.control == 0x04);
-+#else
- 		data_track = (cd.trk[C(i)].toc.cdte_ctrl == CDROM_DATA_TRACK);
-+#endif
- 
- 		g_snprintf(buf, TRK_NAME_LEN, "%2d - %s", i,
- 			   data_track ? "[Data]" : cd.trk[C(i)].name);
--- a/audio/gnomemedia/files/patch-tcd::gtracked.c
+++ b/audio/gnomemedia/files/patch-tcd::gtracked.c
@ -1,22 +0,0 @@
--- tcd/gtracked.c.orig	Mon Jun 11 13:50:57 2001
-+++ tcd/gtracked.c	Tue Apr 16 15:53:53 2002
-@@ -211,8 +211,8 @@
-     
-     /* Disc area */
-     g_snprintf(tmp, 63, _("Disc Information (%02u:%02u minutes)"),
-	       cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute,
-	       cd.trk[cd.last_t+1].toc.cdte_addr.msf.second);
-+	       TOC_MINUTE(cd.trk[cd.last_t+1]),
-+	       TOC_SECOND(cd.trk[cd.last_t+1]));
- 
-     disc_frame = gtk_frame_new(tmp);
-     disc_vbox  = gtk_vbox_new(FALSE, GNOME_PAD_SMALL);
-@@ -397,7 +397,7 @@
-     
-     /* build service menu */
-     service_menu = gtk_menu_new();
-    key = gnome_datadir_file("gnome/cddb-submit-methods");
-+    key = gnome_datadir_file("cddb-submit-methods");
-     prefix = g_strconcat("=", key, "=/", NULL);
-     g_free(key);
- 
--- a/audio/gnomemedia/files/patch-tcd::linux-cdrom.c
+++ b/audio/gnomemedia/files/patch-tcd::linux-cdrom.c
@ -1,668 +0,0 @@
--- tcd/linux-cdrom.c.orig	Mon Jun 11 13:50:58 2001
-+++ tcd/linux-cdrom.c	Tue Apr 16 15:55:46 2002
-@@ -67,6 +67,7 @@
-     return;
- }
- 
-+#ifndef TCD_BSD
- static void decrement_msf_end_by_one (struct cdrom_msf *msf)
- {
-     if (msf->cdmsf_frame1)
-@@ -87,13 +88,14 @@
- 	}
-     }
- }
-+#endif
- 
- int tcd_init_disc( cd_struct *cd, WarnFunc msg_cb )
- {
-     debug("cdrom.c: tcd_init_disc(%p) top\n", cd );
-     tcd_opencddev( cd, msg_cb );
-     
-#if defined(TCD_CHANGER_ENABLED)
-+#if defined(TCD_CHANGER_ENABLED) && !defined(TCD_BSD)
-     cd->nslots = ioctl( cd->cd_dev, CDROM_CHANGER_NSLOTS );
- #else
-     cd->nslots = 0;
-@@ -131,6 +133,9 @@
- int tcd_close_disc( cd_struct *cd )
- {
-     debug("cdrom.c: tcd_close_disc(%p) top\n", cd );
-+#ifdef TCD_BSD
-+    ioctl( cd->cd_dev, CDIOCALLOW);
-+#endif
-     close(cd->cd_dev);
-     cd->cd_dev = -1;
-     debug("cdrom.c: tcd_close_disc exiting normally\n" );
-@@ -141,6 +146,10 @@
- {
-     int i;
-     int delsecs;
-+#ifdef TCD_BSD
-+    struct ioc_read_toc_single_entry tocentry;
-+#endif
-+
- 
-     if(cd->time_lock)
- 	    return;
-@@ -152,7 +161,11 @@
-     cd->isplayable=FALSE;
- 	
-     /* read the TOC header */
-+#ifdef TCD_BSD
-+    if((ioctl( cd->cd_dev, CDIOREADTOCHEADER, &cd->tochdr))==-1)
-+#else
-     if(ioctl( cd->cd_dev, CDROMREADTOCHDR, &cd->tochdr))
-+#endif
-     {
- 	strcpy( cd->errmsg, "Can't read disc." );
- 	cd->err = TRUE;
-@@ -164,15 +177,29 @@
-     }
- 
-     /* grab first & last tracks */
-+#ifdef TCD_BSD
-+    cd->first_t = cd->tochdr.starting_track;
-+    cd->last_t = cd->tochdr.ending_track;
-+#else
-     cd->first_t = cd->tochdr.cdth_trk0;
-     cd->last_t = cd->tochdr.cdth_trk1;
-+#endif
- 
-     /* read the leadout track */
-+#ifdef TCD_BSD
-+    tocentry.track = 0xaa;   /* Magic last track */
-+    tocentry.address_format = CD_MSF_FORMAT;
-+#else
-     cd->trk[C(cd->last_t+1)].toc.cdte_track = CDROM_LEADOUT;
-     cd->trk[C(cd->last_t+1)].toc.cdte_format = CDROM_MSF;
-+#endif
- 
-     /* read the leadout toc */
-+#ifdef TCD_BSD
-+    if((ioctl(cd->cd_dev, CDIOREADTOCENTRY, &tocentry)) == -1)
-+#else
-     if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(cd->last_t+1)].toc))
-+#endif
-     {
- 	strcpy(cd->errmsg, "Can't read disc.");
- 	cd->err = TRUE;
-@@ -184,13 +211,30 @@
- 	return;
-     }                                         
- 
-+#ifdef TCD_BSD
-+    cd->trk[C(cd->last_t+1)].toc = tocentry.entry;
-+    cd->trk[C(cd->last_t+1)].length = TOC_MINUTE(cd->trk[C(cd->last_t+1)]) * 60 +
-+	TOC_SECOND(cd->trk[C(cd->last_t+1)]);
-+    cd->trk[C(cd->last_t+1)].start = cd->trk[C(cd->last_t+1)].length * 75 +
-+	TOC_FRAME(cd->trk[C(cd->last_t+1)]);
-+#endif
-+
-     /* read the rest of the tocs */
-     for( i = cd->first_t; i <= cd->last_t; i++ )
-     {
-+#ifdef TCD_BSD
-+	tocentry.track = i;
-+	tocentry.address_format = CD_MSF_FORMAT;
-+#else
- 	cd->trk[C(i)].toc.cdte_track = i;
- 	cd->trk[C(i)].toc.cdte_format = CDROM_MSF;
-+#endif
- 	
-+#ifdef TCD_BSD
-+	if((ioctl(cd->cd_dev, CDIOREADTOCENTRY, &tocentry)) == -1)
-+#else
- 	if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(i)].toc))
-+#endif
- 	{
- 	    strcpy( cd->errmsg, "Can't read disc." );
- 	    cd->err = TRUE;
-@@ -201,21 +245,34 @@
- 	    return;
- 	}
- 
-+#ifdef TCD_BSD
-+	cd->trk[C(i)].toc = tocentry.entry;
-+	cd->trk[C(i)].type = cd->trk[C(i)].toc.control;
-+	cd->trk[C(i)].length = TOC_MINUTE(cd->trk[C(i)]) * 60 +
-+	    TOC_SECOND(cd->trk[C(i)]);
-+	cd->trk[C(i)].start = cd->trk[C(i)].length * 75 +
-+	    TOC_FRAME(cd->trk[C(i)]);
-+#else
- 	cd->trk[C(i)].type = cd->trk[C(i)].toc.cdte_ctrl;
- 	cd->trk[C(i)].length = cd->trk[C(i)].toc.cdte_addr.msf.minute * 60 +
- 	    cd->trk[C(i)].toc.cdte_addr.msf.second;
- 	cd->trk[C(i)].start = cd->trk[C(i)].length * 75 + 
- 	    cd->trk[C(i)].toc.cdte_addr.msf.frame;
-+#endif
-     }
- 
-     /* calculate track times */
-     for(i = cd->first_t; i <= cd->last_t; i ++)
-     {
- 	/* Taken from cdtool...Thanks Thomas I.! */
-+#ifdef TCD_BSD
-+	delsecs = cd->trk[C(i+1)].length - cd->trk[C(i)].length;
-+#else
- 	delsecs = cd->trk[C(i+1)].toc.cdte_addr.msf.minute * 60
- 	    + cd->trk[C(i+1)].toc.cdte_addr.msf.second
- 	    - cd->trk[C(i)].toc.cdte_addr.msf.minute * 60
- 	    - cd->trk[C(i)].toc.cdte_addr.msf.second;
-+#endif
- 
- 	cd->trk[C(i)].tot_min = delsecs / 60;
- 	cd->trk[C(i)].tot_sec = delsecs - (delsecs/60)*60;
-@@ -245,9 +302,14 @@
- 	    return;
- 
-     /* calculate various timing values */
-+#ifdef TCD_BSD
-+    cd->cur_pos_abs = SC_MINUTE(cd->sc) * 60 + SC_SECOND(cd->sc);
-+    cd->cur_frame = cd->cur_pos_abs * 75 + SC_FRAME(cd->sc);
-+#else
-     cd->cur_pos_abs = cd->sc.cdsc_absaddr.msf.minute * 60 +
- 	cd->sc.cdsc_absaddr.msf.second;
-     cd->cur_frame = cd->cur_pos_abs * 75 + cd->sc.cdsc_absaddr.msf.frame;
-+#endif
-         
-     cd->cur_pos_rel = (cd->cur_frame - cd->trk[C(cd->cur_t)].start) / 75;
- 	
-@@ -266,10 +328,12 @@
-     cd->cd_min = cd->cur_pos_abs / 60;
- 
- #ifdef TCD_CHANGER_ENABLED
-+#ifndef TCD_BSD
-     tcd_opencddev( cd, NULL );
-     cd->cur_disc = ioctl( cd->cd_dev, CDROM_SELECT_DISC, CDSL_CURRENT );
-     tcd_close_disc ( cd );
- #endif
-+#endif
- }
- 
- void tcd_recalculate_fake(cd_struct *cd, gint abs_pos, gint track)
-@@ -305,7 +369,11 @@
- 	
- 	for(t = cd->first_t; t <= cd->last_t; t++)
- 	{
-+#ifdef TCD_BSD
-+		if(cd->trk[t].toc.control == 0x04)
-+#else
- 		if(cd->trk[t].toc.cdte_ctrl == CDROM_DATA_TRACK)
-+#endif
- 			return t-1;
- 		if(abs_pos >= cd->trk[t].start/75)
- 			continue;
-@@ -316,16 +384,35 @@
- 
- void tcd_gettime( cd_struct *cd )
- {
-+#ifdef TCD_BSD
-+	struct ioc_read_subchannel subch;
-+#endif
- 	cd->err = FALSE;
-+#ifdef TCD_BSD
-+	subch.address_format = CD_MSF_FORMAT;
-+	subch.data_format = CD_CURRENT_POSITION;
-+	subch.data_len = sizeof(cd->sc);
-+	subch.track = 0;
-+	subch.data = &(cd->sc);
-+#else
- 	cd->sc.cdsc_format = CDROM_MSF;
-+#endif
- 	
- 	if(cd->isplayable)
- 	{
- 	        int tmp;
- 		tcd_opencddev (cd, NULL);
-+#ifdef TCD_BSD
-+		tmp = ioctl( cd->cd_dev, CDIOCREADSUBCHANNEL, &subch);
-+#else
- 		tmp = ioctl( cd->cd_dev, CDROMSUBCHNL, &cd->sc);
-+#endif
- 		tcd_close_disc (cd);
-+#ifdef TCD_BSD
-+		if(tmp == -1)
-+#else
- 		if(tmp)
-+#endif
- 		{
- 			strcpy( cd->errmsg, "Can't read disc." );
- 			cd->err = TRUE;
-@@ -333,8 +420,18 @@
- 			cd->cur_t = 0;
- 			return;
- 		}
-+#ifdef TCD_BSD
-+		if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PLAY )
-+#else
- 		if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PLAY)
-+#endif
-+		{
-+#ifdef TCD_BSD
-+			cd->cur_t = SC_TRACK(cd->sc);
-+#else
- 			cd->cur_t = cd->sc.cdsc_trk;
-+#endif
-+		}
- 		else
- 			cd->cur_t = 0;
- 		tcd_recalculate(cd);
-@@ -343,14 +440,27 @@
- 
- int tcd_set_volume(cd_struct *cd, int volume)
- {
-+#ifdef TCD_BSD
-+    struct ioc_vol vol;
-+#else
-     struct cdrom_volctrl vol;
-+#endif
-     int tmp;
- 
-+#ifdef TCD_BSD
-+    vol.vol[0] = volume;
-+    vol.vol[1] = vol.vol[2] = vol.vol[3] = vol.vol[0];
-+#else
-     vol.channel0 = volume;
-     vol.channel1 = vol.channel2 = vol.channel3 = vol.channel0;
-+#endif
- 
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    tmp = ioctl(cd->cd_dev, CDIOCSETVOL, &vol);
-+#else
-     tmp = ioctl(cd->cd_dev, CDROMVOLCTRL, &vol);
-+#endif
-     tcd_close_disc ( cd );
-     if(tmp < 0)
- 	return FALSE;
-@@ -360,6 +470,18 @@
- 
- int tcd_get_volume(cd_struct *cd)
- {
-+#ifdef TCD_BSD
-+    struct ioc_vol vol;
-+    int tmp;
-+
-+    tcd_opencddev( cd, NULL );
-+    tmp = ioctl(cd->cd_dev, CDIOCGETVOL, &vol);
-+    tcd_close_disc ( cd );
-+    if (tmp < 0)
-+	return -1;
-+
-+    return vol.vol[0];
-+#else
- #ifdef CDROMVOLREAD
-     struct cdrom_volctrl vol;
-     int tmp;
-@@ -374,12 +496,38 @@
- #else
-     return 0;
- #endif
-+#endif
- }	
- 	                                  
- void tcd_playtracks(cd_struct *cd, int start_t, int end_t, int only_use_trkind)
- {
-+#ifdef TCD_BSD
-+    struct ioc_play_msf msf;
-+#define MSF_START_MIN  (msf.start_m)
-+#define MSF_START_SEC  (msf.start_s)
-+#define MSF_START_FRM  (msf.start_f)
-+#define MSF_END_MIN    (msf.end_m)
-+#define MSF_END_SEC    (msf.end_s)
-+#define MSF_END_FRM    (msf.end_f)
-+    struct ioc_play_track trkind;
-+#define TI_START_TRK   (trkind.start_track)
-+#define TI_START_IND   (trkind.start_index)
-+#define TI_END_TRK     (trkind.end_track)
-+#define TI_END_IND     (trkind.end_index)
-+#else
-     struct cdrom_msf msf;
-+#define MSF_START_MIN  (msf.cdmsf_min0)
-+#define MSF_START_SEC  (msf.cdmsf_sec0)
-+#define MSF_START_FRM  (msf.cdmsf_frame0)
-+#define MSF_END_MIN    (msf.cdmsf_min1)
-+#define MSF_END_SEC    (msf.cdmsf_sec1)
-+#define MSF_END_FRM    (msf.cdmsf_frame0)
-     struct cdrom_ti trkind;
-+#define TI_START_TRK   (trkind.cdti_trk0)
-+#define TI_START_IND   (trkind.cdti_ind0)
-+#define TI_END_TRK     (trkind.cdti_trk1)
-+#define TI_END_IND     (trkind.cdti_ind1)
-+#endif
-     debug("cdrom.c: tcd_playtracks( %p, %d, %d )\n", cd, start_t, end_t );
-     cd->err = FALSE;
- 	
-@@ -390,7 +538,7 @@
-     tcd_gettime(cd);
-     if(cd->err) 
-     {
-	/* try and inject cd */
-+	/* try and eject cd */
- 	tcd_ejectcd(cd);
- 
- 	if(cd->err) 
-@@ -401,62 +549,79 @@
-     }
- 
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    ioctl(cd->cd_dev, CDIOCCLOSE);
-+#else
- #if defined(CDROMCLOSETRAY)
-     if( ioctl( cd->cd_dev, CDROM_DRIVE_STATUS ) == CDS_TRAY_OPEN )
- 	    ioctl(cd->cd_dev, CDROMCLOSETRAY);
- #endif	        
-+#endif
- 	
-+#ifdef TCD_BSD
-+    if(cd->trk[start_t].toc.control == 0x04)
-+#else
-     if(cd->trk[start_t].toc.cdte_ctrl == CDROM_DATA_TRACK)
-+#endif
- 	start_t++;		/* bad hack. most data tracks are the first track... */
- 
-    msf.cdmsf_min0 = cd->trk[start_t].toc.cdte_addr.msf.minute;
-    msf.cdmsf_sec0 = cd->trk[start_t].toc.cdte_addr.msf.second;
-    msf.cdmsf_frame0 = cd->trk[start_t].toc.cdte_addr.msf.frame;
-+    MSF_START_MIN = TOC_MINUTE(cd->trk[start_t]);
-+    MSF_START_SEC = TOC_SECOND(cd->trk[start_t]);
-+    MSF_START_FRM = TOC_FRAME(cd->trk[start_t]);
- 	
-     if( end_t < 0 )
-     {
-	msf.cdmsf_min1 = cd->trk[start_t].tot_min+msf.cdmsf_min0;
-	msf.cdmsf_sec1 = cd->trk[start_t].tot_sec+msf.cdmsf_sec0;
-	msf.cdmsf_frame1=0;
-+	MSF_END_MIN = cd->trk[start_t].tot_min+MSF_START_MIN;
-+	MSF_END_SEC = cd->trk[start_t].tot_sec+MSF_START_SEC;
-+	MSF_END_FRM = 0;
-     }
-     else
-     {
-	msf.cdmsf_min1 = cd->trk[end_t+1].toc.cdte_addr.msf.minute;
-	msf.cdmsf_sec1 = cd->trk[end_t+1].toc.cdte_addr.msf.second;
-	msf.cdmsf_frame1 = cd->trk[end_t+1].toc.cdte_addr.msf.frame;
-	decrement_msf_end_by_one (&msf);
-+	MSF_END_MIN = TOC_MINUTE(cd->trk[end_t+1]);
-+	MSF_END_SEC = TOC_SECOND(cd->trk[end_t+1]);
-+	MSF_END_FRM = TOC_FRAME(cd->trk[end_t+1]);
-+	MSF_END_FRM -= 1;
- 
- #ifdef UNSIGNED_NUMBERS_CAN_BE_NEGATIVE
-	if(msf.cdmsf_frame1 < 0)
-+	if(MSF_END_FRM < 0)
- 	{
-	    msf.cdmsf_sec1 += msf.cdmsf_frame1;
-	    msf.cdmsf_frame1 = 0;
-+	    MSF_END_SEC += MSF_END_FRM;
-+	    MSF_END_FRM = 0;
- 	}
-	if(msf.cdmsf_sec1 < 0)
-+	if(MSF_END_SEC < 0)
- 	{
-	    msf.cdmsf_min1 += msf.cdmsf_sec1;
-	    msf.cdmsf_sec1 = 0;
-+	    MSF_END_MIN += MSF_END_SEC;
-+	    MSF_END_SEC = 0;
- 	}
-	if(msf.cdmsf_min1 < 0)
-+	if(MSF_END_MIN < 0)
- 	{
-	    msf.cdmsf_min1 = 0;
-+	    MSF_END_MIN = 0;
- 	}
- #endif
-     }
-    msf.cdmsf_min1 += (msf.cdmsf_sec1 / 60);
-    msf.cdmsf_sec1 %= 60;
-+    MSF_END_MIN += (MSF_END_SEC / 60);
-+    MSF_END_SEC %= 60;
- 
-+#ifdef TCD_BSD
-+    ioctl( cd->cd_dev, CDIOCPREVENT);
-+    if(only_use_trkind || ioctl( cd->cd_dev, CDIOCPLAYMSF, &msf))
-+#else
-     if(ioctl( cd->cd_dev, CDROMPLAYMSF, &msf) || only_use_trkind)
-+#endif
-     {
- 	debug("cdrom.c: tcd_playtracks error. CDROMPLAYMSF ioctl error (or user override). Trying PLAYTRKIND\n" );
- 
- 	/* Try alternate method of playing */
-	trkind.cdti_trk0 = start_t;     /* start track */
-	trkind.cdti_ind0 = 0;      	/* start index */
-	trkind.cdti_trk1 = end_t;      	/* end track */
-	trkind.cdti_ind1 = 0;      	/* end index */
-+	TI_START_TRK = start_t;		/* start track */
-+	TI_START_IND = 0;	      	/* start index */
-+	TI_END_TRK = end_t;      	/* end track */
-+	TI_END_IND = 0;         	/* end index */
- 		                                
-+#ifdef TCD_BSD
-+	if(ioctl(cd->cd_dev, CDIOCPLAYTRACKS, &trkind))
-+#else
- 	if(ioctl(cd->cd_dev, CDROMPLAYTRKIND, &trkind))
-+#endif
- 	{
- 	    strcpy( cd->errmsg, "Error playing disc" );
- 	    cd->err = TRUE;
-@@ -472,25 +637,15 @@
-     return;
- }       
- 
-static int msf_2_frame( cd_min_sec_frame *msf )
-{
-	return( ( msf->minute * CD_SECS + msf->second )
-			* CD_FRAMES + msf->frame );
-}
-
-static void frame_2_msf( int frame, cd_min_sec_frame *msf )
-{
-	msf->frame = frame % CD_FRAMES;
-	frame /= CD_FRAMES;
-	msf->second = frame % CD_SECS;
-	msf->minute = frame / CD_SECS;
-}
-
- int tcd_play_seconds( cd_struct *cd, long int offset )
- {
-+#ifdef TCD_BSD
-+    struct ioc_play_msf msf;
-+#else
-     struct cdrom_msf msf;
-     cd_min_sec_frame msf0;
-     int cur_frame, start_frame, end_frame;
-+#endif
-     int tmp;
- 
-     debug("cdrom.c: tcd_play_seconds( %p, %ld )\n", cd, offset );
-@@ -498,53 +653,54 @@
-     cd->err = FALSE;
-     cd->isplayable=FALSE;
- 
-    /* converting msf to frames makes life much easier */
-    start_frame = msf_2_frame( &cd->trk[C(cd->first_t)].toc.cdte_addr.msf );
-    end_frame = msf_2_frame( &cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf ) - 1;
-    cur_frame = cd->cur_frame + ( offset * CD_FRAMES );
-
-    /* keep the cur_frame within the boundaries of the first and last track */
-    if ( cur_frame < start_frame ) {
-	    cur_frame = start_frame;
-    } else if ( cur_frame > end_frame ) {
-	    cur_frame = end_frame;
-    }
-
-    /* convert frames back to msf */
-    frame_2_msf( cur_frame, &msf0 );
-    msf.cdmsf_min0 = msf0.minute;
-    msf.cdmsf_sec0 = msf0.second;
-    msf.cdmsf_frame0 = msf0.frame;
-    msf.cdmsf_min1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute;
-    msf.cdmsf_sec1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second;
-    msf.cdmsf_frame1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.frame;
-    decrement_msf_end_by_one (&msf);
-+    /* got subchannel? */
-+    MSF_START_SEC = SC_SECOND(cd->sc)+offset;
-+    MSF_START_MIN = SC_MINUTE(cd->sc);
-+    MSF_START_FRM = SC_FRAME(cd->sc);
-+    MSF_END_MIN = TOC_MINUTE(cd->trk[C(cd->last_t+1)]);
-+    MSF_END_SEC = TOC_SECOND(cd->trk[C(cd->last_t+1)]);
-+    MSF_END_FRM = TOC_FRAME(cd->trk[C(cd->last_t+1)]);
-+    MSF_END_FRM -= 1;
-  
- #ifdef UNSIGNED_NUMBERS_CAN_BE_NEGATIVE
-    if(msf.cdmsf_frame1 < 0)
-+    if((MSF_END_FRM < 0)
-     {
-	msf.cdmsf_sec1 += msf.cdmsf_frame1;
-	msf.cdmsf_frame1 = 0;
-+	MSF_END_SEC += MSF_END_FRM;
-+	MSF_END_FRM = 0;
-     }
-    if(msf.cdmsf_sec1 < 0)
-+    if(MSF_END_SEC < 0)
-     {
-	msf.cdmsf_min1 += msf.cdmsf_sec1;
-	msf.cdmsf_sec1 = 0;
-+	MSF_END_MIN += MSF_END_SEC;
-+	MSF_END_SEC = 0;
-     }
-    if(msf.cdmsf_min1 < 0)
-+    if(MSF_END_MIN < 0)
-     {
-	msf.cdmsf_min1 = 0;
-+	MSF_END_MIN = 0;
-     }
- #endif
-	
-+
-+    if(MSF_START_SEC > 60 && (offset<0))
-+    {
-+	MSF_START_SEC = 60-abs(offset);
-+	MSF_START_MIN--;
-+    }
-+
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    ioctl( cd->cd_dev, CDIOCPREVENT );
-+    tmp = ioctl(cd->cd_dev, CDIOCPLAYMSF, &msf);
-+#else
-     tmp = ioctl(cd->cd_dev, CDROMPLAYMSF, &msf);
-+#endif
-     if(tmp)
-       {
- 	strcpy( cd->errmsg, "Error playing disc." );
- 	cd->err = TRUE;
- 
- 	debug("cdrom.c: tcd_play_seconds error. CDROMPLAYMSF ioctl error.\n" );
-+#ifdef TCD_BSD
-+	ioctl( cd->cd_dev, CDIOCALLOW );
-+#endif
-     }
-     cd->isplayable=TRUE;
-     tcd_close_disc( cd );
-@@ -562,7 +718,11 @@
-     cd->err = FALSE;
- 
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    if(!ioctl(cd->cd_dev, CDIOCEJECT))
-+#else
-     if(!ioctl(cd->cd_dev, CDROMEJECT))
-+#endif
-     {
- 	cd->isplayable = FALSE;
- 	strcpy(cd->errmsg, "No disc in drive ");
-@@ -570,9 +730,17 @@
-     } 
-     else 
-     {
-+#ifdef TCD_BSD
-+	tmp = ioctl( cd->cd_dev, CDIOCCLOSE );
-+#else
- #ifdef CDROMCLOSETRAY
- 	tmp = ioctl( cd->cd_dev, CDROMCLOSETRAY );
- #endif
-+#endif
-+
-+#ifdef TCD_BSD
-+	ioctl( cd->cd_dev, CDIOCPREVENT);
-+#endif
- 
- 	if(tcd_post_init(cd))
- 	{
-@@ -582,6 +750,9 @@
- 	    debug("cdrom.c: tcd_eject - disc init error. %s\n",  
- 		  strerror(errno) );
- 
-+#ifdef TCD_BSD
-+	    ioctl( cd->cd_dev, CDIOCALLOW);
-+#endif
- 	    return(-1);
- 	}
- 	cd->isplayable = TRUE;
-@@ -600,12 +771,21 @@
-     debug("cdrom.c: tcd_stopcd(%p)\n", cd );
- 	
-     /* SDH: Makes things cleaner on eject */
-+#ifdef TCD_BSD
-+    if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED )
-+#else
-     if( cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED )
-+#endif
- 	tcd_pausecd(cd);
- 
-     cd->err = FALSE;
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    ioctl( cd->cd_dev, CDIOCALLOW);
-+    tmp = ioctl(cd->cd_dev, CDIOCSTOP);
-+#else
-     tmp = ioctl(cd->cd_dev, CDROMSTOP);
-+#endif
-     tcd_close_disc ( cd );
-     if(tmp)
-     {
-@@ -626,13 +806,25 @@
-     cd->err = FALSE;
- 	
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    if(SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED)
-+#else
-     if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED)
-+#endif
-     {
-+#ifdef TCD_BSD
-+	tmp=ioctl(cd->cd_dev, CDIOCRESUME);
-+#else
-         tmp = ioctl(cd->cd_dev, CDROMRESUME);
-+#endif
-     }	        
-     else
-     {
-+#ifdef TCD_BSD
-+	tmp=ioctl(cd->cd_dev, CDIOCPAUSE);
-+#else
-         tmp=ioctl(cd->cd_dev, CDROMPAUSE);
-+#endif
-     }
-     if(tmp < 0)
-     {
-@@ -647,6 +839,7 @@
- int tcd_change_disc( cd_struct *cd, int disc )
- {
- #ifdef TCD_CHANGER_ENABLED
-+#ifndef TCD_BSD
-     int tmp;
-     cd->err = FALSE;
- 
-@@ -657,6 +850,7 @@
- 	fprintf( stdout, "ioctl: %s\n", strerror(errno) );	
- 
-     return tmp;
-+#endif
- #else
-     debug("tcd_change_disc called, but changer support isn't compiled in. Ickyblah.\n" );
-     return 0;
--- a/audio/gnomemedia/files/patch-tcd::linux-cdrom.h
+++ b/audio/gnomemedia/files/patch-tcd::linux-cdrom.h
@ -1,73 +0,0 @@
-
-$FreeBSD$
-
--- tcd/linux-cdrom.h	2001/07/13 09:27:50	1.1
-+++ tcd/linux-cdrom.h	2001/07/13 09:34:48
-@@ -27,8 +27,20 @@
- 
- #include <sys/types.h>
- #include <glib.h>
-#if !defined(linux) && !defined(sun) && !defined(__sun__)
-# error TCD only builds on linux and Solaris/SunOs
-+#if !defined(linux) && !defined(sun) && !defined(__sun__) && !defined(__FreeBSD__)
-+# error TCD only builds on linux, Solaris/SunOs and FreeBSD
-+#endif
-+
-+#ifdef __FreeBSD__
-+#define TCD_BSD
-+#include <sys/cdio.h>
-+#define CDROM_AUDIO_INVALID     CD_AS_AUDIO_INVALID
-+#define CDROM_AUDIO_PLAY        CD_AS_PLAY_IN_PROGRESS
-+#define CDROM_AUDIO_PAUSED      CD_AS_PLAY_PAUSED
-+#define CDROM_AUDIO_COMPLETED   CD_AS_PLAY_COMPLETED
-+#define CDROM_AUDIO_ERROR       CD_AS_PLAY_ERROR
-+#define CDROM_AUDIO_NO_STATUS   CD_AS_NO_STATUS
-+#define CDROM
- #endif
- 
- #ifdef linux
-@@ -126,7 +138,17 @@
- {
- 	char name[TRK_NAME_LEN+1];
- 	char extd[EXT_DATA_LEN+1];      /* extra information for this track */
-+#ifdef TCD_BSD
-+	struct cd_toc_entry toc;
-+#define TOC_MINUTE(trk)        (trk.toc.addr.msf.minute)
-+#define TOC_SECOND(trk)        (trk.toc.addr.msf.second)
-+#define TOC_FRAME(trk)         (trk.toc.addr.msf.frame)
-+#else
- 	struct cdrom_tocentry toc;
-+#define TOC_MINUTE(trk)        (trk.toc.cdte_addr.msf.minute)
-+#define TOC_SECOND(trk)        (trk.toc.cdte_addr.msf.second)
-+#define TOC_FRAME(trk)         (trk.toc.cdte_addr.msf.frame)
-+#endif
- 	int titled;
- 	int start, length;
- 	int tot_min, tot_sec;
-@@ -152,10 +174,26 @@
- 	char album[DISC_INFO_LEN+1], artist[DISC_INFO_LEN+1];
- 	char extd[EXT_DATA_LEN+1];      /* extra information for this disc */
- 
-+#ifdef TCD_BSD
-+	/* See /usr/include/sys/cdio.h */
-+	struct ioc_play_track ti;
-+	struct ioc_toc_header tochdr;
-+	struct cd_sub_channel_info sc;
-+#define SC_AUDIOSTATUS(sc)     (sc.header.audio_status)
-+#define SC_TRACK(sc)           (sc.what.position.track_number)
-+#define SC_MINUTE(sc)          (sc.what.position.absaddr.msf.minute)
-+#define SC_SECOND(sc)          (sc.what.position.absaddr.msf.second)
-+#define SC_FRAME(sc)           (sc.what.position.absaddr.msf.frame)
-+#else
- 	/* See /usr/src/linux/include/linux/cdrom.h */
- 	struct cdrom_ti ti;		/* Track info */
- 	struct cdrom_tochdr tochdr; 	/* TOC header */
- 	struct cdrom_subchnl sc;	/* Subchannel, for time */
-+#define SC_AUDIOSTATUS(sc)     (sc.cdsc_audiostatus)
-+#define SC_TRACK(sc)           (sc.cdsc_trk)
-+#define SC_SECOND(sc)          (sc.cdsc_absaddr.msf.second)
-+#define SC_FRAME(sc)           (sc.cdsc_absaddr.msf.frame)
-+#endif
- 	int volume;			/* Must range 0-100 */
- 
- 	int cd_min, cd_sec;		/* Total CD time */
--- a/audio/gnomemedia/files/patch-tcd::tcd.c
+++ b/audio/gnomemedia/files/patch-tcd::tcd.c
@ -1,79 +0,0 @@
-
-$FreeBSD$
-
--- tcd/tcd.c	2001/07/13 09:35:21	1.1
-+++ tcd/tcd.c	2001/07/13 09:39:30
-@@ -142,8 +142,8 @@
- 		
- 	/* if the user hasn't stopped the cd, but it is 
- 	   stopped anyway, fix it. */
-	if( cd->sc.cdsc_audiostatus != CDROM_AUDIO_PLAY &&
-	    cd->sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED )
-+	if( SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PLAY &&
-+	    SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PAUSED )
- 	{
- 	    if( cd->play_method == REPEAT_CD )
- 		tcd_playtracks(cd, cd->first_t, cd->last_t, 0);
-@@ -173,7 +173,7 @@
- 	case 'p':
- 	case 'P':
- 	    if(cd->isplayable) {
-		if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PAUSED )
-+		if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PAUSED )
- 		    tcd_pausecd(cd);
- 		else
- 		    tcd_playtracks(cd,cd->first_t,cd->last_t, 0);
-@@ -443,8 +443,8 @@
-     mvwprintw(win,maxy-2,30,"Track:" );
-     attron( C_RED+A_BOLD );
-     mvwprintw(win,maxy-4,38,"%02u:%02u",
-	      cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute,
-	      cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second );
-+	      TOC_MINUTE(cd->trk[C(cd->last_t+1)]),
-+	      TOC_SECOND(cd->trk[C(cd->last_t+1)]) );
-     mvwprintw(win,maxy-3,38,cd->dtitle );
-     attroff( C_RED+A_BOLD );
- }
-@@ -481,11 +481,15 @@
-     j=height;
-     for(i=cd->first_t; i <= cd->last_t; i++) 
-     {
-	if(cd->cur_t == i && cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY)
-+	if(cd->cur_t == i && SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY)
- 	    stat = 'P';
- 	else if(cd->repeat_track == i)
- 	    stat = 'R';
-+#ifdef TCD_BSD
-+	else if(cd->trk[i].toc.control == 0x04)
-+#else
- 	else if(cd->trk[i].toc.cdte_ctrl == CDROM_DATA_TRACK)
-+#endif
- 	    stat = 'd';
- 	else
- 	    stat = 'a';
-@@ -501,14 +505,14 @@
- 	    x = 2;
- 	}
- 	
-	if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i )
-+	if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i )
- 	    attron( A_BOLD );
- 	
- 	mvwprintw(win,y,x,"%02u%c - %02u:%02u",
- 		  i, stat,cd->trk[C(i)].tot_min,
- 		  cd->trk[C(i)].tot_sec );
- 	
-	if(cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i)
-+	if(SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i)
- 	    attroff( A_BOLD );
-     }	
- }
-@@ -519,7 +523,7 @@
- 	
-     if( !cd->err )
-     {
-	switch( cd->sc.cdsc_audiostatus )
-+	switch( SC_AUDIOSTATUS(cd->sc) )
- 	{
- 	case CDROM_AUDIO_INVALID:
- 	    strcpy( tmp,"No Audio         " );
--- a/audio/gnomemedia/pkg-descr
+++ b/audio/gnomemedia/pkg-descr
@ -1,3 +0,0 @@
-Multimedia applications for the GNOME desktop.  Includes gtcd, a CDDB
-aware CD player; GMix, for controlling the sound card's mixer; and
-VU-Meter, to slow down your desktop...
--- a/audio/gnomemedia/pkg-plist
+++ b/audio/gnomemedia/pkg-plist
@ -1,112 +0,0 @@
-bin/cddbslave
-bin/cddbsubmit
-bin/gmix
-bin/grecord
-bin/gtcd
-bin/vumeter
-etc/CORBA/servers/gtcd.goad
-share/gnome/apps/Multimedia/Soundrecorder.desktop
-share/gnome/apps/Multimedia/gmix.desktop
-share/gnome/apps/Multimedia/gtcd.desktop
-share/gnome/apps/Multimedia/vumeter.desktop
-share/gnome/cddb-submit-methods
-share/gnome/help/gmix/C/authors.html
-share/gnome/help/gmix/C/bugs.html
-share/gnome/help/gmix/C/figures/gmix-prefs.png
-share/gnome/help/gmix/C/figures/gmix.png
-share/gnome/help/gmix/C/gmix-prefs.html
-share/gnome/help/gmix/C/gmix-use.html
-share/gnome/help/gmix/C/gmix.sgml
-share/gnome/help/gmix/C/index.html
-share/gnome/help/gmix/C/license.html
-share/gnome/help/gmix/C/ln7.html
-share/gnome/help/gmix/C/topic.dat
-share/gnome/help/gmix/it/authors.html
-share/gnome/help/gmix/it/bugs.html
-share/gnome/help/gmix/it/figures/gmix-prefs.png
-share/gnome/help/gmix/it/figures/gmix.png
-share/gnome/help/gmix/it/gmix-prefs.html
-share/gnome/help/gmix/it/gmix-use.html
-share/gnome/help/gmix/it/gmix.sgml
-share/gnome/help/gmix/it/index.html
-share/gnome/help/gmix/it/license.html
-share/gnome/help/gmix/it/ln10.html
-share/gnome/help/gmix/it/topic.dat
-share/gnome/help/gtcd/C/authors.html
-share/gnome/help/gtcd/C/bugs.html
-share/gnome/help/gtcd/C/figures/gtcd-props.png
-share/gnome/help/gtcd/C/figures/gtcd-window.png
-share/gnome/help/gtcd/C/figures/gtcd.png
-share/gnome/help/gtcd/C/figures/track-number.png
-share/gnome/help/gtcd/C/figures/track-time.png
-share/gnome/help/gtcd/C/figures/trackeditor.png
-share/gnome/help/gtcd/C/gtcd.sgml
-share/gnome/help/gtcd/C/index.html
-share/gnome/help/gtcd/C/license.html
-share/gnome/help/gtcd/C/ln7.html
-share/gnome/help/gtcd/C/topic.dat
-share/gnome/help/gtcd/C/usage.html
-share/gnome/idl/gtcd.idl
-share/gnome/mime-info/grecord.keys
-share/gnome/mime-info/grecord.mime
-share/gnome/omf/gnome-media/gmix-C.omf
-share/gnome/omf/gnome-media/gmix-it.omf
-share/gnome/omf/gnome-media/gtcd-C.omf
-share/gnome/pixmaps/gnome-grecord.png
-share/gnome/pixmaps/gnome-mixer.png
-share/gnome/pixmaps/gnome-vumeter.png
-share/gnome/pixmaps/gtcd.png
-share/gnome/pixmaps/tcd/cdrom.xpm
-share/gnome/pixmaps/tcd/eject.xpm
-share/gnome/pixmaps/tcd/ff.xpm
-share/gnome/pixmaps/tcd/goto.xpm
-share/gnome/pixmaps/tcd/next_t.xpm
-share/gnome/pixmaps/tcd/pause.xpm
-share/gnome/pixmaps/tcd/play.xpm
-share/gnome/pixmaps/tcd/prev_t.xpm
-share/gnome/pixmaps/tcd/rw.xpm
-share/gnome/pixmaps/tcd/stop.xpm
-share/locale/az/LC_MESSAGES/gnome-media.mo
-share/locale/ca/LC_MESSAGES/gnome-media.mo
-share/locale/cs/LC_MESSAGES/gnome-media.mo
-share/locale/da/LC_MESSAGES/gnome-media.mo
-share/locale/de/LC_MESSAGES/gnome-media.mo
-share/locale/el/LC_MESSAGES/gnome-media.mo
-share/locale/en_GB/LC_MESSAGES/gnome-media.mo
-share/locale/es/LC_MESSAGES/gnome-media.mo
-share/locale/et/LC_MESSAGES/gnome-media.mo
-share/locale/fi/LC_MESSAGES/gnome-media.mo
-share/locale/fr/LC_MESSAGES/gnome-media.mo
-share/locale/ga/LC_MESSAGES/gnome-media.mo
-share/locale/gl/LC_MESSAGES/gnome-media.mo
-share/locale/hu/LC_MESSAGES/gnome-media.mo
-share/locale/it/LC_MESSAGES/gnome-media.mo
-share/locale/ja/LC_MESSAGES/gnome-media.mo
-share/locale/ko/LC_MESSAGES/gnome-media.mo
-share/locale/lt/LC_MESSAGES/gnome-media.mo
-share/locale/nl/LC_MESSAGES/gnome-media.mo
-share/locale/no/LC_MESSAGES/gnome-media.mo
-share/locale/pl/LC_MESSAGES/gnome-media.mo
-share/locale/pt/LC_MESSAGES/gnome-media.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-media.mo
-share/locale/ro/LC_MESSAGES/gnome-media.mo
-share/locale/ru/LC_MESSAGES/gnome-media.mo
-share/locale/sk/LC_MESSAGES/gnome-media.mo
-share/locale/sl/LC_MESSAGES/gnome-media.mo
-share/locale/sv/LC_MESSAGES/gnome-media.mo
-share/locale/tr/LC_MESSAGES/gnome-media.mo
-share/locale/uk/LC_MESSAGES/gnome-media.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-media.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo
-@dirrm share/gnome/pixmaps/tcd
-@dirrm share/gnome/help/gtcd/C/stylesheet-images
-@dirrm share/gnome/help/gtcd/C/figures
-@dirrm share/gnome/help/gtcd/C
-@dirrm share/gnome/help/gtcd
-@dirrm share/gnome/help/gmix/it/stylesheet-images
-@dirrm share/gnome/help/gmix/it/figures
-@dirrm share/gnome/help/gmix/it
-@dirrm share/gnome/help/gmix/C/stylesheet-images
-@dirrm share/gnome/help/gmix/C/figures
-@dirrm share/gnome/help/gmix/C
-@dirrm share/gnome/help/gmix
--- a/devel/Makefile
+++ b/devel/Makefile
@ -329,7 +329,6 @@
    SUBDIR += libglademm
    SUBDIR += libgnugetopt
    SUBDIR += libgsf
-    SUBDIR += libgtop
    SUBDIR += libgtop2
    SUBDIR += libhash
    SUBDIR += libhoard
--- a/editors/Makefile
+++ b/editors/Makefile
@ -52,7 +52,6 @@
    SUBDIR += flim113-xemacs21-mule
    SUBDIR += fte
    SUBDIR += gate
-    SUBDIR += gedit
    SUBDIR += gedit2
    SUBDIR += ghex
    SUBDIR += ghex2
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@ -1,29 +0,0 @@
-# New ports collection makefile for:	gedit
-# Date created:				4 May 1999
-# Whom:					Andrey Zakhvatov
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gedit
-PORTVERSION=	0.9.7
-PORTREVISION=	1
-CATEGORIES=	editors gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gedit/0.9
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A small but powerful text editor for Gnome Desktop Environment
-
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomeprint libglade gnomevfs
-USE_REINPLACE=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-MAKE_ENV=	OLD_PO_FILE_INPUT=1
-
-MAN1=		gedit.1
-
-.include <bsd.port.mk>
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@ -1 +0,0 @@
-MD5 (gedit-0.9.7.tar.gz) = a02667dd67e46efdbdb6f875442506b1
--- a/editors/gedit/files/patch-an
+++ b/editors/gedit/files/patch-an
@ -1,8 +0,0 @@
--- app-docs.make.orig	Fri May  5 14:35:51 2000
-+++ app-docs.make	Sun Jun 11 11:11:24 2000
-@@ -1,4 +1,4 @@
-helpdir = $(datadir)/gnome/help/$(app)/$(lang)
-+helpdir = $(datadir)/help/$(app)/$(lang)
- help_DATA = \
- 	index.html	\
- 	topic.dat	\
--- a/editors/gedit/files/patch-ao
+++ b/editors/gedit/files/patch-ao
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/browse/Makefile.in.orig	Sat Jul 20 13:59:48 2002
-+++ plugins/browse/Makefile.in	Sat Jul 20 14:09:48 2002
-@@ -147,7 +147,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libbrowse_la_LDFLAGS = 
-+libbrowse_la_LDFLAGS = -avoid-version -module
- libbrowse_la_LIBADD = 
- libbrowse_la_OBJECTS =  browse.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-configure
+++ b/editors/gedit/files/patch-configure
@ -1,13 +0,0 @@
-
-$FreeBSD$
-
--- configure.orig	Sat Jul 20 13:58:23 2002
-+++ configure	Sat Jul 20 13:58:37 2002
-@@ -5492,6 +5492,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--- a/editors/gedit/files/patch-plugins::ASCII::Makefile.in
+++ b/editors/gedit/files/patch-plugins::ASCII::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/ASCII/Makefile.in	2002/07/20 11:08:53	1.1
-+++ plugins/ASCII/Makefile.in	2002/07/20 11:09:42
-@@ -150,7 +150,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libasciitable_la_LDFLAGS = 
-+libasciitable_la_LDFLAGS = -avoid-version -module
- libasciitable_la_LIBADD = 
- libasciitable_la_OBJECTS =  ascii.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-plugins::convert::Makefile.in
+++ b/editors/gedit/files/patch-plugins::convert::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/convert/Makefile.in.orig	Sat Jul 20 13:59:48 2002
-+++ plugins/convert/Makefile.in	Sat Jul 20 14:09:54 2002
-@@ -150,7 +150,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libconvert_la_LDFLAGS = 
-+libconvert_la_LDFLAGS = -avoid-version -module
- libconvert_la_LIBADD = 
- libconvert_la_OBJECTS =  convert.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-plugins::diff::Makefile.in
+++ b/editors/gedit/files/patch-plugins::diff::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/diff/Makefile.in.orig	Sat Jul 20 13:59:48 2002
-+++ plugins/diff/Makefile.in	Sat Jul 20 14:10:00 2002
-@@ -147,7 +147,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libdiff_la_LDFLAGS = 
-+libdiff_la_LDFLAGS = -avoid-version -module
- libdiff_la_LIBADD = 
- libdiff_la_OBJECTS =  diff.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-plugins::docinfo::Makefile.in
+++ b/editors/gedit/files/patch-plugins::docinfo::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/docinfo/Makefile.in	2002/07/20 11:09:25	1.1
-+++ plugins/docinfo/Makefile.in	2002/07/20 11:10:07
-@@ -150,7 +150,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libdocinfo_la_LDFLAGS = 
-+libdocinfo_la_LDFLAGS = -avoid-version -module
- libdocinfo_la_LIBADD = 
- libdocinfo_la_OBJECTS =  docinfo.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-plugins::email::Makefile.in
+++ b/editors/gedit/files/patch-plugins::email::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/email/Makefile.in.orig	Sat Jul 20 13:59:48 2002
-+++ plugins/email/Makefile.in	Sat Jul 20 14:10:11 2002
-@@ -150,7 +150,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libemail_la_LDFLAGS = 
-+libemail_la_LDFLAGS = -avoid-version -module
- libemail_la_LIBADD = 
- libemail_la_OBJECTS =  email.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-plugins::reverse::Makefile.in
+++ b/editors/gedit/files/patch-plugins::reverse::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/reverse/Makefile.in.orig	Sat Jul 20 13:59:48 2002
-+++ plugins/reverse/Makefile.in	Sat Jul 20 14:10:16 2002
-@@ -143,7 +143,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libreverse_la_LDFLAGS = 
-+libreverse_la_LDFLAGS = -avoid-version -module
- libreverse_la_LIBADD = 
- libreverse_la_OBJECTS =  reverse.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-plugins::sample::Makefile.in
+++ b/editors/gedit/files/patch-plugins::sample::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/sample/Makefile.in.orig	Sat Jul 20 13:59:48 2002
-+++ plugins/sample/Makefile.in	Sat Jul 20 14:10:21 2002
-@@ -143,7 +143,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libsample_la_LDFLAGS = 
-+libsample_la_LDFLAGS = -avoid-version -module
- libsample_la_LIBADD = 
- libsample_la_OBJECTS =  sample.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-plugins::shell_output::Makefile.in
+++ b/editors/gedit/files/patch-plugins::shell_output::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/shell_output/Makefile.in.orig	Sat Jul 20 13:59:48 2002
-+++ plugins/shell_output/Makefile.in	Sat Jul 20 14:10:26 2002
-@@ -150,7 +150,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libshell_output_la_LDFLAGS = 
-+libshell_output_la_LDFLAGS = -avoid-version -module
- libshell_output_la_LIBADD = 
- libshell_output_la_OBJECTS =  shell_output.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-plugins::sort::Makefile.in
+++ b/editors/gedit/files/patch-plugins::sort::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/sort/Makefile.in	2002/07/20 11:09:25	1.1
-+++ plugins/sort/Makefile.in	2002/07/20 11:10:30
-@@ -150,7 +150,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libsort_la_LDFLAGS = 
-+libsort_la_LDFLAGS = -avoid-version -module
- libsort_la_LIBADD = 
- libsort_la_OBJECTS =  sort.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/files/patch-plugins::time::Makefile.in
+++ b/editors/gedit/files/patch-plugins::time::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- plugins/time/Makefile.in.orig	Sat Jul 20 13:59:48 2002
-+++ plugins/time/Makefile.in	Sat Jul 20 14:10:35 2002
-@@ -143,7 +143,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
-libtime_la_LDFLAGS = 
-+libtime_la_LDFLAGS = -avoid-version -module
- libtime_la_LIBADD = 
- libtime_la_OBJECTS =  time.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- a/editors/gedit/pkg-descr
+++ b/editors/gedit/pkg-descr
@ -1,21 +0,0 @@
-gEdit is a text editor for X using the GTK+ and GNOME libraries.
-It is being developed by Alex Roberts, Evan Lawrence and Chris Lahey
-(among others).
-
-This version is quite a neat text editor, it contains the following
-features:
-	* Opening/Saving/Creating of files;
-	* File Revert;
-	* Cut/Copy/Paste and Select All text;
-	* Complete integration with the GNOME Environment, including GnomeMDI;
-	* Search and Replace;
-	* Global search;	
-	* A complete preferences interface;
-	* Dynamically loading fonts;
-	* Splitscreen Mode;
-	* Printing support; 
-	* Configurable Plugins system;
-	* Configurable window sizing;
-	* Unlimited Undo/Redo.
-
-WWW: http://gedit.sourceforge.net/
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@ -1,114 +0,0 @@
-bin/gedit
-lib/gedit/plugins/libasciitable.so
-lib/gedit/plugins/libbrowse.so
-lib/gedit/plugins/libconvert.so
-lib/gedit/plugins/libdiff.so
-lib/gedit/plugins/libdocinfo.so
-lib/gedit/plugins/libemail.so
-lib/gedit/plugins/libreverse.so
-lib/gedit/plugins/libsample.so
-lib/gedit/plugins/libshell_output.so
-lib/gedit/plugins/libsort.so
-lib/gedit/plugins/libtime.so
-share/gnome/apps/Applications/gedit.desktop
-share/gnome/gedit/glade/about.glade
-share/gnome/gedit/glade/asciitable.glade
-share/gnome/gedit/glade/browse.glade
-share/gnome/gedit/glade/convert.glade
-share/gnome/gedit/glade/diff.glade
-share/gnome/gedit/glade/docinfo.glade
-share/gnome/gedit/glade/email.glade
-share/gnome/gedit/glade/goto-line.glade
-share/gnome/gedit/glade/plugin-manager.glade
-share/gnome/gedit/glade/prefs.glade
-share/gnome/gedit/glade/program.glade
-share/gnome/gedit/glade/replace.glade
-share/gnome/gedit/glade/shell_output.glade
-share/gnome/gedit/glade/sort.glade
-share/gnome/gedit/glade/uri.glade
-share/gnome/help/gedit/C/images/browse.png
-share/gnome/help/gedit/C/images/convert.png
-share/gnome/help/gedit/C/images/diff.png
-share/gnome/help/gedit/C/images/email.png
-share/gnome/help/gedit/C/images/find.png
-share/gnome/help/gedit/C/images/gedit.png
-share/gnome/help/gedit/C/images/goto-line.png
-share/gnome/help/gedit/C/images/lynx.png
-share/gnome/help/gedit/C/images/manager.png
-share/gnome/help/gedit/C/images/mta.png
-share/gnome/help/gedit/C/images/prefs-documents.png
-share/gnome/help/gedit/C/images/prefs-font.png
-share/gnome/help/gedit/C/images/prefs-general.png
-share/gnome/help/gedit/C/images/prefs-paper.png
-share/gnome/help/gedit/C/images/prefs-printing.png
-share/gnome/help/gedit/C/images/print-preview.png
-share/gnome/help/gedit/C/images/print.png
-share/gnome/help/gedit/C/images/replace.png
-share/gnome/help/gedit/C/images/shell.png
-share/gnome/help/gedit/C/images/toolbar.png
-share/gnome/help/gedit/C/topic.dat
-share/gnome/help/gedit/ja/images/browse.png
-share/gnome/help/gedit/ja/images/convert.png
-share/gnome/help/gedit/ja/images/diff.png
-share/gnome/help/gedit/ja/images/email.png
-share/gnome/help/gedit/ja/images/find.png
-share/gnome/help/gedit/ja/images/gedit.png
-share/gnome/help/gedit/ja/images/goto-line.png
-share/gnome/help/gedit/ja/images/lynx.png
-share/gnome/help/gedit/ja/images/manager.png
-share/gnome/help/gedit/ja/images/mta.png
-share/gnome/help/gedit/ja/images/prefs-documents.png
-share/gnome/help/gedit/ja/images/prefs-font.png
-share/gnome/help/gedit/ja/images/prefs-general.png
-share/gnome/help/gedit/ja/images/prefs-paper.png
-share/gnome/help/gedit/ja/images/prefs-printing.png
-share/gnome/help/gedit/ja/images/print-preview.png
-share/gnome/help/gedit/ja/images/print.png
-share/gnome/help/gedit/ja/images/replace.png
-share/gnome/help/gedit/ja/images/shell.png
-share/gnome/help/gedit/ja/images/toolbar.png
-share/gnome/help/gedit/ja/topic.dat
-share/gnome/mime-info/gedit.keys
-share/gnome/pixmaps/gedit-icon.png
-share/gnome/pixmaps/gedit-logo.png
-share/locale/az/LC_MESSAGES/gedit.mo
-share/locale/ca/LC_MESSAGES/gedit.mo
-share/locale/cs/LC_MESSAGES/gedit.mo
-share/locale/da/LC_MESSAGES/gedit.mo
-share/locale/de/LC_MESSAGES/gedit.mo
-share/locale/el/LC_MESSAGES/gedit.mo
-share/locale/es/LC_MESSAGES/gedit.mo
-share/locale/fi/LC_MESSAGES/gedit.mo
-share/locale/fr/LC_MESSAGES/gedit.mo
-share/locale/ga/LC_MESSAGES/gedit.mo
-share/locale/gl/LC_MESSAGES/gedit.mo
-share/locale/hu/LC_MESSAGES/gedit.mo
-share/locale/it/LC_MESSAGES/gedit.mo
-share/locale/ja/LC_MESSAGES/gedit.mo
-share/locale/ko/LC_MESSAGES/gedit.mo
-share/locale/lt/LC_MESSAGES/gedit.mo
-share/locale/nl/LC_MESSAGES/gedit.mo
-share/locale/nn/LC_MESSAGES/gedit.mo
-share/locale/no/LC_MESSAGES/gedit.mo
-share/locale/pl/LC_MESSAGES/gedit.mo
-share/locale/pt/LC_MESSAGES/gedit.mo
-share/locale/pt_BR/LC_MESSAGES/gedit.mo
-share/locale/ru/LC_MESSAGES/gedit.mo
-share/locale/sk/LC_MESSAGES/gedit.mo
-share/locale/sl/LC_MESSAGES/gedit.mo
-share/locale/sv/LC_MESSAGES/gedit.mo
-share/locale/ta/LC_MESSAGES/gedit.mo
-share/locale/tr/LC_MESSAGES/gedit.mo
-share/locale/uk/LC_MESSAGES/gedit.mo
-share/locale/wa/LC_MESSAGES/gedit.mo
-share/locale/zh_CN/LC_MESSAGES/gedit.mo
-share/locale/zh_TW/LC_MESSAGES/gedit.mo
-@dirrm share/gnome/help/gedit/ja/stylesheet-images
-@dirrm share/gnome/help/gedit/ja/images
-@dirrm share/gnome/help/gedit/ja
-@dirrm share/gnome/help/gedit/C/stylesheet-images
-@dirrm share/gnome/help/gedit/C/images
-@dirrm share/gnome/gedit/glade
-@dirrm share/gnome/gedit
-@dirrm lib/gedit/plugins
-@dirrm lib/gedit
--- a/x11-fm/Makefile
+++ b/x11-fm/Makefile
@ -15,7 +15,6 @@
    SUBDIR += gnome-commander
    SUBDIR += krusader
    SUBDIR += mtoolsfm
-    SUBDIR += nautilus
    SUBDIR += nautilus2
    SUBDIR += offix-files
    SUBDIR += rox-filer
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@ -1,43 +0,0 @@
-# New ports collection makefile for:    nautilus
-# Date created:         		28th August 2000
-# Whom:                 		ade, archie
-#
-# $FreeBSD$
-#
-
-PORTNAME=	nautilus
-PORTVERSION=	1.0.6
-PORTREVISION=	9
-CATEGORIES=	x11-fm gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME file manager and graphical shell developed by Eazel
-
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		eel.0:${PORTSDIR}/x11-toolkits/eel
-
-.if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so.0)
-LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
-.endif
-
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-GNOME_DESKTOP_VERSION=1
-USE_GNOME=	gnomehack gnomeprefix gnomehier libpanel libghttp bonobo \
-		gnomevfs
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
-		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
-		LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
-CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
-		--with-freetype2-include-place=${LOCALBASE}/include/freetype2 \
-		--disable-mozilla-component
-
-MAN1=		nautilus-xml-migrate.1
-
-.include <bsd.port.mk>
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@ -1 +0,0 @@
-MD5 (nautilus-1.0.6.tar.gz) = 436283056c100bcbd14098a5342e2868
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@ -1,57 +0,0 @@
-
-$FreeBSD$
-
--- configure.orig	Thu Apr 25 22:34:32 2002
-+++ configure	Thu Apr 25 22:35:04 2002
-@@ -5335,6 +5335,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7005,7 +7006,7 @@
- 
- CC="$_save_cc"
- 
-LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
-+LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
- _mozilla_gtk_super_win_libs=
- echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6
- echo "configure:7012: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
-@@ -7048,7 +7049,7 @@
- fi
- 
- 
-LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs"
-+LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtkembedmoz $_mozilla_xpcom_libs"
- _mozilla_gtk_moz_embed_libs=
- echo $ac_n "checking for gtk_moz_embed_get_type in -lgtkembedmoz""... $ac_c" 1>&6
- echo "configure:7055: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
-@@ -7057,7 +7058,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
-LIBS="-lgtkembedmoz  $LIBS"
-+LIBS="-lgtkembedmoz  -lgtksuperwin $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 7063 "configure"
- #include "confdefs.h"
-@@ -9141,7 +9142,7 @@
- fi
- 
- if test x$SCROLLKEEPER_CONFIG = xno; then
-  { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; }
-+  echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2
- fi
- 
- 
-@@ -12061,6 +12062,7 @@
- s%@MOZILLA_COMPONENT_RPATH_FLAGS@%$MOZILLA_COMPONENT_RPATH_FLAGS%g
- s%@MOZILLA_COMPONENT_LDFLAGS@%$MOZILLA_COMPONENT_LDFLAGS%g
- s%@MOZILLA_COMPONENT_LIBS@%$MOZILLA_COMPONENT_LIBS%g
-+s%@MOZILLA_LIB_PLACE@%$_mozilla_lib_place%g
- s%@BUILD_MOZILLA_COMPONENT_TRUE@%$BUILD_MOZILLA_COMPONENT_TRUE%g
- s%@BUILD_MOZILLA_COMPONENT_FALSE@%$BUILD_MOZILLA_COMPONENT_FALSE%g
- s%@MOZILLA_PROFILES_CFLAGS@%$MOZILLA_PROFILES_CFLAGS%g
--- a/x11-fm/nautilus/files/patch-ab
+++ b/x11-fm/nautilus/files/patch-ab
@ -1,34 +0,0 @@
-
-$FreeBSD$
-
--- Makefile.in.orig	Fri Dec  7 21:51:58 2001
-+++ Makefile.in	Sat Dec  8 00:33:03 2001
-@@ -226,7 +226,7 @@
- 
- @HAVE_APPLETS_TRUE@APPLETS_SUBDIRS = applets
- 
-SUBDIRS =  	data 				icons 				cut-n-paste-code 		libnautilus 			libnautilus-adapter		libnautilus-private 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)		test 				user-guide			help				po 				omf-install			$(NULL)
-+SUBDIRS =  	data 				icons 				cut-n-paste-code 		libnautilus 			libnautilus-adapter		libnautilus-private 		helper-utilities 		helper-scripts			src 				components			$(APPLETS_SUBDIRS)			user-guide			help				po 				omf-install			$(NULL)
- 
- 
- EXTRA_DIST =  	TRADEMARK_NOTICE				COPYING.LIB					COPYING-DOCS					HACKING						MAINTAINERS					nautilus.spec.in				nautilus-clean.sh				nautilus.desktop				nautilus.desktop.in				nautilus-help.desktop				nautilus-help.desktop.in			nautilus-launch-icon.png			gnome-starthere-96.png				gnome-starthere.png				nautilusConf.sh.in				nautilus-config.in				ChangeLog-20000414				ChangeLog-20000625				ChangeLog-20000831				ChangeLog-20001018				xml-i18n-extract.in				xml-i18n-merge.in				xml-i18n-update.in				Makefile.shared					$(DESKTOP_IN_FILES)				$(DESKTOP_FILES)				$(NULL)
-@@ -244,7 +244,7 @@
- 
- bin_SCRIPTS = $(top_builddir)/nautilus-config
- 
-confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA =  	nautilusConf.sh					$(NULL)
- 
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -685,8 +685,8 @@
- 	$(mkinstalldirs) $(DESTDIR)$(prefix)/bin
- 	@list='nautilus-clean.sh'; for p in $$list; do\
- 	  if test -f $(srcdir)/$$p; then \
-	    echo "  $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(prefix)/bin/$$p"; \
-	    $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(prefix)/bin/$$p; \
-+	    echo "  $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(prefix)/bin/$$p"; \
-+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(prefix)/bin/$$p; \
- 	  else :; fi; \
- 	done
- 
--- a/x11-fm/nautilus/files/patch-ag
+++ b/x11-fm/nautilus/files/patch-ag
@ -1,25 +0,0 @@
-
-$FreeBSD$
-
--- src/Makefile.in.orig	Thu Feb 21 14:19:34 2002
-+++ src/Makefile.in	Wed Feb 27 00:39:53 2002
-@@ -225,7 +225,7 @@
- 
- bin_PROGRAMS = nautilus
- 
-INCLUDES =  	-I$(top_srcdir) 	-I$(top_srcdir)/cut-n-paste-code/widgets/e-paned 	-I$(top_srcdir)/cut-n-paste-code/widgets/gimphwrapbox 	$(NAUTILUS_PRIVATE_CFLAGS) 	-DVERSION="\"$(VERSION)\"" 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" 	-DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" 	-DDATADIR=\""$(datadir)"\" 	$(NULL)
-+INCLUDES =  	-I$(top_srcdir) 	-I$(top_srcdir)/cut-n-paste-code/widgets/e-paned 	-I$(top_srcdir)/cut-n-paste-code/widgets/gimphwrapbox 	$(NAUTILUS_PRIVATE_CFLAGS) 	-DVERSION="\"$(VERSION)\"" 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" 	-DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" 	-DDATADIR=\""$(datadir)"\" 	-DMOZILLA_LIB_PLACE=\"@MOZILLA_LIB_PLACE@\"	$(NULL)
- 
- 
- LDADD =  	$(top_builddir)/src/file-manager/libnautilus-file-manager.la 	$(top_builddir)/libnautilus/libnautilus.la 	$(top_builddir)/libnautilus-adapter/libnautilus-adapter.la 	$(top_builddir)/libnautilus-private/libnautilus-private.la  	$(NAUTILUS_PRIVATE_LIBS) 	$(NULL)
-@@ -1171,8 +1171,8 @@
- 	$(mkinstalldirs) $(DESTDIR)/$(prefix)/bin
- 	@list='run-nautilus'; for p in $$list; do\
- 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
-+	    echo "  $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \
-+	    $(INSTALL_SCRIPT) $$p $(DESTDIR)/$(prefix)/bin/$$p; \
- 	  else :; fi; \
- 	done
- 
--- a/x11-fm/nautilus/files/patch-al
+++ b/x11-fm/nautilus/files/patch-al
@ -1,16 +0,0 @@
-
-$FreeBSD$
-
--- helper-scripts/Makefile.in.orig	Thu Oct 25 18:21:43 2001
-+++ helper-scripts/Makefile.in	Thu Oct 25 18:22:45 2001
-@@ -328,8 +328,8 @@
- 	$(mkinstalldirs) $(DESTDIR)$(prefix)/bin
- 	@list='nautilus-verify-rpm.sh nautilus-restore-settings-to-default.sh'; for p in $$list; do\
- 	  if test -f $(srcdir)/$$p; then \
-	    echo "  $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(prefix)/bin/$$p"; \
-	    $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(prefix)/bin/$$p; \
-+	    echo "  $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(prefix)/bin/$$p"; \
-+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(prefix)/bin/$$p; \
- 	  else :; fi; \
- 	done
- 
--- a/x11-fm/nautilus/files/patch-components::help::hyperbola-filefmt.c
+++ b/x11-fm/nautilus/files/patch-components::help::hyperbola-filefmt.c
@ -1,13 +0,0 @@
-
-$FreeBSD$
-
--- components/help/hyperbola-filefmt.c	2001/05/14 15:56:20	1.1
-+++ components/help/hyperbola-filefmt.c	2001/05/14 15:56:32
-@@ -30,6 +30,7 @@
- #include <libgnome/gnome-util.h>
- #include <limits.h>
- #include <parser.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <string.h>
- #include <tree.h>
--- a/x11-fm/nautilus/files/patch-components::mozilla::Makefile.in
+++ b/x11-fm/nautilus/files/patch-components::mozilla::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- components/mozilla/Makefile.in	2002/02/26 22:23:08	1.1
-+++ components/mozilla/Makefile.in	2002/02/26 22:24:11
-@@ -221,7 +221,7 @@
- 
- NULL = 
- 
-INCLUDES =  	-I$(top_srcdir) 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-DG_LOG_DOMAIN=\"Nautilus-Mozilla\" 	-DDATADIR=\"$(datadir)\" 	-DPREFIX=\"$(prefix)\" 	$(MOZILLA_COMPONENT_DEBUG_FLAGS) 	$(MOZILLA_PROFILES_CFLAGS) 	$(MOZILLA_COMPONENT_CFLAGS) 	$(GCONF_CFLAGS) 	$(NAUTILUS_DEPENDENCY_CFLAGS) 	$(NULL)
-+INCLUDES =  	-I$(top_srcdir) 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-DG_LOG_DOMAIN=\"Nautilus-Mozilla\" 	-DDATADIR=\"$(datadir)\" 	-DPREFIX=\"$(prefix)\"	-DMOZILLA_LIB_PLACE=\"@MOZILLA_LIB_PLACE@\" 	$(MOZILLA_COMPONENT_DEBUG_FLAGS) 	$(MOZILLA_PROFILES_CFLAGS) 	$(MOZILLA_COMPONENT_CFLAGS) 	$(GCONF_CFLAGS) 	$(NAUTILUS_DEPENDENCY_CFLAGS) 	$(NULL)
- 
- 
- bin_PROGRAMS =  	nautilus-mozilla-content-view 	$(NULL)
--- a/x11-fm/nautilus/files/patch-components::mozilla::main.c
+++ b/x11-fm/nautilus/files/patch-components::mozilla::main.c
@ -1,22 +0,0 @@
-
-$FreeBSD$
-
--- components/mozilla/main.c	2002/02/26 22:24:25	1.1
-+++ components/mozilla/main.c	2002/02/26 22:25:27
-@@ -141,7 +141,7 @@
- 	char *file_name;
- 	gboolean good;
- 
-	file_name = g_strconcat (path, "/chrome/embed.jar", NULL);
-+	file_name = g_strconcat (path, "/libgtkembedmoz.so", NULL);
- 	good = g_file_exists (file_name);
- 	g_free (file_name);
- 	return good;
-@@ -155,6 +155,7 @@
- 	 */
- 	guint i;
- 	const char * const paths[] = {
-+		MOZILLA_LIB_PLACE,
- 		PREFIX "/lib/mozilla",
- 		"/usr/lib/mozilla",
- 		"/usr/local/mozilla",
--- a/x11-fm/nautilus/files/patch-components::news::news_channels.xml
+++ b/x11-fm/nautilus/files/patch-components::news::news_channels.xml
@ -1,16 +0,0 @@
-
-$FreeBSD$
-
--- components/news/news_channels.xml	2001/11/12 13:38:02	1.1
-+++ components/news/news_channels.xml	2001/11/12 17:24:48
-@@ -8,8 +8,10 @@
- 	<rss_channel name="Beyond 2000" uri="http://beyond2000.com/b2k.rdf" show="false" open="false"/>
- 	<rss_channel name="CNet" uri="http://www.newsisfree.com/export.php3?_f=rss91&amp;_w=f&amp;_i=1443" show="false" open="false"/>
- 	<rss_channel name="CNN" uri="http://www.cnn.com/cnn.rss" show="false" open="false"/>
-+	<rss_channel name="Daily Daemon News" uri="http://daily.daemonnews.org/ddn.rdf.php3" show="false" open="false"/>
- 	<rss_channel name="Dictionary.com" uri="http://www.dictionary.com/wordoftheday/wotd.rss" show="false" open="false"/>
- 	<rss_channel name="DVD Review" uri="http://www.dvdreview.com/rss/newschannel.rss" show="false" open="false"/>
-+	<rss_channel name="FreeBSD Newsflash" uri="http://www.freebsd.org/news/news.rdf" show="false" open="false"/>
- 	<rss_channel name="Freshmeat" uri="http://freshmeat.net/backend/fm.rdf" show="false" open="false"/>
- 	<rss_channel name="GNOME News" uri="http://news.gnome.org/gnome-news/rdf" show="false" open="false"/>	
- 	<rss_channel name="Internet.com" uri="http://headlines.internet.com/internetnews/prod-news/news.rss" show="false" open="false"/>
--- a/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c
+++ b/x11-fm/nautilus/files/patch-libnautilus-extensions::nautilus-medusa-support.c
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- libnautilus-private/nautilus-medusa-support.c.orig	Wed Apr 11 21:36:16 2001
-+++ libnautilus-private/nautilus-medusa-support.c	Mon May 14 17:45:24 2001
-@@ -84,7 +84,7 @@
- 		 */
- 		status = NAUTILUS_CRON_STATUS_OFF;
- 
-		stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number);
-+		stat_file_name = g_strdup_printf ("/proc/%d/status", process_number);
- 		stat_file = fopen (stat_file_name, "r");
- 		g_free (stat_file_name);
- 		
--- a/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-desktop-file-loader.c
+++ b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-desktop-file-loader.c
@ -1,60 +0,0 @@
-
-$FreeBSD$
-
--- libnautilus-private/nautilus-desktop-file-loader.c.orig	Wed Sep 26 19:37:15 2001
-+++ libnautilus-private/nautilus-desktop-file-loader.c	Fri Mar 29 14:58:54 2002
-@@ -39,7 +39,9 @@
- #include <ctype.h>
- #include <locale.h>
- #include <iconv.h>
-+#if (defined __FreeBSD__) && (__FreeBSD_version > 450001)
- #include <langinfo.h>
-+#endif
- 
- typedef struct NautilusDesktopFileSection NautilusDesktopFileSection;
- typedef struct NautilusDesktopFileAddition NautilusDesktopFileAddition;
-@@ -117,6 +119,44 @@
- 									   const char                      *value);
- static void                         addition_free                         (NautilusDesktopFileAddition     *addition);
- 
-+#if (defined __FreeBSD__) && (__FreeBSD_version < 450001)
-+/* Quick and dirty implementation of nl_langinfo(CODESET) */
-+static char *
-+nl_langinfo(void) {
-+	char *ret, *s, *cs;
-+	static char *cset = NULL;
-+
-+	ret = "";
-+	if ((s = setlocale(LC_CTYPE, NULL)) != NULL) {
-+		if ((cs = strchr(s, '.')) != NULL) {
-+			ret = cs + 1;
-+			if (strncmp(ret, "ISO_", 4) == 0) {
-+				int slen = strlen(ret);
-+
-+				if ((cset = reallocf(cset, slen)) != NULL) {
-+					strcpy(cset, "ISO");
-+					strcat(cset, ret + 4);
-+					ret = cset;
-+				} else
-+					ret = "";
-+			} else if (strcmp(ret, "EUC") == 0) {
-+				if (strncmp(s, "ja_JP", 5) == 0)
-+					ret = "eucJP";
-+				else if (strncmp(s, "ko_KR", 5) == 0)
-+					ret = "eucKR";
-+				else if (strncmp(s, "zh_CN", 5) == 0)
-+					ret = "eucCN";
-+			} else if (strcmp(ret, "ASCII") == 0)
-+				ret = "US-ASCII";
-+		} else if (strcmp(s, "C") == 0 ||
-+			   strcmp(s, "POSIX") == 0
-+			   || strstr(s, "ASCII") != NULL)
-+			ret = "US-ASCII";
-+	}
-+	return ret;
-+}
-+#define nl_langinfo(x) nl_langinfo()
-+#endif
- 
- static NautilusDesktopFile*
- nautilus_desktop_file_new (void)
--- a/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c
+++ b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-monitor.c
@ -1,25 +0,0 @@
-
-$FreeBSD$
-
--- libnautilus-private/nautilus-monitor.c	2001/12/07 22:54:34	1.1
-+++ libnautilus-private/nautilus-monitor.c	2001/12/07 23:10:06
-@@ -274,7 +274,8 @@
- 	}
- 	
- 	monitor = g_new0 (NautilusMonitor, 1);
-	FAMMonitorFile (connection, path, &monitor->request, NULL);
-+	if (FAMMonitorFile (connection, path, &monitor->request, NULL) == -1)
-+		return NULL;
- 
- 	g_free (path);
- 
-@@ -314,7 +315,8 @@
- 	}
- 	
- 	monitor = g_new0 (NautilusMonitor, 1);
-	FAMMonitorDirectory (connection, path, &monitor->request, NULL);
-+	if (FAMMonitorDirectory (connection, path, &monitor->request, NULL) == -1)
-+		return NULL;
- 
- 	g_assert (g_hash_table_lookup (get_request_hash_table (),
- 				       GINT_TO_POINTER (FAMREQUEST_GETREQNUM (&monitor->request))) == NULL);
--- a/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-volume-monitor.c
+++ b/x11-fm/nautilus/files/patch-libnautilus-private::nautilus-volume-monitor.c
@ -1,271 +0,0 @@
--- libnautilus-private/nautilus-volume-monitor.c.orig	Wed Sep 11 11:37:54 2002
-+++ libnautilus-private/nautilus-volume-monitor.c	Wed Sep 11 11:39:24 2002
-@@ -60,6 +60,18 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+
-+#define HAVE_GETMNTINFO
-+#define HAVE_SETFSENT
-+#define HAVE_FSTAB_H
-+#define FREEBSD_MNT
-+#define setmntent(f,m) setfsent()
-+#endif
-+
- #ifdef HAVE_SYS_VFSTAB_H
- #include <sys/vfstab.h>
- #else
-@@ -104,7 +116,7 @@
- #define MNTOPT_RO "ro"
- #endif
- 
-#ifndef HAVE_SETMNTENT
-+#if !defined(HAVE_SETMNTENT) &&  !defined(HAVE_SETFSENT)
- #define setmntent(f,m) fopen(f,m)
- #endif
- 
-@@ -481,6 +493,9 @@
- static gboolean
- has_removable_mntent_options (MountTableEntry *ent)
- {
-+#ifdef __FreeBSD__
-+    	struct fstab *fsent;
-+#endif
- #ifdef HAVE_HASMNTOPT
- 	/* Use "owner" or "user" or "users" as our way of determining a removable volume */
- 	if (hasmntopt (ent, "user") != NULL
-@@ -495,6 +510,12 @@
- 		return TRUE;
- 	}
- #endif
-+#ifdef __FreeBSD__
-+	fsent = getfsspec(ent->f_mntfromname);
-+	if (fsent !=  NULL && strstr (fsent->fs_mntops, "noauto")) {
-+		return TRUE;
-+	}
-+#endif
- 	
- 	return FALSE;
- }
-@@ -510,35 +531,42 @@
- static GList *
- get_removable_volumes (NautilusVolumeMonitor *monitor)
- {
-+#ifndef HAVE_SETFSENT
- 	FILE *file;
-	GList *volumes;
-	MountTableEntry *ent;
-	NautilusVolume *volume;
-+#else
-+	int file;
-+	struct fstab *fsent;
-+#endif
-+	GList *volumes = NULL;
-+	MountTableEntry *ent = NULL;
-+	NautilusVolume *volume = NULL;
- #ifdef HAVE_SYS_MNTTAB_H
-         MountTableEntry ent_storage;
- #endif
-	ent = NULL;
-	volume = NULL;
-	volumes = NULL;
- 
- #ifdef HAVE_GETMNTINFO
- 	int count, index;
-+	/*{static int b = 1; while (b);}*/
- 	
- 	count = getmntinfo (&ent, MNT_WAIT);
- 	/* getmentinfo returns a pointer to static data. Do not free. */
- 	for (index = 0; index < count; index++) {
-		if (has_removable_mntent_options (ent + 1)) {
-+		if (has_removable_mntent_options (ent + index)) {
- 			volume = create_volume (ent[index].f_mntfromname,
-						ent[index].f_mntoname);
-+						ent[index].f_mntonname);
- 			volume->is_removable = TRUE;
- 			volumes = finish_creating_volume_and_prepend
-				(monitor, volume, ent[index].f_fstyename, volumes);
-+				(monitor, volume, ent[index].f_fstypename, volumes);
- 		}
- 	}
- #endif
- 	
- 	file = setmntent (MOUNT_TABLE_PATH, "r");
-+#ifndef HAVE_SETFSENT
- 	if (file == NULL) {
-+#else
-+	if (file == 0) {
-+#endif
- 		return NULL;
- 	}
- 	
-@@ -560,9 +588,21 @@
- 				(monitor, volume, ent->mnt_type, volumes);
- 		}
- 	}
-+#elif defined (HAVE_SETFSENT)
-+	while ((fsent = getfsent ()) != NULL) {
-+		if (strstr (fsent->fs_mntops, "noauto") != NULL) {
-+			volume = create_volume (fsent->fs_spec, fsent->fs_file);
-+			volumes = finish_creating_volume_and_prepend
-+				(monitor, volume, fsent->fs_vfstype, volumes);
-+		}
-+	}
- #endif
- 			
-+#ifndef HAVE_SETFSENT
- 	fclose (file);
-+#else
-+	endfsent();
-+#endif
- 	
- #ifdef HAVE_CDDA
- 	volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH);
-@@ -575,7 +615,7 @@
- 	return g_list_sort (g_list_reverse (volumes), (GCompareFunc) floppy_sort);
- }
- 
-#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT)
- 
- static gboolean
- volume_is_removable (const NautilusVolume *volume)
-@@ -813,7 +853,7 @@
- 	path = arg;
- 
- 	if (path != NULL) {		
-		command = g_strdup_printf ("eject %s", path);	
-+		command = g_strdup_printf ("/usr/sbin/cdcontrol -f %s eject", path);	
- 		eel_gnome_shell_execute (command);
- 		g_free (command);
- 		g_free (path);
-@@ -907,23 +947,35 @@
- 
- 
- 
-#ifdef SOLARIS_MNT
-+#if defined(SOLARIS_MNT) || defined(FREEBSD_MNT)
- 
- static GList *
- get_mount_list (NautilusVolumeMonitor *monitor) 
- {
-        FILE *fh;
-         GList *volumes;
-+#ifndef HAVE_SETFSENT
-+        FILE *fh;
-         MountTableEntry ent;
-+#else
-+	int fh, index;
-+	MountTableEntry *ent;
-+#endif
-         NautilusVolume *volume;
-+        /*{static int b = 1; while (b);}*/
- 
- 	volumes = NULL;
-         
-+#ifndef HAVE_SETFSENT
- 	fh = setmntent (MOUNT_TABLE_PATH, "r");
- 	if (fh == NULL) {
-+#else
-+	fh = getmntinfo(&ent, MNT_WAIT);
-+	if (fh == 0) {
-+#endif
- 		return NULL;
- 	}
- 
-+#ifndef HAVE_SETFSENT
-         while (! getmntent(fh, &ent)) {
-                 volume = create_volume (ent.mnt_special, ent.mnt_mountp);
-                 volume->is_removable = has_removable_mntent_options (&ent);
-@@ -932,6 +984,16 @@
-         }
- 
- 	fclose (fh);
-+#else
-+	for (index = 0; index < fh; index++) {
-+	    volume = create_volume(ent[index].f_mntfromname,
-+	    	ent[index].f_mntonname);
-+	    volume->is_removable = has_removable_mntent_options(ent + index);
-+	    volumes = finish_creating_volume_and_prepend
-+	    	(monitor, volume, ent[index].f_fstypename, volumes);
-+	}
-+#endif
-+
- 
-         return volumes;
- }
-@@ -1144,10 +1206,40 @@
- static int
- get_cdrom_type (const char *vol_dev_path, int* fd)
- {
-#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT)
- 	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
- 	return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
-+#elif defined(FREEBSD_MNT)
-+	struct ioc_toc_header header;
-+	struct ioc_read_toc_single_entry entry;
-+	int type;
-+
-+	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
-+	if (*fd < 0) {
-+	    	return CDS_DATA_1;
-+	}
-+
-+	if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) {
-+	    	return CDS_DATA_1;
-+	}
-+
-+	type = CDS_DATA_1;
-+
-+	for (entry.track = header.starting_track;
-+	     entry.track <= header.ending_track;
-+	     entry.track++) {
-+	    entry.address_format = CD_LBA_FORMAT;
-+	    if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) {
-+		    if (entry.entry.control & CDROM_DATA_TRACK) {
-+			type = CDS_AUDIO;
-+			break;
-+		    }
-+	    }
-+	}
-+
-+	return type;
- #else
-+
- 	GString *new_dev_path;
- 	struct cdrom_tocentry entry;
- 	struct cdrom_tochdr header;
-@@ -1668,7 +1760,7 @@
- 	for (node = volume_list; node != NULL; node = node->next) {
- 		volume = node->data;
- 		
-#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT)
- 		/* These are set up by get_current_mount_list for Solaris. */
- 		volume->is_removable = volume_is_removable (volume);
- #endif
-@@ -1692,7 +1784,7 @@
- 		ok = mount_volume_auto_add (volume);
- 	} else if (strcmp (file_system_type_name, "cdda") == 0) {		
- 		ok = mount_volume_cdda_add (volume);
-	} else if (strcmp (file_system_type_name, "iso9660") == 0) {		    		
-+	} else if (strcmp (file_system_type_name, "cd9660") == 0) {		    		
- 		ok = mount_volume_iso9660_add (volume);
- 	} else if (strcmp (file_system_type_name, "nfs") == 0) {		
- 		ok = mount_volume_nfs_add (volume);
-@@ -1709,8 +1801,8 @@
- 	}
- 
- 	/* Identify device type */
-	if (eel_str_has_prefix (volume->mount_path, "/mnt/")) {		
-		name = volume->mount_path + strlen ("/mnt/");
-+	if (eel_str_has_prefix (volume->mount_path, "/")) {		
-+		name = volume->mount_path + strlen ("/");
- 		
- 		if (eel_str_has_prefix (name, "cdrom")) {
- 			volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
--- a/x11-fm/nautilus/files/patch-nautilus-config.in
+++ b/x11-fm/nautilus/files/patch-nautilus-config.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- nautilus-config.in	2002/03/13 23:29:56	1.1
-+++ nautilus-config.in	2002/03/13 23:30:46
-@@ -3,7 +3,7 @@
- usage="\
-     Usage: nauilus-config [--version] [--config] [--cflags] [--libs]"
- 
-config_file="@LIBDIR@/nautilusConf.sh"
-+config_file="@sysconfdir@/nautilusConf.sh"
- . $config_file
- 
- if test $# -eq 0; then
--- a/x11-fm/nautilus/files/patch-po::Makefile.in.in
+++ b/x11-fm/nautilus/files/patch-po::Makefile.in.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- po/Makefile.in.in	2001/07/06 11:16:00	1.1
-+++ po/Makefile.in.in	2001/07/06 11:16:20
-@@ -104,7 +104,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
--- a/x11-fm/nautilus/files/patch-src::nautilus-main.c
+++ b/x11-fm/nautilus/files/patch-src::nautilus-main.c
@ -1,27 +0,0 @@
-
-$FreeBSD$
-
--- src/nautilus-main.c	2002/02/26 22:34:03	1.1
-+++ src/nautilus-main.c	2002/02/26 22:43:21
-@@ -140,6 +140,7 @@
- 	CORBA_ORB orb;
- 	NautilusApplication *application;
- 	char **argv_copy;
-+	char *ld_library_path;
- 
- 	struct poptOption options[] = {
- #ifndef NAUTILUS_OMIT_SELF_CHECK
-@@ -205,6 +206,13 @@
- 				    argc, argv, options, 0,
- 				    &popt_context);
- 	eel_setenv ("DISPLAY", DisplayString (GDK_DISPLAY ()), TRUE);
-+	ld_library_path = g_getenv ("LD_LIBRARY_PATH");
-+	if (ld_library_path == NULL)
-+		ld_library_path = "";
-+	else
-+		ld_library_path = g_strconcat (ld_library_path, ":", NULL);
-+	ld_library_path = g_strconcat(ld_library_path, MOZILLA_LIB_PLACE, NULL);
-+	eel_setenv ("LD_LIBRARY_PATH", ld_library_path, TRUE);
- 	orb = oaf_init (argc, argv);
-         gdk_rgb_init ();
- 
--- a/x11-fm/nautilus/pkg-descr
+++ b/x11-fm/nautilus/pkg-descr
@ -1,8 +0,0 @@
-Nautilus is an open-source file manager and graphical shell being
-developed by Eazel, Inc. and others. It is part of the GNOME project,
-and its source code can be found in the GNOME CVS repository.
-Nautilus is still in the early stages of development.  It will
-become an integral part of the GNOME desktop environment when it
-is finished.
-
-WWW: http://nautilus.eazel.com/
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
--- a/x11/Makefile
+++ b/x11/Makefile
@ -39,7 +39,6 @@
    SUBDIR += fspanel
    SUBDIR += gbackground
    SUBDIR += gdkxft
-    SUBDIR += gdm
    SUBDIR += gdm2
    SUBDIR += gmessage
    SUBDIR += gmrun
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@ -1,57 +0,0 @@
-# New ports collection makefile for:   gdm
-# Date created:        12 September 2000
-# Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gdm
-PORTVERSION=	2.2.5.5
-PORTREVISION=	1
-CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=		sources/gdm/2.2
-DIST_SUBDIR=	gnome
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME version of xdm display manager
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade gdkpixbuf
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-
-GDMDIR?=	${PREFIX}/etc/gdm
-
-.include <bsd.port.pre.mk>
-
-.if exists(/usr/include/security/pam_misc.h)
-PLIST_SUB=      PAM_MISC=""
-.else
-PLIST_SUB=      PAM_MISC="@comment "
-.endif
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE=	yes
-.endif
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-pre-fetch:
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@ -1 +0,0 @@
-MD5 (gnome/gdm-2.2.5.5.tar.bz2) = 32085157d128caab9b53c110a9818d61
--- a/x11/gdm/files/patch-ab
+++ b/x11/gdm/files/patch-ab
@ -1,78 +0,0 @@
-
-$FreeBSD$
-
--- config/gdm.conf.in.orig	Fri Nov 16 13:42:13 2001
-+++ config/gdm.conf.in	Thu Dec 20 11:35:10 2001
-@@ -5,7 +5,7 @@
- # want gdm to kill/restart the server, turn this on
- AlwaysRestartServer=false
- Configurator=@EXPANDED_GDMCONFIGDIR@/gdmconfig --disable-sound --disable-crash-dialog
-GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
-+GnomeDefaultSession=@EXPANDED_DATADIR@/default.session
- Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
- DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
- DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
-@@ -13,7 +13,7 @@
- Group=gdm
- HaltCommand=/sbin/shutdown -h now
- KillInitClients=true
-LogDir=@EXPANDED_AUTHDIR@
-+LogDir=/var/log
- PidFile=/var/run/gdm.pid
- PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
- PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
-@@ -22,7 +22,7 @@
- FailsafeXServer=
- XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
- RebootCommand=/sbin/shutdown -r now
-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
-+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
- ServAuthDir=@EXPANDED_AUTHDIR@
- SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
- SuspendCommand=
-@@ -33,9 +33,9 @@
- TimedLoginEnable=false
- TimedLogin=
- TimedLoginDelay=30
-StandardXServer=/usr/bin/X11/X
-+StandardXServer=@EXPANDED_BINDIR@/X
- FlexibleXServers=5
-Xnest=/usr/bin/X11/Xnest -name Xnest
-+Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
- 
- [security]
- # If any distributions ship with this one off, they should be shot
-@@ -68,7 +68,7 @@
- Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling
- 
- [gui]
-GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
-+GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk/gtkrc
- MaxIconWidth=128
- MaxIconHeight=128
- 
-@@ -77,14 +77,14 @@
- ConfigAvailable=true
- Browser=false
- DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
-DefaultLocale=en_US
-+DefaultLocale=en_US.ISO_8859-1
- # These are things excluded from the face browser, not from logging in
- Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
-Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*
-+Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,*
- GlobalFaceDir=@EXPANDED_DATADIR@/faces/
- Icon=@EXPANDED_PIXMAPDIR@/gdm.xpm
- LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
-Logo=@EXPANDED_PIXMAPDIR@/gnome-logo-large.png
-+Logo=@EXPANDED_PIXMAPDIR@/Daemon.png
- Quiver=true
- SystemMenu=true
- Welcome=Welcome to %n
-@@ -137,5 +137,5 @@
- 
- [server-Standard]
- name=Standard server
-command=/usr/bin/X11/X
-+command=@EXPANDED_BINDIR@/X
- flexible=true
--- a/x11/gdm/files/patch-ag
+++ b/x11/gdm/files/patch-ag
@ -1,7 +0,0 @@
--- config/Default.orig	Fri Mar 30 19:27:22 2001
-+++ config/Default	Tue May  8 11:30:59 2001
-@@ -3,3 +3,3 @@
- #Color is now handled by gdmgreeter itself
-#/usr/bin/X11/xsetroot -solid "#007777"
-+#/usr/X11R6/bin/xsetroot -solid "#007777"
- 
--- a/x11/gdm/files/patch-ah
+++ b/x11/gdm/files/patch-ah
@ -1,9 +0,0 @@
--- config/PreSession.orig	Sun Jun  3 14:45:40 2001
-+++ config/PreSession	Sun Jun  3 14:47:23 2001
-@@ -1,4 +1,4 @@
- #!/bin/sh
-if [ -x /usr/bin/X11/sessreg ]; then
-	/usr/bin/X11/sessreg -a -w /var/log/wtmp -u none -l $DISPLAY $USER
-+if [ -x /usr/X11R6/bin/sessreg ]; then
-+	/usr/X11R6/bin/sessreg -a -w /var/log/wtmp -u none -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER
- fi
--- a/x11/gdm/files/patch-ai
+++ b/x11/gdm/files/patch-ai
@ -1,9 +0,0 @@
--- config/PostSession.orig	Sun Jun  3 14:48:43 2001
-+++ config/PostSession	Sun Jun  3 14:49:15 2001
-@@ -1,4 +1,4 @@
- #!/bin/sh
-if [ -x /usr/bin/X11/sessreg ]; then
-	/usr/bin/X11/sessreg -d -w /var/log/wtmp -u none -l $DISPLAY $USER
-+if [ -x /usr/X11R6/bin/sessreg ]; then
-+	/usr/X11R6/bin/sessreg -d -w /var/log/wtmp -u none -l $DISPLAY -x /usr/X11R6/lib/X11/xdm/Xservers $USER
- fi
--- a/x11/gdm/files/patch-al
+++ b/x11/gdm/files/patch-al
@ -1,8 +0,0 @@
--- config/gnomerc.in.orig	Thu Feb 15 19:41:46 2001
-+++ config/gnomerc.in	Fri Apr 20 18:48:24 2001
-@@ -1 +1,4 @@
-@EXPANDED_BINDIR@/gnome-session
-+#!/bin/csh
-+
-+unsetenv LC_CTYPE
-+exec @EXPANDED_BINDIR@/gnome-session
--- a/x11/gdm/files/patch-ap
+++ b/x11/gdm/files/patch-ap
@ -1,77 +0,0 @@
-
-$FreeBSD$
-
--- config/locale.alias.orig	Thu Dec 20 11:40:42 2001
-+++ config/locale.alias	Thu Dec 20 11:40:47 2001
-@@ -29,39 +29,38 @@
- catalan		ca_ES.ISO-8859-1
- chinese(simplified)	zh_CN.GB2312
- chinese(traditional)	zh_TW
-croatian	hr_HR.ISO-8859-2
-czech		cs_CZ.ISO-8859-2
-+croatian	hr_HR.ISO_8859-2
-+czech		cs_CZ.ISO_8859-2
- danish          da_DK.ISO-8859-1
-dansk		da_DK.ISO-8859-1
-deutsch		de_DE.ISO-8859-1
-dutch		nl_NL.ISO-8859-1
-english		en.ISO-8859-1
-english.us	en_US.ISO-8859-1
-english.gb	en_GB.ISO-8859-1
-finnish         fi_FI.ISO-8859-1
-french		fr_FR.ISO-8859-1
-galician	gl_ES.ISO-8859-1
-german		de_DE.ISO-8859-1
-greek           el_GR.ISO-8859-7
-hebrew          iw_IL.ISO-8859-8
-hrvatski	hr_HR.ISO-8859-2
-hungarian       hu_HU.ISO-8859-2
-icelandic       is_IS.ISO-8859-1
-italian         it_IT.ISO-8859-1
-japanese	ja_JP.SJIS
-japanese.euc	ja_JP.eucJP
-korean          ko_KR.eucKR
-lithuanian	lt_LT.ISO-8859-13
-norwegian       no_NO.ISO-8859-1
-nynorsk		nn_NO.ISO-8859-1
-polish          pl_PL.ISO-8859-2
-portuguese      pt_PT.ISO-8859-1
-portuguese.br	pt_BR.ISO-8859-1
-romanian        ro_RO.ISO-8859-2
-+dansk		da_DK.ISO_8859-1
-+deutsch		de_DE.ISO_8859-1
-+dutch		nl_NL.ISO_8859-1
-+english		en_US.ISO_8859-1
-+english.us	en_US.ISO_8859-1
-+english.gb	en_GB.ISO_8859-1
-+finnish         fi_FI.ISO_8859-1
-+french		fr_FR.ISO_8859-1
-+galician	gl_ES.ISO_8859-1
-+german		de_DE.ISO_8859-1
-+greek           el_GR.ISO_8859-7
-+hebrew          iw_IL.ISO_8859-8
-+hrvatski	hr_HR.ISO_8859-2
-+hungarian       hu_HU.ISO_8859-2
-+icelandic       is_IS.ISO_8859-1
-+italian         it_IT.ISO_8859-1
-+japanese	ja_JP.EUC
-+korean          ko_KR.EUC
-+lithuanian	lt_LT.ISO_8859-13
-+norwegian       no_NO.ISO_8859-1
-+nynorsk		nn_NO.ISO_8859-1
-+polish          pl_PL.ISO_8859-2
-+portuguese      pt_PT.ISO_8859-1
-+portuguese.br	pt_BR.ISO_8859-1
-+romanian        ro_RO.ISO_8859-2
- russian         ru_RU.KOI8-R
-slovak          sk_SK.ISO-8859-2
-slovenian       sl_SI.ISO-8859-2
-spanish         es_ES.ISO-8859-1
-swedish         sv_SE.ISO-8859-1
-turkish         tr_TR.ISO-8859-9
-+slovak          sk_SK.ISO_8859-2
-+slovenian       sl_SI.ISO_8859-2
-+spanish         es_ES.ISO_8859-1
-+swedish         sv_SE.ISO_8859-1
-+turkish         tr_TR.ISO_8859-9
- ukrainian	uk_UA.KOI8-U
--- a/x11/gdm/files/patch-at
+++ b/x11/gdm/files/patch-at
@ -1,15 +0,0 @@
-
-$FreeBSD$
-
--- utils/Makefile.in.orig	Wed Mar 13 17:52:05 2002
-+++ utils/Makefile.in	Wed Mar 13 17:52:32 2002
-@@ -195,8 +195,7 @@
- gdmaskpass_LDADD = \
- 	$(GNOME_LIBDIR)		\
- 	$(INTLLIBS)		\
-	-lpam			\
-	-lpam_misc
-+	-lpam
- 
- 
- gdmopen_LDADD = \
--- a/x11/gdm/files/patch-config.h.in
+++ b/x11/gdm/files/patch-config.h.in
@ -1,10 +0,0 @@
--- config.h.in.orig	Thu Jan 10 11:06:01 2002
-+++ config.h.in	Thu Jan 10 11:06:18 2002
-@@ -6,6 +6,7 @@
- #undef HAVE_CATGETS
- #undef HAVE_GETTEXT
- #undef HAVE_LC_MESSAGES
-+#undef HAVE_LOGINCAP
- #undef HAVE_STPCPY
- #undef HAVE_PAM
- #undef HAVE_TCPWRAPPERS
--- a/x11/gdm/files/patch-config_Makefile.in
+++ b/x11/gdm/files/patch-config_Makefile.in
@ -1,92 +0,0 @@
--- config/Makefile.in.orig	Tue Mar 12 18:00:50 2002
-+++ config/Makefile.in	Fri Aug  9 18:26:26 2002
-@@ -298,27 +298,30 @@
- 	fi
- 	$(INSTALL_DATA) gdm.conf $(confdir)/factory-gdm.conf
- 
-	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(confdir)/XKeepsCrashing
-+	if test '!' -f $(DESTDIR)$(confdir)/XKeepsCrashing; then \
-+	    	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing; \
-+	fi
-+	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/factory-XKeepsCrashing
- 
-	-if test -f $(localedir)/locale.alias; then \
-		cp $(localedir)/locale.alias $(localedir)/locale.alias.orig; \
-+	if test '!' -f $(DESTDIR)$(localedir)/locale.alias; then \
-+	    	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias; \
- 	fi
-	$(INSTALL_DATA) $(srcdir)/locale.alias $(localedir)/locale.alias
-+	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/factory-locale.alias
- 
- 	if test '!' -d $(sessdir); then \
- 		$(mkinstalldirs) $(sessdir); \
- 		chmod 755 $(sessdir); \
- 	fi
- 
-	-if test -f $(sessdir)/Xsession; then \
-		cp $(sessdir)/Xsession $(sessdir)/Xsession.orig; \
-+	if test '!' -f $(DESTDIR)$(sessdir)/Xsession; then \
-+	    	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession; \
- 	fi
-	$(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession
-+	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/factory-Xsession
- 
-	-if test -f $(sessdir)/Gnome; then \
-		cp $(sessdir)/Gnome $(sessdir)/Gnome.orig; \
-+	if test '!' -f $(DESTDIR)$(sessdir)/Gnome; then \
-+	    	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome; \
- 	fi
-	$(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome
-+	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/factory-Gnome
- 
- 	-if test -f /etc/redhat-release; then \
- 		if test -f $(sessdir)/Default; then \
-@@ -331,37 +334,38 @@
- 		$(mkinstalldirs) $(initdir); \
- 		chmod 755 $(initdir); \
- 	fi
-	-if test -f $(initdir)/Default; then \
-		cp $(initdir)/Default $(initdir)/Default.orig; \
-+	if test '!' -f $(DESTDIR)$(initdir)/Default; then \
-+	    	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default; \
- 	fi
-	$(INSTALL_SCRIPT) $(srcdir)/Default $(initdir)/Default
-+	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/factory-Default
- 
- 	if test '!' -d $(predir); then \
- 		$(mkinstalldirs) $(predir); \
- 		chmod 755 $(predir); \
- 	fi
-	-if test -f $(predir)/Default; then \
-		cp $(predir)/Default $(predir)/Default.orig; \
-+	if test '!' -f $(DESTDIR)$(predir)/Default; then \
-+	    	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default; \
- 	fi
-	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(predir)/Default
-+	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/factory-Default
- 
- 	if test '!' -d $(postdir); then \
- 		$(mkinstalldirs) $(postdir); \
- 		chmod 755 $(postdir); \
- 	fi
-	-if test -f $(postdir)/Default; then \
-		cp $(postdir)/Default $(postdir)/Default.orig; \
-+	if test '!' -f $(DESTDIR)$(postdir)/Default; then \
-+	    	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default; \
- 	fi
-	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(postdir)/Default
-+	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/factory-Default
- 
- 	if test '!' -d $(gnomercdir); then \
- 		$(mkinstalldirs) $(gnomercdir); \
- 		chmod 755 $(gnomercdir); \
- 	fi
- 
-	if test '!' -f $(gnomercdir)/gnomerc; then \
-+	 if test '!' -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
- 		$(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \
- 	fi
-+	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/factory-gnomerc
- 
- 	if test '!' -d $(authdir); then \
- 		$(mkinstalldirs) $(authdir); \
--- a/x11/gdm/files/patch-configure
+++ b/x11/gdm/files/patch-configure
@ -1,66 +0,0 @@
-
-$FreeBSD$
-
--- configure.orig	Wed Mar 13 00:58:30 2002
-+++ configure	Thu Jul 18 13:27:09 2002
-@@ -5874,6 +5874,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8575,6 +8576,52 @@
- done
- 
- fi
-+
-+
-+for ac_hdr in sys/types.h login_cap.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:8583: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 8588 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:8593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+		 LIBS="$LIBS -lutil"
-+		 cat >> confdefs.h <<\EOF
-+#define HAVE_LOGINCAP 1
-+EOF
-+
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
- 
- 
- if test x$enable_authentication_scheme = xpam -a x$have_pam = xno ; then
--- a/x11/gdm/files/patch-daemon::slave.c
+++ b/x11/gdm/files/patch-daemon::slave.c
@ -1,118 +0,0 @@
-
-$FreeBSD$
-
--- daemon/slave.c.orig	Tue Jan  1 04:48:07 2002
-+++ daemon/slave.c	Fri Jan 11 15:51:27 2002
-@@ -45,6 +45,11 @@
- #include <time.h>
- #include <syslog.h>
- 
-+#ifdef HAVE_LOGINCAP
-+#include <unistd.h>
-+#include <login_cap.h>
-+#endif
-+
- #include <vicious.h>
- 
- #include "gdm.h"
-@@ -140,6 +145,8 @@
- static gboolean x_error_occured = FALSE;
- static gboolean gdm_got_usr2 = FALSE;
- 
-+static void		changeUser(struct passwd *pwent, char *login);
-+
- /* ignore handlers */
- static int
- ignore_xerror_handler (Display *disp, XErrorEvent *evt)
-@@ -1785,6 +1792,27 @@
- 
- }
- 
-+#ifdef HAVE_LOGINCAP
-+void changeUser(struct passwd *pwent, char *login) {
-+	if (setsid() == -1)
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: setsid() failed for %s. Aborting."), login);
-+	if (setusercontext(NULL, pwent, pwent->pw_uid, LOGIN_SETALL) == -1)
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: setusercontext() failed for %s. Aborting."), login);
-+}
-+#else
-+void changeUser(struct passwd *pwent, char *login) {
-+	setpgid(0, 0);
-+	umask(022);
-+	/* setup the user's correct group */
-+	if (setgid(pwent->pw_gid) < 0)
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: Could not setgid %d. Aborting."), pwent->pw_gid);
-+	if (initgroups(login, pwent->pw_gid) < 0)
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: initgroups() failed for %s. Aborting."), login);
-+	if (setuid(pwent->pw_uid) < 0) 
-+		gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: Could not become %s. Aborting."), login);
-+}
-+#endif
-+
- static char *
- dequote (const char *in)
- {
-@@ -1840,12 +1871,6 @@
- 	if (gnome_session != NULL)
- 		ve_setenv ("GDM_GNOME_SESSION", gnome_session, TRUE);
- 
-	/* Special PATH for root */
-	if (pwent->pw_uid == 0)
-		ve_setenv ("PATH", GdmRootPath, TRUE);
-	else
-		ve_setenv ("PATH", GdmDefaultPath, TRUE);
-
- 	/* Eeeeek, this no lookie as a correct language code, let's
- 	 * try unaliasing it */
- 	if (strlen (language) < 3 ||
-@@ -1853,14 +1878,31 @@
- 		language = unaliaslang (language);
- 	}
- 
-	/* Set locale */
-+	changeUser(pwent, login);
-+
-+	/*
-+	 * Set locale. XXX in the HAVE_LOGINCAP case we override user's
-+	 * default language, but there is no other way around, because there
-+	 * is no way to select "Use user's default language" in the GDM, so
-+	 * that we either have to give up ability to select language other
-+	 * one specified in the login.conf, or just ignore default setting.
-+	 * I selected the latter, which is suboptimal, but at least gives
-+	 * some freedom to the user.
-+	 */
- 	ve_setenv ("LANG", language, TRUE);
- 	ve_setenv ("GDM_LANG", language, TRUE);
-+
-+#ifndef HAVE_LOGINCAP
-+
-+	/* Special PATH for root */
-+	if (pwent->pw_uid == 0) 
-+		ve_setenv("PATH", GdmRootPath, TRUE);
-+	else
-+		ve_setenv("PATH", GdmDefaultPath, TRUE);
-+#else
-+	 /* Do not reset PATH */
-+#endif
-     
-	setpgid (0, 0);
-	
-	umask (022);
-	
- 	/* setup the verify env vars */
- 	if ( ! gdm_verify_setup_env (d))
- 		gdm_child_exit (DISPLAY_REMANAGE,
-@@ -1870,12 +1912,8 @@
- 
- 	/* setup egid to the correct group,
- 	 * not to leave the egid around */
-	setegid (pwent->pw_gid);
-+	/*setegid (pwent->pw_gid);*/
- 
-	if (setuid (pwent->pw_uid) < 0) 
-		gdm_child_exit (DISPLAY_REMANAGE,
-				_("gdm_slave_session_start: Could not become %s. Aborting."), login);
-	
- 	chdir (home_dir);
- 
- 	/* anality, make sure nothing is in memory for gnome_config
--- a/x11/gdm/files/patch-docs::Makefile.in
+++ b/x11/gdm/files/patch-docs::Makefile.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- docs/Makefile.in	2002/03/13 23:43:57	1.1
-+++ docs/Makefile.in	2002/03/13 23:44:08
-@@ -147,7 +147,7 @@
- XPM_LIBS = @XPM_LIBS@
- ZVT_LIBS = @ZVT_LIBS@
- 
-SUBDIRS = C eu gdmconfig
-+SUBDIRS = C gdmconfig
- 
- EXTRA_DIST = sgmldocs.make
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- a/x11/gdm/files/patch-gui::gdmlogin.c
+++ b/x11/gdm/files/patch-gui::gdmlogin.c
@ -1,27 +0,0 @@
-
--- gui/gdmlogin.c.orig	Mon Dec 31 21:51:17 2001
-+++ gui/gdmlogin.c	Tue Jan 29 18:12:12 2002
-@@ -3326,7 +3326,9 @@
- static gboolean
- gdm_login_check_exclude (struct passwd *pwent)
- {
-+#ifdef HAVE_SHADOW
- 	const char * const lockout_passes[] = { "*", "!!", NULL };
-+#endif
- 	gint i;
- 
- 	if ( ! GdmAllowRoot && pwent->pw_uid == 0)
-@@ -3335,11 +3337,13 @@
- 	if ( ! GdmAllowRemoteRoot && ! login_is_local && pwent->pw_uid == 0)
- 		return TRUE;
- 
-+#ifdef HAVE_SHADOW
- 	for (i=0 ; lockout_passes[i] != NULL ; i++)  {
- 		if (strcmp (lockout_passes[i], pwent->pw_passwd) == 0) {
- 			return TRUE;
- 		}
- 	}
-+#endif
- 
- 	if (GdmExclude != NULL &&
- 	    GdmExclude[0] != '\0') {
--- a/x11/gdm/pkg-descr
+++ b/x11/gdm/pkg-descr
@ -1,3 +0,0 @@
-The GNOME version of the xdm display manager. It has support for
-face pixmaps, multiple sessions plus clean shutdowns from the login
-menu.
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@ -1,46 +0,0 @@
-#!/bin/sh
-
-if [ -n "${PACKAGE_BUILDING}" ]; then
-	exit 0
-fi
-
-if [ "$2" = "POST-INSTALL" ]; then
-	USER=gdm
-	GROUP=${USER}
-	UID=92
-	GID=${UID}
-	PW=/usr/sbin/pw
-	CHMOD=/bin/chmod
-	CHOWN=/usr/sbin/chown
-
-	if ${PW} group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d "/nonexistent" -s /sbin/nologin -c "GNOME Display Manager"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-        ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm
-        ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm
-	exit 0
-fi
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --yesno "GDM may contain vulnerabilities leading local root compromise, and it is reported widely with various security sites and groups. It is not recommended that this port be installed in public environment. Do you wish to accept the security risk and build GDM anyway?" 10 60 || /usr/bin/false
-fi
--- a/x11/gdm/pkg-message
+++ b/x11/gdm/pkg-message
@ -1,20 +0,0 @@
-GDM is installed.
-
-Please note the following:
- This port has been tested on 5.0-CURRENT and 4.4-RELEASE and higher.
- If you are running a version of FreeBSD prior to 4.5-PRERELEASE, you should 
-  append these lines to your /etc/pam.conf, otherwise GDM will refuse all 
-  logins:
-
-# gdm config
-gdm     auth            requisite       pam_unix.so     try_first_pass
-gdm     account         requisite       pam_unix.so     try_first_pass
-gdm     session         required        pam_permit.so
-
- To enable GDM after booting, edit your /etc/ttys(5), and change the line
-  for ttyv8 to
-
-ttyv8   "/usr/X11R6/bin/gdm -nodaemon"  xterm   on
-
-These notes were written by:  Yukihiro Nakai <nakai@FreeBSD.org>
-and updated by: Joe Marcus Clarke <marcus@marcuscom.com>
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@ -1,187 +0,0 @@
-bin/gdm
-bin/gdmXnestchooser
-bin/gdmchooser
-bin/gdmconfig
-bin/gdmflexiserver
-bin/gdmlogin
-bin/gdmmktemp
-bin/gdmphotosetup
-@unexec if cmp -s %D/etc/gdm/Init/Default %D/etc/gdm/Init/factory-Default; then rm -f %D/etc/gdm/Init/Default; fi
-etc/gdm/Init/factory-Default
-@exec [ ! -f %B/Default ] && cp %B/%f %B/Default
-@unexec if cmp -s %D/etc/gdm/PostSession/Default %D/etc/gdm/PostSession/factory-Default; then rm -f %D/etc/gdm/PostSession/Default; fi
-etc/gdm/PostSession/factory-Default
-@exec [ ! -f %B/Default ] && cp %B/%f %B/Default
-@unexec if cmp -s %D/etc/gdm/PreSession/Default %D/etc/gdm/PreSession/factory-Default; then rm -f %D/etc/gdm/PreSession/Default; fi
-etc/gdm/PreSession/factory-Default
-@exec [ ! -f %B/Default ] && cp %B/%f %B/Default
-@unexec if cmp -s %D/etc/gdm/Sessions/Gnome %D/etc/gdm/Sessions/factory-Gnome; then rm -f %D/etc/gdm/Sessions/Gnome; fi
-etc/gdm/Sessions/factory-Gnome
-@exec [ ! -f %B/Gnome ] && cp %B/%f %B/Gnome
-@unexec if cmp -s %D/etc/gdm/Sessions/Xsession %D/etc/gdm/Sessions/factory-Xsession; then rm -f %D/etc/gdm/Sessions/Xsession; fi
-etc/gdm/Sessions/factory-Xsession
-@exec [ ! -f %B/Xsession ] && cp %B/%f %B/Xsession
-@unexec if cmp -s %D/etc/gdm/XKeepsCrashing %D/etc/gdm/factory-XKeepsCrashing; then rm -f %D/etc/gdm/XKeepsCrashing; fi
-etc/gdm/factory-XKeepsCrashing
-@exec [ ! -f %B/XKeepsCrashing ] && cp %B/%f %B/XKeepsCrashing
-@unexec if cmp -s %D/etc/gdm/gnomerc %D/etc/gdm/factory-gnomerc; then rm -f %D/etc/gdm/gnomerc; fi
-etc/gdm/factory-gnomerc
-@exec [ ! -f %B/gnomerc ] && cp %B/%f %B/gnomerc
-@unexec if cmp -s %D/etc/gdm/gdm.conf %D/etc/gdm/factory-gdm.conf; then rm -f %D/etc/gdm/gdm.conf; fi
-etc/gdm/factory-gdm.conf
-@exec [ ! -f %B/gdm.conf ] && cp %B/%f %B/gdm.conf
-@unexec if cmp -s %D/etc/gdm/locale.alias %D/etc/gdm/factory-locale.alias; then rm -f %D/etc/gdm/locale.alias; fi
-etc/gdm/factory-locale.alias
-@exec [ ! -f %B/locale.alias ] && cp %B/%f %B/locale.alias
-%%PAM_MISC%%sbin/gdmaskpass
-sbin/gdm-restart
-sbin/gdm-safe-restart
-share/gnome/apps/Settings/gdmphotosetup.desktop
-share/gnome/apps/System/gdmconfig.desktop
-share/gnome/apps/System/gdmflexiserver-xnest.desktop
-share/gnome/apps/System/gdmflexiserver.desktop
-share/gnome/gdm/gdmchooser.glade
-share/gnome/gdm/gdmconfig.glade
-share/gnome/help/gdm/C/configuration.html
-share/gnome/help/gdm/C/daemonov.html
-share/gnome/help/gdm/C/docbook.css
-share/gnome/help/gdm/C/f39.html
-share/gnome/help/gdm/C/gdm.html
-share/gnome/help/gdm/C/index.html
-share/gnome/help/gdm/C/intro.html
-share/gnome/help/gdm/C/x156.html
-share/gnome/help/gdm/C/x80.html
-share/gnome/help/gdm/C/x89.html
-share/gnome/help/gdmconfig/C/authors.html
-share/gnome/help/gdmconfig/C/basic.html
-share/gnome/help/gdmconfig/C/bugs.html
-share/gnome/help/gdmconfig/C/docbook.css
-share/gnome/help/gdmconfig/C/expert.html
-share/gnome/help/gdmconfig/C/figures/GDM_auto_login.png
-share/gnome/help/gdmconfig/C/figures/GDM_background.png
-share/gnome/help/gdmconfig/C/figures/GDM_chooser.png
-share/gnome/help/gdmconfig/C/figures/GDM_enviro.png
-share/gnome/help/gdmconfig/C/figures/GDM_face_brow.png
-share/gnome/help/gdmconfig/C/figures/GDM_full.png
-share/gnome/help/gdmconfig/C/figures/GDM_login_appear.png
-share/gnome/help/gdmconfig/C/figures/GDM_login_behav.png
-share/gnome/help/gdmconfig/C/figures/GDM_login_sessions.png
-share/gnome/help/gdmconfig/C/figures/GDM_menubar.png
-share/gnome/help/gdmconfig/C/figures/GDM_misc.png
-share/gnome/help/gdmconfig/C/figures/GDM_paths.png
-share/gnome/help/gdmconfig/C/figures/GDM_security.png
-share/gnome/help/gdmconfig/C/figures/GDM_xdmcp.png
-share/gnome/help/gdmconfig/C/figures/GDM_xserv_setup.png
-share/gnome/help/gdmconfig/C/gdmconfig.sgml
-share/gnome/help/gdmconfig/C/index.html
-share/gnome/help/gdmconfig/C/license.html
-share/gnome/help/gdmconfig/C/ln7.html
-share/gnome/help/gdmconfig/C/stylesheet-images/caution.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/home.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/important.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/next.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/note.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/prev.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/tip.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/toc-blank.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/toc-minus.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/toc-plus.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/up.gif
-share/gnome/help/gdmconfig/C/stylesheet-images/warning.gif
-share/gnome/help/gdmconfig/C/system.html
-share/gnome/help/gdmconfig/C/topic.dat
-share/gnome/help/gdmconfig/C/usage.html
-share/gnome/help/gdmconfig/eu/basic.html
-share/gnome/help/gdmconfig/eu/figures/GDM_auto_login.png
-share/gnome/help/gdmconfig/eu/figures/GDM_background.png
-share/gnome/help/gdmconfig/eu/figures/GDM_chooser.png
-share/gnome/help/gdmconfig/eu/figures/GDM_enviro.png
-share/gnome/help/gdmconfig/eu/figures/GDM_face_brow.png
-share/gnome/help/gdmconfig/eu/figures/GDM_full.png
-share/gnome/help/gdmconfig/eu/figures/GDM_login_appear.png
-share/gnome/help/gdmconfig/eu/figures/GDM_login_behav.png
-share/gnome/help/gdmconfig/eu/figures/GDM_login_sessions.png
-share/gnome/help/gdmconfig/eu/figures/GDM_menubar.png
-share/gnome/help/gdmconfig/eu/figures/GDM_misc.png
-share/gnome/help/gdmconfig/eu/figures/GDM_paths.png
-share/gnome/help/gdmconfig/eu/figures/GDM_security.png
-share/gnome/help/gdmconfig/eu/figures/GDM_xdmcp.png
-share/gnome/help/gdmconfig/eu/figures/GDM_xserv_setup.png
-share/gnome/help/gdmconfig/eu/gdmconfig.sgml
-share/gnome/help/gdmconfig/eu/index.html
-share/gnome/help/gdmconfig/eu/ln10.html
-share/gnome/help/gdmconfig/eu/stylesheet-images/caution.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/home.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/important.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/next.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/note.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/prev.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/tip.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/toc-blank.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/toc-minus.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/toc-plus.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/up.gif
-share/gnome/help/gdmconfig/eu/stylesheet-images/warning.gif
-share/gnome/help/gdmconfig/eu/topic.dat
-share/gnome/help/gdmconfig/eu/usage.html
-share/gnome/omf/gdm/gdmconfig-C.omf
-share/gnome/omf/gdm/gdmconfig-eu.omf
-share/gnome/pixmaps/gdm.xpm
-share/gnome/pixmaps/nobody.png
-share/gnome/pixmaps/nohost.png
-share/locale/az/LC_MESSAGES/gdm.mo
-share/locale/bg/LC_MESSAGES/gdm.mo
-share/locale/ca/LC_MESSAGES/gdm.mo
-share/locale/cs/LC_MESSAGES/gdm.mo
-share/locale/da/LC_MESSAGES/gdm.mo
-share/locale/de/LC_MESSAGES/gdm.mo
-share/locale/el/LC_MESSAGES/gdm.mo
-share/locale/es/LC_MESSAGES/gdm.mo
-share/locale/et/LC_MESSAGES/gdm.mo
-share/locale/eu/LC_MESSAGES/gdm.mo
-share/locale/fi/LC_MESSAGES/gdm.mo
-share/locale/fr/LC_MESSAGES/gdm.mo
-share/locale/ga/LC_MESSAGES/gdm.mo
-share/locale/gl/LC_MESSAGES/gdm.mo
-share/locale/hu/LC_MESSAGES/gdm.mo
-share/locale/it/LC_MESSAGES/gdm.mo
-share/locale/ja/LC_MESSAGES/gdm.mo
-share/locale/ko/LC_MESSAGES/gdm.mo
-share/locale/lt/LC_MESSAGES/gdm.mo
-share/locale/lv/LC_MESSAGES/gdm.mo
-share/locale/ms/LC_MESSAGES/gdm.mo
-share/locale/nl/LC_MESSAGES/gdm.mo
-share/locale/nn/LC_MESSAGES/gdm.mo
-share/locale/no/LC_MESSAGES/gdm.mo
-share/locale/pl/LC_MESSAGES/gdm.mo
-share/locale/pt/LC_MESSAGES/gdm.mo
-share/locale/pt_BR/LC_MESSAGES/gdm.mo
-share/locale/ro/LC_MESSAGES/gdm.mo
-share/locale/ru/LC_MESSAGES/gdm.mo
-share/locale/sk/LC_MESSAGES/gdm.mo
-share/locale/sl/LC_MESSAGES/gdm.mo
-share/locale/sv/LC_MESSAGES/gdm.mo
-share/locale/ta/LC_MESSAGES/gdm.mo
-share/locale/tr/LC_MESSAGES/gdm.mo
-share/locale/uk/LC_MESSAGES/gdm.mo
-share/locale/zh_CN/LC_MESSAGES/gdm.mo
-share/locale/zh_TW/LC_MESSAGES/gdm.mo
-@unexec rm -f %D/etc/gdm/Init/Default.orig :: true
-@unexec rm -f %D/etc/gdm/PostSession/Default.orig :: true
-@unexec rm -f %D/etc/gdm/PreSession/Default.orig :: true
-@unexec rm -f %D/etc/gdm/Sessions/Gnome.orig :: true
-@unexec rm -f %D/etc/gdm/Sessions/Xsession.orig :: true
-@unexec rm -f %D/etc/gdm/locale.alias.orig :: true
-@dirrm share/gnome/omf/gdm
-@dirrm share/gnome/help/gdmconfig/eu/stylesheet-images
-@dirrm share/gnome/help/gdmconfig/eu/figures
-@dirrm share/gnome/help/gdmconfig/eu
-@dirrm share/gnome/help/gdmconfig/C/stylesheet-images
-@dirrm share/gnome/help/gdmconfig/C/figures
-@dirrm share/gnome/help/gdmconfig/C
-@dirrm share/gnome/help/gdmconfig
-@dirrm share/gnome/help/gdm/C/images
-@dirrm share/gnome/help/gdm/C
-@dirrm share/gnome/help/gdm
-@dirrm etc/pam.d
-@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
--- a/x11/gnome-fifth-toe/pkg-descr
+++ b/x11/gnome-fifth-toe/pkg-descr
@ -1,4 +0,0 @@
-GNOME "Fifth-Toe"
-
-A collection of programs that GNOME users may find useful, all brought
-together with the convenience of a single "meta-port".
--- a/x11/gnome-fifth-toe/pkg-plist
+++ b/x11/gnome-fifth-toe/pkg-plist
@ -1 +0,0 @@
-@comment this plist intentionally left empty
--- a/x11/gnome/Makefile
+++ b/x11/gnome/Makefile
@ -1,48 +0,0 @@
-# New ports collection makefile for:	gnome
-# Date created:		17 Aug 1998
-# Whom:			Yukihiro Nakai <Nakai@technologist.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnome
-PORTVERSION=	1.4.1b2
-PORTREVISION=	2
-CATEGORIES=	x11 gnome
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-EXTRACT_ONLY=	# empty
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	The "meta-port" for the GNOME integrated X11 desktop
-
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		another_clock_applet:${PORTSDIR}/x11/gnomeapplets \
-		gtcd:${PORTSDIR}/audio/gnomemedia \
-		${X11BASE}/share/gnome/help/glossary/C/index.html:${PORTSDIR}/misc/gnomeuserdocs \
-	 	gcalc:${PORTSDIR}/misc/gnomeutils \
-		gnomecard:${PORTSDIR}/deskutils/gnomepim \
-		gnomine:${PORTSDIR}/games/gnomegames \
-		sawfish:${PORTSDIR}/x11-wm/sawfish \
-		ggv:${PORTSDIR}/print/ggv \
-		ghex:${PORTSDIR}/editors/ghex \
-		bug-buddy:${PORTSDIR}/devel/bugbuddy \
-		glade:${PORTSDIR}/devel/glade \
-		gtop:${PORTSDIR}/sysutils/gtop \
-		gdm:${PORTSDIR}/x11/gdm \
-		xalf:${PORTSDIR}/x11/xalf \
-		${X11BASE}/share/themes/Metal/ICON.png:${PORTSDIR}/x11-toolkits/gtk-engines \
-		${PYTHON_SITELIBDIR}/gtk-1.2/_appletmodule.so:${PORTSDIR}/x11-toolkits/py-gnome \
-		gnomeg:${PORTSDIR}/x11-toolkits/guile-gnome \
-		${X11BASE}/etc/panelmmConf.sh:${PORTSDIR}/x11-toolkits/panel-- \
-		nautilus:${PORTSDIR}/x11-fm/nautilus \
-		screensaver-properties-capplet:${PORTSDIR}/x11/xscreensaver-gnome
-
-NO_BUILD=	yes
-
-USE_PYTHON=	yes
-
-do-install:	# empty
-
-.include <bsd.port.mk>
--- a/x11/gnome/pkg-descr
+++ b/x11/gnome/pkg-descr
@ -1,9 +0,0 @@
-GNU Network Object Model Environment
-
-This package does not contain anything by itself -- it is a
-"meta-port" that depends on other GNOME packages.  Its sole purpose is
-to require dependencies so users can install this package only and
-have all the GNOME stuff pulled in by the port/package dependency
-mechanism.
-
-WWW: http://www.FreeBSD.org/gnome/
--- a/x11/gnome/pkg-plist
+++ b/x11/gnome/pkg-plist
@ -1 +0,0 @@
-@comment this plist intentionally left empty
--- a/x11/gnomeapplets/Makefile
+++ b/x11/gnomeapplets/Makefile
@ -1,48 +0,0 @@
-# New ports collection makefile for:	gnomeapplets
-# Date created:				26th May 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomeapplets
-PORTVERSION=	1.4.1
-CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/1.4
-DISTNAME=	gnome-applets-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Applets components for the Gnome Desktop Environment
-
-LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
-
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-GNOME_DESKTOP_VERSION=1
-USE_GNOME=	gnomeprefix gnomehack libpanel gnomevfs gnomecanvas libghttp
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-MAN1=		another_clock_applet.1 asclock_applet.1 \
-		cdplayer_applet.1 charpick_applet.1 clockmail_applet.1 \
-		cpumemusage_applet.1 diskusage_applet.1 drivemount_applet.1 \
-		esdpvd.1 fifteen_applet.1 geyes_applet.1 gkb_applet.1 \
-		gnotes_applet.1 gtik2_applet.1 gweather_applet.1 jbc_applet.1 \
-		life_applet.1 mini-commander_applet.1 mixer_applet.1 \
-		modemlights_applet.1 multiload_applet.1 odometer_applet.1 \
-		quicklaunch_applet.1 slash_applet.1 sound-monitor_applet.1 \
-		tickastat_applet.1 webcontrol_applet.1 whereami_applet.1
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile.in
-PLIST_SUB=	BATTERY="@comment "
-.else
-PLIST_SUB=	BATTERY=""
-MAN1+=	battery_applet.1
-.endif
-
-.include <bsd.port.post.mk>
--- a/x11/gnomeapplets/distinfo
+++ b/x11/gnomeapplets/distinfo
@ -1 +0,0 @@
-MD5 (gnome-applets-1.4.1.tar.gz) = 520ff76e2d0ef9fcaf97c6d5fdbab71f
--- a/x11/gnomeapplets/files/patch-aa
+++ b/x11/gnomeapplets/files/patch-aa
@ -1,6 +0,0 @@
--- configure.orig	Thu Mar 15 11:59:13 2001
-+++ configure	Mon Mar 19 10:00:53 2001
-@@ -3503,2 +3503,3 @@
- *solaris*) CDROM_HOST=solaris;;
-+*freebsd*) CDROM_HOST=freebsd;;
- esac
--- a/x11/gnomeapplets/files/patch-ab
+++ b/x11/gnomeapplets/files/patch-ab
@ -1,7 +0,0 @@
--- applet-docs.make.orig	Mon Feb 26 10:31:11 2001
-+++ applet-docs.make	Thu Mar  1 17:58:21 2001
-@@ -11,3 +11,3 @@
- 
-helpdir = $(datadir)/gnome/help/$(applet)_applet/$(lang)
-+helpdir = $(datadir)/help/$(applet)_applet/$(lang)
- help_DATA =	\
--- a/x11/gnomeapplets/files/patch-ac
+++ b/x11/gnomeapplets/files/patch-ac
@ -1,10 +0,0 @@
--- mini-commander/src/macro.c.orig	Sun Feb  6 05:15:37 2000
-+++ mini-commander/src/macro.c	Sat May 27 13:02:19 2000
-@@ -20,6 +20,7 @@
-  */
- 
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <config.h>
- #include <gnome.h>
--- a/x11/gnomeapplets/files/patch-ad
+++ b/x11/gnomeapplets/files/patch-ad
@ -1,353 +0,0 @@
--- cdplayer/cdplayer.c.orig	Thu Aug 10 15:58:16 2000
-+++ cdplayer/cdplayer.c	Mon Sep 25 15:02:16 2000
-@@ -84,6 +84,11 @@
- 				break;
- 			case DISC_COMPLETED:
- 				/* check for looping or ? */
-+				led_time(cd->panel.time,
-+					 stat.relative_address.minute,
-+					 stat.relative_address.second,
-+					 cd->panel.track_control.display,
-+					 stat.track);
- 				break;
- 			case DISC_STOP:
- 			case DISC_ERROR:
--- /dev/null	Mon May 29 02:15:42 2000
-+++ cdplayer/cdrom-freebsd.c	Mon May 29 10:37:28 2000
-@@ -0,0 +1,336 @@
-+#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;
-+	struct ioc_read_toc_single_entry tocentry;
-+
-+	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 + 1;
-+	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 + 1) * sizeof(track_info_t));
-+	}
-+	for (i = 0, j = cdp->track0; i < cdp->nr_track; i++, j++) {
-+		tocentry.track = j;
-+		tocentry.address_format = CD_MSF_FORMAT;
-+
-+		if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
-+			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.entry.control !=
-+		    0x04 ? 1 : 0;
-+		ASSIGN_MSF(cdp->track_info[i].address, tocentry.entry.addr.msf);
-+	}
-+
-+	tocentry.track = 0xAA;
-+	tocentry.address_format = CD_MSF_FORMAT;
-+	if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
-+		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.entry.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 + 1, 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 + 1].address.second;
-+	s2 = cdp->track_info[index].address.second;
-+	length->second = s1 = s1 - s2;
-+	if (s1 < 0) {
-+		i = 1;
-+		length->second = s1 + 60;
-+	} else
-+		i = 0;
-+
-+	length->minute = cdp->track_info[index + 1].address.minute -
-+	    cdp->track_info[index].address.minute - i;
-+
-+	return 0;
-+}
--- a/x11/gnomeapplets/files/patch-battery::read-battery.c
+++ b/x11/gnomeapplets/files/patch-battery::read-battery.c
@ -1,22 +0,0 @@
-
-$FreeBSD$
-
--- battery/read-battery.c	2002/01/14 14:23:46	1.1
-+++ battery/read-battery.c	2002/01/14 14:25:45
-@@ -170,7 +170,7 @@
-   *hours_remaining = -1;
-   *minutes_remaining = 1;
- 
-  fd = open(APMDEV, O_RDWR);
-+  fd = open(APMDEV, O_RDONLY);
-   if (fd == -1)
-     {
-       g_error (_("Cannot open /dev/apm; can't get data."));
-@@ -179,6 +179,7 @@
- 
-   if (ioctl(fd, APMIO_GETINFO, &aip) == -1) {
-     g_error(_("ioctl failed on /dev/apm."));
-+    close(fd);
-     return FALSE;
-   }
- 
--- a/x11/gnomeapplets/files/patch-ltmain.sh
+++ b/x11/gnomeapplets/files/patch-ltmain.sh
@ -1,28 +0,0 @@
-
-$FreeBSD$
-
--- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
--- a/x11/gnomeapplets/files/patch-po::Makefile.in.in
+++ b/x11/gnomeapplets/files/patch-po::Makefile.in.in
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- po/Makefile.in.in	2001/08/03 10:53:37	1.1
-+++ po/Makefile.in.in	2001/08/03 10:53:57
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
--- a/x11/gnomeapplets/pkg-descr
+++ b/x11/gnomeapplets/pkg-descr
@ -1,6 +0,0 @@
-Applets components for the Gnome Desktop Environment
-
-For more information about Gnome on FreeBSD,
-please refer to ${PORTSDIR}/x11/gnome/pkg-descr
-
-WWW: http://www.gnome.org/
--- a/x11/gnomeapplets/pkg-plist
+++ b/x11/gnomeapplets/pkg-plist
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@ -1,41 +0,0 @@
-# New ports collection makefile for:	gnomecore
-# Date created:				17 March 1998
-# Whom:					Yukihiro Nakai <Nakai@technologist.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomecore
-PORTVERSION=	1.4.2
-CATEGORIES?=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-core/1.4
-DISTNAME=	gnome-core-${PORTVERSION}
-DIST_SUBDIR=	gnome
-
-MAINTAINER?=	gnome@FreeBSD.org
-COMMENT=	Core component for the Gnome Desktop Environment
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-GNOME_DESKTOP_VERSION=1
-USE_GNOME=	gnomehack gnomeprefix gnomehier libcapplet libglade gnomeaudio \
-		libpanel
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-MAN1=		deskguide_applet.1 gmenu.1 gnome-about.1 gnome-convert.1 \
-		gnome-download.1 gnome-edit.1 gnome-hint-properties-capplet.1 \
-		gnome-hint.1 gnome-info2html.1 gnome-man2html.1 \
-		gnome-panel-add-launcher.1 gnome-panel-properties-capplet.1 \
-		gnome-session.1 gnome-terminal.1 gnome-wm.1 panel.1 \
-		save-session.1 tasklist_applet.1 gnome-libice-check.1 \
-		gnome-login-check.1 gnome-smproxy.1 session-properties.1 \
-		session-properties-capplet.1 
-MAN5=		default.session.5
-
-.include <bsd.port.mk>
--- a/x11/gnomecore/distinfo
+++ b/x11/gnomecore/distinfo
@ -1 +0,0 @@
-MD5 (gnome/gnome-core-1.4.2.tar.bz2) = d2caf2e71afcc946d5bceaec1b7ba1d3
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`MD5 (gnome-audio-1.4.0.tar.gz) = 412f279a4741b2b14227f1cc36a06d18`
				`@ -1 +0,0 @@`
				`MD5 (gnome-media-1.2.3.tar.gz) = bcd99b4fe81141d36bbd40d74a9b448f`
				`@ -1 +0,0 @@`
				`MD5 (gedit-0.9.7.tar.gz) = a02667dd67e46efdbdb6f875442506b1`
				`@ -1 +0,0 @@`
				`MD5 (nautilus-1.0.6.tar.gz) = 436283056c100bcbd14098a5342e2868`
				`@ -1 +0,0 @@`
				`MD5 (gnome/gdm-2.2.5.5.tar.bz2) = 32085157d128caab9b53c110a9818d61`
				`@ -1 +0,0 @@`
				`@comment this plist intentionally left empty`
				`@ -1 +0,0 @@`
				`MD5 (gnome-applets-1.4.1.tar.gz) = 520ff76e2d0ef9fcaf97c6d5fdbab71f`
				`@ -1 +0,0 @@`
				`MD5 (gnome/gnome-core-1.4.2.tar.bz2) = d2caf2e71afcc946d5bceaec1b7ba1d3`