7 files changed, 63 insertions, 222 deletions

diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index abf5c790c008..09a49d707d28 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -6,50 +6,46 @@
 #
 
 PORTNAME=	dgd
-PORTVERSION=	1.2p4
-PORTREVISION=	2
+PORTVERSION=	1.3
 CATEGORIES=	net lang games
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/dgd|} \
-		ftp://ftp.dworkin.nl/pub/dgd/ \
-		ftp://ftp.imaginary.com/pub/LPC/servers/DGD/
+		http://ftp.dworkin.nl/dgd/
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Dworkin's Generic Driver (network server)
 
-NO_CDROM=	"no distribution to corporate environment"
-RESTRICTED=	"license required for commercial use"
+NO_CDROM=	no distribution to corporate environment
+RESTRICTED=	license required for commercial use
 
-OPTIONS=	NETWORKING	"With networking kfuns"		off \
-		ANSI		"Allow ANSI escape codes"	off
+OPTIONS=	NETWORKING	"With networking kfuns"		off
 
 DIST_SUBDIR=	dgd
 WRKSRC=		${WRKDIR}/dgd/src
 PATCH_WRKSRC=	${WRKDIR}/dgd
 ALL_TARGET=	install
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_NETWORKING)
-PATCH_SITES+=	ftp://noname.franken.de/pub/dgd/
-PATCHFILES+=	Network-1-DGD-1.2p3-patch.gz
+PATCH_SITES+=	http://ftp.dworkin.nl/dgd/pkg/
+PATCHFILES+=	Network-6-DGD-1.3.patch.gz
 PLIST_SUB+=	NETWORKING=""
-.else
-PLIST_SUB+=	NETWORKING="@comment "
-.endif
-
-.ifdef (WITH_ANSI)
-PATCH_SITES+=	http://www.eyesbeyond.com/dgd/
-PATCHFILES+=	ansi.diff
-.endif
-
-.if defined(WITH_NETWORKING) || defined(WITH_ANSI)
-PATCH_SITES+=		${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/dgd|}
 PATCH_DIST_STRIP=	-p1
 PATCH_STRIP=		-p0 -F 3
+.else
+PLIST_SUB+=	NETWORKING="@comment "
 .endif
 
-do-configure:
-	${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:" ${WRKDIR}/dgd/mud.dgd
+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\":" ${WRKDIR}/dgd/mud.dgd
+	@${REINPLACE_CMD} -e "/^DEBUG/d" ${WRKSRC}/Makefile
 
 .ifdef (WITH_NETWORKING)
 post-configure:
@@ -72,12 +68,18 @@ 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/Copyright ${DOCSDIR}
 .ifdef (WITH_NETWORKING)
-	${INSTALL_DATA} ${WRKDIR}/dgd/Copyright.NETWORK-PACKAGE ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/dgd/Copyright.NET ${DOCSDIR}
 .endif
 	${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}
 .endif
diff --git a/net/dgd/distinfo b/net/dgd/distinfo
index 50507d429728..18cc5623c930 100644
--- a/net/dgd/distinfo
+++ b/net/dgd/distinfo
@@ -1,9 +1,6 @@
-MD5 (dgd/dgd-1.2p4.tar.gz) = 130a14cb2a09892bd742b6d85d0d9e16
-SHA256 (dgd/dgd-1.2p4.tar.gz) = 99b7b43182920e5a90dc75c8f8b15e456b0329b195c538b63fedc5ce3be41b9a
-SIZE (dgd/dgd-1.2p4.tar.gz) = 472205
-MD5 (dgd/Network-1-DGD-1.2p3-patch.gz) = 6204e4072df50a7fcf75b0968fa659e9
-SHA256 (dgd/Network-1-DGD-1.2p3-patch.gz) = 2c20fa3534794ef002ba479d0b48ea17b4a0dd4e642e083a13c8307fb92ccebb
-SIZE (dgd/Network-1-DGD-1.2p3-patch.gz) = 11043
-MD5 (dgd/ansi.diff) = 0a33d9f19b2d7f6dd6786d4dc98e9b9b
-SHA256 (dgd/ansi.diff) = 0335645da1db3bfc43d319b7cda481b82b2bbb8e925b2c20a739bb73b95566e5
-SIZE (dgd/ansi.diff) = 595
+MD5 (dgd/dgd-1.3.tar.gz) = e7dc3bbc4fe416b2ee400c549b1470b7
+SHA256 (dgd/dgd-1.3.tar.gz) = 3aec104d65dd63484c5450c5b35145f378127d83605196a342ff0f5ee7a7a31c
+SIZE (dgd/dgd-1.3.tar.gz) = 518082
+MD5 (dgd/Network-6-DGD-1.3.patch.gz) = af63408d813965457ab865c8401a721e
+SHA256 (dgd/Network-6-DGD-1.3.patch.gz) = c90a96d5d58bb53d62044b3c3b09747cac1aebeb9ba07e56c2564c373a8d83d5
+SIZE (dgd/Network-6-DGD-1.3.patch.gz) = 21144
diff --git a/net/dgd/files/dgd.sh b/net/dgd/files/dgd.sh
index 832bd9a4f03b..941688b47a61 100644
--- a/net/dgd/files/dgd.sh
+++ b/net/dgd/files/dgd.sh
@@ -11,7 +11,7 @@ case "$1" in
 	start)
 		if [ -x "${DGD}" ]; then
 			su ${DGD_USER} -c "${DGD} ${DGD_CONF}" >> "${DGD_LOG}" 2>&1 &
