audio/p5-CDDB_get:
  Maintainer:	oyvindmo@initio.no
  Changes:
  Adds   : files
  Removes:

audio/ripit:
  Maintainer:	oyvindmo@initio.no
  Changes: files/patch-aa
  Adds   :
  Removes:

editors/cooledit:
  Maintainer:	brett@peloton.runet.edu
  Changes:
  Adds   : files/patch-am
  Removes:

graphics/mplayer:
  Maintainer:	riggs@rrr.de
  Changes: Makefile
  Adds   :
  Removes:

mail/mutt:
  Maintainer:
  Changes: MAINTAINER?= obrien@FreeBSD.org
  Adds   : files/patch-04
  Removes:

math/gnuplot:
  Maintainer:	chuckr@FreeBSD.org
  Changes: Makefile
  Adds   :
  Removes:

math/octave:
  Maintainer:	chuckr@FreeBSD.org
  Changes: Makefile
  Adds   :
  Removes:

misc/gnomehier:
  Maintainer:	sobomax@FreeBSD.org
  Changes: Makefile pkg-plist
  Adds   :
  Removes: files/dirlist

palm/pilot-link:
  Maintainer:	dima@FreeBSD.org
  Changes:
  Adds   : files/patch-gcc31
  Removes:

sysutils/wmavgload:
  Maintainer:	ports@FreeBSD.org
  Changes: files/patch-a0
  Adds   :
  Removes:

textproc/docbook-xml:
  Maintainer:	kuriyama@FreeBSD.org
  Changes: pkg-plist
  Adds   :
  Removes:

textproc/docproj:
  Maintainer:	nik@freebsd.org
  Changes: Makefile
  Adds   :
  Removes:

textproc/jade:
  Maintainer:	kuriyama@FreeBSD.org
  Changes:
  Adds   : files/patch-aa
  Removes:

textproc/sgmlformat:
  Maintainer:	kuriyama@FreeBSD.org
  Changes: Makefile
  Adds   :
  Removes:

x11-toolkits/panel--:
  Maintainer:	gnome@FreeBSD.org
  Changes:
  Adds   : files/patch-gcc31
  Removes:

--- /usr/ports.ref/audio/p5-CDDB_get/files/patch-CDDB_get.pm	Thu Jan  1 02:00:00 1970
+++ audio/p5-CDDB_get/files/patch-CDDB_get.pm	Wed Aug 28 23:26:27 2002
@@ -0,0 +1,155 @@
+--- CDDB_get.pm.orig	Thu May 31 21:22:46 2001
++++ CDDB_get.pm	Wed Aug 28 23:23:35 2002
+@@ -68,6 +68,8 @@
+ my $CDDB_MODE = "cddb";
+ my $CD_DEVICE = "/dev/cdrom";
+ 
++my $CDDB_DIR  = "/tmp/xmcd";
++
+ my $HELLO_ID  = "root nowhere.com fastrip 0.77";
+ 
+ # endian check
+@@ -103,8 +105,6 @@
+   $CDROMREADTOCHDR=0x40046304;
+   $CDROMREADTOCENTRY=0xc0086305;
+ 
+-  $CD_DEVICE="/dev/cd0a";
+-
+   if($os eq "OpenBSD") {
+     $CD_DEVICE="/dev/cd0c";
+   }
+@@ -255,6 +255,10 @@
+   }
+   $query.=" ". int(($toc->[$total]->{frames}-$toc->[0]->{frames})/75);
+ 
++  if ( -r $CDDB_DIR."/".$id2 ) {
++    $CDDB_MODE = "local";
++  }
++
+   if ($CDDB_MODE eq "cddb") {
+     print STDERR "cddb: connecting to $CDDB_HOST:$CDDB_PORT\n" if $debug;
+ 
+@@ -272,7 +276,12 @@
+     unless ($return =~ /^2\d\d\s+/) {
+       die "handshake error at cddb db: $CDDB_HOST:$CDDB_PORT";
+     }
+- 
++    print $socket "proto 5\n";
++    $return=<$socket>;
++    unless ($return =~ /^2\d\d\s+/) {
++      die "protocol error at cddb db: $CDDB_HOST:$CDDB_PORT";
++    }
++
+     print STDERR "cddb: sending: $query\n" if $debug;
+     print $socket "$query\n";
+ 
+@@ -315,6 +324,9 @@
+     chomp $return;
+ 
+     print STDERR "cddb: http result: $return\n" if $debug;
++  } elsif ($CDDB_MODE eq "local") {
++    open(CDDB_FILE, $CDDB_DIR."/".$id2);
++    $return = "200 misc $id2 Local File / Junk Data";
+   } else {
+     die "unkown mode: $CDDB_MODE for querying cddb";
+   }
+@@ -329,6 +341,7 @@
+   } elsif(($err==211) || ($err==210)) {
+     while(<$socket>) {
+       last if(/^\./);
++      $_ =~ s/\r//g;
+       push @list,$_;
+     } 
+   } elsif($err==200) {
+@@ -342,8 +355,9 @@
+       print "This CD could be:\n\n";
+       my $i=1;
+       for(@list) {
++        my ($tid) = $_ =~ /^\S+\s+(\S+)\s+.*/;
+         my ($tit) = $_ =~ /^\S+\s+\S+\s+(.*)/;
+-        print "$i: $tit\n";
++        print "$i: $tit ($tid)\n";
+         $i++
+       }
+       print "\n0: none of the above\n\nChoose: ";
+@@ -380,6 +394,8 @@
+   $cd{title}=$title;
+   $cd{cat}=$cat;
+   $cd{id}=$id;
++  $cd{year}="";
++  $cd{genre}="";
+ 
+   my @lines;
+ 
+@@ -391,6 +407,7 @@
+ 
+     while(<$socket>) {
+       last if(/^\./);
++      $_ =~ s/\r//g;
+       push @lines,$_;
+     }
+     print $socket "quit\n";
+@@ -431,9 +448,31 @@
+ 
+     while(<$socket>) {
+       last if(/^\./);
++      $_ =~ s/\r//g;
+       push @lines,$_;
+     }
+     close $socket;
++  } elsif ($CDDB_MODE eq "local") {
++    while(<CDDB_FILE>) {
++      last if(/^\./);
++      push @lines,$_;
++      if(/^DTITLE\=\s*(.+)/) {
++	$at = $1;
++        if($at =~ /\//) {
++          ($artist,$title)= $at =~ /(.*?)\s*\/\s*(.*)/;
++        } else {
++          $artist=$at;
++          $title=$at;
++        }
++        $cd{artist}=$artist;
++        $cd{title}=$title;
++      }
++      if(/Category:\s*(.+)/) {
++        $cat = $1;
++        $cd{cat}=$cat;
++      }
++    }
++    close CDDB_FILE;
+   } else {
+     die "unkown mode: $CDDB_MODE for querying cddb";
+   }
+@@ -445,7 +484,6 @@
+     #TTITLE0=Bitch (Edit) 
+     if(/^TTITLE(\d+)\=\s*(.*)/) {
+       my $t= $2;
+-      chop $t;
+       $cd{frames}[$1]=$toc->[$1]->{frames};
+       unless (defined $cd{track}[$1]) {
+         $cd{track}[$1]=$t;
+@@ -453,8 +491,22 @@
+         $cd{track}[$1]=$cd{track}[$1].$t;
+       }
+     } 
++    if(/^DYEAR\=\s*(.*)/) {
++      $cd{year} = $1;
++    }
++    if($cd{year} eq "" && /^EXTD\=\s*YEAR:\s*(\d+)/) {
++      $cd{year} = $1;
++    }
++    if(/^DGENRE\=\s*(.*)/) {
++      $cd{genre} = $1;
++    }
++  }
++  if($cd{genre} eq "") {
++    $cd{genre} = $cd{cat};
++    $cd{genre} =~ s/misc/Other/;
++    $cd{genre} =~ s/data/Other/;
++    $cd{genre} =~ s/newage/New Age/;
+   }
+-
+ 
+   $cd{tno}=$#{$cd{track}}+1;
+   $cd{frames}[$cd{tno}]=$toc->[$cd{tno}]->{frames};
--- /usr/ports.ref/audio/ripit/files/patch-aa	Sat Jun  1 12:52:36 2002
+++ audio/ripit/files/patch-aa	Thu Sep 12 16:30:49 2002
@@ -1,5 +1,5 @@
 --- ripit.pl.orig	Sat Aug 25 18:20:06 2001
