diff --git a/net/dgd/Makefile b/net/dgd/Makefile index 10cee4bf6b57..8caf42c7367d 100644 --- a/net/dgd/Makefile +++ b/net/dgd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dgd -PORTVERSION= 1.4.19 +PORTVERSION= 1.4.20 CATEGORIES= net lang games MASTER_SITES= https://github.com/dworkin/dgd/archive/ DISTNAME= ${PORTVERSION} diff --git a/net/dgd/distinfo b/net/dgd/distinfo index 3a83a384dd55..c9f1af46f199 100644 --- a/net/dgd/distinfo +++ b/net/dgd/distinfo @@ -1,2 +1,2 @@ -SHA256 (dgd/1.4.19.tar.gz) = ffa03af44fbf15b766a08e7488c06d7e972030f30f99e655096052334977cf46 -SIZE (dgd/1.4.19.tar.gz) = 437896 +SHA256 (dgd/1.4.20.tar.gz) = 114a0ee84ea5ffc8687151e3e0068ce49855702461932ea2e989f3ecf97c0494 +SIZE (dgd/1.4.20.tar.gz) = 437141 diff --git a/net/dgd/files/patch-src-Makefile b/net/dgd/files/patch-src-Makefile index c075ec01ee14..29874b11aee7 100644 --- a/net/dgd/files/patch-src-Makefile +++ b/net/dgd/files/patch-src-Makefile @@ -1,36 +1,34 @@ $FreeBSD$ ---- src/Makefile.orig 2012-11-01 05:57:43.000000000 -0700 -+++ src/Makefile 2012-11-17 20:33:47.000000000 -0800 -@@ -39,14 +39,14 @@ +--- src/Makefile.orig 2013-07-07 02:00:52.000000000 -0700 ++++ src/Makefile 2013-08-03 11:35:03.000000000 -0700 +@@ -39,13 +39,13 @@ $(error HOST is undefined) endif --DEFINES=-D$(HOST) # -DSLASHSLASH -DNETWORK_EXTENSIONS -DCLOSURES -DCO_THROTTLE=50 -+DEFINES=-D$(HOST) $(EXTRA_DEFINES) # -DSLASHSLASH -DNETWORK_EXTENSIONS -DCLOSURES -DCO_THROTTLE=50 +-DEFINES=-D$(HOST) # -DSLASHSLASH -DNETWORK_EXTENSIONS -DNOFLOAT -DCLOSURES -DCO_THROTTLE=50 ++DEFINES=-D$(HOST) $(EXTRA_DEFINES) # -DSLASHSLASH -DNETWORK_EXTENSIONS -DNOFLOAT -DCLOSURES -DCO_THROTTLE=50 DEBUG= -O -g -CCFLAGS=$(DEFINES) $(DEBUG) +CCFLAGS=$(DEFINES) CFLAGS= -I. -Icomp -Ilex -Ied -Iparser -Ikfun $(CCFLAGS) LDFLAGS= --LIBS= -ldl -+LIBS= - LINTFLAGS=-abcehpruz + LIBS= -ldl -CC= gcc +CC?= gcc LD= $(CC) YACC= yacc BIN= ../bin -@@ -65,6 +65,8 @@ +@@ -64,6 +64,8 @@ COMPOBJ=alloc.o error.o hash.o path.o str.o array.o object.o sdata.o data.o \ interpret.o config.o ext.o +all: a.out comp/a.out + - a.out: $(OBJ) always - cd comp; $(MAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' 'YACC=$(YACC)' dgd - cd lex; $(MAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd -@@ -84,10 +86,15 @@ + a.out: $(OBJ) comp/dgd lex/dgd ed/dgd parser/dgd kfun/dgd lpc/dgd host/dgd + $(LD) $(DEBUG) $(LDFLAGS) -o $@ $(OBJ) `cat comp/dgd` `cat lex/dgd` \ + `cat ed/dgd` `cat parser/dgd` `cat kfun/dgd` `cat lpc/dgd` \ +@@ -94,10 +96,15 @@ all: a.out $(BIN)/driver: a.out @@ -45,9 +43,9 @@ $FreeBSD$ + +install: $(BIN)/driver $(BIN)/precomp - lint: - lint $(LINTFLAGS) $(CFLAGS) $(SRC) -@@ -113,7 +120,8 @@ + comp.sub: $(COMPOBJ) + @for i in $(COMPOBJ); do echo ../$$i; done > comp.sub +@@ -107,7 +114,8 @@ comp/a.out: cd comp; $(MAKE) 'CC=$(CC)' 'HOST=$(HOST)' 'CCFLAGS=$(CCFLAGS)' \ diff --git a/net/dgd/files/patch-src-comp-Makefile b/net/dgd/files/patch-src-comp-Makefile new file mode 100644 index 000000000000..baa2e19f897f --- /dev/null +++ b/net/dgd/files/patch-src-comp-Makefile @@ -0,0 +1,14 @@ +$FreeBSD$ + +--- src/comp/Makefile.orig 2013-08-03 12:44:56.000000000 -0700 ++++ src/comp/Makefile 2013-08-03 12:45:14.000000000 -0700 +@@ -52,6 +52,9 @@ + ../kfun/comp:: + cd ../kfun; $(MAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' comp + ++../host/comp:: ++ cd ../host; $(MAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' comp ++ + ../host/sub:: + cd ../host; $(MAKE) 'CC=$(CC)' 'HOST=$(HOST)' 'CCFLAGS=$(CCFLAGS)' sub +