Wed Jul 30 14:08:59 2008 UTC ()
Update aranym to 0.9.6beta2.
Throw out a few options which are pointless (fixed{video,fast}ram) since they
are only minimally relevant to JIT, or broken (blitsdlblit, blitmemmove).
Patch posix shell script instead of requiring bash.
Make OpenGL support an option.

Emutos has to be downloaded from http://emutos.sourceforge.net/en/download.htm


(hauke)
diff -r1.18 -r1.19 pkgsrc/emulators/aranym/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/emulators/aranym/PLIST
diff -r1.5 -r1.6 pkgsrc/emulators/aranym/distinfo
diff -r0 -r1.1 pkgsrc/emulators/aranym/options.mk
diff -r1.3 -r1.4 pkgsrc/emulators/aranym/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/emulators/aranym/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/emulators/aranym/patches/patch-ac
cvs diff -r1.18 -r1.19 pkgsrc/emulators/aranym/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/aranym/Makefile 2007/09/02 11:45:31 1.18
+++ pkgsrc/emulators/aranym/Makefile 2008/07/30 14:08:59 1.19
@@ -1,46 +1,27 @@ @@ -1,46 +1,27 @@
1# $NetBSD: Makefile,v 1.18 2007/09/02 11:45:31 joerg Exp $ 1# $NetBSD: Makefile,v 1.19 2008/07/30 14:08:59 hauke Exp $
2# 2#
3 3
4DISTNAME= aranym-0.8.9beta 4DISTNAME= aranym-0.9.6beta2
5PKGREVISION= 5 
6CATEGORIES= emulators 5CATEGORIES= emulators
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aranym/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aranym/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://aranym.sourceforge.net/ 9HOMEPAGE= http://aranym.sourceforge.net/
11COMMENT= Atari Running on Any Machine 10COMMENT= Atari Running on Any Machine
12 11
13USE_TOOLS+= gmake makedepend bash:run 12USE_TOOLS+= gmake gzip
14USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16WRKSRC= ${WRKDIR}/${DISTNAME}/src/Unix 
17USE_TOOLS+= gzip 
18MANCOMPRESSED= yes 15MANCOMPRESSED= yes
19 16
20REPLACE_BASH+= ${WRKSRC}/../../tools/arabridge 
21 
22BUILD_TARGET= # void 
23 
24BUILD_DEFS+= FIXED_FASTRAM 
25 
26FIXED_FASTRAM?= 64 # Default value 
27 
28CONFIGURE_ARGS+= --enable-fullmmu 17CONFIGURE_ARGS+= --enable-fullmmu
29CONFIGURE_ARGS+= --enable-dsp-disasm 
30CONFIGURE_ARGS+= --enable-blitsdlblit 
31CONFIGURE_ARGS+= --enable-fixedvideoram 
32CONFIGURE_ARGS+= --enable-fixedfastram=${FIXED_FASTRAM:Q} 
33CONFIGURE_ARGS+= --enable-blitmemmove 
34 18
 19.include "options.mk"
35.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
36 21
37.if ${OPSYS} != "NetBSD" && ${OPSYS} != "DragonFly" 22.if ${OPSYS} != "NetBSD" && ${OPSYS} != "DragonFly"
38CONFIGURE_ARGS+= --enable-nfpci 23CONFIGURE_ARGS+= --enable-nfpci
39.endif 24.endif
40 25
41pre-build: 
42 cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} depend 
43 
44.include "../../devel/SDL/buildlink3.mk" 26.include "../../devel/SDL/buildlink3.mk"
45.include "../../graphics/Mesa/buildlink3.mk" 
46.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/emulators/aranym/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/aranym/PLIST 2004/07/06 07:28:38 1.1.1.1
+++ pkgsrc/emulators/aranym/PLIST 2008/07/30 14:08:59 1.2
@@ -1,47 +1,41 @@ @@ -1,47 +1,41 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/06 07:28:38 xtraeme Exp $ 1@comment $NetBSD: PLIST,v 1.2 2008/07/30 14:08:59 hauke Exp $
2bin/aranym 2bin/aranym
 3man/man1/aranym-jit.1
 4man/man1/aranym-mmu.1