-+++ ripit.pl	Fri May 24 14:16:20 2002
++++ ripit.pl	Thu Sep 12 16:29:54 2002
 @@ -9,41 +9,47 @@
  #		Create an M3U file
  #
@@ -46,7 +46,7 @@
  $cddev 		= "/dev/cdrom";		# CD Audio device
 -$outputdir 	= "/tmp/cdrip/";	# Where the MP3s should go, 
 -					# must have trailing /
-+$outputdir 	= "/tmp/cdrip";		# Where the MP3s should go
++$outputdir 	= "/usr/tmp/mp3";	# Where the MP3s should go
  $bitrate	= 160;			# Bitrate for MP3s
 -$encoder	= 0; 			# 0 - Lame, 1 - OggVorbis
 +$quality	= 0;			# Quality setting for Ogg
@@ -100,17 +100,23 @@
     exit 1;
  }
  
-@@ -110,6 +125,9 @@
+@@ -110,6 +125,15 @@
          print STDERR "Warning: year is not Y2K compliant - $year\n";
  }
  
 +# Make sure outputdir ends with a slash
 +$outputdir =~ s/(.*)\/?/$1\//;
 +
++if ($encoder == 2) {
++  $mp3ext = ".ogg";
++} else {
++  $mp3ext = ".mp3";
++}
++
  if ($haltonfinish == 1) {print "Will halt machine when finished.\n";}
  
  # Get starting track parameter if it has been given
-@@ -132,8 +150,8 @@
+@@ -132,8 +156,8 @@
  &create_dirs();				# Create directories MP3 files
  &rip_cd();				# Rip, Encode & Tag
  
@@ -121,7 +127,7 @@
  
  &create_m3u();			# Create the M3U file for the MP3 files
  
-@@ -157,6 +175,10 @@
+@@ -157,6 +181,10 @@
  
  exit;
  
@@ -132,19 +138,106 @@
  #
  # Create the track selection from the parameters passed
  # on the command line
