5 files changed, 62 insertions, 142 deletions

diff --git a/net/dgd-net/Makefile b/net/dgd-net/Makefile
index 3ed3ff986cd1..b1c5911ed503 100644
--- a/net/dgd-net/Makefile
+++ b/net/dgd-net/Makefile
@@ -6,26 +6,10 @@
 #
 
 PORTNAME=	dgd-net
-PORTVERSION=	1.1.6
+PORTVERSION=	1.1.8
 CATEGORIES=	net lang
-MASTER_SITES=	ftp://ftp.imaginary.com/pub/LPC/servers/DGD/ \
-		ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/ \
-		ftp://ftp.veda.is/pub/mud/dgd/ \
-		ftp://ftp.dreamlabs.com/pub/mud/dgd/
-DISTFILES=	dgd-1.1.tar.gz
-
-PATCH_SITES=	ftp://ftp.imaginary.com/pub/LPC/servers/DGD/patches/ \
-		ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/patches/ \
-		ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/pkg/ \
-		ftp://ftp.veda.is/pub/mud/dgd/patches/ \
-		ftp://ftp.dreamlabs.com/pub/mud/dgd/patches/
-PATCHFILES=	net-10.dgd-1.1.gz \
-		1.1p1.gz \
-		1.1p2.gz \
-		1.1p3.gz \
-		1.1p4.gz \
-		1.1p5.gz \
-		1.1p6.gz
+MASTER_SITES=	ftp://ftp.imaginary.com/pub/LPC/servers/DGD/archive/
+DISTFILES=	dgd-1.1p8.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -42,6 +26,7 @@ PATCH_DIST_ARGS=	-d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
 
 pre-patch:
 	@${LN} -s dgd ${WRKDIR}/dgd+net
+	@mkdir ${WRKDIR}/dgd/bin
 
 post-build:
 	@cd ${WRKSRC}; ${MAKE} install
@@ -57,3 +42,4 @@ do-install:
 		| tar -C ${PREFIX} -xpf -
 
 .include <bsd.port.mk>
