. Update to dgd 1.4.1.

6 files changed, 80 insertions, 45 deletions

diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index b7a44182b471..3171e6547886 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dgd
-PORTVERSION=	1.4
+PORTVERSION=	1.4.1
 CATEGORIES=	net lang games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME}-osr|}:1 \
 		http://ftp.dworkin.nl/kernellib/:2 \
@@ -20,13 +20,15 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Dworkin's Game Driver
 
-OPTIONS=	NETWORKING	"With networking kfuns"		off
+OPTIONS=	NETWORKING	"With networking kfuns"		off \
+		DUMP		"With dump kfuns"		off
 
 DIST_SUBDIR=	dgd
 WRKSRC=		${WRKDIR}/dgd/src
 PATCH_WRKSRC=	${WRKDIR}/dgd
 ALL_TARGET=	install
 MAKE_JOBS_UNSAFE=	yes
+MAKE_ENV+=	EXTRA_DEFINES="$(EXTRA_DEFINES)"
 
 KERNELLIB_VERSION=	1.3
 EXTRA_PATCHES=		${WRKDIR}/${KERNELLIB_VERSION}-${KERNELLIB_VERSION}.1
@@ -37,31 +39,29 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
+EXTRA_DEFINES=
+
 .if defined(WITH_NETWORKING)
-MASTER_SITES+=	http://wotf.org/downloads/${PORTNAME}/:4
-DIST_FILES+=	Network-0.8-dgd-${PORTVERSION}.patch.gz:4
-EXTRA_PATCHES+=	${WRKDIR}/Network-0.8-dgd-${PORTVERSION}.patch \
-		${FILESDIR}/extrapatch-kernellib-net
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-kernellib-net
 PLIST_SUB+=	NETWORKING=""
+EXTRA_DEFINES+=	-DNETWORK_EXTENSIONS
 .else
 PLIST_SUB+=	NETWORKING="@comment "
 .endif
 
+.if defined(WITH_DUMP)
+EXTRA_DEFINES+=	-DDUMP_FUNCS
+.endif
+
 post-extract:
 	@${MV} ${WRKDIR}/kernellib ${WRKDIR}/dgd/
 
 pre-patch:
 	@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERNELLIB_VERSION}-${KERNELLIB_VERSION}.1.gz > ${WRKDIR}/${KERNELLIB_VERSION}-${KERNELLIB_VERSION}.1
-.if defined(WITH_NETWORKING)
-	@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/Network-0.8-dgd-${PORTVERSION}.patch.gz | ${SED} -e 's:^\*\*\* dgd/:*** :' -e 's:^--- dgd-net/:--- :'> ${WRKDIR}/Network-0.8-dgd-${PORTVERSION}.patch
-.endif
 
 post-patch:
 	@${MV} ${WRKSRC}/host/Makefile.bsd ${WRKSRC}/host/Makefile
-	@# There are here since the networking package modifies either these
-	@# lines or lines near them so they cannot be applied as patches.
-	@${REINPLACE_CMD} -e "s:^directory\([[:space:]]\)=\([[:space:]]\)\"[^\"]*\":directory\1=\2\"${DATADIR}/kernel\":" -e "s:tmp/swap:tmp/dgd.swap:" ${WRKDIR}/dgd/mud.dgd
-	@${REINPLACE_CMD} -e "/^DEBUG/d" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:" ${WRKDIR}/dgd/mud.dgd
 	@cd ${WRKDIR}/dgd/ && ${FIND} . -name '*.orig' -delete
 
 do-install:
@@ -80,30 +80,20 @@ do-install:
 	${CHMOD} a+x ${PREFIX}/etc/rc.d/dgd.sh.sample
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.ifdef (WITH_NETWORKING)
-	${INSTALL_DATA} ${WRKDIR}/dgd/Changelog.NET ${DOCSDIR}
-.endif
 	${INSTALL_DATA} ${WRKDIR}/dgd/COPYING ${DOCSDIR}
-.ifdef (WITH_NETWORKING)
-	${INSTALL_DATA} ${WRKDIR}/dgd/COPYING.NET ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/dgd/Copyright.NET ${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKDIR}/dgd/Changelog ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/dgd/Credits ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/dgd/README ${DOCSDIR}
-.ifdef (WITH_NETWORKING)
-	${INSTALL_DATA} ${WRKDIR}/dgd/README.NET ${DOCSDIR}
-.endif
-	cd ${WRKDIR}/dgd/doc && ${FIND} . \
-		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	cd ${WRKDIR}/dgd/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
 post-install:
