Date: Sun, 16 Jul 2017 18:06:45 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446041 - in head/emulators/darcnes: . files Message-ID: <201707161806.v6GI6jXQ084112@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Sun Jul 16 18:06:45 2017 New Revision: 446041 URL: https://svnweb.freebsd.org/changeset/ports/446041 Log: - COMMENT should start wit capital letter - Remove deprecated WANT_GNOME - Turn pkg-plist to PLIST_FILES, PORTDOCS - only 2 plist items - Convert to options helpers, add missing dependencies when GTK1=on - Fix build when SVGALIB=on => patch-video__svga.c - Regenerate patches with make makepatch Added: head/emulators/darcnes/files/patch-cd__unix.c - copied, changed from r445874, head/emulators/darcnes/files/patch-cd_unix.c head/emulators/darcnes/files/patch-snd__unix.c - copied, changed from r445874, head/emulators/darcnes/files/patch-snd_unix.c head/emulators/darcnes/files/patch-ui__gtk.c - copied, changed from r445874, head/emulators/darcnes/files/patch-ui_gtk.c head/emulators/darcnes/files/patch-ui__x.c - copied, changed from r445874, head/emulators/darcnes/files/patch-ui_x.c head/emulators/darcnes/files/patch-video__svga.c (contents, props changed) Deleted: head/emulators/darcnes/files/patch-cd_unix.c head/emulators/darcnes/files/patch-snd_unix.c head/emulators/darcnes/files/patch-ui_gtk.c head/emulators/darcnes/files/patch-ui_x.c head/emulators/darcnes/pkg-plist Modified: head/emulators/darcnes/Makefile head/emulators/darcnes/files/patch-Makefile head/emulators/darcnes/files/patch-mtypes.h head/emulators/darcnes/files/patch-tool.c head/emulators/darcnes/files/patch-types.h head/emulators/darcnes/files/patch-video__x.c Modified: head/emulators/darcnes/Makefile ============================================================================== --- head/emulators/darcnes/Makefile Sun Jul 16 17:32:04 2017 (r446040) +++ head/emulators/darcnes/Makefile Sun Jul 16 18:06:45 2017 (r446041) @@ -10,53 +10,50 @@ MASTER_SITES= http://www.dridus.com/~nyef/darcnes/down 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 <bsd.port.options.mk> +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 <bsd.port.pre.mk> + .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 <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/emulators/darcnes/files/patch-Makefile ============================================================================== --- head/emulators/darcnes/files/patch-Makefile Sun Jul 16 17:32:04 2017 (r446040) +++ head/emulators/darcnes/files/patch-Makefile Sun Jul 16 18:06:45 2017 (r446041) @@ -1,6 +1,6 @@ ---- 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 @@ -22,7 +22,7 @@ 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 @@ -36,7 +36,7 @@ LIBS=-lvgagl -lvga endif -@@ -43,9 +47,9 @@ +@@ -43,9 +47,9 @@ endif # ifeq ($(TARGET),Linux_X) CONFFLAGS=-DPCE_CD_SUPPORT -DSOUND Copied and modified: head/emulators/darcnes/files/patch-cd__unix.c (from r445874, head/emulators/darcnes/files/patch-cd_unix.c) ============================================================================== --- head/emulators/darcnes/files/patch-cd_unix.c Sat Jul 15 13:54:33 2017 (r445874, copy source) +++ head/emulators/darcnes/files/patch-cd__unix.c Sun Jul 16 18:06:45 2017 (r446041) @@ -1,6 +1,6 @@ ---- cd_unix.c.orig Sun Aug 20 03:25:53 2000 +--- cd_unix.c.orig 2000-10-30 22:18:23 UTC +++ cd_unix.c -@@ -62,7 +62,6 @@ +@@ -62,7 +62,6 @@ void cd_read_next_sector(u8 *buf) void cd_play_track(u8 track) { @@ -8,7 +8,7 @@ struct ioc_play_track playtrack; /* FIXME: CD keeps playing after program quits */ -@@ -74,12 +73,10 @@ +@@ -74,12 +73,10 @@ void cd_play_track(u8 track) playtrack.end_index = 1; ioctl(cd_drive, CDIOCPLAYTRACKS, &playtrack); @@ -21,7 +21,7 @@ struct ioc_play_blocks playblocks; /* FIXME: ignores the repeat flag */ -@@ -94,7 +91,6 @@ +@@ -94,7 +91,6 @@ void cd_play_lba(u32 from, u32 to, int repeat) playblocks.len = to - from; ioctl(cd_drive, CDIOCPLAYBLOCKS, &playblocks); Modified: head/emulators/darcnes/files/patch-mtypes.h ============================================================================== --- head/emulators/darcnes/files/patch-mtypes.h Sun Jul 16 17:32:04 2017 (r446040) +++ head/emulators/darcnes/files/patch-mtypes.h Sun Jul 16 18:06:45 2017 (r446041) @@ -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; Copied and modified: head/emulators/darcnes/files/patch-snd__unix.c (from r445874, head/emulators/darcnes/files/patch-snd_unix.c) ============================================================================== --- head/emulators/darcnes/files/patch-snd_unix.c Sat Jul 15 13:54:33 2017 (r445874, copy source) +++ head/emulators/darcnes/files/patch-snd__unix.c Sun Jul 16 18:06:45 2017 (r446041) @@ -1,5 +1,5 @@ ---- snd_unix.c.orig Wed Oct 23 20:11:53 2002 -+++ snd_unix.c Wed Oct 23 20:12:07 2002 +--- snd_unix.c.orig 2000-10-30 22:18:27 UTC ++++ snd_unix.c @@ -23,7 +23,7 @@ #endif Modified: head/emulators/darcnes/files/patch-tool.c ============================================================================== --- head/emulators/darcnes/files/patch-tool.c Sun Jul 16 17:32:04 2017 (r446040) +++ head/emulators/darcnes/files/patch-tool.c Sun Jul 16 18:06:45 2017 (r446041) @@ -1,5 +1,5 @@ ---- 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" Modified: head/emulators/darcnes/files/patch-types.h ============================================================================== --- head/emulators/darcnes/files/patch-types.h Sun Jul 16 17:32:04 2017 (r446040) +++ head/emulators/darcnes/files/patch-types.h Sun Jul 16 18:06:45 2017 (r446041) @@ -1,5 +1,5 @@ ---- 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 Copied and modified: head/emulators/darcnes/files/patch-ui__gtk.c (from r445874, head/emulators/darcnes/files/patch-ui_gtk.c) ============================================================================== --- head/emulators/darcnes/files/patch-ui_gtk.c Sat Jul 15 13:54:33 2017 (r445874, copy source) +++ head/emulators/darcnes/files/patch-ui__gtk.c Sun Jul 16 18:06:45 2017 (r446041) @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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. */ Copied and modified: head/emulators/darcnes/files/patch-ui__x.c (from r445874, head/emulators/darcnes/files/patch-ui_x.c) ============================================================================== --- head/emulators/darcnes/files/patch-ui_x.c Sat Jul 15 13:54:33 2017 (r445874, copy source) +++ head/emulators/darcnes/files/patch-ui__x.c Sun Jul 16 18:06:45 2017 (r446041) @@ -1,4 +1,4 @@ ---- ui_x.c.orig Mon Oct 30 23:15:31 2000 +--- 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; Added: head/emulators/darcnes/files/patch-video__svga.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/darcnes/files/patch-video__svga.c Sun Jul 16 18:06:45 2017 (r446041) @@ -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(); Modified: head/emulators/darcnes/files/patch-video__x.c ============================================================================== --- head/emulators/darcnes/files/patch-video__x.c Sun Jul 16 17:32:04 2017 (r446040) +++ head/emulators/darcnes/files/patch-video__x.c Sun Jul 16 18:06:45 2017 (r446041) @@ -1,6 +1,6 @@ ---- 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]; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707161806.v6GI6jXQ084112>