3man/man1/aranym.1 5man/man1/aranym.1
4share/aranym/arabridge 6share/aranym/arabridge
5share/aranym/atari/aranymrc.example 
6share/aranym/atari/fvdi/aranym.sys.bz2 
7share/aranym/atari/fvdi/fvdi.prg.bz2 
8share/aranym/atari/fvdi/fvdi.sys 
9share/aranym/atari/hostfs/README 7share/aranym/atari/hostfs/README
10share/aranym/atari/hostfs/bdconfig.sys 8share/aranym/atari/hostfs/bdconfig.sys
11share/aranym/atari/hostfs/hostfs.dos.bz2 
12share/aranym/atari/hostfs/hostfs.xfs.bz2 
13share/aranym/atari/mmusetup.cnf 9share/aranym/atari/mmusetup.cnf
14share/aranym/atari/network/README 10share/aranym/atari/network/README
15share/aranym/atari/network/aranym.xif.bz2 
16share/aranym/atari/network/eth0-config.sh 11share/aranym/atari/network/eth0-config.sh
17share/aranym/atari/network/nfeth-config.bz2 
18share/aranym/atari/newdesk.inf 12share/aranym/atari/newdesk.inf
19share/aranym/atari/nfcdrom/nfcdrom.bos.bz2 
20share/aranym/atari/sound/README 13share/aranym/atari/sound/README
21share/aranym/atari/sound/zmagxsnd.prg.bz2 
22share/aranym/atari/tools/README 14share/aranym/atari/tools/README
23share/aranym/atari/tools/clocky.prg.bz2 
24share/aranym/atari/tools/fastram.prg.bz2 
25share/aranym/atari/tools/pc101us.kbd.bz2 15share/aranym/atari/tools/pc101us.kbd.bz2
26share/aranym/atari/tools/pcpatch.prg.bz2 
27share/aranym/etos512k.img 
28share/aranym/floppy.sh 16share/aranym/floppy.sh
 17share/aranym/logo.png
 18share/aranym/wm_icon.bmp
29share/doc/aranym/AUTHORS 19share/doc/aranym/AUTHORS
30share/doc/aranym/BUGS 20share/doc/aranym/BUGS
31share/doc/aranym/COPYING 21share/doc/aranym/COPYING
32share/doc/aranym/FAQ 22share/doc/aranym/FAQ
33share/doc/aranym/INSTALL 23share/doc/aranym/INSTALL
34share/doc/aranym/NEWS 24share/doc/aranym/NEWS
35share/doc/aranym/README 25share/doc/aranym/README
36share/doc/aranym/TODO 26share/doc/aranym/TODO
37share/doc/aranym/changelog 27share/doc/aranym/changelog
38share/doc/aranym/documentation.txt 28share/doc/aranym/config
39@dirrm share/doc/aranym 29@dirrm share/doc/aranym
40@dirrm share/aranym/atari/tools 30@dirrm share/aranym/atari/tools
41@dirrm share/aranym/atari/sound 31@dirrm share/aranym/atari/sound
 32@exec ${MKDIR} %D/share/aranym/atari/nfosmesa
 33@dirrm share/aranym/atari/nfosmesa
 34@exec ${MKDIR} %D/share/aranym/atari/nfjpeg
 35@dirrm share/aranym/atari/nfjpeg
 36@exec ${MKDIR} %D/share/aranym/atari/nfcdrom