-			echo $(($!+1)) > "${DGD_PID}"
+			echo $(($!+2)) > "${DGD_PID}"
 			echo -n ' dgd'
 		fi
 		;;
diff --git a/net/dgd/files/patch-comp.c b/net/dgd/files/patch-comp.c
index cb23188eb861..42e2c320c7db 100644
--- a/net/dgd/files/patch-comp.c
+++ b/net/dgd/files/patch-comp.c
@@ -1,74 +1,19 @@
---- src/comp/comp.c.orig	Tue Sep  2 10:58:56 2003
-+++ src/comp/comp.c	Tue Sep  2 11:14:29 2003
-@@ -558,6 +558,20 @@
-     return TRUE;
+$FreeBSD$
+
+--- src/comp/comp.c.orig	2009-07-03 21:10:25.000000000 -0700
++++ src/comp/comp.c	2009-07-03 21:12:26.000000000 -0700
+@@ -699,6 +699,14 @@
+     return (string *) NULL;
  }
  
 +#ifdef NETWORK_PACKAGE
-+/*
-+ * NAME:	comm->openport()
-+ * DESCRIPTION:	pretend to open a port
-+ */
-+void comm_openport(f, obj, protocol, portnr)
-+frame *f;
++bool comm_is_connection(obj)
 +object *obj;
-+unsigned char protocol;
-+unsigned short portnr;
 +{
++    return FALSE;
 +}
 +#endif
 +
  /*
-  * NAME:	comm->finish()
-  * DESCRIPTION:	pretend to terminate connections
-@@ -585,6 +599,35 @@
-     return 0;
- }
- 
-+#ifdef NETWORK_PACKAGE
-+/*
-+ * NAME:	comm->connect()
-+ * DESCRIPTION:	pretend to open a connection to a port
-+ */
-+void
-+comm_connect(f, obj, addr, protocol, port)
-+frame *f;
-+object *obj;
-+char *addr;
-+unsigned char protocol;
-+unsigned short port;
-+{
-+}
-+
-+/*
-+ * NAME:	comm->senddatagram()
-+ * DESCRIPTION:	pretend to send a UDP datagram
-+ */
-+int comm_senddatagram(obj, str, ip, port)
-+object * obj;
-+string * str;
-+string * ip;
-+int port;
-+{
-+	return 0;
-+}
-+#endif
-+
- /*
-  * NAME:	comm->udpsend()
-  * DESCRIPTION:	pretend to send a message on the UDP channel of a connection
-@@ -668,8 +711,14 @@
-  * NAME:	comm->users()
-  * DESCRIPTION:	pretend to return an array with all user objects
-  */
-+#ifdef NETWORK_PACKAGE
-+array *comm_users(data, ports)
-+dataspace *data;
-+bool ports;
-+#else
- array *comm_users(data)
- dataspace *data;
-+#endif
- {
-     return (array *) NULL;
- }
+  * NAME:	comm->close()
+  * DESCRIPTION:	pretend to remove a user
diff --git a/net/dgd/files/patch-mud.dgd b/net/dgd/files/patch-mud.dgd
index 27b7535880f8..8cb2e73831a3 100644
--- a/net/dgd/files/patch-mud.dgd
+++ b/net/dgd/files/patch-mud.dgd
@@ -1,12 +1,8 @@
 $FreeBSD$
 
