5 files changed, 24 insertions, 17 deletions

diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index aa73e59c59c0..750915d1ef5e 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dgd
-PORTVERSION=	1.4.8
+PORTVERSION=	1.4.11
 CATEGORIES=	net lang games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME}-osr|} \
 		${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME}-osr/old|}
@@ -18,6 +18,7 @@ LICENSE=	GPLv3
 
 OPTIONS=	NETWORKING	"With networking kfuns"		off \
 		DUMP		"With dump kfuns"		off \
+		CLOSURES	"With function pointer support"	off \
 		LPC_EXTENSION	"With LPC extension interface"	off
 
 DIST_SUBDIR=	dgd
@@ -47,6 +48,10 @@ EXTRA_DEFINES+=	-DDUMP_FUNCS
 EXTRA_DEFINES+=	-DLPC_EXTENSION
 .endif
 
+.if defined(WITH_CLOSURES)
+EXTRA_DEFINES+=	-DCLOSURES
+.endif
+
 post-patch:
 	@${MV} ${WRKSRC}/host/Makefile.bsd ${WRKSRC}/host/Makefile
 	@cd ${WRKDIR}/dgd/ && ${FIND} . -name '*.orig' -delete
diff --git a/net/dgd/distinfo b/net/dgd/distinfo
index d18d39f5738e..a5a79d1054db 100644
--- a/net/dgd/distinfo
+++ b/net/dgd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dgd/dgd-1.4.8.tar.gz) = 6af521f1d91088b17c6c5a49e12dc0ff8253ee71649468643ef370c9450c0bcf
-SIZE (dgd/dgd-1.4.8.tar.gz) = 448713
+SHA256 (dgd/dgd-1.4.11.tar.gz) = cd54e5abbb518f2e31b64052c1cc1d4dcc35d4c38c7deb99eda5afb75b3864d8
+SIZE (dgd/dgd-1.4.11.tar.gz) = 451950
diff --git a/net/dgd/files/patch-mud.dgd b/net/dgd/files/patch-mud.dgd
index f9807d2b7589..0e8b2ea40cfb 100644
--- a/net/dgd/files/patch-mud.dgd
+++ b/net/dgd/files/patch-mud.dgd
@@ -1,7 +1,7 @@
 $FreeBSD$
 
---- mud.dgd.orig	2010-02-20 08:46:29.000000000 -0800
-+++ mud.dgd	2010-02-20 08:47:38.000000000 -0800
+--- mud.dgd.orig	2011-07-28 04:59:26.000000000 -0700
++++ mud.dgd	2011-07-30 00:24:57.000000000 -0700
 @@ -1,11 +1,11 @@
  telnet_port	= 6047;			/* telnet port number */
  binary_port	= 6048;			/* binary port number */
@@ -9,7 +9,7 @@ $FreeBSD$
 +directory	= "%%DATADIR%%/mud";	/* 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) */
+ 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 */
diff --git a/net/dgd/files/patch-src-Makefile b/net/dgd/files/patch-src-Makefile
index ef88e195d020..5937e0afb6b3 100644
--- a/net/dgd/files/patch-src-Makefile
+++ b/net/dgd/files/patch-src-Makefile
@@ -1,15 +1,15 @@
 $FreeBSD$
 
---- src/Makefile.orig	2011-05-19 07:59:49.000000000 -0700
-+++ src/Makefile	2011-05-29 14:41:28.000000000 -0700
+--- src/Makefile.orig	2011-07-28 04:59:26.000000000 -0700
++++ src/Makefile	2011-07-30 00:27:22.000000000 -0700
 @@ -16,17 +16,17 @@
  # You should have received a copy of the GNU Affero General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
 -HOST=	DARWIN
--DEFINES=-D$(HOST)	#-DNETWORK_EXTENSIONS #-DDUMP_FUNCS #-DCO_THROTTLE=50
+-DEFINES=-D$(HOST)	# -DNETWORK_EXTENSIONS -DCLOSURES -DCO_THROTTLE=50 -DDUMP_FUNCS
 +HOST=	FREEBSD
-+DEFINES=-D$(HOST) $(EXTRA_DEFINES)	#-DNETWORK_EXTENSIONS #-DDUMP_FUNCS #-DCO_THROTTLE=50
++DEFINES=-D$(HOST) $(EXTRA_DEFINES)	# -DNETWORK_EXTENSIONS -DCLOSURES -DCO_THROTTLE=50 -DDUMP_FUNCS
  DEBUG=	-O -g
 -CCFLAGS=$(DEFINES) $(DEBUG)
 +CCFLAGS=$(DEFINES)
@@ -35,8 +35,8 @@ $FreeBSD$
  a.out:	$(OBJ) always
  	cd comp; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' 'YACC=$(YACC)' dgd
  	cd lex; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
-@@ -54,10 +56,15 @@
- 	@rm -f a.out
+@@ -56,10 +58,15 @@
+ all:	a.out
  
  $(BIN)/driver: a.out
 +	-mkdir $(BIN)
@@ -52,7 +52,7 @@ $FreeBSD$
  
  lint:
  	lint $(LINTFLAGS) $(CFLAGS) $(SRC)
-@@ -83,7 +90,8 @@
+@@ -85,7 +92,8 @@
  
  comp/a.out:
  	cd comp; $(DMAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' \
diff --git a/net/dgd/files/patch-src-kfun-std.c b/net/dgd/files/patch-src-kfun-std.c
index b2acbbd06545..5f1699425c14 100644
--- a/net/dgd/files/patch-src-kfun-std.c
+++ b/net/dgd/files/patch-src-kfun-std.c
@@ -1,11 +1,13 @@
---- src/kfun/std.c.orig	2010-04-25 14:29:57.000000000 -0700
-+++ src/kfun/std.c	2010-04-25 14:30:09.000000000 -0700
-@@ -1278,10 +1278,6 @@
+$FreeBSD$
+
+--- src/kfun/std.c.orig	2011-07-30 00:30:37.000000000 -0700
++++ src/kfun/std.c	2011-07-30 00:30:49.000000000 -0700
+@@ -1291,10 +1291,6 @@
  	error("open_port() in special purpose object");
      }
  
 -    if (obj->flags & O_DRIVER) {
--        error("open_port() in driver object");
+-	error("open_port() in driver object");
 -    }
 -
      if (f->level != 0) {