42@dirrm share/aranym/atari/nfcdrom 37@dirrm share/aranym/atari/nfcdrom
43@dirrm share/aranym/atari/network 38@dirrm share/aranym/atari/network
44@dirrm share/aranym/atari/hostfs 39@dirrm share/aranym/atari/hostfs
45@dirrm share/aranym/atari/fvdi 
46@dirrm share/aranym/atari 40@dirrm share/aranym/atari
47@dirrm share/aranym 41@dirrm share/aranym
cvs diff -r1.5 -r1.6 pkgsrc/emulators/aranym/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/aranym/distinfo 2006/04/28 14:10:12 1.5
+++ pkgsrc/emulators/aranym/distinfo 2008/07/30 14:08:59 1.6
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.5 2006/04/28 14:10:12 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2008/07/30 14:08:59 hauke Exp $
2 2
3SHA1 (aranym-0.8.9beta.tar.gz) = 509ad0e79c53ace176a8acef2fb2a4f23fa87d69 3SHA1 (aranym-0.9.6beta2.tar.gz) = 7f66d0770b58ffcbcff5b3e0c36a5e9310d8df08
4RMD160 (aranym-0.8.9beta.tar.gz) = b0b994d672f6be530e6d2f4baa0327a690972f26 4RMD160 (aranym-0.9.6beta2.tar.gz) = 512032c46a0a67ac79762ac34dd000e0f03d2231
5Size (aranym-0.8.9beta.tar.gz) = 1246180 bytes 5Size (aranym-0.9.6beta2.tar.gz) = 1527029 bytes
6SHA1 (patch-aa) = fbb3606d92d1a30086ec3576aeb5f0f9f2d58221 6SHA1 (patch-aa) = 8bf0ef529ce3cc2ff4e6436e00bdcf28e4a85905
7SHA1 (patch-ab) = 5d0120517eb94c0ff5fef3043b465b46fc23a0b6 7SHA1 (patch-ab) = 8796751780cc559acd089298f3e8a0918d36db3a
8SHA1 (patch-ac) = a4ea32937e756c76d9972f0c76d1d48e05da673e 8SHA1 (patch-ac) = b9456fced8f9f89f5f9bd388f0329478f775b62f
File Added: pkgsrc/emulators/aranym/options.mk
# $NetBSD: options.mk,v 1.1 2008/07/30 14:08:59 hauke Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.aranym
PKG_SUPPORTED_OPTIONS=	opengl

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mopengl)
CONFIGURE_ARGS+=	--enable-opengl
.include "../../graphics/Mesa/buildlink3.mk"
.else
CONFIGURE_ARGS+=	--disable-opengl
.endif
cvs diff -r1.3 -r1.4 pkgsrc/emulators/aranym/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/emulators/aranym/patches/Attic/patch-aa 2006/03/28 20:11:34 1.3
+++ pkgsrc/emulators/aranym/patches/Attic/patch-aa 2008/07/30 14:08:59 1.4
@@ -1,30 +1,74 @@ @@ -1,30 +1,74 @@
1$NetBSD: patch-aa,v 1.3 2006/03/28 20:11:34 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2008/07/30 14:08:59 hauke Exp $
2 2
3--- configure.orig 2006-03-28 17:40:31.000000000 +0000 3--- configure.orig 2008-01-29 20:26:32.000000000 +0100
4+++ configure 4+++ configure
5@@ -1776,6 +1776,7 @@ case "$target_os" in 5@@ -2335,7 +2335,7 @@ case "$host_os" in
 6 linux*) OS_TYPE=linux;;
