4 files changed, 71 insertions, 93 deletions

diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 186576c6ea00..aaf8b2a3cd33 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,31 +1,24 @@
 # New ports collection makefile for:	dgd
 # Date created:		23 August 1994
-# Whom:			adam
+# Whom:			adam@veda.is
 #
 # $FreeBSD$
 #
 
 PORTNAME=	dgd
-PORTVERSION=	1.1.6
+PORTVERSION=	1.2
 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/
-DISTNAME=	dgd-1.1
 
 PATCH_SITES=	ftp://ftp.imaginary.com/pub/LPC/servers/DGD/patches/ \
 		ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/patches/ \
 		ftp://ftp.veda.is/pub/mud/dgd/patches/ \
 		ftp://ftp.dreamlabs.com/pub/mud/dgd/patches/
-PATCHFILES=	1.1p1.gz \
-		1.1p2.gz \
-		1.1p3.gz \
-		1.1p4.gz \
-		1.1p5.gz \
-		1.1p6.gz
-
-MAINTAINER=	adam@veda.is
+
+MAINTAINER=	ports@FreeBSD.org
 
 NO_CDROM=	"no distribution to corporate environment"
 RESTRICTED=	"license required for commercial use"
diff --git a/net/dgd/distinfo b/net/dgd/distinfo
index bc44ff5d0fdd..c581a21dce05 100644
--- a/net/dgd/distinfo
+++ b/net/dgd/distinfo
@@ -1,7 +1 @@
-MD5 (dgd/dgd-1.1.tar.gz) = c8b2890b4bdf89e1f970be6c5ab4b261
-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.2.tar.gz) = adc0c9f601454922d3ebf72a241b1c66
diff --git a/net/dgd/files/patch-aa b/net/dgd/files/patch-aa
index d6a64b2cf2f4..6f866c2b28bc 100644
--- a/net/dgd/files/patch-aa
+++ b/net/dgd/files/patch-aa
@@ -1,72 +1,49 @@
-*** Makefile	Sun Dec 10 19:21:36 1995
---- Makefile.new	Wed Feb  7 22:53:33 1996
-***************
-** 6,14 ****
-  DEBUG=
-  CCFLAGS=-O2 $(DEFINES) $(DEBUG)
-  CFLAGS= -I. -Icomp -Ilex -Ied -Ikfun $(CCFLAGS)
-! LDFLAGS=
-! LIBS=
-! CC=	gcc
-  LD=	$(CC)
-  DMAKE=	make
-  BIN=	../bin
---- 3,14 ----
-  DEBUG=
-  CCFLAGS=-O2 $(DEFINES) $(DEBUG)
-  CFLAGS= -I. -Icomp -Ilex -Ied -Ikfun $(CCFLAGS)
-! LDFLAGS=-s
-! LIBS=-lcrypt
-! CC=	cc
-  LD=	$(CC)
-  DMAKE=	make
-  BIN=	../bin
-***************
-*** 20,25 ****
---- 20,27 ----
-  COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \
-  	interpret.o config.o
-  
-+ all: a.out comp/a.out
-+ 
-  a.out:	$(OBJ) always
-  	cd comp; $(MAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
-  	cd lex; $(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
+--- Makefile.orig	Wed Dec 20 02:13:29 2000
++++ Makefile	Mon Mar 12 00:27:18 2001
+@@ -3,13 +3,12 @@
+ #
+ HOST=	NETBSD
+ DEFINES=-D$(HOST) #-DDUMP_FUNCS
+-DEBUG=	-O2
+ CCFLAGS=$(DEFINES) $(DEBUG)
+-CFLAGS=	-I. -Icomp -Ilex -Ied -Iparser -Ikfun $(CCFLAGS)
++CFLAGS+=	-I. -Icomp -Ilex -Ied -Iparser -Ikfun $(CCFLAGS)
+ LDFLAGS=
+ LIBS=
+ LINTFLAGS=-abcehpruz
+-CC=	gcc
++CC?=	gcc
+ LD=	$(CC)
+ DMAKE=	make
+ BIN=	../bin
+@@ -21,6 +20,8 @@
+ COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \
+ 	interpret.o config.o
+ 
++all: a.out comp/a.out
++
+ a.out:	$(OBJ) always
+ 	cd comp; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
+ 	cd lex; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
+@@ -41,7 +42,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
+ 
+ lint:
+ 	lint $(LINTFLAGS) $(CFLAGS) $(SRC)
+@@ -67,7 +72,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
diff --git a/net/dgd/pkg-plist b/net/dgd/pkg-plist
index 0f15960d0881..bb7e6103b487 100644
--- a/net/dgd/pkg-plist
+++ b/net/dgd/pkg-plist
@@ -8,14 +8,12 @@ dgd/bin/precomp
 dgd/doc/Commercial
 dgd/doc/Introduction
 dgd/doc/LPC.html
-dgd/doc/Patching
 dgd/doc/Platforms
 dgd/doc/editor
 dgd/doc/kfun/allocate
 dgd/doc/kfun/call_other
 dgd/doc/kfun/call_out
 dgd/doc/kfun/call_trace
-dgd/doc/kfun/catch
 dgd/doc/kfun/ceil
 dgd/doc/kfun/clone_object
 dgd/doc/kfun/compile_object
@@ -77,7 +75,6 @@ dgd/mud/doc/kernel/efun/event
 dgd/mud/doc/kernel/efun/find_object
 dgd/mud/doc/kernel/efun/get_dir
 dgd/mud/doc/kernel/efun/query_events
-dgd/mud/doc/kernel/efun/query_subscribed
 dgd/mud/doc/kernel/efun/remove_event
 dgd/mud/doc/kernel/efun/status
 dgd/mud/doc/kernel/efun/subscribe_event
@@ -116,3 +113,20 @@ dgd/mud/kernel/sys/driver.c
 dgd/mud/kernel/sys/objregd.c
 dgd/mud/kernel/sys/rsrcd.c
 dgd/mud/kernel/sys/userd.c
+@dirrm dgd/bin
+@dirrm dgd/doc/kfun
+@dirrm dgd/doc
+@dirrm dgd/mud/doc/kernel/efun
+@dirrm dgd/mud/doc/kernel/hook
+@dirrm dgd/mud/doc/kernel/lfun
+@dirrm dgd/mud/doc/kernel
+@dirrm dgd/mud/doc
+@dirrm dgd/mud/include/kernel
+@dirrm dgd/mud/include
+@dirrm dgd/mud/kernel/lib/api
+@dirrm dgd/mud/kernel/lib
+@dirrm dgd/mud/kernel/obj
+@dirrm dgd/mud/kernel/sys
+@dirrm dgd/mud/kernel
+@dirrm dgd/mud
+@dirrm dgd