Index: head/emulators/darcnes/pkg-plist =================================================================== --- head/emulators/darcnes/pkg-plist (revision 446040) +++ head/emulators/darcnes/pkg-plist (nonexistent) @@ -1,2 +0,0 @@ -bin/darcnes -%%PORTDOCS%%%%DOCSDIR%%/readme Property changes on: head/emulators/darcnes/pkg-plist ___________________________________________________________________ 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/darcnes/Makefile =================================================================== --- head/emulators/darcnes/Makefile (revision 446040) +++ head/emulators/darcnes/Makefile (revision 446041) @@ -1,62 +1,59 @@ # Created by: Yukihiro Nakai # $FreeBSD$ PORTNAME= darcnes PORTVERSION= 9b0401 PORTREVISION= 6 CATEGORIES= emulators MASTER_SITES= http://www.dridus.com/~nyef/darcnes/download/ \ LOCAL/grembo DISTNAME= dn${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= multi-system emulator +COMMENT= Multi-system emulator NO_CDROM= Commercial use is restricted WRKSRC= ${WRKDIR}/${PORTNAME} -WANT_GNOME= yes USES= gmake tar:tgz MAKE_ARGS= CC="${CC}" TARGET_CC="${CC}" CXX="${CXX}" TARGET_CXX="${CXX}" \ AS="${AS}" TARGET_AS="${CC}" LD="${LD}" TARGET_LD="${CC}" +PLIST_FILES= bin/darcnes +PORTDOCS= readme + OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= X11 GTK1 SVGALIB OPTIONS_DEFAULT=X11 BACKEND_DESC= GUI backend -.include +GTK1_USES= gettext-runtime +GTK1_USE= GNOME=gtk12 XORG=x11,xext,xi +GTK1_VARS= MAKE_ARGS+=TARGET=Linux_GTK +SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib +SVGALIB_VARS= MAKE_ARGS+=TARGET=Linux_svgalib + +X11_USE= XORG=x11,xaw,xext,xmu,xt + +.include + .if ${ARCH} != "i386" || defined(WITHOUT_X86_ASM) MAKE_ARGS+= C_ONLY=-DC_ONLY .else MAKE_ARGS+= MACH_TYPES=-DMACH_TYPES=\\\"types-i386.h\\\" .endif -.if ${PORT_OPTIONS:MGTK1} -USE_GNOME= gtk12 -MAKE_ARGS+= TARGET=Linux_GTK -PKGNAMESUFFIX= -gtk -.endif - -.if ${PORT_OPTIONS:MSVGALIB} -LIB_DEPENDS+= libvga.so:graphics/svgalib -MAKE_ARGS+= TARGET=Linux_svgalib -PKGNAMESUFFIX= -svgalib -.endif - -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 xaw xext xmu xt -.endif - post-patch: @${CP} ${FILESDIR}/endian.h ${WRKSRC} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/darcnes ${STAGEDIR}${PREFIX}/bin + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR} -.include +.include Index: head/emulators/darcnes/files/patch-cd_unix.c =================================================================== --- head/emulators/darcnes/files/patch-cd_unix.c (revision 446040) +++ head/emulators/darcnes/files/patch-cd_unix.c (nonexistent) @@ -1,31 +0,0 @@ ---- cd_unix.c.orig Sun Aug 20 03:25:53 2000 -+++ cd_unix.c -@@ -62,7 +62,6 @@ - - void cd_play_track(u8 track) - { --#ifdef SYSTEM_FREEBSD - struct ioc_play_track playtrack; - - /* FIXME: CD keeps playing after program quits */ -@@ -74,12 +73,10 @@ - playtrack.end_index = 1; - - ioctl(cd_drive, CDIOCPLAYTRACKS, &playtrack); --#endif - } - - void cd_play_lba(u32 from, u32 to, int repeat) - { --#ifdef SYSTEM_FREEBSD - struct ioc_play_blocks playblocks; - - /* FIXME: ignores the repeat flag */ -@@ -94,7 +91,6 @@ - playblocks.len = to - from; - - ioctl(cd_drive, CDIOCPLAYBLOCKS, &playblocks); --#endif - } - - #ifdef SYSTEM_LINUX Property changes on: head/emulators/darcnes/files/patch-cd_unix.c ___________________________________________________________________ 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/darcnes/files/patch-ui_x.c =================================================================== --- head/emulators/darcnes/files/patch-ui_x.c (revision 446040) +++ head/emulators/darcnes/files/patch-ui_x.c (nonexistent) @@ -1,15 +0,0 @@ ---- ui_x.c.orig Mon Oct 30 23:15:31 2000 -+++ ui_x.c -@@ -177,6 +177,12 @@ int main(int argc, char *argv[]) - return 1; - } - -+ if (romfile == NULL) { -+ printf("rom not specified.\n"); -+ usage(argv[0]); -+ return 1; -+ } -+ - initialize_window(display); - - activate_system(system_type, romfile); Property changes on: head/emulators/darcnes/files/patch-ui_x.c ___________________________________________________________________ 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/darcnes/files/patch-ui_gtk.c =================================================================== --- head/emulators/darcnes/files/patch-ui_gtk.c (revision 446040) +++ head/emulators/darcnes/files/patch-ui_gtk.c (nonexistent) @@ -1,10 +0,0 @@ ---- ui_gtk.c.orig Tue Aug 22 11:06:48 2000 -+++ ui_gtk.c Mon Feb 2 20:12:54 2004 -@@ -63,6 +63,7 @@ - video_buffer_1 = video_buffer_2 = NULL; - - /* Get Gtk up and running. */ -+ gtk_set_locale(); - gtk_init( &argc, &argv ); - - nes_gtk_window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); Property changes on: head/emulators/darcnes/files/patch-ui_gtk.c ___________________________________________________________________ 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/darcnes/files/patch-snd_unix.c =================================================================== --- head/emulators/darcnes/files/patch-snd_unix.c (revision 446040) +++ head/emulators/darcnes/files/patch-snd_unix.c (nonexistent) @@ -1,11 +0,0 @@ ---- snd_unix.c.orig Wed Oct 23 20:11:53 2002 -+++ snd_unix.c Wed Oct 23 20:12:07 2002 -@@ -23,7 +23,7 @@ - #endif - - #ifdef SYSTEM_FREEBSD --#include -+#include - #define SOUND_DEVICE "/dev/dsp" - #endif - Property changes on: head/emulators/darcnes/files/patch-snd_unix.c ___________________________________________________________________ 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/darcnes/files/patch-Makefile =================================================================== --- head/emulators/darcnes/files/patch-Makefile (revision 446040) +++ head/emulators/darcnes/files/patch-Makefile (revision 446041) @@ -1,51 +1,51 @@ ---- Makefile.orig 2001-03-28 02:51:41.000000000 +0200 -+++ Makefile 2008-04-01 16:53:11.000000000 +0200 -@@ -11,16 +11,16 @@ +--- Makefile.orig 2001-03-28 00:51:41 UTC ++++ Makefile +@@ -11,16 +11,16 @@ TARGET?=Linux_X #C_ONLY=-DC_ONLY -MACH_TYPES=-DMACH_TYPES=\"types-i386.h\" +#MACH_TYPES=-DMACH_TYPES=\"types-i386.h\" #BYTE_ORDER=-DMSB_FIRST -BYTE_ORDER=-DLSB_FIRST +#BYTE_ORDER=-DLSB_FIRST -DEBUG=-g +#DEBUG=-g -OPTFLAGS=-O2 -fomit-frame-pointer +#OPTFLAGS=-O2 -fomit-frame-pointer -BASE_CFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(C_ONLY) $(BYTE_ORDER) $(MACH_TYPES) +BASE_CFLAGS=-Wall $(DEBUG) $(OPTFLAGS) $(C_ONLY) $(MACH_TYPES) BASE_SFLAGS=-Wall $(DEBUG) $(OPTFLAGS) BASE_LDFLAGS= -@@ -33,8 +33,12 @@ +@@ -33,8 +33,12 @@ endif # ifeq ($(TARGET),Linux_svgalib) CONFFLAGS=-DPCE_CD_SUPPORT -DSOUND +LOCALBASE?=/usr/local +LDFLAGS+=-L${LOCALBASE}/lib +CFLAGS+=-I${LOCALBASE}/include +SFLAGS+=-I${LOCALBASE}/include SYSTEMSRCS=video_svga.c ui_svga.c snd_unix.c cd_unix.c -BINFILE=sdarcnes +BINFILE=darcnes LIBS=-lvgagl -lvga endif -@@ -43,9 +47,9 @@ +@@ -43,9 +47,9 @@ endif # ifeq ($(TARGET),Linux_X) CONFFLAGS=-DPCE_CD_SUPPORT -DSOUND -LDFLAGS+=-L/usr/X11R6/lib -CFLAGS+=-I/usr/X11R6/include -SFLAGS+=-I/usr/X11R6/include +LDFLAGS+=-L${LOCALBASE}/lib +CFLAGS+=-I${LOCALBASE}/include +SFLAGS+=-I${LOCALBASE}/include SYSTEMSRCS=video_x.c ui_x.c snd_unix.c keyboard_x.c cd_unix.c BINFILE=darcnes LIBS=-lXext -lXaw -lXmu -lXt -lX11 Index: head/emulators/darcnes/files/patch-cd__unix.c =================================================================== --- head/emulators/darcnes/files/patch-cd__unix.c (nonexistent) +++ head/emulators/darcnes/files/patch-cd__unix.c (revision 446041) @@ -0,0 +1,31 @@ +--- cd_unix.c.orig 2000-10-30 22:18:23 UTC ++++ cd_unix.c +@@ -62,7 +62,6 @@ void cd_read_next_sector(u8 *buf) + + void cd_play_track(u8 track) + { +-#ifdef SYSTEM_FREEBSD + struct ioc_play_track playtrack; + + /* FIXME: CD keeps playing after program quits */ +@@ -74,12 +73,10 @@ void cd_play_track(u8 track) + playtrack.end_index = 1; + + ioctl(cd_drive, CDIOCPLAYTRACKS, &playtrack); +-#endif + } + + void cd_play_lba(u32 from, u32 to, int repeat) + { +-#ifdef SYSTEM_FREEBSD + struct ioc_play_blocks playblocks; + + /* FIXME: ignores the repeat flag */ +@@ -94,7 +91,6 @@ void cd_play_lba(u32 from, u32 to, int repeat) + playblocks.len = to - from; + + ioctl(cd_drive, CDIOCPLAYBLOCKS, &playblocks); +-#endif + } + + #ifdef SYSTEM_LINUX Property changes on: head/emulators/darcnes/files/patch-cd__unix.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/darcnes/files/patch-mtypes.h =================================================================== --- head/emulators/darcnes/files/patch-mtypes.h (revision 446040) +++ head/emulators/darcnes/files/patch-mtypes.h (revision 446041) @@ -1,7 +1,11 @@ ---- mtypes.h.orig Sat Aug 7 18:19:37 1999 -+++ mtypes.h Thu Jun 1 02:43:05 2000 -@@ -11,2 +11,4 @@ +--- mtypes.h.orig 1999-08-07 16:19:37 UTC ++++ mtypes.h +@@ -9,6 +9,8 @@ + /* $Id: mtypes.h,v 1.2 1999/08/07 16:19:37 nyef Exp $ */ + +#include "endian.h" + typedef unsigned char byte; + typedef unsigned short word; + typedef signed char offset; Index: head/emulators/darcnes/files/patch-snd__unix.c =================================================================== --- head/emulators/darcnes/files/patch-snd__unix.c (nonexistent) +++ head/emulators/darcnes/files/patch-snd__unix.c (revision 446041) @@ -0,0 +1,11 @@ +--- snd_unix.c.orig 2000-10-30 22:18:27 UTC ++++ snd_unix.c +@@ -23,7 +23,7 @@ + #endif + + #ifdef SYSTEM_FREEBSD +-#include ++#include + #define SOUND_DEVICE "/dev/dsp" + #endif + Property changes on: head/emulators/darcnes/files/patch-snd__unix.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/darcnes/files/patch-tool.c =================================================================== --- head/emulators/darcnes/files/patch-tool.c (revision 446040) +++ head/emulators/darcnes/files/patch-tool.c (revision 446041) @@ -1,10 +1,10 @@ ---- tool.c.orig Sat May 6 23:50:17 2000 -+++ tool.c Thu Jun 1 02:43:09 2000 +--- tool.c.orig 2001-03-25 21:53:42 UTC ++++ tool.c @@ -19,6 +19,7 @@ #include "video.h" #include "tool.h" #include "system.h" +#include "endian.h" unsigned long system_flags; Index: head/emulators/darcnes/files/patch-types.h =================================================================== --- head/emulators/darcnes/files/patch-types.h (revision 446040) +++ head/emulators/darcnes/files/patch-types.h (revision 446041) @@ -1,11 +1,11 @@ ---- types.h.orig Tue Dec 7 03:01:23 1999 -+++ types.h Thu Jun 1 02:43:11 2000 +--- types.h.orig 2000-08-04 20:19:23 UTC ++++ types.h @@ -13,6 +13,8 @@ #include MACH_TYPES #endif +#include "endian.h" + typedef unsigned char u8; typedef signed char s8; Index: head/emulators/darcnes/files/patch-ui__gtk.c =================================================================== --- head/emulators/darcnes/files/patch-ui__gtk.c (nonexistent) +++ head/emulators/darcnes/files/patch-ui__gtk.c (revision 446041) @@ -0,0 +1,10 @@ +--- ui_gtk.c.orig 2000-08-22 02:06:48 UTC ++++ ui_gtk.c +@@ -63,6 +63,7 @@ int main( int argc, char* argv[] ) + video_buffer_1 = video_buffer_2 = NULL; + + /* Get Gtk up and running. */ ++ gtk_set_locale(); + gtk_init( &argc, &argv ); + + nes_gtk_window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); Property changes on: head/emulators/darcnes/files/patch-ui__gtk.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/darcnes/files/patch-ui__x.c =================================================================== --- head/emulators/darcnes/files/patch-ui__x.c (nonexistent) +++ head/emulators/darcnes/files/patch-ui__x.c (revision 446041) @@ -0,0 +1,15 @@ +--- ui_x.c.orig 2000-10-30 22:15:31 UTC ++++ ui_x.c +@@ -177,6 +177,12 @@ int main(int argc, char *argv[]) + return 1; + } + ++ if (romfile == NULL) { ++ printf("rom not specified.\n"); ++ usage(argv[0]); ++ return 1; ++ } ++ + initialize_window(display); + + activate_system(system_type, romfile); Property changes on: head/emulators/darcnes/files/patch-ui__x.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/darcnes/files/patch-video__svga.c =================================================================== --- head/emulators/darcnes/files/patch-video__svga.c (nonexistent) +++ head/emulators/darcnes/files/patch-video__svga.c (revision 446041) @@ -0,0 +1,10 @@ +--- video_svga.c.orig 2000-09-16 23:45:10 UTC ++++ video_svga.c +@@ -52,7 +52,6 @@ unsigned char *vbpfunc8(int line); + + void video_events(void); + +-__inline__ + void input_update() + { + keyboard_update(); Property changes on: head/emulators/darcnes/files/patch-video__svga.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/darcnes/files/patch-video__x.c =================================================================== --- head/emulators/darcnes/files/patch-video__x.c (revision 446040) +++ head/emulators/darcnes/files/patch-video__x.c (revision 446041) @@ -1,11 +1,11 @@ ---- video_x.c.orig Tue Aug 24 10:46:40 2004 -+++ video_x.c Tue Aug 24 10:46:55 2004 -@@ -365,7 +365,7 @@ +--- video_x.c.orig 2000-10-30 22:15:34 UTC ++++ video_x.c +@@ -365,7 +365,7 @@ void handle_joypad_key(int type, KeySym keysym) ui_joypad->data &= ~ui_joypad->button_template->buttons[0]; } - default: + default: break; } }