6 openbsd*) OS_TYPE=openbsd;; 7 openbsd*) OS_TYPE=openbsd;;
7 netbsd*) OS_TYPE=netbsd;; 8 netbsd*) OS_TYPE=netbsd;;
8 freebsd*) OS_TYPE=freebsd;; 9- freebsd*|kfreebsd*-gnu) OS_TYPE=freebsd;;
9+ dragonfly*) OS_TYPE=freebsd;; 10+ freebsd*|dragonfly*|kfreebsd*-gnu) OS_TYPE=freebsd;;
10 solaris*) OS_TYPE=solaris;; 11 solaris*) OS_TYPE=solaris;;
11 darwin*) OS_TYPE=darwin;; 12 darwin*) OS_TYPE=darwin;;
12 cygwin*) OS_TYPE=cygwin;; 13 cygwin*) OS_TYPE=cygwin;;
13@@ -10469,7 +10470,7 @@ _ACEOF 14@@ -5887,7 +5887,7 @@ done
 15
 16
 17
 18-for ac_header in linux/if.h linux/if_tun.h net/if.h net/if_tun.h
 19+for ac_header in linux/if.h linux/if_tun.h net/if.h net/if_tun.h net/if_tap.h
 20 do
 21 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 22 { echo "$as_me:$LINENO: checking for $ac_header" >&5
 23@@ -5905,6 +5905,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 24 #ifdef HAVE_SYS_SOCKET_H
 25 #include <sys/socket.h>
 26 #endif
 27+#ifdef HAVE_SYS_TYPES_H
 28+#include <sys/types.h>
 29+#endif
 30
 31
 32 #include <$ac_header>
 33@@ -11456,7 +11459,7 @@ _ACEOF
14 irix*) 34 irix*)
15 EXTRASYSSRCS="parameters_unix.cpp irix/unaligned.c" 35 EXTRASYSSRCS="Unix/parameters_unix.cpp Unix/irix/unaligned.c Unix/host_filesys_unix.cpp"
16 ;; 36 ;;
17- freebsd*) 37- freebsd*|kfreebsd*-gnu)
18+ freebsd* | dragonfly*) 38+ freebsd*|dragonfly*|kfreebsd*-gnu)
19  39
20 cat >>confdefs.h <<\_ACEOF 40 cat >>confdefs.h <<\_ACEOF
21 #define HAVE_O_FSYNC 1 41 #define HAVE_O_FSYNC 1
22@@ -11925,7 +11926,7 @@ echo "$as_me: error: Sorry, extended seg 42@@ -11914,8 +11917,14 @@ cat >>conftest.$ac_ext <<_ACEOF
 43 #include <linux/if_tun.h>
 44 #endif
 45 #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_IF_TUN_H)
 46+ #ifdef HAVE_SYS_TYPES_H
 47+ #include <sys/types.h>
 48+ #endif
 49 #include <net/if.h>
 50 #include <net/if_tun.h>
 51+ #if defined(HAVE_NET_IF_TAP_H)
 52+ #include <net/if_tap.h>
 53+ #endif
 54 #endif
 55
 56 int
 57@@ -13455,7 +13464,7 @@ echo "$as_me: error: Sorry, extended seg
23 { (exit 1); exit 1; }; } 58 { (exit 1); exit 1; }; }
24 fi 59 fi
25 ;; 60 ;;
26- freebsd*) 61- freebsd*|kfreebsd*-gnu)
27+ freebsd* | dragonfly*) 62+ freebsd*|dragonfly*|kfreebsd*-gnu)
28 if [ "x$HAVE_I386" = "xyes" ]; then 63 if [ "x$HAVE_I386" = "xyes" ]; then
29 SYSSRCS="$SYSSRCS xbsd/sigsegv_xbsd.cpp" 64 SYSSRCS="$SYSSRCS Unix/xbsd/sigsegv_xbsd.cpp"
30 else 65 else
 66@@ -14975,7 +14984,7 @@ fi
 67
 68 SDL_CFLAGS=
 69 SDL_LIBS=
 70-if test "x$OS_TYPE" == "xdarwin" -a "x$WITH_FINK" = "xno"; then
 71+if test "x$OS_TYPE" = "xdarwin" -a "x$WITH_FINK" = "xno"; then
 72
 73 { echo "$as_me:$LINENO: checking whether compiler supports framework SDL" >&5
 74 echo $ECHO_N "checking whether compiler supports framework SDL... $ECHO_C" >&6; }
