. Update to 1.4.19.

3 files changed, 16 insertions, 118 deletions

diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 87ceaaf7ecc9..10cee4bf6b57 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	dgd
-PORTVERSION=	1.4.18
+PORTVERSION=	1.4.19
 CATEGORIES=	net lang games
-MASTER_SITES=	http://cloud.github.com/downloads/dworkin/${PORTNAME}/
+MASTER_SITES=	https://github.com/dworkin/dgd/archive/
+DISTNAME=	${PORTVERSION}
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Dworkin\'s Game Driver
@@ -24,11 +25,13 @@ OPTIONS_DEFAULT=CPLUSPLUS_COMMENTS
 USE_GMAKE=	yes
 
 DIST_SUBDIR=	dgd
-WRKSRC=		${WRKDIR}/dgd/src
-PATCH_WRKSRC=	${WRKDIR}/dgd
+BASE_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${BASE_WRKSRC}/src
+PATCH_WRKSRC=	${BASE_WRKSRC}
 ALL_TARGET=	install
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV+=	EXTRA_DEFINES="$(EXTRA_DEFINES)"
+FETCH_ARGS=	-Fpr
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -54,13 +57,13 @@ EXTRA_DEFINES+=	-DNETWORK_EXTENSIONS
 .endif
 
 post-patch:
-	@cd ${WRKDIR}/dgd/ && ${FIND} . -name '*.orig' -delete
+	@cd ${PATCH_WRKSRC} && ${FIND} . -name '*.orig' -delete
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/dgd/bin/driver ${PREFIX}/sbin/dgd
-	${INSTALL_PROGRAM} ${WRKDIR}/dgd/bin/precomp ${PREFIX}/bin/precomp
+	${INSTALL_PROGRAM} ${BASE_WRKSRC}/bin/driver ${PREFIX}/sbin/dgd
+	${INSTALL_PROGRAM} ${BASE_WRKSRC}/bin/precomp ${PREFIX}/bin/precomp
 	${MKDIR} ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA} ${WRKDIR}/dgd/mud.dgd \
+	${INSTALL_DATA} ${BASE_WRKSRC}/mud.dgd \
 		${PREFIX}/etc/${PORTNAME}/mud.dgd.sample
 	@# Install an RC script for DGD
 	${CAT} ${FILESDIR}/dgd.sh | ${SED} -e "s:%%PREFIX%%:${PREFIX}:" \
@@ -69,9 +72,9 @@ do-install:
 	${CHMOD} a+x ${PREFIX}/etc/rc.d/dgd.sh.sample
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/dgd/COPYING ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/dgd/README ${DOCSDIR}
-	cd ${WRKDIR}/dgd/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
+	${INSTALL_DATA} ${BASE_WRKSRC}/COPYING ${DOCSDIR}
+	${INSTALL_DATA} ${BASE_WRKSRC}/README ${DOCSDIR}
+	cd ${BASE_WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/dgd/distinfo b/net/dgd/distinfo
index 676d360e9781..3a83a384dd55 100644
--- a/net/dgd/distinfo
+++ b/net/dgd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dgd/dgd-1.4.18.tar.gz) = d7bfbdd633066e5b6b4de28337bcdb246eb58e3cf7ce6da22a2cf6591eb6bf0c
-SIZE (dgd/dgd-1.4.18.tar.gz) = 465941
+SHA256 (dgd/1.4.19.tar.gz) = ffa03af44fbf15b766a08e7488c06d7e972030f30f99e655096052334977cf46
+SIZE (dgd/1.4.19.tar.gz) = 437896
diff --git a/net/dgd/files/patch-src-comp-comp.c b/net/dgd/files/patch-src-comp-comp.c
deleted file mode 100644
index ae86f0adb649..000000000000
--- a/net/dgd/files/patch-src-comp-comp.c
+++ /dev/null
@@ -1,105 +0,0 @@
-$FreeBSD$
-
---- src/comp/comp.c.orig	2012-11-18 13:25:06.000000000 -0800
-+++ src/comp/comp.c	2012-11-18 13:25:12.000000000 -0800
-@@ -278,7 +278,7 @@
-     }
- 
-     /* initialize */
--    if (!conf_init(argv[0], (char *) NULL, module, &fragment)) {
-+    if (!conf_init(argv[0], (char *) NULL, (char *) NULL, module, &fragment)) {
- 	P_message("Initialization failed\012");	/* LF */
- 	return 2;
-     }
-@@ -542,6 +542,14 @@
- }
- 
- /*
-+ * NAME:	swap->conv2()
-+ * DESCRIPTION:	pretend to restore bytes from a vector of sectors in the secondary snapshot
-+ */
-+void sw_conv2(char *m, sector *vec, Uint size, Uint idx)
-+{
-+}
-+
-+/*
-  * NAME:	swap->mapsize()
-  * DESCRIPTION:	pretend to count the number of sectors required for size bytes
-  */
-@@ -572,12 +580,20 @@
-  * NAME:	swap->dump()
-  * DESCRIPTION:	pretend to create snapshot
-  */
--int sw_dump(char *snapshot)
-+int sw_dump(char *snapshot, bool keep)
- {
-     return 0;
- }
- 
- /*
-+ * NAME:	swap->dump2()
-+ * DESCRIPTION:	pretend to finish snapshot
-+ */
-+void sw_dump2(char *header, int size, bool incr)
-+{
-+}
-+
-+/*
-  * NAME:	swap->restore()
-  * DESCRIPTION:	pretend to restore swap file
-  */
-@@ -586,6 +602,14 @@
- }
- 
- /*
-+ * NAME:	swap->restore2()
-+ * DESCRIPTION:	pretend to restore secondary snapshot
-+ */
-+void sw_restore2(int fd)
-+{
-+}
-+
-+/*
-  * NAME:	comm->init()
-  * DESCRIPTION:	pretend to initialize communications
-  */
-@@ -603,6 +627,14 @@
- }
- 
- /*
-+ * NAME:        comm->clear()
-+ * DESCRIPTION: pretend to clean up connections
-+ */
-+void comm_clear()
-+{
-+}
-+
-+/*
-  * NAME:	comm->finish()
-  * DESCRIPTION:	pretend to terminate connections
-  */
-@@ -750,6 +782,24 @@
- }
- 
- /*
-+ * NAME:        comm->dump()
-+ * DESCRIPTION: pretend to save users
-+ */
-+bool comm_dump(int fd)
-+{
-+    return TRUE;
-+}
-+
-+/*
-+ * NAME:        comm->restore()
-+ * DESCRIPTION: pretend to restore users
-+ */
-+bool comm_restore(int fd)
-+{
-+    return TRUE;
-+}
-+
-+/*
-  * NAME:	ed->init()
-  * DESCRIPTION:	pretend to initialize editor handling
-  */