---- mud.dgd.orig	Thu Mar  4 13:54:52 1999
-+++ mud.dgd	Thu Aug 28 14:54:26 2003
-@@ -1,10 +1,10 @@
- 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) */
+--- mud.dgd.orig	2003-12-30 18:58:57.000000000 -0800
++++ mud.dgd	2009-05-24 22:28:04.000000000 -0700
+@@ -4,7 +4,7 @@
  users		= 40;			/* max # of users */
  editors		= 40;			/* max # of editor sessions */
  ed_tmpfile	= "../tmp/ed";		/* proto editor tmpfile */
diff --git a/net/dgd/files/patch-aa b/net/dgd/files/patch-src-Makefile
index 6b66c026ea3a..d382607f0bfd 100644
--- a/net/dgd/files/patch-aa
+++ b/net/dgd/files/patch-src-Makefile
@@ -1,25 +1,21 @@
 $FreeBSD$
 
---- src/Makefile.orig	Mon Aug 26 07:21:20 2002
-+++ src/Makefile	Mon Aug 26 09:24:19 2002
-@@ -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)
+--- 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 @@
  LDFLAGS=
  LIBS=
  LINTFLAGS=-abcehpruz
 -CC=	gcc
 +CC?=	gcc
  LD=	$(CC)
- DMAKE=	make
+-DMAKE=	make
++DMAKE=	$(MAKE)
  YACC=	yacc
+ BIN=	../bin
+ 
 @@ -22,6 +21,8 @@
- COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o data.o \
+ COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o sdata.o data.o \
  	interpret.o config.o
  
 +all: a.out comp/a.out
diff --git a/net/dgd/pkg-plist b/net/dgd/pkg-plist
index d0f384fe2928..afa891bef11d 100644
--- a/net/dgd/pkg-plist
+++ b/net/dgd/pkg-plist
@@ -14,6 +14,7 @@ sbin/dgd
 %%DATADIR%%/kernel/doc/kernel/efun/file_info
 %%DATADIR%%/kernel/doc/kernel/efun/find_object
 %%DATADIR%%/kernel/doc/kernel/efun/get_dir
+%%DATADIR%%/kernel/doc/kernel/efun/new_object
 %%DATADIR%%/kernel/doc/kernel/efun/query_events
 %%DATADIR%%/kernel/doc/kernel/efun/query_subscribed_event
 %%DATADIR%%/kernel/doc/kernel/efun/remove_event
@@ -30,7 +31,7 @@ sbin/dgd
 %%DATADIR%%/kernel/include/config.h
 %%DATADIR%%/kernel/include/kernel/access.h
 %%DATADIR%%/kernel/include/kernel/kernel.h
-%%DATADIR%%/kernel/include/kernel/net.h
+%%NETWORKING%%%%DATADIR%%/kernel/include/kernel/net.h
 %%DATADIR%%/kernel/include/kernel/objreg.h
 %%DATADIR%%/kernel/include/kernel/rsrc.h
 %%DATADIR%%/kernel/include/kernel/tls.h
@@ -45,127 +46,32 @@ sbin/dgd
 %%DATADIR%%/kernel/kernel/lib/auto.c
 %%DATADIR%%/kernel/kernel/lib/connection.c
 %%NETWORKING%%%%DATADIR%%/kernel/kernel/lib/network/port.c
-%%DATADIR%%/kernel/kernel/lib/port.c
 %%DATADIR%%/kernel/kernel/lib/user.c
 %%DATADIR%%/kernel/kernel/lib/wiztool.c
 %%DATADIR%%/kernel/kernel/obj/binary.c
-%%DATADIR%%/kernel/kernel/obj/port.c
+%%NETWORKING%%%%DATADIR%%/kernel/kernel/obj/port.c
 %%DATADIR%%/kernel/kernel/obj/rsrc.c
 %%DATADIR%%/kernel/kernel/obj/telnet.c
-%%DATADIR%%/kernel/kernel/obj/udp.c
 %%DATADIR%%/kernel/kernel/obj/user.c
 %%DATADIR%%/kernel/kernel/obj/wiztool.c
 %%DATADIR%%/kernel/kernel/sys/accessd.c
+%%NETWORKING%%%%DATADIR%%/kernel/kernel/sys/binary_port.c
 %%DATADIR%%/kernel/kernel/sys/driver.c
+%%NETWORKING%%%%DATADIR%%/kernel/kernel/sys/emergency_port.c
 %%DATADIR%%/kernel/kernel/sys/objregd.c
 %%DATADIR%%/kernel/kernel/sys/rsrcd.c
 %%NETWORKING%%%%DATADIR%%/kernel/kernel/sys/telnet_port.c
 %%DATADIR%%/kernel/kernel/sys/userd.c
 %%NETWORKING%%%%DATADIR%%/kernel/usr/System/initd.c
