1 files changed, 20 insertions, 30 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>