-	# Need a temporary directory for certain files
-	${MKDIR} ${DATADIR}/tmp
-	# Run package installation script
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} \
+	@# Need a temporary directory for certain files
+	@${MKDIR} ${DATADIR}/tmp
+	@# Run package installation script
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} \
 		POST-INSTALL
-	# Set mudlib ownership
+	@# Set mudlib ownership
 	-@${CHOWN} -h -R mud:mud ${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/net/dgd/distinfo b/net/dgd/distinfo
index 268576df4399..8449bbc4b2d7 100644
--- a/net/dgd/distinfo
+++ b/net/dgd/distinfo
@@ -1,12 +1,9 @@
-MD5 (dgd/dgd-1.4.tar.gz) = 7c2f6c213db9e51b0443c85129a17ff8
-SHA256 (dgd/dgd-1.4.tar.gz) = e9b5050845f348ca6f76b491d752120a51d0d58f40885d47dacf75dd5b866e05
-SIZE (dgd/dgd-1.4.tar.gz) = 439293
+MD5 (dgd/dgd-1.4.1.tar.gz) = 23e14f727f9595faa30abc53ffe6c51d
+SHA256 (dgd/dgd-1.4.1.tar.gz) = 5ff969c7cfcba32b504a3fb4c70c7b4328f3e3bc7b2c329e5eed69a90d8b3b31
+SIZE (dgd/dgd-1.4.1.tar.gz) = 466644
 MD5 (dgd/kernellib-1.3.tar.gz) = a388b467537dd148d69525e7d31399c1
 SHA256 (dgd/kernellib-1.3.tar.gz) = e78b9e2e6d72206d89b9bb1841bb5e47e5b835df29879acd1eb72cb10d778fe6
 SIZE (dgd/kernellib-1.3.tar.gz) = 44225
 MD5 (dgd/1.3-1.3.1.gz) = baf6781e216271dbd815014ce0ef4359
 SHA256 (dgd/1.3-1.3.1.gz) = 46e8cb08b920845077fcb8e50584d57e7898502a678a9308e8b8f597cac15423
 SIZE (dgd/1.3-1.3.1.gz) = 1793
-MD5 (dgd/Network-0.8-dgd-1.4.patch.gz) = a005d5c8eaa91dff798ae028b3e4af39
-SHA256 (dgd/Network-0.8-dgd-1.4.patch.gz) = 54da8dc063ab362c4247dd1a0576acefbd148edca4c28ff8ae7be4d10d7154ac
-SIZE (dgd/Network-0.8-dgd-1.4.patch.gz) = 28339
diff --git a/net/dgd/files/extrapatch-kernellib-net b/net/dgd/files/extrapatch-kernellib-net
index 7cb125bc7a99..58e17128908c 100644
--- a/net/dgd/files/extrapatch-kernellib-net
+++ b/net/dgd/files/extrapatch-kernellib-net
@@ -48,7 +48,7 @@
   # define BINARY_CONN		("/kernel" + CLONABLE_SUBDIR + "binary")
   # define API_USER		("/kernel" + INHERITABLE_SUBDIR + "api/user")
   
-+ #ifdef __NETWORK_PACKAGE__
++ #ifdef __NETWORK_EXTENSIONS__
 + #define LIB_PORT                "/kernel/lib/network/port"
 + #endif
 + 
@@ -60,7 +60,7 @@
 ***************
 *** 1,2 ****
 --- 1,8 ----
-+ #ifdef __NETWORK_PACKAGE__
++ #ifdef __NETWORK_EXTENSIONS__
 + #ifndef SYS_NETWORKING
 + #define SYS_NETWORKING
 + #endif
@@ -583,7 +583,7 @@
   # include <kernel/access.h>
   # include <kernel/user.h>
   # include <kernel/tls.h>
-+ # ifdef __NETWORK_PACKAGE__
++ # ifdef __NETWORK_EXTENSIONS__
 + # ifndef SYS_NETWORKING
 + # define SYS_NETWORKING
 + # endif
diff --git a/net/dgd/files/patch-mud.dgd b/net/dgd/files/patch-mud.dgd
new file mode 100644
index 000000000000..be48d259f51f
--- /dev/null
+++ b/net/dgd/files/patch-mud.dgd
@@ -0,0 +1,18 @@
+$FreeBSD$
+
+--- mud.dgd.orig	2010-02-20 08:46:29.000000000 -0800
++++ mud.dgd	2010-02-20 08:47:38.000000000 -0800
+@@ -1,11 +1,11 @@
+ telnet_port	= 6047;			/* telnet port number */
+ binary_port	= 6048;			/* binary port number */
+-directory	= "/home/dworkin/dgd/mud";/* base directory (MUST be absolute) */
++directory	= "%%DATADIR%%/kernel";	/* base directory (MUST be absolute) */
+ users		= 40;			/* max # of users */
+ editors		= 40;			/* max # of editor sessions */
+ ports           = 16;                   /* max number of open ports (for network extensions) */
+ ed_tmpfile	= "../tmp/ed";		/* proto editor tmpfile */
+-swap_file	= "../tmp/swap";	/* swap file */
++swap_file	= "../tmp/dgd.swap";	/* swap file */
+ swap_size	= 1024;			/* # sectors in swap file */
+ cache_size	= 50;			/* # sectors in swap cache */
+ sector_size	= 512;			/* swap sector size */
diff --git a/net/dgd/files/patch-src-Makefile b/net/dgd/files/patch-src-Makefile
index d382607f0bfd..f21e5de91852 100644
--- a/net/dgd/files/patch-src-Makefile
+++ b/net/dgd/files/patch-src-Makefile
@@ -1,8 +1,16 @@
 $FreeBSD$
 
---- src/Makefile.orig	2009-07-03 17:24:28.000000000 -0700
-+++ src/Makefile	2009-07-03 17:26:10.000000000 -0700
-@@ -8,9 +8,9 @@
+--- src/Makefile.orig	2010-02-12 13:38:01.000000000 -0800
++++ src/Makefile	2010-02-20 08:54:47.000000000 -0800
+@@ -16,16 +16,15 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ HOST=	DARWIN
+-DEFINES=-D$(HOST) #-DNETWORK_EXTENSIONS #-DDUMP_FUNCS
+-DEBUG=	-O -g
++DEFINES=-D$(HOST) $(EXTRA_DEFINES) #-DNETWORK_EXTENSIONS #-DDUMP_FUNCS
+ CCFLAGS=$(DEFINES) $(DEBUG)
+ CFLAGS=	-I. -Icomp -Ilex -Ied -Iparser -Ikfun $(CCFLAGS)
  LDFLAGS=
  LIBS=
  LINTFLAGS=-abcehpruz
@@ -14,7 +22,7 @@ $FreeBSD$
  YACC=	yacc
  BIN=	../bin
  
-@@ -22,6 +21,8 @@
+@@ -36,6 +35,8 @@
  COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o sdata.o data.o \
  	interpret.o config.o
  
@@ -23,7 +31,7 @@ $FreeBSD$
  a.out:	$(OBJ) always
  	cd comp; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' 'YACC=$(YACC)' dgd
  	cd lex; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
-@@ -39,10 +40,15 @@
+@@ -53,10 +54,15 @@
  	@rm -f a.out
  
  $(BIN)/driver: a.out
@@ -40,7 +48,7 @@ $FreeBSD$
  
  lint:
  	lint $(LINTFLAGS) $(CFLAGS) $(SRC)
-@@ -68,7 +74,8 @@
+@@ -82,7 +88,8 @@
  
  comp/a.out:
  	cd comp; $(DMAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' \
diff --git a/net/dgd/files/patch-src-comp.c b/net/dgd/files/patch-src-comp.c
new file mode 100644
index 000000000000..e6337a27ef81
--- /dev/null
+++ b/net/dgd/files/patch-src-comp.c
@@ -0,0 +1,22 @@
+$FreeBSD$
+
+--- src/comp/comp.c.orig	2010-02-20 08:34:08.000000000 -0800
++++ src/comp/comp.c	2010-02-20 08:34:17.000000000 -0800
+@@ -631,7 +631,7 @@
+  * NAME:	comm->init()
+  * DESCRIPTION:	pretend to initialize communications
+  */
+-#ifndef NETWORK_EXTENSION
++#ifndef NETWORK_EXTENSIONS
+ bool comm_init(n, thosts, bhosts, tports, bports, ntelnet, nbinary)
+ int n, ntelnet, nbinary;
+ #else
+@@ -765,7 +765,7 @@
+  * NAME:	comm->users()
+  * DESCRIPTION:	pretend to return an array with all user objects
+  */
+-#ifndef NETWORK_EXTENSION
++#ifndef NETWORK_EXTENSIONS
+ array *comm_users(data)
+ dataspace *data;
+ {