Date: Sun, 18 Nov 2012 16:21:07 -0800 From: FreeBSD Mail <bsd-src@helfman.org> To: Greg Lewis <glewis@FreeBSD.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r307547 - in head/net/dgd: . files Message-ID: <D58FB078-ACA6-42A2-83E0-E8F248D59F73@helfman.org> In-Reply-To: <201211182200.qAIM08aD019697@svn.freebsd.org> References: <201211182200.qAIM08aD019697@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Is there any particular reason this wasn't converted to the new options fram= ework? Nonetheless, thanks for the update! Thanks, Jgh On Nov 18, 2012, at 2:00 PM, Greg Lewis <glewis@FreeBSD.org> wrote: > Author: glewis > Date: Sun Nov 18 22:00:07 2012 > New Revision: 307547 > URL: http://svnweb.freebsd.org/changeset/ports/307547 >=20 > Log: > . Update to 1.4.18. >=20 > Feature safe: yes >=20 > Added: > head/net/dgd/files/patch-src-comp-comp.c (contents, props changed) > Modified: > head/net/dgd/Makefile > head/net/dgd/distinfo (contents, props changed) > head/net/dgd/files/patch-src-Makefile (contents, props changed) >=20 > Modified: head/net/dgd/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/net/dgd/Makefile Sun Nov 18 19:49:32 2012 (r307546) > +++ head/net/dgd/Makefile Sun Nov 18 22:00:07 2012 (r307547) > @@ -6,7 +6,7 @@ > # >=20 > PORTNAME=3D dgd > -PORTVERSION=3D 1.4.15 > +PORTVERSION=3D 1.4.18 > CATEGORIES=3D net lang games > MASTER_SITES=3D http://cloud.github.com/downloads/dworkin/${PORTNAME}/ >=20 > @@ -16,9 +16,10 @@ COMMENT=3D Dworkin\'s Game Driver > LICENSE=3D GPLv3 >=20 > OPTIONS=3D NETWORKING "With networking kfuns" off \ > - DUMP "With dump kfuns" off \ > CLOSURES "With function pointer support" off \ > - LPC_EXTENSION "With LPC extension interface" off > + CPLUSPLUS_COMMENTS "With C++ style comment support" on > + > +USE_GMAKE=3D yes >=20 > DIST_SUBDIR=3D dgd > WRKSRC=3D ${WRKDIR}/dgd/src > @@ -38,24 +39,19 @@ GROUPS=3D mud >=20 > EXTRA_DEFINES=3D >=20 > -.if defined(WITH_NETWORKING) > -EXTRA_DEFINES+=3D -DNETWORK_EXTENSIONS > -.endif > - > -.if defined(WITH_DUMP) > -EXTRA_DEFINES+=3D -DDUMP_FUNCS > +.if defined(WITH_CLOSURES) > +EXTRA_DEFINES+=3D -DCLOSURES > .endif >=20 > -.if defined(WITH_LPC_EXTENSION) > -EXTRA_DEFINES+=3D -DLPC_EXTENSION > +.if defined(WITH_CPLUSPLUS_COMMENTS) > +EXTRA_DEFINES+=3D -DSLASHSLASH > .endif >=20 > -.if defined(WITH_CLOSURES) > -EXTRA_DEFINES+=3D -DCLOSURES > +.if defined(WITH_NETWORKING) > +EXTRA_DEFINES+=3D -DNETWORK_EXTENSIONS > .endif >=20 > post-patch: > - @${MV} ${WRKSRC}/host/Makefile.bsd ${WRKSRC}/host/Makefile > @cd ${WRKDIR}/dgd/ && ${FIND} . -name '*.orig' -delete >=20 > do-install: > @@ -72,8 +68,6 @@ do-install: > .if !defined(NOPORTDOCS) > ${MKDIR} ${DOCSDIR} > ${INSTALL_DATA} ${WRKDIR}/dgd/COPYING ${DOCSDIR} > - ${INSTALL_DATA} ${WRKDIR}/dgd/Changelog ${DOCSDIR} > - ${INSTALL_DATA} ${WRKDIR}/dgd/Credits ${DOCSDIR} > ${INSTALL_DATA} ${WRKDIR}/dgd/README ${DOCSDIR} > cd ${WRKDIR}/dgd/doc && ${COPYTREE_SHARE} . ${DOCSDIR} > .endif >=20 > Modified: head/net/dgd/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/net/dgd/distinfo Sun Nov 18 19:49:32 2012 (r307546) > +++ head/net/dgd/distinfo Sun Nov 18 22:00:07 2012 (r307547) > @@ -1,2 +1,2 @@ > -SHA256 (dgd/dgd-1.4.15.tar.gz) =3D 00a025f33efa31ae0a6614b064a2e2f9d3d36b= 9ab74badfac150c7feae3d6d15 > -SIZE (dgd/dgd-1.4.15.tar.gz) =3D 463901 > +SHA256 (dgd/dgd-1.4.18.tar.gz) =3D d7bfbdd633066e5b6b4de28337bcdb246eb58e= 3cf7ce6da22a2cf6591eb6bf0c > +SIZE (dgd/dgd-1.4.18.tar.gz) =3D 465941 >=20 > Modified: head/net/dgd/files/patch-src-Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/net/dgd/files/patch-src-Makefile Sun Nov 18 19:49:32 2012 (= r307546) > +++ head/net/dgd/files/patch-src-Makefile Sun Nov 18 22:00:07 2012 (= r307547) > @@ -1,41 +1,36 @@ > $FreeBSD$ >=20 > ---- 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 Licen= se > - # along with this program. If not, see <http://www.gnu.org/licenses/>. > - # > --HOST=3D DARWIN > --DEFINES=3D-D$(HOST) # -DNETWORK_EXTENSIONS -DCLOSURES -DCO_THROTTLE=3D= 50 -DDUMP_FUNCS > -+HOST=3D FREEBSD > -+DEFINES=3D-D$(HOST) $(EXTRA_DEFINES) # -DNETWORK_EXTENSIONS -DCLOSURE= S -DCO_THROTTLE=3D50 -DDUMP_FUNCS > +--- 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 @@ > + $(error HOST is undefined) > + endif > +=20 > +-DEFINES=3D-D$(HOST) # -DSLASHSLASH -DNETWORK_EXTENSIONS -DCLOSURES -D= CO_THROTTLE=3D50 > ++DEFINES=3D-D$(HOST) $(EXTRA_DEFINES) # -DSLASHSLASH -DNETWORK_EXTENSI= ONS -DCLOSURES -DCO_THROTTLE=3D50 > DEBUG=3D -O -g > -CCFLAGS=3D$(DEFINES) $(DEBUG) > +CCFLAGS=3D$(DEFINES) > CFLAGS=3D -I. -Icomp -Ilex -Ied -Iparser -Ikfun $(CCFLAGS) > LDFLAGS=3D > --LIBS=3D -ldl # FreeBSD may require "make HOST=3DFREEBSD LIBS=3D= " > +-LIBS=3D -ldl > +LIBS=3D > LINTFLAGS=3D-abcehpruz > -CC=3D gcc > +CC?=3D gcc > LD=3D $(CC) > --DMAKE=3D make > -+DMAKE=3D $(MAKE) > YACC=3D yacc > BIN=3D ../bin > -=20 > -@@ -37,6 +37,8 @@ > +@@ -65,6 +65,8 @@ > COMPOBJ=3Dalloc.o error.o hash.o path.o str.o array.o object.o sdata.o da= ta.o \ > interpret.o config.o ext.o >=20 > +all: a.out comp/a.out > + > a.out: $(OBJ) always > - cd comp; $(DMAKE) 'CC=3D$(CC)' 'CCFLAGS=3D$(CCFLAGS)' 'YACC=3D$(YACC)= ' dgd > - cd lex; $(DMAKE) 'CC=3D$(CC)' 'CCFLAGS=3D$(CCFLAGS)' dgd > -@@ -56,10 +58,15 @@ > + cd comp; $(MAKE) 'CC=3D$(CC)' 'CCFLAGS=3D$(CCFLAGS)' 'YACC=3D$(YACC)'= dgd > + cd lex; $(MAKE) 'CC=3D$(CC)' 'CCFLAGS=3D$(CCFLAGS)' dgd > +@@ -84,10 +86,15 @@ > all: a.out >=20 > $(BIN)/driver: a.out > @@ -52,13 +47,13 @@ $FreeBSD$ >=20 > lint: > lint $(LINTFLAGS) $(CFLAGS) $(SRC) > -@@ -85,7 +92,8 @@ > +@@ -113,7 +120,8 @@ >=20 > comp/a.out: > - cd comp; $(DMAKE) 'DMAKE=3D$(DMAKE)' 'CC=3D$(CC)' 'CCFLAGS=3D$(CCFLAG= S)' \ > -- 'YACC=3D$(YACC)' 'LIBS=3D$(LIBS)' a.out > -+ 'LDFLAGS=3D$(LDFLAGS)' 'YACC=3D$(YACC)' 'LIBS=3D$(LIBS)' \= > -+ a.out > + cd comp; $(MAKE) 'CC=3D$(CC)' 'HOST=3D$(HOST)' 'CCFLAGS=3D$(CCFLAGS)'= \ > +- 'YACC=3D$(YACC)' 'LIBS=3D$(LIBS)' a.out > ++ 'LDFLAGS=3D$(LDFLAGS)' 'YACC=3D$(YACC)' 'LIBS=3D$(LIBS)' \ > ++ a.out >=20 > clean: > rm -f a.out $(OBJ) comp.sub lex.sub ed.sub >=20 > Added: head/net/dgd/files/patch-src-comp-comp.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/net/dgd/files/patch-src-comp-comp.c Sun Nov 18 22:00:07 2012 = (r307547) > @@ -0,0 +1,105 @@ > +$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 @@ > + } > +=20 > + /* initialize */ > +- if (!conf_init(argv[0], (char *) NULL, module, &fragment)) { > ++ if (!conf_init(argv[0], (char *) NULL, (char *) NULL, module, &fragm= ent)) { > + P_message("Initialization failed\012"); /* LF */ > + return 2; > + } > +@@ -542,6 +542,14 @@ > + } > +=20 > + /* > ++ * NAME: swap->conv2() > ++ * DESCRIPTION: pretend to restore bytes from a vector of sectors in t= he 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 s= ize 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; > + } > +=20 > + /* > ++ * 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 @@ > + } > +=20 > + /* > ++ * 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 @@ > + } > +=20 > + /* > ++ * NAME: comm->clear() > ++ * DESCRIPTION: pretend to clean up connections > ++ */ > ++void comm_clear() > ++{ > ++} > ++ > ++/* > + * NAME: comm->finish() > + * DESCRIPTION: pretend to terminate connections > + */ > +@@ -750,6 +782,24 @@ > + } > +=20 > + /* > ++ * 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 > + */ >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D58FB078-ACA6-42A2-83E0-E8F248D59F73>