Update dgd to 1.2.0.4. Patch provided by the maintainer, Scott Thompson,

in PR pkg/24698.

Changes:
 - Fixed a bug with deleting mapping elements in atomic code.
 - Allow allocation of blocks up to 1G in size.
 - Fixed a bug that could cause a crash during the atomic commit phase.
 - While restoring a callout, not all appropriate fields were zeroed.
 - Some fixes to get restarting to work.
 - Make sure that a callout handle is not truncated to 16 bits before an
   attempt is made to remove it.
 - Made sure that destructing the driver object in atomic code does not lead
   to trouble.
 - Fixed a problem with driver->recompile() in multi-level atomic code.
 - Input blocking for binary connections didn't work.

Additionally, this update changes LICENSE to the more accurate
"fee-based-commercial-use."

4 files changed, 36 insertions, 29 deletions

diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 47eb3ea4476..62b46b907b1 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:22:19 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/08 01:56:53 minskim Exp $
 
-DISTNAME=	dgd-1.2p3
-PKGNAME=	dgd-1.2.0.3
+DISTNAME=	dgd-1.2p4
+PKGNAME=	dgd-1.2.0.4
 CATEGORIES=	net games
 MASTER_SITES=	ftp://ftp.dworkin.nl/pub/dgd/
 
@@ -9,9 +9,20 @@ MAINTAINER=     sco@openface.ca
 HOMEPAGE=	http://www.dworkin.nl/dgd/
 COMMENT=	Object-oriented programmable server
 
-LICENSE=	no-commercial-use
+LICENSE=	fee-based-commercial-use
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/dgd/src
+USE_BUILDLINK3=	yes
+
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	"Fixing hardcoded paths and command names."
+SUBST_STAGE.paths=	post-patch
+SUBST_FILES.paths=	../mud.dgd
+SUBST_SED.paths=	-e 's,/home/dworkin/,${PREFIX}/libdata/,g'
+
+INSTALLATION_DIRS=	libexec
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/a.out ${PREFIX}/libexec/dgd
@@ -25,7 +36,6 @@ do-install:
 	${GTAR} cCf ${WRKDIR}/dgd - mud | ${GTAR} xCf ${PREFIX}/libdata/dgd -
 	${CHOWN} -R ${BINOWN}:${BINGRP}  ${PREFIX}/libdata/dgd \
 		${PREFIX}/share/doc/dgd
-	${SED} -e "s#@PREFIX@#${PREFIX}#" ${WRKSRC}/../mud.dgd > \
-		${PREFIX}/share/examples/dgd/mud.dgd
+	${INSTALL_DATA} ${WRKSRC}/../mud.dgd ${PREFIX}/share/examples/dgd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dgd/distinfo b/net/dgd/distinfo
index 7d04f4dce07..f4c8c327ee9 100644
--- a/net/dgd/distinfo
+++ b/net/dgd/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/10/24 00:47:48 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2004/03/08 01:56:53 minskim Exp $
 
-SHA1 (dgd-1.2p3.tar.gz) = 5860a246bd21e13dec3383cdf514ddfe1e1acc2a
-Size (dgd-1.2p3.tar.gz) = 471351 bytes
-SHA1 (patch-aa) = bb85916706717011f00b21301ad17cfcefef68e9
-SHA1 (patch-ab) = 9efa9f6f8f457e2cce586ae6da2760708a8d26b4
+SHA1 (dgd-1.2p4.tar.gz) = 7a42cf6534ad114ab2eca6638414d5dd5595342a
+Size (dgd-1.2p4.tar.gz) = 472205 bytes
+SHA1 (patch-aa) = 9926a03ca84c0d9473b0f3ee7bd19167b11c3579
diff --git a/net/dgd/patches/patch-aa b/net/dgd/patches/patch-aa
index 9323993cebc..bd454f02f78 100644
--- a/net/dgd/patches/patch-aa
+++ b/net/dgd/patches/patch-aa
@@ -1,19 +1,27 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/25 15:19:37 tron Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/08 01:56:53 minskim Exp $
 
---- Makefile.orig	Wed Dec 20 05:13:29 2000
-+++ Makefile	Tue Aug 21 10:48:37 2001
-@@ -7,3 +7,3 @@
+--- Makefile.orig	2002-08-26 08:21:20.000000000 -0500
++++ Makefile
+@@ -5,11 +5,11 @@ 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=
-@@ -11,3 +11,3 @@
+ LIBS=
  LINTFLAGS=-abcehpruz
 -CC=	gcc
 +CC?=	gcc
  LD=	$(CC)
-@@ -22,2 +22,4 @@
+ DMAKE=	make
+ YACC=	yacc
+@@ -22,6 +22,8 @@ OBJ=	alloc.o error.o hash.o swap.o str.o
+ COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \
  	interpret.o config.o
-+
-+all:	a.out
  
++all:	a.out
++
+ a.out:	$(OBJ) always
+ 	cd comp; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' 'YACC=$(YACC)' dgd
+ 	cd lex; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
diff --git a/net/dgd/patches/patch-ab b/net/dgd/patches/patch-ab
deleted file mode 100644
index d27ff580f86..00000000000
--- a/net/dgd/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/04/25 15:19:37 tron Exp $
-
---- ../mud.dgd.orig	Thu Mar  4 15:54:52 1999
-+++ ../mud.dgd	Tue Apr 23 12:23:17 2002
-@@ -2,3 +2,4 @@
- binary_port	= 6048;			/* binary port number */
--directory	= "/home/dworkin/dgd/mud";/* base directory (MUST be absolute) */
-+directory	= "@PREFIX@/libdata/dgd/mud";
-+					/* base directory (MUST be absolute) */
- users		= 40;			/* max # of users */