Index: head/emulators/jzintv/Makefile =================================================================== --- head/emulators/jzintv/Makefile (revision 547525) +++ head/emulators/jzintv/Makefile (revision 547526) @@ -1,56 +1,57 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= jzintv PORTVERSION= 1.0b4 PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= http://spatula-city.org/~im14u2c/intv/dl/ DISTFILES= ${PORTNAME}-1.0-beta4-src${EXTRACT_SUFX} \ ${PORTNAME}-1.0-beta4-sdk1600${EXTRACT_SUFX} MAINTAINER= martymac@FreeBSD.org COMMENT= Portable Intellivision(TM) Emulator LICENSE= GPLv2 -USES= alias gmake sdl xorg zip +USES= alias dos2unix gmake sdl xorg zip USE_XORG= x11 xau xdmcp USE_SDL= sdl +DOS2UNIX_GLOB= *.[ch] CPPFLAGS+= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` LDFLAGS+= -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lm WRKSRC= ${WRKDIR}/jzintv-1.0-beta4 BUILD_WRKSRC= ${WRKSRC}/src OPTIONS_DEFINE= TOOLS DOCS EXAMPLES OPTIONS_SUB= yes TOOLS_DESC= Install additional tools TOOLS= as1600 bin2rom cgc_update crc32 dasm0256 dasm1600 dasm1600o dis1600 \ frombit frombit_r fromhex gms2rom imvtogif imvtoppm rom2bin rom_merge \ show_grom split_rom tobit tobit_f tobit_r tohex SUB_FILES= pkg-message post-patch: @${REINPLACE_CMD} '288s|/usr/local/share/jzintv|${DATADIR}|' ${BUILD_WRKSRC}/config.h @${CP} ${BUILD_WRKSRC}/Makefile.freebsd ${BUILD_WRKSRC}/Makefile pre-build: ${MKDIR} ${WRKSRC}/bin ${MKDIR} ${WRKSRC}/rom do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/rom ${INSTALL_DATA} ${WRKSRC}/rom/*.rom ${STAGEDIR}${DATADIR}/rom/ ${INSTALL_PROGRAM} ${WRKSRC}/bin/jzintv ${STAGEDIR}${PREFIX}/bin/jzintv .for tool in ${TOOLS} ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${STAGEDIR}${PREFIX}/bin/jzintv-${tool} .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR}/doc (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/emulators/jzintv/files/patch-Makefile.freebsd =================================================================== --- head/emulators/jzintv/files/patch-Makefile.freebsd (revision 547525) +++ head/emulators/jzintv/files/patch-Makefile.freebsd (nonexistent) @@ -1,43 +0,0 @@ ---- src/Makefile.freebsd.orig 2007-11-06 09:31:28.000000000 +0100 -+++ src/Makefile.freebsd 2013-03-26 18:17:55.000000000 +0100 -@@ -18,8 +18,8 @@ - ############################################################################## - P = export PATH; - --SDL_CFLAGS := $(shell sdl-config --cflags) --SDL_LFLAGS := $(shell sdl-config --libs) -+#SDL_CFLAGS := $(shell sdl-config --cflags) -+#SDL_LFLAGS := $(shell sdl-config --libs) - - # Set "X" to be the executable extension - X = -@@ -45,14 +45,14 @@ - #OPT_FLAGS = -ggdb - #OPT_FLAGS = -O - #OPT_FLAGS = -O2 -ggdb -- OPT_FLAGS = -O3 -fomit-frame-pointer -fprefetch-loop-arrays #-DBENCHMARK_STIC -+#OPT_FLAGS = -O3 -fomit-frame-pointer -fprefetch-loop-arrays #-DBENCHMARK_STIC - #OPT_FLAGS = -O2 -pg -ggdb -DLOCAL= - #OPT_FLAGS = -tpp6 -axMiKW -ip -vec_report3 -opt_report -ansi_alias -restrict -DHAVE_RESTRICT -align -O3 -Ob1 # -ipo # intel icc flags - --CFLAGS ?= $(OPT_FLAGS) $(WARN) -I. -I.. $(DEF_FLAGS) $(EXTRA) --CXXFLAGS ?= $(OPT_FLAGS) $(WARNXX) -I. -I.. $(DEF_FLAGS) $(EXTRA) -+CFLAGS += $(CPPFLAGS) $(OPT_FLAGS) $(WARN) -I. -I.. $(DEF_FLAGS) $(EXTRA) -+CXXFLAGS += $(OPT_FLAGS) $(WARNXX) -I. -I.. $(DEF_FLAGS) $(EXTRA) - #LFLAGS = /usr/local/lib/libgcc_s.so -L../lib --LFLAGS = -L../lib -+LFLAGS += $(LDFLAGS) -L../lib - - - OBJS=jzintv.o -@@ -61,8 +61,8 @@ - - PROGS=$(PROG) - --CFLAGS += $(SDL_CFLAGS) --LFLAGS += $(SDL_LFLAGS) -+#CFLAGS += $(SDL_CFLAGS) -+#LFLAGS += $(SDL_LFLAGS) - - ############################################################################## - ## Generic build-rules Property changes on: head/emulators/jzintv/files/patch-Makefile.freebsd ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/jzintv/files/patch-src-asm-frasmdat.h =================================================================== --- head/emulators/jzintv/files/patch-src-asm-frasmdat.h (nonexistent) +++ head/emulators/jzintv/files/patch-src-asm-frasmdat.h (revision 547526) @@ -0,0 +1,11 @@ +--- src/asm/frasmdat.h.orig 2010-12-24 04:00:49 UTC ++++ src/asm/frasmdat.h +@@ -146,7 +146,7 @@ extern int listflag; + extern int hexvalid, hexflag; + Global FILE *romoutf, *binoutf, *cfgoutf, *loutf; + Global char *loutfn; +-Global int listlineno; ++extern int listlineno; + extern int errorcnt, warncnt; + + Property changes on: head/emulators/jzintv/files/patch-src-asm-frasmdat.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/jzintv/files/patch-src-gif-gif_enc.c =================================================================== --- head/emulators/jzintv/files/patch-src-gif-gif_enc.c (nonexistent) +++ head/emulators/jzintv/files/patch-src-gif-gif_enc.c (revision 547526) @@ -0,0 +1,11 @@ +--- src/gif/gif_enc.c.orig 2009-10-03 20:33:17 UTC ++++ src/gif/gif_enc.c +@@ -30,7 +30,7 @@ LOCAL int gif_img_sz = 0; + LOCAL int gen_mpi(uint_8 *src, uint_8 *xtra, uint_8 *dst, + int cnt, uint_8 *pal); + +-int gif_best_stats[6]; ++int gif_best_stat[6]; + + /* ======================================================================== */ + /* GIF_START -- Starts a single or multi-frame GIF. */ Property changes on: head/emulators/jzintv/files/patch-src-gif-gif_enc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/jzintv/files/patch-src-gif-gif_enc.h =================================================================== --- head/emulators/jzintv/files/patch-src-gif-gif_enc.h (nonexistent) +++ head/emulators/jzintv/files/patch-src-gif-gif_enc.h (revision 547526) @@ -0,0 +1,11 @@ +--- src/gif/gif_enc.h.orig 2006-07-03 05:04:46 UTC ++++ src/gif/gif_enc.h +@@ -21,7 +21,7 @@ typedef struct gif_t + uint_8 *vid, *pal; + } gif_t; + +-int gif_best_stat[6]; ++extern int gif_best_stat[6]; + + /* ======================================================================== */ + /* GIF_START -- Starts a single or multi-frame GIF. */ Property changes on: head/emulators/jzintv/files/patch-src-gif-gif_enc.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/jzintv/files/patch-src-imasm-parser.cpp =================================================================== --- head/emulators/jzintv/files/patch-src-imasm-parser.cpp (revision 547525) +++ head/emulators/jzintv/files/patch-src-imasm-parser.cpp (revision 547526) @@ -1,20 +1,20 @@ ---- src/imasm/parser.cpp.orig 2010-11-01 07:19:01.000000000 +0100 -+++ src/imasm/parser.cpp 2013-10-29 06:17:34.000000000 +0100 -@@ -65,7 +65,7 @@ +--- src/imasm/parser.cpp.orig 2010-11-01 06:19:01 UTC ++++ src/imasm/parser.cpp +@@ -65,7 +65,7 @@ int stricmp_(const char *str1, const char *str2) Parser::~Parser() { - map ::iterator itr; + map::iterator itr; for (itr = m_macroMap.begin(); itr != m_macroMap.end(); itr++) { -@@ -583,7 +583,7 @@ +@@ -583,7 +583,7 @@ int Parser::FindMacros(string &sLine, string &sOut) macro *Parser::GetMacroPtr(const char *macName) { - map ::iterator itr; + map::iterator itr; itr = m_macroMap.find(macName); return itr == m_macroMap.end() ? NULL : itr->second; Index: head/emulators/jzintv/files/patch-src_Makefile.freebsd =================================================================== --- head/emulators/jzintv/files/patch-src_Makefile.freebsd (nonexistent) +++ head/emulators/jzintv/files/patch-src_Makefile.freebsd (revision 547526) @@ -0,0 +1,43 @@ +--- src/Makefile.freebsd.orig 2007-11-06 08:31:28 UTC ++++ src/Makefile.freebsd +@@ -18,8 +18,8 @@ R=../rom + ############################################################################## + P = export PATH; + +-SDL_CFLAGS := $(shell sdl-config --cflags) +-SDL_LFLAGS := $(shell sdl-config --libs) ++#SDL_CFLAGS := $(shell sdl-config --cflags) ++#SDL_LFLAGS := $(shell sdl-config --libs) + + # Set "X" to be the executable extension + X = +@@ -45,14 +45,14 @@ RM = rm -f + #OPT_FLAGS = -ggdb + #OPT_FLAGS = -O + #OPT_FLAGS = -O2 -ggdb +- OPT_FLAGS = -O3 -fomit-frame-pointer -fprefetch-loop-arrays #-DBENCHMARK_STIC ++#OPT_FLAGS = -O3 -fomit-frame-pointer -fprefetch-loop-arrays #-DBENCHMARK_STIC + #OPT_FLAGS = -O2 -pg -ggdb -DLOCAL= + #OPT_FLAGS = -tpp6 -axMiKW -ip -vec_report3 -opt_report -ansi_alias -restrict -DHAVE_RESTRICT -align -O3 -Ob1 # -ipo # intel icc flags + +-CFLAGS ?= $(OPT_FLAGS) $(WARN) -I. -I.. $(DEF_FLAGS) $(EXTRA) +-CXXFLAGS ?= $(OPT_FLAGS) $(WARNXX) -I. -I.. $(DEF_FLAGS) $(EXTRA) ++CFLAGS += $(CPPFLAGS) $(OPT_FLAGS) $(WARN) -I. -I.. $(DEF_FLAGS) $(EXTRA) ++CXXFLAGS += $(OPT_FLAGS) $(WARNXX) -I. -I.. $(DEF_FLAGS) $(EXTRA) + #LFLAGS = /usr/local/lib/libgcc_s.so -L../lib +-LFLAGS = -L../lib ++LFLAGS += $(LDFLAGS) -L../lib + + + OBJS=jzintv.o +@@ -61,8 +61,8 @@ TOCLEAN=$(B)/jzintv core + + PROGS=$(PROG) + +-CFLAGS += $(SDL_CFLAGS) +-LFLAGS += $(SDL_LFLAGS) ++#CFLAGS += $(SDL_CFLAGS) ++#LFLAGS += $(SDL_LFLAGS) + + ############################################################################## + ## Generic build-rules Property changes on: head/emulators/jzintv/files/patch-src_Makefile.freebsd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property