Index: head/net/gopher/Makefile
===================================================================
--- head/net/gopher/Makefile	(revision 447578)
+++ head/net/gopher/Makefile	(revision 447579)
@@ -1,33 +1,37 @@
 # Created by: ats (original)
 # $FreeBSD$
 
 PORTNAME=	gopher
 PORTVERSION=	3.0.6
 PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://gopher.quux.org:70/give-me-gopher/ \
-		http://dl.droso.net/FreeBSD/distfiles/
-DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}/${PORTNAME}
+		http://aaron.baugher.biz/files/FreeBSD/ports/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	aaron@baugher.biz
 COMMENT=	Gopher client for access to a distributed document service
 
-GNU_CONFIGURE=	yes
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USES=		gmake
+GNU_CONFIGURE=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's,<malloc.h>,<stdlib.h>,'
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gopher/gopher ${STAGEDIR}${PREFIX}/bin/gopher
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gopher
 	${INSTALL_DATA} ${WRKSRC}/gopher/gopher.rc ${STAGEDIR}${PREFIX}/etc/gopher/gopher.rc
 	${INSTALL_DATA} ${WRKSRC}/gopher/gopherremote.rc ${STAGEDIR}${PREFIX}/etc/gopher/gopherremote.rc
 	${INSTALL_DATA} ${WRKSRC}/gopher/gopher.hlp ${STAGEDIR}${PREFIX}/etc/gopher/gopher.hlp
 	${INSTALL_PROGRAM} ${WRKSRC}/gophfilt/gophfilt ${STAGEDIR}${PREFIX}/bin/gophfilt
 	${INSTALL_MAN} ${WRKSRC}/doc/gopher.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/gophfilt.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/gopherrc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 
 .include <bsd.port.mk>
Index: head/net/gopher/files/patch-gopher_form.c
===================================================================
--- head/net/gopher/files/patch-gopher_form.c	(revision 447578)
+++ head/net/gopher/files/patch-gopher_form.c	(revision 447579)
@@ -1,12 +1,12 @@
---- gopher/form.c.orig	Sun Aug 22 15:55:22 2004
-+++ gopher/form.c	Sun Aug 22 15:55:36 2004
-@@ -288,7 +288,8 @@
+--- gopher/form.c.orig	2003-08-18 16:58:14 UTC
++++ gopher/form.c
+@@ -288,7 +288,8 @@ FORMgetAskdata(GopherObj *gs, FORM *form
                 case ITEM_UNINIT: /* Unhandled cases... */
                 case ITEM_LABEL:
                 case ITEM_FILENAME:
 -	       }
 +	       break;
 +		}
  	  }
  	  responses[respnum++] = NULL;
       }
Index: head/net/gopher/files/patch-object_BLblock.c
===================================================================
--- head/net/gopher/files/patch-object_BLblock.c	(revision 447578)
+++ head/net/gopher/files/patch-object_BLblock.c	(revision 447579)
@@ -1,51 +1,51 @@
---- object/BLblock.c.orig	Sun Aug 22 15:52:31 2004
-+++ object/BLblock.c	Sun Aug 22 15:53:33 2004
-@@ -118,7 +118,7 @@
+--- object/BLblock.c.orig	2003-08-18 16:58:55 UTC
++++ object/BLblock.c
+@@ -118,7 +118,7 @@ BLinit(Blockobj *bl)
  	  STAinit(bl->data.text);
  	  break;
       case BDATA_NONE:
 -     }
 +     break;}
  }
  
  /*
-@@ -141,7 +141,8 @@
+@@ -141,7 +141,8 @@ BLdatadestroy(Blockobj *bl)
  	  GSdestroy(bl->data.gs);
  	  break;
       case BDATA_NONE:
 -     }
 +     break;
 +	}
  }
  
  /*
-@@ -174,7 +175,8 @@
+@@ -174,7 +175,8 @@ BLcpy(Blockobj *dest, Blockobj *orig)
  	  BLsetText(dest, orig->data.text);
  	  break;
       case BDATA_NONE:
 -     }
 +     break;
 +	}
  }
  
  
-@@ -209,7 +211,8 @@
+@@ -209,7 +211,8 @@ BLgetLine(Blockobj *bl, int lineno)
       case BDATA_NONE:
       case BDATA_FILE:
       case BDATA_GREF:
 -     }
 +     break;
 +	}
       return(NULL);
  }
  
-@@ -343,7 +346,8 @@
+@@ -343,7 +346,8 @@ BLtoNet(Blockobj *bl, int fd, boolean sh
  	  fclose(infile);
  	  break;
       case BDATA_NONE:
 -     }
 +     break;
 +	}
  }
  
  
Index: head/net/gopher/files/patch-object_GSgopherobj.c
===================================================================
--- head/net/gopher/files/patch-object_GSgopherobj.c	(revision 447578)
+++ head/net/gopher/files/patch-object_GSgopherobj.c	(revision 447579)
@@ -1,11 +1,11 @@
---- object/GSgopherobj.c.orig	Sun Aug 22 15:51:21 2004
-+++ object/GSgopherobj.c	Sun Aug 22 15:51:30 2004
-@@ -2003,7 +2003,7 @@
+--- object/GSgopherobj.c.orig	2003-08-18 16:58:58 UTC
++++ object/GSgopherobj.c
+@@ -2003,7 +2003,7 @@ GSfromURL(GopherObj *gs, char *urltxt, c
       case news:
       case unset:
       case unknown:
 -     }
 +     break;}
  
       if (serviceType == ftp) {
  	  if (!(doneflags & G_PATH)) {
Index: head/net/gopher/files/patch-object_Regex.c
===================================================================
--- head/net/gopher/files/patch-object_Regex.c	(revision 447578)
+++ head/net/gopher/files/patch-object_Regex.c	(revision 447579)
@@ -1,12 +1,12 @@
---- object/Regex.c.orig	Wed Dec 18 22:49:17 2002
-+++ object/Regex.c	Wed Dec 18 22:49:29 2002
+--- object/Regex.c.orig	2003-08-18 16:58:55 UTC
++++ object/Regex.c
 @@ -51,8 +51,8 @@
  
  #define  REGEX_CODEIT    /* only include sysv regex code once.. */
  #include "config.h"
 -#include "Regex.h"
  #include "Malloc.h"
 +#include "Regex.h"
  
  /**************************************************
   POSIX
Index: head/net/gopher/files/patch-object_url.c
===================================================================
--- head/net/gopher/files/patch-object_url.c	(revision 447578)
+++ head/net/gopher/files/patch-object_url.c	(revision 447579)
@@ -1,12 +1,12 @@
---- object/url.c.orig	Sun Aug 22 15:54:02 2004
-+++ object/url.c	Sun Aug 22 15:54:25 2004
-@@ -362,7 +362,8 @@
+--- object/url.c.orig	2003-08-18 16:58:57 UTC
++++ object/url.c
+@@ -362,7 +362,8 @@ URLparse(Url *url)
            case ftp:
            case unset:
            case unknown:
 -	  }
 +	  break; 
 +	}
  	  URLsetHost(url, cp);
       }