-@@ -280,7 +302,6 @@
+@@ -216,22 +244,34 @@
+   if(defined $cd{title}) {
+ 
+     $artist = $cd{artist};
+-    $album = $cd{title};
++    if ($artist =~ /^Various/) {
++      $various = 1;
++      ($artist,$album) = split(/ - /, $cd{title}, 2);
++      if ($album eq "") {
++        $album = $artist;
++        $artist = "Various Artists";
++      }
++    } else {
++      $various = 0;
++      $album = $cd{title};
++    }
++    $artist =~ s/\s+/ /g;
++    $album =~ s/\s+/ /g;
++    $artist =~ s/ \(.*\)//g;
++    $album =~ s/ - .*//g;
+ 
+     if( $genre eq "") {				# Only set if it wasn't
+-      $genre = $cd{cat};			# passed on command line
++      $genre = $cd{genre};			# passed on command line
++    }
++    if( $year eq "") {				# Only set if it wasn't
++      $year = $cd{year};			# passed on command line
+     }
+     
+-    $artist =~ s/[:;*#?|><"\$!]//g; 		# Strip dodgey chars
++    $artist =~ s/[:;*#?|><"\$]//g; 		# Strip dodgey chars
+     $artist =~ s/`/'/g;
+-    $album =~ s/[:;*#?|><"\$!]//g; 		# Strip dodgey chars
++    $album =~ s/[:;*#?|><"\$]//g; 		# Strip dodgey chars
+     $album =~ s/`/'/g;
+ 
+-    #Translate valid genres for id3 tagger
+-    $genre =~ s/misc//;
+-    $genre =~ s/data//;
+-    $genre =~ s/newage/New Age/;
+-  
+     $nocddbinfo = 0;				# Got CDDB info OK
+   }
+   else {
+@@ -250,12 +290,15 @@
+   print "Artist: $artist\n";
+   print "Album: $album\n";
+   print "Genre: $genre\n";
++  print "Year: $year\n";
+ 
+   my $n=1;
+   foreach my $i ( @{$cd{track}} ) {
+     $i =~ s/`/'/g;            # Change ` to ' to avoid problems later  
+     $i =~ s/\//-/g;           # Change / to - to avoid problems later  
+-    $i =~ s/[;:*#?|><"\$!]//g;
++    $i =~ s/[;:*#?|><"\$]//g;
++    $i =~ s/\s+/ /g;
++    next if ($i eq "DATA");
+     push @tracklist, $i;
+     printf("%02d: %s\n", $n,$i);
+     $n++;
+@@ -280,12 +323,19 @@
  #
  sub create_dirs {
    # Directory created will be: /outputdir/Artist - Album/
 -  # The value must end in /
+-
+-  $mp3dir = $outputdir.$artist." - ".$album."/";
  
-   $mp3dir = $outputdir.$artist." - ".$album."/";
- 
-@@ -336,31 +357,37 @@
++  $mp3dir = $outputdir.$artist."/";
+   if ($use_underscore == 1) { $mp3dir =~ s/ /_/g; }
+-
++  if ($mp3dir =~ /\.\/$/) { $mp3dir =~ s/\.//g; }
++  if (!opendir(TESTDIR, $mp3dir)) {
++    mkdir($mp3dir,0777) || die "Cannot create directory $mp3dir: $!";
++  }
++  else {
++    closedir(TESTDIR);
++  }
++  $mp3dir = $mp3dir.$album."/";
++  if ($use_underscore == 1) { $mp3dir =~ s/ /_/g; }
++  if ($mp3dir =~ /\.\/$/) { $mp3dir =~ s/\.//g; }
+   if (!opendir(TESTDIR, $mp3dir)) {
+     mkdir($mp3dir,0777) || die "Cannot create directory $mp3dir: $!";
+   }
+@@ -308,6 +358,9 @@
+       $riptrname = $mp3dir.sprintf("%02d",$trnum).$trname;
+       $tracknum = sprintf("%02d",$trnum);
+       $trackname = $trname;
++      if ($various == 1) { $trackname =~ s/^.*- //g; }
++      $trackname =~ s/ \(.*\)$//g;
++      $trackname =~ s/^\(.*\) //g;
+       if (! eval ("\$riptrname = \$mp3dir.$tracktemplate")) {
+         die "Track Template is incorrect, caused eval to fail: $!" ;
+       }       
+@@ -336,31 +389,37 @@
      $riptrackname = &get_trackname($_, $tracklist[$_ - 1]);
      $riptrackno = $_;
  
-+    if ( ! -r "$riptrackname.wav" && ! -r "$riptrackname.mp3" ) {
++    if ( ! -r "$riptrackname.wav" && ! -r "$riptrackname$mp3ext" ) {
 +    print "Ripping track $tracklist[$_ - 1]...\n";
      &printflush(RIPLOG,"Ripping $tracklist[$_ - 1]...\n");
  
@@ -182,7 +275,7 @@
        }
      }
      elsif ($cdripper == 4) {
-@@ -369,9 +396,37 @@
+@@ -369,9 +428,37 @@
        $cdd_dev =~ s/c$//;
        if (system("cdd -t $riptrackno -q -f $cdd_dev - 2>/dev/null | sox -t cdr -x - \"$riptrackname.rip\"")) {
          &printflush(RIPLOG,"cdd failed on $tracklist[$_ - 1]\n");
@@ -220,7 +313,7 @@
      else {
        die "No CD Ripper defined";
      }
-@@ -381,11 +436,13 @@
+@@ -381,11 +468,13 @@
      rename "$riptrackname.rip","$riptrackname.wav";
  
      &printflush(RIPLOG,"Rip complete $tracklist[$_ - 1]\n");
@@ -238,7 +331,7 @@
      }
  
    }
-@@ -407,24 +464,37 @@
+@@ -407,24 +496,61 @@
      $riptrackno = $_;
      $ncount++;
   
@@ -249,20 +342,45 @@
      # timeout after 30 minutes
      $x=0;
 -    while( ! -r "$riptrackname.wav" ){ 
-+    while( ! -r "$riptrackname.wav" && ! -r "$riptrackname.mp3" ){ 
++    while( ! -r "$riptrackname.wav" && ! -r "$riptrackname$mp3ext" ){ 
        $x++; 
        if ($x > 179) { die "MP3 encoder waited 30 minutes before giving up"; } 
 +      if ($ripper_died) { die "CD Ripper seems to have died - exiting"; }
        sleep 10;
      }
  
-+    if ( ! -r "$riptrackname.mp3" ) {
++    if ( ! -r "$riptrackname$mp3ext" ) {
 +    print "\nMP3 Encoding track ".$ncount." of ".($#seltrack + 1)."\n";
 +    &printflush(RIPLOG,"Encoding $tracklist[$_ - 1]...\n");
 +
++    my($ttitle,$tartist,$tcomment);
++    if ($various == 1) {
++      ($tartist, $ttitle) = split(/ - /, $tracklist[$_ - 1], 2);
++      if ($ttitle eq "") {
++        $ttitle = $tartist;
++        $tartist = $artist;
++      }
++    } else {
++      $ttitle = $tracklist[$_ - 1];
++      $tartist = $artist;
++    }
++    $tcomment = "";
++    if ($ttitle =~ /^(\(.*\)) /) {
++      $tcomment .= $1;
++      $tcomment =~ s/\(//;
++      $tcomment =~ s/\)//;
++      $ttitle =~ s/^\(.*?\) //g;
++    }
++    if ($ttitle =~ /(\(.*\))$/) {
++      $tcomment .= $1;
++      $tcomment =~ s/\(//;
++      $tcomment =~ s/\)//;
++      $ttitle =~ s/ \(.*?\)$//g;
++    }
      # Set the encoder we are going to use
      if ($encoder == 0) {
-       $enc = "lame $encopt -S -b $bitrate --tt \"$tracklist[$_ - 1]\" --ta \"$artist\" --tl \"$album\" --ty \"$year\" --tg \"$genre\" --tn $riptrackno --add-id3v2 \"$riptrackname.wav\" \"$riptrackname.mp3\"";
+-      $enc = "lame $encopt -S -b $bitrate --tt \"$tracklist[$_ - 1]\" --ta \"$artist\" --tl \"$album\" --ty \"$year\" --tg \"$genre\" --tn $riptrackno --add-id3v2 \"$riptrackname.wav\" \"$riptrackname.mp3\"";
++      $enc = "lame $encopt -S --tt \"$ttitle\" --ta \"$tartist\" --tl \"$album\" --tc \"$tcomment\" --ty \"$year\" --tg \"$genre\" --tn $riptrackno \"$riptrackname.wav\" \"$riptrackname.mp3\"";
      }
      elsif ($encoder == 1) {
 -      $enc = "oggenc $encopt -b $bitrate -t \"$tracklist[$_ - 1]\" -a \"$artist\" -l \"$album\" -d \"$year\" -N $riptrackno -o \"$riptrackname.ogg\" \"$riptrackname.wav\"";
@@ -274,14 +392,14 @@
 +      } else {
 +	$oggenc_quality_option = "-b $bitrate";
 +      }
-+      $enc = "oggenc $encopt $oggenc_quality_option -t \"$tracklist[$_ - 1]\" -a \"$artist\" -l \"$album\" -d \"$year\" -N $riptrackno -o \"$riptrackname.ogg\" \"$riptrackname.wav\"";
++      $enc = "oggenc $encopt $oggenc_quality_option -t \"$ttitle\" -a \"$tartist\" -l \"$album\" -d \"$year\" -N $riptrackno -G \"$genre\" -c \"$tcomment\" -o \"$riptrackname.ogg\" \"$riptrackname.wav\"";
 +    }
 +    else {
 +      die "No encoder defined";
      }
  
      if ( ! system("$enc >$enclog 2>&1 </dev/null")) {
-@@ -438,7 +508,8 @@
+@@ -438,7 +564,8 @@
        &printflush(RIPLOG,"MP3 Encoder Failed on $tracklist[$_ - 1]\n");
        die "MP3 Encoder Failed on $tracklist[$_ - 1]";
      }
@@ -291,17 +409,25 @@
    }
    exit ;
  }
-@@ -452,10 +523,10 @@
-   $file="$artist.m3u";
-   if ($use_underscore == 1) { $file =~ s/ /_/g; }
+@@ -449,13 +576,13 @@
+ sub create_m3u {
+   my ($file);
  
+-  $file="$artist.m3u";
++  $file = $outputdir."/All.m3u";
+   if ($use_underscore == 1) { $file =~ s/ /_/g; }
+-
 -  if($encoder == 1) {
 -    system("cd \"$mp3dir\" ; ls -rt *.ogg >\"$file\"");
-+  if($encoder == 2) {
-+    system("cd \"$mp3dir\" ; ls *.ogg | sort >\"$file\"");
-   }
-   else {
+-  }
+-  else {
 -    system("cd \"$mp3dir\" ; ls -rt *.mp3 >\"$file\"");
-+    system("cd \"$mp3dir\" ; ls *.mp3 | sort >\"$file\"");
-   }
+-  }
++  system("cd \"$outputdir\" ; ls */*/*$mp3ext | sort >\"$file\"");
++  $file = $mp3dir."/../$artist.m3u";
++  if ($use_underscore == 1) { $file =~ s/ /_/g; }
++  system("cd \"$mp3dir/..\" ; ls */*$mp3ext | sort >\"$file\"");
++  $file = $mp3dir."$album.m3u";
++  if ($use_underscore == 1) { $file =~ s/ /_/g; }
++  system("cd \"$mp3dir\" ; ls *$mp3ext | sort >\"$file\"");
  }
--- /usr/ports.ref/editors/cooledit/files/patch-am	Thu Jan  1 02:00:00 1970
+++ editors/cooledit/files/patch-am	Sun Jan  6 22:02:56 2002
@@ -0,0 +1,20 @@
+--- configure.orig	Mon Sep  4 08:51:32 2000
++++ configure	Thu Nov  9 01:37:48 2000
+@@ -3112,7 +3112,7 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   
+-			PT="-lc_r"
++			PT="-pthread"
+ 		    
+ else
+   echo "$ac_t""no" 1>&6
+@@ -3256,7 +3256,7 @@
+ 	echo "$ac_t""no" 1>&6
+     fi
+     PYTHON_LIBS="-L$PYTHON_LIBDIR -l$LIBPY $EXTRA_PYTHON_LIBS $PT -lm"
+-    PYTHON_INCLUDES="-I$PYTHON_INCLUDEDIR"
++    PYTHON_INCLUDES="-I$PYTHON_INCLUDEDIR -DTHREAD_SAFE"
+ else
+     echo "$ac_t""no" 1>&6
+     PYTHON_LIBS=""
--- /usr/ports.ref/graphics/mplayer/Makefile	Sun Oct 20 01:15:31 2002
+++ graphics/mplayer/Makefile	Sun Oct 20 01:31:50 2002
@@ -24,7 +24,7 @@
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		mp3lame.0:${PORTSDIR}/audio/lame
-RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
+RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts/iso-8859-1/arial-14/font.desc:${PORTSDIR}/graphics/mplayer-fonts
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
--- /usr/ports.ref/mail/mutt/files/patch-04	Thu Jan  1 02:00:00 1970
+++ mail/mutt/files/patch-04	Sun Jan  6 22:05:02 2002
@@ -0,0 +1,41 @@
+--- configure.orig	Tue Jan 18 14:19:14 2000
++++ configure	Tue Feb 29 01:47:49 2000
+@@ -1925,6 +1925,9 @@
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
++#ifdef __FreeBSD__
++#define bkgdset initscr
++#endif
+ 
+ int main() {
+ 
+@@ -4936,15 +4939,15 @@
+ fi
+ 
+         
+-	USE_INCLUDED_LIBINTL=yes
++	USE_INCLUDED_LIBINTL=no
+         CATOBJEXT=.gmo
+         INSTOBJEXT=.mo
+         DATADIRNAME=share
+-	INTLDEPS='$(top_builddir)/intl/libintl.a'
++	INTLDEPS='-lintl'
+ 	INTLLIBS=$INTLDEPS
+ 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+-        nls_cv_header_intl=intl/libintl.h
+-        nls_cv_header_libgt=intl/libgettext.h
++#        nls_cv_header_intl=intl/libintl.h
++#        nls_cv_header_libgt=intl/libgettext.h
+       fi
+ 
+             if test "$XGETTEXT" != ":"; then
+@@ -5710,7 +5713,7 @@
+ s%@FFLAGS@%$FFLAGS%g
+ s%@DEFS@%$DEFS%g
+ s%@LDFLAGS@%$LDFLAGS%g
+-s%@LIBS@%$LIBS%g
++s%@LIBS@%$LIBS -lxpg4%g
+ s%@exec_prefix@%$exec_prefix%g
+ s%@prefix@%$prefix%g
+ s%@program_transform_name@%$program_transform_name%g
--- /usr/ports.ref/math/gnuplot/Makefile	Tue Sep 11 05:19:45 2001
+++ math/gnuplot/Makefile	Tue Feb 26 02:41:39 2002
@@ -17,6 +17,7 @@
 		gd.2:${PORTSDIR}/graphics/gd
 
 USE_XLIB=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/gd"
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
--- /usr/ports.ref/math/octave/Makefile	Mon Jul  3 06:48:29 2000
+++ math/octave/Makefile	Thu Aug 22 15:09:36 2002
@@ -8,7 +8,8 @@
 PORTNAME=	octave
 PORTVERSION=	2.1.30
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
+MASTER_SITES=	ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
+		ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/
 
 MAINTAINER=	chuckr@FreeBSD.org
--- /usr/ports.ref/misc/gnomehier/Makefile	Thu Jul 11 23:38:43 2002
+++ misc/gnomehier/Makefile	Thu Jul 11 23:58:37 2002
@@ -16,17 +16,27 @@
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-
-USE_X_PREFIX=	yes
+PREFIX=		${X11BASE}
 
 do-fetch:
 	@${DO_NADA}
 
 do-install:
-	@for dir in `${CAT} ${FILESDIR}/dirlist`; \
+	for dir in `${GREP} '@dirrm' ${PLIST} | sed -e 's^@dirrm ^^g'`; \
 	do \
 		${MKDIR} ${PREFIX}/$${dir}; \
 		${TOUCH} ${PREFIX}/$${dir}/.keep_me; \
+	done
+
+generate-plist:
+	@${ECHO_MSG} "===>   Generating temporary packing list"
+	@${MKDIR} `dirname ${TMPPLIST}`
+	@if [ ! -f ${PLIST} -o ! -f ${COMMENT} -o ! -f ${DESCR} ]; then ${ECHO_CMD} "** Missing package files for ${PKGNAME}."; exit 1; fi
+	@>${TMPPLIST}
+	@for dir in `${GREP} '@dirrm' ${PLIST} | sed -e 's^@dirrm ^^g'`; \
+	do \
+		${ECHO_CMD} $${dir}/.keep_me >> ${TMPPLIST}; \
+		${ECHO_CMD} @dirrm $${dir} >> ${TMPPLIST}; \
 	done
 
 .include <bsd.port.mk>
--- /usr/ports.ref/misc/gnomehier/files/dirlist	Thu Jul 11 23:38:43 2002
+++ misc/gnomehier/files/dirlist	Thu Jul 11 23:57:43 2002
@@ -1,246 +0,0 @@
-etc/CORBA
-etc/CORBA/servers
-etc/X11
-etc/X11/serverconfig
-etc/X11/starthere
-etc/X11/sysconfig
-etc/gconf
-etc/gconf/gconf.xml.defaults
-etc/gconf/gconf.xml.defaults/apps
-etc/gconf/gconf.xml.defaults/apps/eog
-etc/gconf/gconf.xml.defaults/apps/eog/full_screen
-etc/gconf/gconf.xml.defaults/apps/eog/view
-etc/gconf/gconf.xml.defaults/apps/eog/window
-etc/gconf/gconf.xml.defaults/schemas
-etc/gconf/gconf.xml.defaults/schemas/apps
-etc/gconf/gconf.xml.defaults/schemas/apps/eog
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/view
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
-etc/gconf/gconf.xml.mandatory
-etc/gconf/schemas
-etc/gdm
-etc/gdm/Init
-etc/gdm/PostSession
-etc/gdm/PreSession
-etc/gdm/Sessions
-etc/gnome
-etc/gnome/config
-etc/gnome-vfs-2.0
-etc/gnome-vfs-2.0/modules
-etc/sound
-etc/sound/events
-etc/vfs
-etc/vfs/modules
-include/gconf
-include/gdkcardimage
-include/gnome-1.0
-include/libnautilus
-lib/GConf
-lib/bonobo
-lib/bonobo/monikers
-lib/bonobo/plugin
-lib/gnome-pilot
-lib/gnome-pilot/conduits
-lib/gnome-vfs-2.0
-lib/gnome-vfs-2.0/modules
-lib/gtk-2.0
-lib/libglade
-lib/libglade/2.0
-lib/vfs
-lib/vfs/modules
-libdata/bonobo
-libdata/bonobo/servers
-libexec/sawfish
-share/doc/libgda
-share/gnome
-share/gnome/applets
-share/gnome/applets/Amusements
-share/gnome/applets/Clocks
-share/gnome/applets/Monitors
-share/gnome/applets/Multimedia
-share/gnome/applets/Network
-share/gnome/applets/Utility
-share/gnome/application-registry
-share/gnome/applications
-share/gnome/apps
-share/gnome/apps/Applications
-share/gnome/apps/Development
-share/gnome/apps/Games
-share/gnome/apps/Graphics
-share/gnome/apps/Internet
-share/gnome/apps/Multimedia
-share/gnome/apps/Settings
-share/gnome/apps/Settings/Desktop
-share/gnome/apps/Settings/Documents
-share/gnome/apps/Settings/Peripherals
-share/gnome/apps/Settings/Session
-share/gnome/apps/System
-share/gnome/apps/Utilities
-share/gnome/bug-buddy
-share/gnome/bug-buddy/bugzilla
-share/gnome/bug-buddy/bugzilla/gnome
-share/gnome/bug-buddy/bugzilla/ximian
-share/gnome/control-center
-share/gnome/control-center-2.0
-share/gnome/control-center-2.0/capplets
-share/gnome/control-center/Desktop
-share/gnome/control-center/Documents
-share/gnome/control-center/Peripherals
-share/gnome/control-center/Session
-share/gnome/fonts
-share/gnome/games
-share/gnome/gdm
-share/gnome/geyes
-share/gnome/geyes/Bizarre
-share/gnome/geyes/Bloodshot
-share/gnome/geyes/Default
-share/gnome/geyes/Default-tiny
-share/gnome/geyes/Horrid
-share/gnome/gkb
-share/gnome/gnect
-share/gnome/gnibbles
-share/gnome/gnobots2
-share/gnome/gnome-2.0
-share/gnome/gnome-2.0/ui
-share/gnome/gnome-about
-share/gnome/gnome-pilot
-share/gnome/gnome-pilot/conduits
-share/gnome/gnome-stones
-share/gnome/gnome-stones/objects
-share/gnome/gnome-terminal
-share/gnome/gnome-terminal/glade
-share/gnome/gweather
-share/gnome/help
-share/gnome/help/aisleriot
-share/gnome/help/aisleriot/C
-share/gnome/help/aisleriot/C/figures
-share/gnome/help/bug-buddy
-share/gnome/help/bug-buddy/C
-share/gnome/help/eog
-share/gnome/help/eog/C
-share/gnome/help/fdl
-share/gnome/help/fdl/C
-share/gnome/help/gataxx
-share/gnome/help/gataxx/C
-share/gnome/help/gataxx/C/figures
-share/gnome/help/gedit
-share/gnome/help/gedit/C
-share/gnome/help/gnect
-share/gnome/help/gnect/C
-share/gnome/help/gnect/C/figures
-share/gnome/help/gnibbles
-share/gnome/help/gnibbles/C
-share/gnome/help/gnibbles/C/figures
-share/gnome/help/gnobots2
-share/gnome/help/gnobots2/C
-share/gnome/help/gnobots2/C/figures
-share/gnome/help/gnobots2/da
-share/gnome/help/gnobots2/es
-share/gnome/help/gnobots2/it
-share/gnome/help/gnome-stones
-share/gnome/help/gnome-stones/C
-share/gnome/help/gnome-stones/C/figures
-share/gnome/help/gnome-terminal
-share/gnome/help/gnome-terminal/C
-share/gnome/help/gnotravex
-share/gnome/help/gnotravex/C
-share/gnome/help/gnotravex/C/figures
-share/gnome/help/gpl
-share/gnome/help/gpl/C
-share/gnome/help/gtali
-share/gnome/help/gtali/C
-share/gnome/help/gtali/C/figures
-share/gnome/help/gtali/da
-share/gnome/help/iagno
-share/gnome/help/iagno/C
-share/gnome/help/iagno/C/figures
-share/gnome/help/lgpl
-share/gnome/help/lgpl/C
-share/gnome/help/mahjongg
-share/gnome/help/mahjongg/C
-share/gnome/help/mahjongg/C/figures
-share/gnome/help/same-gnome
-share/gnome/help/same-gnome/C
-share/gnome/idl
-share/gnome/images
-share/gnome/mc
-share/gnome/mc/templates
-share/gnome/mime-info
-share/gnome/nautilus
-share/gnome/nautilus/emblems
-share/gnome/nautilus/patterns
-share/gnome/nautilus/services
-share/gnome/nautilus/services/text
-share/gnome/oaf
-share/gnome/omf
-share/gnome/omf/gnome-applets
-share/gnome/omf/gnome-games
-share/gnome/omf/gnome-media
-share/gnome/omf/gnome-utils
-share/gnome/panel
-share/gnome/pixmaps
-share/gnome/pixmaps/cards
-share/gnome/pixmaps/cards/backs
-share/gnome/pixmaps/cards/honors
-share/gnome/pixmaps/cards/jokers
-share/gnome/pixmaps/cards/ranks
-share/gnome/pixmaps/cards/slots
-share/gnome/pixmaps/cards/suits_large
-share/gnome/pixmaps/cards/suits_medium
-share/gnome/pixmaps/cards/suits_small
-share/gnome/pixmaps/eog
-share/gnome/pixmaps/fish
-share/gnome/pixmaps/gataxx
-share/gnome/pixmaps/gkb
-share/gnome/pixmaps/glines
-share/gnome/pixmaps/gnect
-share/gnome/pixmaps/gnibbles
-share/gnome/pixmaps/gnobots2
-share/gnome/pixmaps/gnome-stones
-share/gnome/pixmaps/gnometris
-share/gnome/pixmaps/gnometris/bg
-share/gnome/pixmaps/gnotravex
-share/gnome/pixmaps/gweather
-share/gnome/pixmaps/iagno
-share/gnome/pixmaps/mahjongg
-share/gnome/pixmaps/mahjongg/bg
-share/gnome/pixmaps/mailcheck
-share/gnome/pixmaps/mini-commander
-share/gnome/pixmaps/nautilus
-share/gnome/pixmaps/nautilus/crux_eggplant
-share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds
-share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber
-share/gnome/pixmaps/nautilus/crux_teal
-share/gnome/pixmaps/nautilus/crux_teal/backgrounds
-share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces
-share/gnome/pixmaps/nautilus/crux_teal/throbber
-share/gnome/pixmaps/nautilus/gnome
-share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces
-share/gnome/pixmaps/nautilus/gnome/throbber
-share/gnome/pixmaps/nautilus/sidebar_tab_pieces
-share/gnome/pixmaps/nautilus/sierra
-share/gnome/pixmaps/nautilus/tahoe
-share/gnome/pixmaps/nautilus/throbber
-share/gnome/pixmaps/same-gnome
-share/gnome/pixmaps/splash
-share/gnome/sgml
-share/gnome/sgml/docbook
-share/gnome/sgml/docbook/gnome-customization-0.1
-share/gnome/sol-games
-share/gnome/sounds
-share/gnome/sounds/gataxx
-share/gnome/sounds/gnibbles
-share/gnome/sounds/gnobots2
-share/gnome/sounds/iagno
-share/gnome/ui
-share/gnome/vfolders
-share/gnome/wm-properties
-share/gnome/xbill
-share/gnome/xbill/cursors
-share/gnome/xbill/pixmaps
-share/gnome/xmodmap
-share/sawfish
-share/sawfish/sounds
-share/sawfish/themes
--- /usr/ports.ref/misc/gnomehier/pkg-plist	Thu Jul 11 23:38:43 2002
+++ misc/gnomehier/pkg-plist	Thu Jul 11 23:59:20 2002
@@ -1,249 +1,3 @@
-etc/CORBA/.keep_me
-etc/CORBA/servers/.keep_me
-etc/X11/.keep_me
-etc/X11/serverconfig/.keep_me
-etc/X11/starthere/.keep_me
-etc/X11/sysconfig/.keep_me
-etc/gconf/.keep_me
-etc/gconf/gconf.xml.defaults/.keep_me
-etc/gconf/gconf.xml.defaults/apps/.keep_me
-etc/gconf/gconf.xml.defaults/apps/eog/.keep_me
-etc/gconf/gconf.xml.defaults/apps/eog/full_screen/.keep_me
-etc/gconf/gconf.xml.defaults/apps/eog/view/.keep_me
-etc/gconf/gconf.xml.defaults/apps/eog/window/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/.keep_me
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/.keep_me
-etc/gconf/gconf.xml.mandatory/.keep_me
-etc/gconf/schemas/.keep_me
-etc/gdm/.keep_me
-etc/gdm/Init/.keep_me
-etc/gdm/PostSession/.keep_me
-etc/gdm/PreSession/.keep_me
-etc/gdm/Sessions/.keep_me
-etc/gnome-vfs-2.0/.keep_me
-etc/gnome-vfs-2.0/modules/.keep_me
-etc/gnome/.keep_me
-etc/gnome/config/.keep_me
-etc/sound/.keep_me
-etc/sound/events/.keep_me
-etc/vfs/.keep_me
-etc/vfs/modules/.keep_me
-include/gconf/.keep_me
-include/gdkcardimage/.keep_me
-include/gnome-1.0/.keep_me
-include/libnautilus/.keep_me
-lib/GConf/.keep_me
-lib/bonobo/.keep_me
-lib/bonobo/monikers/.keep_me
-lib/bonobo/plugin/.keep_me
-lib/gnome-pilot/.keep_me
-lib/gnome-pilot/conduits/.keep_me
-lib/gnome-vfs-2.0/.keep_me
-lib/gnome-vfs-2.0/modules/.keep_me
-lib/gtk-2.0/.keep_me
-lib/libglade/.keep_me
-lib/libglade/2.0/.keep_me
-lib/vfs/.keep_me
-lib/vfs/modules/.keep_me
-libdata/bonobo/.keep_me
-libdata/bonobo/servers/.keep_me
-libexec/sawfish/.keep_me
-share/doc/libgda/.keep_me
-share/gnome/.keep_me
-share/gnome/applets/.keep_me
-share/gnome/applets/Amusements/.keep_me
-share/gnome/applets/Clocks/.keep_me
-share/gnome/applets/Monitors/.keep_me
-share/gnome/applets/Multimedia/.keep_me
-share/gnome/applets/Network/.keep_me
-share/gnome/applets/Utility/.keep_me
-share/gnome/application-registry/.keep_me
-share/gnome/applications/.keep_me
-share/gnome/apps/.keep_me
-share/gnome/apps/Applications/.keep_me
-share/gnome/apps/Development/.keep_me
-share/gnome/apps/Games/.keep_me
-share/gnome/apps/Graphics/.keep_me
-share/gnome/apps/Internet/.keep_me
-share/gnome/apps/Multimedia/.keep_me
-share/gnome/apps/Settings/.keep_me
-share/gnome/apps/Settings/Desktop/.keep_me
-share/gnome/apps/Settings/Documents/.keep_me
-share/gnome/apps/Settings/Peripherals/.keep_me
-share/gnome/apps/Settings/Session/.keep_me
-share/gnome/apps/System/.keep_me
-share/gnome/apps/Utilities/.keep_me
-share/gnome/bug-buddy/.keep_me
-share/gnome/bug-buddy/bugzilla/.keep_me
-share/gnome/bug-buddy/bugzilla/gnome/.keep_me
-share/gnome/bug-buddy/bugzilla/ximian/.keep_me
-share/gnome/control-center-2.0/.keep_me
-share/gnome/control-center-2.0/capplets/.keep_me
-share/gnome/control-center/.keep_me
-share/gnome/control-center/Desktop/.keep_me
-share/gnome/control-center/Documents/.keep_me
-share/gnome/control-center/Peripherals/.keep_me
-share/gnome/control-center/Session/.keep_me
-share/gnome/fonts/.keep_me
-share/gnome/games/.keep_me
-share/gnome/gdm/.keep_me
-share/gnome/geyes/.keep_me
-share/gnome/geyes/Bizarre/.keep_me
-share/gnome/geyes/Bloodshot/.keep_me
-share/gnome/geyes/Default-tiny/.keep_me
-share/gnome/geyes/Default/.keep_me
-share/gnome/geyes/Horrid/.keep_me
-share/gnome/gkb/.keep_me
-share/gnome/gnect/.keep_me
-share/gnome/gnibbles/.keep_me
-share/gnome/gnobots2/.keep_me
-share/gnome/gnome-2.0/.keep_me
-share/gnome/gnome-2.0/ui/.keep_me
-share/gnome/gnome-about/.keep_me
-share/gnome/gnome-pilot/.keep_me
-share/gnome/gnome-pilot/conduits/.keep_me
-share/gnome/gnome-stones/.keep_me
-share/gnome/gnome-stones/objects/.keep_me
-share/gnome/gnome-terminal/.keep_me
-share/gnome/gnome-terminal/glade/.keep_me
-share/gnome/gweather/.keep_me
-share/gnome/help/.keep_me
-share/gnome/help/aisleriot/.keep_me
-share/gnome/help/aisleriot/C/.keep_me
-share/gnome/help/aisleriot/C/figures/.keep_me
-share/gnome/help/bug-buddy/.keep_me
-share/gnome/help/bug-buddy/C/.keep_me
-share/gnome/help/eog/.keep_me
-share/gnome/help/eog/C/.keep_me
-share/gnome/help/fdl/.keep_me
-share/gnome/help/fdl/C/.keep_me
-share/gnome/help/gataxx/.keep_me
-share/gnome/help/gataxx/C/.keep_me
-share/gnome/help/gataxx/C/figures/.keep_me
-share/gnome/help/gedit/.keep_me
-share/gnome/help/gedit/C/.keep_me
-share/gnome/help/gnect/.keep_me
-share/gnome/help/gnect/C/.keep_me
-share/gnome/help/gnect/C/figures/.keep_me
-share/gnome/help/gnibbles/.keep_me
-share/gnome/help/gnibbles/C/.keep_me
-share/gnome/help/gnibbles/C/figures/.keep_me
-share/gnome/help/gnobots2/.keep_me
-share/gnome/help/gnobots2/C/.keep_me
-share/gnome/help/gnobots2/C/figures/.keep_me
-share/gnome/help/gnobots2/da/.keep_me
-share/gnome/help/gnobots2/es/.keep_me
-share/gnome/help/gnobots2/it/.keep_me
-share/gnome/help/gnome-stones/.keep_me
-share/gnome/help/gnome-stones/C/.keep_me
-share/gnome/help/gnome-stones/C/figures/.keep_me
-share/gnome/help/gnome-terminal/.keep_me
-share/gnome/help/gnome-terminal/C/.keep_me
-share/gnome/help/gnotravex/.keep_me
-share/gnome/help/gnotravex/C/.keep_me
-share/gnome/help/gnotravex/C/figures/.keep_me
-share/gnome/help/gpl/.keep_me
-share/gnome/help/gpl/C/.keep_me
-share/gnome/help/gtali/.keep_me
-share/gnome/help/gtali/C/.keep_me
-share/gnome/help/gtali/C/figures/.keep_me
-share/gnome/help/gtali/da/.keep_me
-share/gnome/help/iagno/.keep_me
-share/gnome/help/iagno/C/.keep_me
-share/gnome/help/iagno/C/figures/.keep_me
-share/gnome/help/lgpl/.keep_me
-share/gnome/help/lgpl/C/.keep_me
-share/gnome/help/mahjongg/.keep_me
-share/gnome/help/mahjongg/C/.keep_me
-share/gnome/help/mahjongg/C/figures/.keep_me
-share/gnome/help/same-gnome/.keep_me
-share/gnome/help/same-gnome/C/.keep_me
-share/gnome/idl/.keep_me
-share/gnome/images/.keep_me
-share/gnome/mc/.keep_me
-share/gnome/mc/templates/.keep_me
-share/gnome/mime-info/.keep_me
-share/gnome/nautilus/.keep_me
-share/gnome/nautilus/emblems/.keep_me
-share/gnome/nautilus/patterns/.keep_me
-share/gnome/nautilus/services/.keep_me
-share/gnome/nautilus/services/text/.keep_me
-share/gnome/oaf/.keep_me
-share/gnome/omf/.keep_me
-share/gnome/omf/gnome-applets/.keep_me
-share/gnome/omf/gnome-games/.keep_me
-share/gnome/omf/gnome-media/.keep_me
-share/gnome/omf/gnome-utils/.keep_me
-share/gnome/panel/.keep_me
-share/gnome/pixmaps/.keep_me
-share/gnome/pixmaps/cards/.keep_me
-share/gnome/pixmaps/cards/backs/.keep_me
-share/gnome/pixmaps/cards/honors/.keep_me
-share/gnome/pixmaps/cards/jokers/.keep_me
-share/gnome/pixmaps/cards/ranks/.keep_me
-share/gnome/pixmaps/cards/slots/.keep_me
-share/gnome/pixmaps/cards/suits_large/.keep_me
-share/gnome/pixmaps/cards/suits_medium/.keep_me
-share/gnome/pixmaps/cards/suits_small/.keep_me
-share/gnome/pixmaps/eog/.keep_me
-share/gnome/pixmaps/fish/.keep_me
-share/gnome/pixmaps/gataxx/.keep_me
-share/gnome/pixmaps/gkb/.keep_me
-share/gnome/pixmaps/glines/.keep_me
-share/gnome/pixmaps/gnect/.keep_me
-share/gnome/pixmaps/gnibbles/.keep_me
-share/gnome/pixmaps/gnobots2/.keep_me
-share/gnome/pixmaps/gnome-stones/.keep_me
-share/gnome/pixmaps/gnometris/.keep_me
-share/gnome/pixmaps/gnometris/bg/.keep_me
-share/gnome/pixmaps/gnotravex/.keep_me
-share/gnome/pixmaps/gweather/.keep_me
-share/gnome/pixmaps/iagno/.keep_me
-share/gnome/pixmaps/mahjongg/.keep_me
-share/gnome/pixmaps/mahjongg/bg/.keep_me
-share/gnome/pixmaps/mailcheck/.keep_me
-share/gnome/pixmaps/mini-commander/.keep_me
-share/gnome/pixmaps/nautilus/.keep_me
-share/gnome/pixmaps/nautilus/crux_eggplant/.keep_me
-share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/.keep_me
-share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/.keep_me
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/.keep_me
-share/gnome/pixmaps/nautilus/crux_teal/.keep_me
-share/gnome/pixmaps/nautilus/crux_teal/backgrounds/.keep_me
-share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/.keep_me
-share/gnome/pixmaps/nautilus/crux_teal/throbber/.keep_me
-share/gnome/pixmaps/nautilus/gnome/.keep_me
-share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/.keep_me
-share/gnome/pixmaps/nautilus/gnome/throbber/.keep_me
-share/gnome/pixmaps/nautilus/sidebar_tab_pieces/.keep_me
-share/gnome/pixmaps/nautilus/sierra/.keep_me
-share/gnome/pixmaps/nautilus/tahoe/.keep_me
-share/gnome/pixmaps/nautilus/throbber/.keep_me
-share/gnome/pixmaps/same-gnome/.keep_me
-share/gnome/pixmaps/splash/.keep_me
-share/gnome/sgml/.keep_me
-share/gnome/sgml/docbook/.keep_me
-share/gnome/sgml/docbook/gnome-customization-0.1/.keep_me
-share/gnome/sol-games/.keep_me
-share/gnome/sounds/.keep_me
-share/gnome/sounds/gataxx/.keep_me
-share/gnome/sounds/gnibbles/.keep_me
-share/gnome/sounds/gnobots2/.keep_me
-share/gnome/sounds/iagno/.keep_me
-share/gnome/ui/.keep_me
-share/gnome/vfolders/.keep_me
-share/gnome/wm-properties/.keep_me
-share/gnome/xbill/.keep_me
-share/gnome/xbill/cursors/.keep_me
-share/gnome/xbill/pixmaps/.keep_me
-share/gnome/xmodmap/.keep_me
-share/sawfish/.keep_me
-share/sawfish/sounds/.keep_me
-share/sawfish/themes/.keep_me
 @dirrm share/sawfish/themes
 @dirrm share/sawfish/sounds
 @dirrm share/sawfish
--- /usr/ports.ref/palm/pilot-link/files/patch-gcc31	Thu Jan  1 02:00:00 1970
+++ palm/pilot-link/files/patch-gcc31	Wed Jul 10 23:16:24 2002
@@ -0,0 +1,55 @@
+--- include/pi-address.hxx.orig	Wed Jul 10 23:13:43 2002
++++ include/pi-address.hxx	Wed Jul 10 23:13:54 2002
+@@ -33,7 +33,7 @@
+ 
+      char *_entry[19];
+      
+-     friend addressList_t;
++     friend class addressList_t;
+      
+      address_t *_next;
+ 
+--- include/pi-datebook.hxx.orig	Wed Jul 10 23:13:15 2002
++++ include/pi-datebook.hxx	Wed Jul 10 23:13:28 2002
+@@ -34,7 +34,7 @@
+      };
+ 
+    private:
+-     friend appointmentList_t;
++     friend class appointmentList_t;
+      
+      tm _begin;			// When the appointment begins
+      tm _end;			// When the appointment ends
+--- include/pi-iambicExpense.hxx.orig	Wed Jul 10 23:14:42 2002
++++ include/pi-iambicExpense.hxx	Wed Jul 10 23:14:52 2002
+@@ -27,7 +27,7 @@
+ 
+ class iambicExpense_t : public baseApp_t
+ {
+-     friend iambicExpenseList_t;
++     friend class iambicExpenseList_t;
+      
+      short _flags;
+      char *_type;
+--- include/pi-memo.hxx.orig	Wed Jul 10 23:14:24 2002
++++ include/pi-memo.hxx	Wed Jul 10 23:14:33 2002
+@@ -19,7 +19,7 @@
+ 
+ class memo_t : public baseApp_t
+ {
+-     friend memoList_t;
++     friend class memoList_t;
+      
+      char *_text;
+      int _size;
+--- include/pi-todo.hxx.orig	Wed Jul 10 23:14:05 2002
++++ include/pi-todo.hxx	Wed Jul 10 23:14:16 2002
+@@ -23,7 +23,7 @@
+ 
+ class todo_t : public baseApp_t
+ {
+-     friend todoList_t;
++     friend class todoList_t;
+      
+      struct tm *_due;		// Non-NULL if there is a due date
+      int _priority;		// A priority in the range 1-5
--- /usr/ports.ref/sysutils/wmavgload/files/patch-a0	Tue Nov 10 17:43:48 1998
+++ sysutils/wmavgload/files/patch-a0	Sun Jan  6 22:05:02 2002
@@ -1,36 +1,30 @@
-*** Imakefile.orig	Tue Jul 21 04:22:43 1998
---- Imakefile	Tue Jul 21 04:24:08 1998
-***************
-*** 2,8 ****
-  DESTDIR = /usr/X11R6
-  BINDIR = /bin
-  
-! XPMLIB = -L/usr/lib/X11 -L/opt/X11_Contrib/lib/sparc -lXpm -lm  
-  DEPLIBS = $(DEPXLIB) 
-  
-  /* uncomment -lrpcsvc at the end of the line below if compile on *sparc* */
---- 2,8 ----
-  DESTDIR = /usr/X11R6
-  BINDIR = /bin
-  
-! XPMLIB =  -lXpm -lm  
-  DEPLIBS = $(DEPXLIB) 
-  
-  /* uncomment -lrpcsvc at the end of the line below if compile on *sparc* */
-***************
-*** 10,16 ****
-  
-  LINTLIBS = $(LINTXLIB)
-  
-! EXTRA_INCLUDES = -I/opt/X11_Contrib/include
-  
-  /* if your compiler does not define linux 
-     please add -Dlinux below (if you are on a linux box :) */
---- 10,16 ----
-  
-  LINTLIBS = $(LINTXLIB)
-  
-! EXTRA_INCLUDES = 
-  
-  /* if your compiler does not define linux 
-     please add -Dlinux below (if you are on a linux box :) */
+--- Imakefile.orig	Mon Sep 28 15:06:35 1998
++++ Imakefile	Sat Dec 23 19:58:04 2000
+@@ -2,7 +2,7 @@
+ DESTDIR = /usr/X11R6
+ BINDIR = /bin
+ 
+-XPMLIB = -L/usr/lib/X11 -L/opt/X11_Contrib/lib/sparc -lXpm -lm  
++XPMLIB =  -lXpm -lm  
+ DEPLIBS = $(DEPXLIB) 
+ 
+ /* -lrpcsvc is required on SPARC or HP-UX */
+@@ -10,16 +10,12 @@
+ 
+ LINTLIBS = $(LINTXLIB)
+ 
+-EXTRA_INCLUDES = -I/opt/X11_Contrib/include
++EXTRA_INCLUDES = 
+ 
+ EXTRA_DEFINES = -DMANY_COLORS
+ 
+ SRCS = get_load.c wmavgload.c
+ OBJS = get_load.o wmavgload.o
+ 
+-wmavgload.man :
+-	@echo "no man page. see wmavgload -h instead or write one :)"
+-	@echo "your complation is still successful"
+-
+-ComplexProgramTarget(wmavgload)
++ComplexProgramTargetNoMan(wmavgload)
+ 
--- /usr/ports.ref/textproc/docbook-xml/pkg-plist	Tue Oct 15 23:05:17 2002
+++ textproc/docbook-xml/pkg-plist	Sun Oct 20 01:48:48 2002
@@ -33,4 +33,5 @@
 share/xml/docbook/%%DTD_VERSION%%/soextblx.dtd
 @dirrm share/xml/docbook/%%DTD_VERSION%%/ent
 @dirrm share/xml/docbook/%%DTD_VERSION%%
+share/xml/docbook/catalog
 @dirrm share/xml/docbook
--- /usr/ports.ref/textproc/docproj/Makefile	Fri Jul  5 23:06:02 2002
+++ textproc/docproj/Makefile	Fri Jul  5 23:06:02 2002
@@ -18,11 +18,11 @@
 
 RUN_DEPENDS=	instant:${PORTSDIR}/textproc/sgmlformat \
 		tidy:${PORTSDIR}/www/tidy \
-		${PREFIX}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textproc/dsssl-docbook-modular \
+		${PREFIX}/share/sgml/docbook/dsssl/modular/catalog:${PORTSDIR}/textproc/dsssl-docbook-modular \
 		${PREFIX}/share/sgml/html/catalog:${PORTSDIR}/textproc/html \
-		${PREFIX}/share/sgml/linuxdoc:${PORTSDIR}/textproc/linuxdoc \
+		${PREFIX}/share/sgml/linuxdoc/catalog:${PORTSDIR}/textproc/linuxdoc \
 		${PREFIX}/share/sgml/docbook/4.1/docbook.dtd:${PORTSDIR}/textproc/docbook-410 \
-		${PREFIX}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879 \
+		${PREFIX}/share/sgml/iso8879/catalog:${PORTSDIR}/textproc/iso8879 \
 		${PREFIX}/share/xml/dtd/xhtml/xhtml.soc:${PORTSDIR}/textproc/xhtml \
 		${PREFIX}/bin/peps:${PORTSDIR}/graphics/peps \
 		${PREFIX}/bin/pngtopnm:${PORTSDIR}/graphics/netpbm \
--- /usr/ports.ref/textproc/jade/files/patch-aa	Thu Jan  1 02:00:00 1970
+++ textproc/jade/files/patch-aa	Sun Jan  6 22:02:56 2002
@@ -0,0 +1,13 @@
+--- Makefile.comm.in.orig	Sun Dec 12 21:06:43 1999
++++ Makefile.comm.in	Sun Dec 12 21:08:59 1999
+@@ -24,8 +24,8 @@
+ LIBS=@LIBS@
+ DEFS=@DEFS@
+ INCS=-I$(srcdir) -I$(srcdir)/../include $(INCLUDE)
+-CXXFLAGS=@CXXFLAGS@ $(INCS) $(DEBUG) $(DEFS)
+-CFLAGS=@CFLAGS@ $(DEBUG) $(DEFS)
++CXXFLAGS+= $(INCS) $(DEBUG) $(DEFS)
++CFLAGS+= $(DEBUG) $(DEFS)
+ LDFLAGS=@LDFLAGS@
+ MSGGENFLAGS=
+ CXXDEPGENFLAGS=-MM
--- /usr/ports.ref/textproc/sgmlformat/Makefile	Fri Jan 18 00:38:19 2002
+++ textproc/sgmlformat/Makefile	Sat May 18 21:58:47 2002
@@ -30,8 +30,8 @@
 .else
 RUN_DEPENDS=	nsgmls:${PORTSDIR}/textproc/jade
 .endif
-RUN_DEPENDS+=	${PREFIX}/share/sgml/linuxdoc:${PORTSDIR}/textproc/linuxdoc \
-		${PREFIX}/share/sgml/docbook:${PORTSDIR}/textproc/docbook
+RUN_DEPENDS+=	${PREFIX}/share/sgml/linuxdoc/catalog:${PORTSDIR}/textproc/linuxdoc \
+		${PREFIX}/share/sgml/docbook/catalog:${PORTSDIR}/textproc/docbook
 
 USE_PERL5=	yes
 
--- /usr/ports.ref/x11-toolkits/panel--/files/patch-gcc31	Thu Jan  1 02:00:00 1970
+++ x11-toolkits/panel--/files/patch-gcc31	Thu Jul 11 01:17:50 2002
@@ -0,0 +1,15 @@
+--- panel--/applet-main.cc.orig	Thu Jul 11 01:15:36 2002
++++ panel--/applet-main.cc	Thu Jul 11 01:15:47 2002
+@@ -29,9 +29,9 @@
+ Applet_Main::Applet_Main(const Gtk::string &app_id,
+ 			 const Gtk::string &app_version,
+ 			 int argc, char **argv,
+-			 struct poptOption *options = 0,
+-			 unsigned int flags = 0,
+-			 poptContext *return_ctx = 0)
++			 struct poptOption *options,
++			 unsigned int flags,
++			 poptContext *return_ctx)
+ {
+   if (instance_) {
+     g_warning("Gnome_Applet_Main::Gnome_Applet_Main called twice!\n");