+
diff --git a/net/dgd-net/distinfo b/net/dgd-net/distinfo
index 97299d8771b3..953869e48353 100644
--- a/net/dgd-net/distinfo
+++ b/net/dgd-net/distinfo
@@ -1,8 +1 @@
-MD5 (dgd/dgd-1.1.tar.gz) = c8b2890b4bdf89e1f970be6c5ab4b261
-MD5 (dgd/net-10.dgd-1.1.gz) = 3566f7f33a50313a3126276bedfa5204
-MD5 (dgd/1.1p1.gz) = 43c83f51a9c78d4387ed4db5885a5d93
-MD5 (dgd/1.1p2.gz) = 3a3465932c617cc4dc30c8d0e5ecdfc2
-MD5 (dgd/1.1p3.gz) = 8d24516610b2b9c972757a747948d48c
-MD5 (dgd/1.1p4.gz) = 7589242d45ec5ee64c3b7500ab4d5ea3
-MD5 (dgd/1.1p5.gz) = 77483cd37cce9662cbf61c0383125b99
-MD5 (dgd/1.1p6.gz) = 7ff143ed6ad640c68e28c7b16ad9a193
+MD5 (dgd/dgd-1.1p8.tar.gz) = 8d2321c5f203609401a4eaa138bec469
diff --git a/net/dgd-net/files/patch-aa b/net/dgd-net/files/patch-aa
index 4691809a8cb0..880687e6cce5 100644
--- a/net/dgd-net/files/patch-aa
+++ b/net/dgd-net/files/patch-aa
@@ -1,90 +1,56 @@
-*** Makefile	Mon Jul 20 09:19:39 1998
---- Makefile.new	Mon Jul 20 09:23:57 1998
-***************
-*** 6,24 ****
-  DEBUG=
-  CCFLAGS=-O2 $(DEFINES) $(DEBUG)
-  CFLAGS=	-I. -Icomp -Ilex -Ied -Ikfun $(CCFLAGS)
-! LDFLAGS=
-! LIBS=
-! CC=	gcc
-  LD=	$(CC)
-  DMAKE=	make
-  BIN=	../bin
-  
-  OBJ=	alloc.o error.o hash.o swap.o str.o array.o object.o data.o path.o \
-! 	editor.o comm.net.o call_out.o interpret.o config.o dgd.o
-  EDOBJ=	alloc.o error.o
-  LEXOBJ=	alloc.o hash.o
-  COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \
-! 	interpret.o config.o
-  
-  a.out:	$(OBJ) always
-  	cd comp; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
---- 6,26 ----
-  DEBUG=
-  CCFLAGS=-O2 $(DEFINES) $(DEBUG)
-  CFLAGS=	-I. -Icomp -Ilex -Ied -Ikfun $(CCFLAGS)
-! LDFLAGS=-s
-! LIBS=-lcrypt -lgnuregex
-! CC=	cc
-  LD=	$(CC)
-  DMAKE=	make
-  BIN=	../bin
-  
-  OBJ=	alloc.o error.o hash.o swap.o str.o array.o object.o data.o path.o \
-! 	editor.o comm.net.o call_out.o interpret.o config.o dgd.o rgx.o
-  EDOBJ=	alloc.o error.o
-  LEXOBJ=	alloc.o hash.o
-  COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \
-! 	interpret.o config.o rgx.o
-! 
-! all: a.out comp/a.out
-  
-  a.out:	$(OBJ) always
-  	cd comp; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
-***************
-*** 38,44 ****
-  	-mv $(BIN)/driver $(BIN)/driver.old
-  	cp a.out $(BIN)/driver
-  
-! install: $(BIN)/driver
-  
-  comp.sub: $(COMPOBJ)
-  	@for i in $(COMPOBJ); do echo ../$$i; done > comp.sub
---- 40,50 ----
-  	-mv $(BIN)/driver $(BIN)/driver.old
-  	cp a.out $(BIN)/driver
-  
-! $(BIN)/precomp: comp/a.out
-! 	-mv $(BIN)/precomp $(BIN)/precomp.old
-! 	cp comp/a.out $(BIN)/precomp
-! 
-! install: $(BIN)/driver $(BIN)/precomp
-  
-  comp.sub: $(COMPOBJ)
-  	@for i in $(COMPOBJ); do echo ../$$i; done > comp.sub
-***************
-*** 54,60 ****
-  
-  comp/a.out:
-  	cd comp; $(DMAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' \
-! 			  'LIBS=$(LIBS)' a.out
-  
-  clean:
-  	rm -f a.out $(OBJ) comp.sub lex.sub ed.sub
---- 60,66 ----
-  
-  comp/a.out:
-  	cd comp; $(DMAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' \
-! 			'LDFLAGS=$(LDFLAGS)' 'LIBS=$(LIBS)' a.out
-  
-  clean:
-  	rm -f a.out $(OBJ) comp.sub lex.sub ed.sub
-***************
-*** 92,94 ****
---- 98,101 ----
-  call_out.o config.o dgd.o: call_out.h
-  error.o comm.o call_out.o config.o dgd.o: comm.h
-  config.o: version.h
-+ rgx.o: str.h array.h rgx.h interpret.h
+--- Makefile.orig	Sat Dec 15 14:14:50 2001
++++ Makefile	Sat Dec 15 14:17:42 2001
+@@ -6,19 +6,21 @@
+ DEBUG=
+ CCFLAGS=-O2 $(DEFINES) $(DEBUG)
+ CFLAGS=	-I. -Icomp -Ilex -Ied -Ikfun $(CCFLAGS)
+-LDFLAGS=
+-LIBS=
+-CC=	gcc
++LDFLAGS=	-s
++LIBS=	-lcrypt -lgnuregex
++CC?=	cc
+ LD=	$(CC)
+ DMAKE=	make
+ BIN=	../bin
+ 
+ OBJ=	alloc.o error.o hash.o swap.o str.o array.o object.o data.o path.o \
+-	editor.o comm.o call_out.o interpret.o config.o dgd.o
++	editor.o comm.o call_out.o interpret.o config.o dgd.o rgx.o
+ EDOBJ=	alloc.o error.o
+ LEXOBJ=	alloc.o hash.o
+ COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \
+-	interpret.o config.o
++	interpret.o config.o rgx.o
++
++all: a.out comp/a.out
+ 
+ a.out:	$(OBJ) always
+ 	cd comp; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
+@@ -38,7 +40,11 @@
+ 	-mv $(BIN)/driver $(BIN)/driver.old
+ 	cp a.out $(BIN)/driver
+ 
+-install: $(BIN)/driver
++$(BIN)/precomp: comp/a.out
++	-mv $(BIN)/precomp $(BIN)/precomp.old
++	cp comp/a.out $(BIN)/precomp
++
++install: $(BIN)/driver $(BIN)/precomp
+ 
+ comp.sub: $(COMPOBJ)
+ 	@for i in $(COMPOBJ); do echo ../$$i; done > comp.sub
+@@ -54,7 +60,7 @@
+ 
+ comp/a.out:
+ 	cd comp; $(DMAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' \
+-			  'LIBS=$(LIBS)' a.out
++		'LDFLAGS=$(LDFLAGS)' 'LIBS=$(LIBS)' a.out
+ 
+ clean:
+ 	rm -f a.out $(OBJ) comp.sub lex.sub ed.sub
+@@ -92,3 +98,4 @@
+ call_out.o config.o dgd.o: call_out.h
+ error.o comm.o call_out.o config.o dgd.o: comm.h
+ config.o: version.h
++rgx.o: str.h array.h rgx.h interpret.h
diff --git a/net/dgd-net/files/patch-ac b/net/dgd-net/files/patch-ac
deleted file mode 100644
index b637ea21817f..000000000000
--- a/net/dgd-net/files/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-*** ../Copyright.NET.old	Mon Jun 17 17:53:49 1996
---- ../Copyright.NET	Mon Jun 17 17:54:29 1996
-***************
-*** 3,9 ****
-  The package is also a derived work of Dworkin's Generic Driver, which
-  is copyrighted by BeeHive Internet Technologies, Inc.  Therefore, its
-  copyright applies to it in addition to mine.  Its license is included
-! in the file Copyright.DGD.
-  
-  I grant permission for any use of this package which does not conflict
-  with the terms of the DGD copyright mentioned above.
---- 3,9 ----
-  The package is also a derived work of Dworkin's Generic Driver, which
-  is copyrighted by BeeHive Internet Technologies, Inc.  Therefore, its
-  copyright applies to it in addition to mine.  Its license is included
-! in the file Copyright.
-  
-  I grant permission for any use of this package which does not conflict
-  with the terms of the DGD copyright mentioned above.
diff --git a/net/dgd-net/pkg-plist b/net/dgd-net/pkg-plist
index fdf190e20e0e..c79225a60a63 100644
--- a/net/dgd-net/pkg-plist
+++ b/net/dgd-net/pkg-plist
@@ -1,5 +1,4 @@
 dgd/Copyright
-dgd/Copyright.NET
 dgd/Credits
 dgd/README
 dgd/README.FreeBSD
@@ -10,7 +9,6 @@ dgd/bin/precomp.net
 dgd/doc/Commercial
 dgd/doc/Introduction.NET
 dgd/doc/LPC.html
-dgd/doc/Networking
 dgd/doc/Patching
 dgd/doc/Platforms
 dgd/doc/editor
@@ -22,7 +20,6 @@ dgd/doc/kfun/catch
 dgd/doc/kfun/ceil
 dgd/doc/kfun/clone_object
 dgd/doc/kfun/compile_object
-dgd/doc/kfun/connect
 dgd/doc/kfun/crypt
 dgd/doc/kfun/ctime
 dgd/doc/kfun/destruct_object
@@ -45,9 +42,7 @@ dgd/doc/kfun/map_sizeof
 dgd/doc/kfun/map_values
 dgd/doc/kfun/modf
 dgd/doc/kfun/object_name
-dgd/doc/kfun/open_port
 dgd/doc/kfun/parse_string
-dgd/doc/kfun/ports
 dgd/doc/kfun/previous_object
 dgd/doc/kfun/previous_program
 dgd/doc/kfun/query_editor
@@ -62,7 +57,6 @@ dgd/doc/kfun/remove_file
 dgd/doc/kfun/rename_file
 dgd/doc/kfun/restore_object
 dgd/doc/kfun/save_object
-dgd/doc/kfun/send_datagram
 dgd/doc/kfun/send_message.NET
 dgd/doc/kfun/shutdown
 dgd/doc/kfun/sizeof