svn commit: r307547 - in head/net/dgd: . files
FreeBSD Mail
bsd-src at helfman.org
Mon Nov 19 00:21:10 UTC 2012
Is there any particular reason this wasn't converted to the new options framework?
Nonetheless, thanks for the update!
Thanks,
Jgh
On Nov 18, 2012, at 2:00 PM, Greg Lewis <glewis at FreeBSD.org> wrote:
> Author: glewis
> Date: Sun Nov 18 22:00:07 2012
> New Revision: 307547
> URL: http://svnweb.freebsd.org/changeset/ports/307547
>
> Log:
> . Update to 1.4.18.
>
> Feature safe: yes
>
> 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)
>
> Modified: head/net/dgd/Makefile
> ==============================================================================
> --- 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 @@
> #
>
> PORTNAME= dgd
> -PORTVERSION= 1.4.15
> +PORTVERSION= 1.4.18
> CATEGORIES= net lang games
> MASTER_SITES= http://cloud.github.com/downloads/dworkin/${PORTNAME}/
>
> @@ -16,9 +16,10 @@ COMMENT= Dworkin\'s Game Driver
> 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
> + CPLUSPLUS_COMMENTS "With C++ style comment support" on
> +
> +USE_GMAKE= yes
>
> DIST_SUBDIR= dgd
> WRKSRC= ${WRKDIR}/dgd/src
> @@ -38,24 +39,19 @@ GROUPS= mud
>
> EXTRA_DEFINES=
>
> -.if defined(WITH_NETWORKING)
> -EXTRA_DEFINES+= -DNETWORK_EXTENSIONS
> -.endif
> -
> -.if defined(WITH_DUMP)
> -EXTRA_DEFINES+= -DDUMP_FUNCS
> +.if defined(WITH_CLOSURES)
> +EXTRA_DEFINES+= -DCLOSURES
> .endif
>
> -.if defined(WITH_LPC_EXTENSION)
> -EXTRA_DEFINES+= -DLPC_EXTENSION
> +.if defined(WITH_CPLUSPLUS_COMMENTS)
> +EXTRA_DEFINES+= -DSLASHSLASH
> .endif
>
> -.if defined(WITH_CLOSURES)
> -EXTRA_DEFINES+= -DCLOSURES
> +.if defined(WITH_NETWORKING)
> +EXTRA_DEFINES+= -DNETWORK_EXTENSIONS
> .endif
>
> post-patch:
> - @${MV} ${WRKSRC}/host/Makefile.bsd ${WRKSRC}/host/Makefile
> @cd ${WRKDIR}/dgd/ && ${FIND} . -name '*.orig' -delete
>
> 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
>
> Modified: head/net/dgd/distinfo
> ==============================================================================
> --- 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) = 00a025f33efa31ae0a6614b064a2e2f9d3d36b9ab74badfac150c7feae3d6d15
> -SIZE (dgd/dgd-1.4.15.tar.gz) = 463901
> +SHA256 (dgd/dgd-1.4.18.tar.gz) = d7bfbdd633066e5b6b4de28337bcdb246eb58e3cf7ce6da22a2cf6591eb6bf0c
> +SIZE (dgd/dgd-1.4.18.tar.gz) = 465941
>
> Modified: head/net/dgd/files/patch-src-Makefile
> ==============================================================================
> --- 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$
>
> ---- 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 -DCLOSURES -DCO_THROTTLE=50 -DDUMP_FUNCS
> -+HOST= FREEBSD
> -+DEFINES=-D$(HOST) $(EXTRA_DEFINES) # -DNETWORK_EXTENSIONS -DCLOSURES -DCO_THROTTLE=50 -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
> +
> +-DEFINES=-D$(HOST) # -DSLASHSLASH -DNETWORK_EXTENSIONS -DCLOSURES -DCO_THROTTLE=50
> ++DEFINES=-D$(HOST) $(EXTRA_DEFINES) # -DSLASHSLASH -DNETWORK_EXTENSIONS -DCLOSURES -DCO_THROTTLE=50
> DEBUG= -O -g
> -CCFLAGS=$(DEFINES) $(DEBUG)
> +CCFLAGS=$(DEFINES)
> CFLAGS= -I. -Icomp -Ilex -Ied -Iparser -Ikfun $(CCFLAGS)
> LDFLAGS=
> --LIBS= -ldl # FreeBSD may require "make HOST=FREEBSD LIBS="
> +-LIBS= -ldl
> +LIBS=
> LINTFLAGS=-abcehpruz
> -CC= gcc
> +CC?= gcc
> LD= $(CC)
> --DMAKE= make
> -+DMAKE= $(MAKE)
> YACC= yacc
> BIN= ../bin
> -
> -@@ -37,6 +37,8 @@
> +@@ -65,6 +65,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; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' 'YACC=$(YACC)' dgd
> - cd lex; $(DMAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
> -@@ -56,10 +58,15 @@
> + cd comp; $(MAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' 'YACC=$(YACC)' dgd
> + cd lex; $(MAKE) 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' dgd
> +@@ -84,10 +86,15 @@
> all: a.out
>
> $(BIN)/driver: a.out
> @@ -52,13 +47,13 @@ $FreeBSD$
>
> lint:
> lint $(LINTFLAGS) $(CFLAGS) $(SRC)
> -@@ -85,7 +92,8 @@
> +@@ -113,7 +120,8 @@
>
> comp/a.out:
> - cd comp; $(DMAKE) 'DMAKE=$(DMAKE)' 'CC=$(CC)' 'CCFLAGS=$(CCFLAGS)' \
> -- 'YACC=$(YACC)' 'LIBS=$(LIBS)' a.out
> -+ 'LDFLAGS=$(LDFLAGS)' 'YACC=$(YACC)' 'LIBS=$(LIBS)' \
> -+ a.out
> + cd comp; $(MAKE) 'CC=$(CC)' 'HOST=$(HOST)' 'CCFLAGS=$(CCFLAGS)' \
> +- 'YACC=$(YACC)' 'LIBS=$(LIBS)' a.out
> ++ 'LDFLAGS=$(LDFLAGS)' 'YACC=$(YACC)' 'LIBS=$(LIBS)' \
> ++ a.out
>
> clean:
> rm -f a.out $(OBJ) comp.sub lex.sub ed.sub
>
> Added: head/net/dgd/files/patch-src-comp-comp.c
> ==============================================================================
> --- /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 @@
> + }
> +
> + /* 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
> + */
>
More information about the svn-ports-all
mailing list