cvs diff -r1.1 -r1.2 pkgsrc/emulators/aranym/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/emulators/aranym/patches/patch-ab 2006/03/28 20:11:34 1.1
+++ pkgsrc/emulators/aranym/patches/patch-ab 2008/07/30 14:08:59 1.2
@@ -1,13 +1,10 @@ @@ -1,13 +1,10 @@
1$NetBSD: patch-ab,v 1.1 2006/03/28 20:11:34 joerg Exp $ 1$NetBSD: patch-ab,v 1.2 2008/07/30 14:08:59 hauke Exp $
2 2
3--- ../cdrom.cpp.orig 2006-03-28 18:18:45.000000000 +0000 3--- tools/arabridge.orig 2006-02-11 10:46:41.000000000 +0100
4+++ ../cdrom.cpp 4+++ tools/arabridge
5@@ -82,7 +82,7 @@ extern "C" { 5@@ -1,4 +1,4 @@
6 #include "cdrom_beos.h" 6-#!/bin/bash
7 #define BX_CD_FRAMESIZE 2048 7+#!/bin/sh
8  8
9-#elif (defined (OS_netbsd) || defined(OS_openbsd) || defined(OS__freebsd)) 9 # ARAnyM - bridging network
10+#elif (defined (OS_netbsd) || defined(OS_openbsd) || defined(OS_freebsd)) 10 # STanda (c) 2004
11 // OpenBSD pre version 2.7 may require extern "C" { } structure around 
12 // all the includes, because the i386 sys/disklabel.h contains code which  
13 // c++ considers invalid. 
cvs diff -r1.1 -r1.2 pkgsrc/emulators/aranym/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/emulators/aranym/patches/Attic/patch-ac 2006/04/28 14:10:12 1.1
+++ pkgsrc/emulators/aranym/patches/Attic/patch-ac 2008/07/30 14:08:59 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ac,v 1.1 2006/04/28 14:10:12 joerg Exp $ 1$NetBSD: patch-ac,v 1.2 2008/07/30 14:08:59 hauke Exp $
2 2
3--- Makefile.in.orig 2006-04-28 13:11:06.000000000 +0000 3--- Makefile.in.orig 2008-01-29 00:07:52.000000000 +0100
4+++ Makefile.in 4+++ Makefile.in
5@@ -140,8 +140,8 @@ $(APP_LIB): $(OBJ_DIR) $(OBJS) 5@@ -237,8 +237,8 @@ $(APP_BUNDLE): $(APP)
6  6 install: $(APP) $(TAPIF) $(APP).1.gz $(APP)-jit.1.gz $(APP)-mmu.1.gz $(APP_IFC).1.gz installdirs
7 install: $(APP) $(TAPIF) $(APP).1.gz installdirs 
8 $(INSTALL_PROGRAM) $(APP) $(DESTDIR)$(bindir)/$(APP) 7 $(INSTALL_PROGRAM) $(APP) $(DESTDIR)$(bindir)/$(APP)
9- if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then\ 8 if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \
10- $(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC);\ 9- $(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC);\
11+ if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \ 10- $(INSTALL_DATA) $(APP_IFC).1.gz $(DESTDIR)$(man1dir)/$(APP_IFC).1.gz ;\
12+ $(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC); \ 11+ $(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC); \
 12+ $(INSTALL_DATA) $(APP_IFC).1.gz $(DESTDIR)$(man1dir)/$(APP_IFC).1.gz ; \
13 fi 13 fi
14 $(INSTALL_DATA) $(APP).1.gz $(DESTDIR)$(man1dir)/$(APP).1.gz 14 $(INSTALL_DATA) $(APP).1.gz $(DESTDIR)$(man1dir)/$(APP).1.gz
15 $(INSTALL_DATA) ../../ChangeLog $(DESTDIR)$(docdir)/$(APP)/changelog 15 $(INSTALL_DATA) $(APP)-jit.1.gz $(DESTDIR)$(man1dir)/$(APP)-jit.1.gz