-%%PORTDOCS%%%%DOCSDIR%%/Commercial
-%%PORTDOCS%%%%DOCSDIR%%/Copyright
-%%NETWORKING%%%%PORTDOCS%%%%DOCSDIR%%/Copyright.NETWORK-PACKAGE
-%%PORTDOCS%%%%DOCSDIR%%/Credits
-%%PORTDOCS%%%%DOCSDIR%%/Extensions
-%%PORTDOCS%%%%DOCSDIR%%/Introduction
-%%PORTDOCS%%%%DOCSDIR%%/LPC.html
-%%PORTDOCS%%%%DOCSDIR%%/Platforms
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/editor
-%%PORTDOCS%%%%DOCSDIR%%/kfun/acos
-%%PORTDOCS%%%%DOCSDIR%%/kfun/allocate
-%%PORTDOCS%%%%DOCSDIR%%/kfun/allocate_float
-%%PORTDOCS%%%%DOCSDIR%%/kfun/allocate_int
-%%PORTDOCS%%%%DOCSDIR%%/kfun/asin
-%%PORTDOCS%%%%DOCSDIR%%/kfun/atan
-%%PORTDOCS%%%%DOCSDIR%%/kfun/atan2
-%%PORTDOCS%%%%DOCSDIR%%/kfun/block_input
-%%PORTDOCS%%%%DOCSDIR%%/kfun/call_other
-%%PORTDOCS%%%%DOCSDIR%%/kfun/call_out
-%%PORTDOCS%%%%DOCSDIR%%/kfun/call_trace
-%%PORTDOCS%%%%DOCSDIR%%/kfun/ceil
-%%PORTDOCS%%%%DOCSDIR%%/kfun/clone_object
-%%NETWORKING%%%%PORTDOCS%%%%DOCSDIR%%/kfun/close_user
-%%PORTDOCS%%%%DOCSDIR%%/kfun/compile_object
-%%NETWORKING%%%%PORTDOCS%%%%DOCSDIR%%/kfun/connect
-%%PORTDOCS%%%%DOCSDIR%%/kfun/cos
-%%PORTDOCS%%%%DOCSDIR%%/kfun/cosh
-%%PORTDOCS%%%%DOCSDIR%%/kfun/crypt
-%%PORTDOCS%%%%DOCSDIR%%/kfun/ctime
-%%PORTDOCS%%%%DOCSDIR%%/kfun/destruct_object
-%%PORTDOCS%%%%DOCSDIR%%/kfun/dump_state
-%%PORTDOCS%%%%DOCSDIR%%/kfun/editor
-%%PORTDOCS%%%%DOCSDIR%%/kfun/error
-%%PORTDOCS%%%%DOCSDIR%%/kfun/exp
-%%PORTDOCS%%%%DOCSDIR%%/kfun/explode
-%%PORTDOCS%%%%DOCSDIR%%/kfun/fabs
-%%PORTDOCS%%%%DOCSDIR%%/kfun/find_object
-%%PORTDOCS%%%%DOCSDIR%%/kfun/floor
-%%PORTDOCS%%%%DOCSDIR%%/kfun/fmod
-%%PORTDOCS%%%%DOCSDIR%%/kfun/frexp
-%%PORTDOCS%%%%DOCSDIR%%/kfun/function_object
-%%PORTDOCS%%%%DOCSDIR%%/kfun/get_dir
-%%PORTDOCS%%%%DOCSDIR%%/kfun/hash_crc16
-%%PORTDOCS%%%%DOCSDIR%%/kfun/hash_md5
-%%PORTDOCS%%%%DOCSDIR%%/kfun/implode
-%%PORTDOCS%%%%DOCSDIR%%/kfun/ldexp
-%%PORTDOCS%%%%DOCSDIR%%/kfun/log
-%%PORTDOCS%%%%DOCSDIR%%/kfun/log10
-%%PORTDOCS%%%%DOCSDIR%%/kfun/make_dir
-%%PORTDOCS%%%%DOCSDIR%%/kfun/map_indices
-%%PORTDOCS%%%%DOCSDIR%%/kfun/map_sizeof
-%%PORTDOCS%%%%DOCSDIR%%/kfun/map_values
-%%PORTDOCS%%%%DOCSDIR%%/kfun/millitime
-%%PORTDOCS%%%%DOCSDIR%%/kfun/modf
-%%PORTDOCS%%%%DOCSDIR%%/kfun/object_name
-%%NETWORKING%%%%PORTDOCS%%%%DOCSDIR%%/kfun/open_port
-%%PORTDOCS%%%%DOCSDIR%%/kfun/parse_string
-%%NETWORKING%%%%PORTDOCS%%%%DOCSDIR%%/kfun/ports
-%%PORTDOCS%%%%DOCSDIR%%/kfun/pow
-%%PORTDOCS%%%%DOCSDIR%%/kfun/previous_object
-%%PORTDOCS%%%%DOCSDIR%%/kfun/previous_program
-%%PORTDOCS%%%%DOCSDIR%%/kfun/query_editor
-%%PORTDOCS%%%%DOCSDIR%%/kfun/query_ip_name
-%%PORTDOCS%%%%DOCSDIR%%/kfun/query_ip_number
-%%PORTDOCS%%%%DOCSDIR%%/kfun/random
-%%PORTDOCS%%%%DOCSDIR%%/kfun/read_file
-%%PORTDOCS%%%%DOCSDIR%%/kfun/remove_call_out
-%%PORTDOCS%%%%DOCSDIR%%/kfun/remove_dir
-%%PORTDOCS%%%%DOCSDIR%%/kfun/remove_file
-%%PORTDOCS%%%%DOCSDIR%%/kfun/rename_file
-%%PORTDOCS%%%%DOCSDIR%%/kfun/restore_object
-%%PORTDOCS%%%%DOCSDIR%%/kfun/save_object
-%%PORTDOCS%%%%DOCSDIR%%/kfun/send_datagram
-%%PORTDOCS%%%%DOCSDIR%%/kfun/send_message
-%%PORTDOCS%%%%DOCSDIR%%/kfun/shutdown
-%%PORTDOCS%%%%DOCSDIR%%/kfun/sin
-%%PORTDOCS%%%%DOCSDIR%%/kfun/sinh
-%%PORTDOCS%%%%DOCSDIR%%/kfun/sizeof
-%%PORTDOCS%%%%DOCSDIR%%/kfun/sqrt
-%%PORTDOCS%%%%DOCSDIR%%/kfun/sscanf
-%%PORTDOCS%%%%DOCSDIR%%/kfun/status
-%%PORTDOCS%%%%DOCSDIR%%/kfun/strlen
-%%PORTDOCS%%%%DOCSDIR%%/kfun/swapout
-%%PORTDOCS%%%%DOCSDIR%%/kfun/tan
-%%PORTDOCS%%%%DOCSDIR%%/kfun/tanh
-%%PORTDOCS%%%%DOCSDIR%%/kfun/this_object
-%%PORTDOCS%%%%DOCSDIR%%/kfun/this_user
-%%PORTDOCS%%%%DOCSDIR%%/kfun/time
-%%PORTDOCS%%%%DOCSDIR%%/kfun/typeof
-%%PORTDOCS%%%%DOCSDIR%%/kfun/users
-%%PORTDOCS%%%%DOCSDIR%%/kfun/write_file
-%%PORTDOCS%%%%DOCSDIR%%/parser
-@exec mkdir -p %D/%%DATADIR%%/tmp
-@comment Remove files generated by DGD
+@unexec rm -f %D/%%DATADIR%%/kernel/kernel/data/*
 @unexec rm -f %D/%%DATADIR%%/kernel/include/float.h
 @unexec rm -f %D/%%DATADIR%%/kernel/include/limits.h
 @unexec rm -f %D/%%DATADIR%%/kernel/include/status.h
 @unexec rm -f %D/%%DATADIR%%/kernel/include/trace.h
 @unexec rm -f %D/%%DATADIR%%/kernel/include/type.h
 @unexec rm -f %D/%%DATADIR%%/kernel.log
-@unexec rm -f %D/%%DATADIR%%/tmp/kernel.swap
-@unexec rmdir %D/%%DATADIR%%/tmp
-@dirrm etc/dgd
+@unexec rm -f %D/%%DATADIR%%/tmp/dgd.swap
+@dirrm %%DATADIR%%/tmp
 @dirrm %%DATADIR%%/kernel/usr/admin
 @dirrm %%DATADIR%%/kernel/usr/System
 @dirrm %%DATADIR%%/kernel/usr
@@ -185,5 +91,4 @@ sbin/dgd
 @dirrm %%DATADIR%%/kernel/doc
 @dirrm %%DATADIR%%/kernel
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/kfun
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/dgd