diff options
| -rw-r--r-- | emulators/aranym/Makefile | 27 | ||||
| -rw-r--r-- | emulators/aranym/PLIST | 28 | ||||
| -rw-r--r-- | emulators/aranym/distinfo | 14 | ||||
| -rw-r--r-- | emulators/aranym/options.mk | 13 | ||||
| -rw-r--r-- | emulators/aranym/patches/patch-aa | 70 | ||||
| -rw-r--r-- | emulators/aranym/patches/patch-ab | 19 | ||||
| -rw-r--r-- | emulators/aranym/patches/patch-ac | 16 |
7 files changed, 108 insertions, 79 deletions
diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile index cf183902ddc..95256e8d707 100644 --- a/emulators/aranym/Makefile +++ b/emulators/aranym/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2007/09/02 11:45:31 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2008/07/30 14:08:59 hauke Exp $ # -DISTNAME= aranym-0.8.9beta -PKGREVISION= 5 +DISTNAME= aranym-0.9.6beta2 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aranym/} @@ -10,37 +9,19 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://aranym.sourceforge.net/ COMMENT= Atari Running on Any Machine -USE_TOOLS+= gmake makedepend bash:run +USE_TOOLS+= gmake gzip USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/${DISTNAME}/src/Unix -USE_TOOLS+= gzip MANCOMPRESSED= yes -REPLACE_BASH+= ${WRKSRC}/../../tools/arabridge - -BUILD_TARGET= # void - -BUILD_DEFS+= FIXED_FASTRAM - -FIXED_FASTRAM?= 64 # Default value - CONFIGURE_ARGS+= --enable-fullmmu -CONFIGURE_ARGS+= --enable-dsp-disasm -CONFIGURE_ARGS+= --enable-blitsdlblit -CONFIGURE_ARGS+= --enable-fixedvideoram -CONFIGURE_ARGS+= --enable-fixedfastram=${FIXED_FASTRAM:Q} -CONFIGURE_ARGS+= --enable-blitmemmove +.include "options.mk" .include "../../mk/bsd.prefs.mk" .if ${OPSYS} != "NetBSD" && ${OPSYS} != "DragonFly" CONFIGURE_ARGS+= --enable-nfpci .endif -pre-build: - cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} depend - .include "../../devel/SDL/buildlink3.mk" -.include "../../graphics/Mesa/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/aranym/PLIST b/emulators/aranym/PLIST index 1d28d357864..37d72d6cdf3 100644 --- a/emulators/aranym/PLIST +++ b/emulators/aranym/PLIST @@ -1,31 +1,21 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/06 07:28:38 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/07/30 14:08:59 hauke Exp $ bin/aranym +man/man1/aranym-jit.1 +man/man1/aranym-mmu.1 man/man1/aranym.1 share/aranym/arabridge -share/aranym/atari/aranymrc.example -share/aranym/atari/fvdi/aranym.sys.bz2 -share/aranym/atari/fvdi/fvdi.prg.bz2 -share/aranym/atari/fvdi/fvdi.sys share/aranym/atari/hostfs/README share/aranym/atari/hostfs/bdconfig.sys -share/aranym/atari/hostfs/hostfs.dos.bz2 -share/aranym/atari/hostfs/hostfs.xfs.bz2 share/aranym/atari/mmusetup.cnf share/aranym/atari/network/README -share/aranym/atari/network/aranym.xif.bz2 share/aranym/atari/network/eth0-config.sh -share/aranym/atari/network/nfeth-config.bz2 share/aranym/atari/newdesk.inf -share/aranym/atari/nfcdrom/nfcdrom.bos.bz2 share/aranym/atari/sound/README -share/aranym/atari/sound/zmagxsnd.prg.bz2 share/aranym/atari/tools/README -share/aranym/atari/tools/clocky.prg.bz2 -share/aranym/atari/tools/fastram.prg.bz2 share/aranym/atari/tools/pc101us.kbd.bz2 -share/aranym/atari/tools/pcpatch.prg.bz2 -share/aranym/etos512k.img share/aranym/floppy.sh +share/aranym/logo.png +share/aranym/wm_icon.bmp share/doc/aranym/AUTHORS share/doc/aranym/BUGS share/doc/aranym/COPYING @@ -35,13 +25,17 @@ share/doc/aranym/NEWS share/doc/aranym/README share/doc/aranym/TODO share/doc/aranym/changelog -share/doc/aranym/documentation.txt +share/doc/aranym/config @dirrm share/doc/aranym @dirrm share/aranym/atari/tools @dirrm share/aranym/atari/sound +@exec ${MKDIR} %D/share/aranym/atari/nfosmesa +@dirrm share/aranym/atari/nfosmesa +@exec ${MKDIR} %D/share/aranym/atari/nfjpeg +@dirrm share/aranym/atari/nfjpeg +@exec ${MKDIR} %D/share/aranym/atari/nfcdrom @dirrm share/aranym/atari/nfcdrom @dirrm share/aranym/atari/network @dirrm share/aranym/atari/hostfs -@dirrm share/aranym/atari/fvdi @dirrm share/aranym/atari @dirrm share/aranym diff --git a/emulators/aranym/distinfo b/emulators/aranym/distinfo index 6dc3cfd070b..a2712962886 100644 --- a/emulators/aranym/distinfo +++ b/emulators/aranym/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2006/04/28 14:10:12 joerg Exp $ +$NetBSD: distinfo,v 1.6 2008/07/30 14:08:59 hauke Exp $ -SHA1 (aranym-0.8.9beta.tar.gz) = 509ad0e79c53ace176a8acef2fb2a4f23fa87d69 -RMD160 (aranym-0.8.9beta.tar.gz) = b0b994d672f6be530e6d2f4baa0327a690972f26 -Size (aranym-0.8.9beta.tar.gz) = 1246180 bytes -SHA1 (patch-aa) = fbb3606d92d1a30086ec3576aeb5f0f9f2d58221 -SHA1 (patch-ab) = 5d0120517eb94c0ff5fef3043b465b46fc23a0b6 -SHA1 (patch-ac) = a4ea32937e756c76d9972f0c76d1d48e05da673e +SHA1 (aranym-0.9.6beta2.tar.gz) = 7f66d0770b58ffcbcff5b3e0c36a5e9310d8df08 +RMD160 (aranym-0.9.6beta2.tar.gz) = 512032c46a0a67ac79762ac34dd000e0f03d2231 +Size (aranym-0.9.6beta2.tar.gz) = 1527029 bytes +SHA1 (patch-aa) = 8bf0ef529ce3cc2ff4e6436e00bdcf28e4a85905 +SHA1 (patch-ab) = 8796751780cc559acd089298f3e8a0918d36db3a +SHA1 (patch-ac) = b9456fced8f9f89f5f9bd388f0329478f775b62f diff --git a/emulators/aranym/options.mk b/emulators/aranym/options.mk new file mode 100644 index 00000000000..cba5a5a0a82 --- /dev/null +++ b/emulators/aranym/options.mk @@ -0,0 +1,13 @@ +# $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 diff --git a/emulators/aranym/patches/patch-aa b/emulators/aranym/patches/patch-aa index 053eddd4f17..e2fa5053075 100644 --- a/emulators/aranym/patches/patch-aa +++ b/emulators/aranym/patches/patch-aa @@ -1,30 +1,74 @@ -$NetBSD: patch-aa,v 1.3 2006/03/28 20:11:34 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2008/07/30 14:08:59 hauke Exp $ ---- configure.orig 2006-03-28 17:40:31.000000000 +0000 +--- configure.orig 2008-01-29 20:26:32.000000000 +0100 +++ configure -@@ -1776,6 +1776,7 @@ case "$target_os" in +@@ -2335,7 +2335,7 @@ case "$host_os" in + linux*) OS_TYPE=linux;; openbsd*) OS_TYPE=openbsd;; netbsd*) OS_TYPE=netbsd;; - freebsd*) OS_TYPE=freebsd;; -+ dragonfly*) OS_TYPE=freebsd;; +- freebsd*|kfreebsd*-gnu) OS_TYPE=freebsd;; ++ freebsd*|dragonfly*|kfreebsd*-gnu) OS_TYPE=freebsd;; solaris*) OS_TYPE=solaris;; darwin*) OS_TYPE=darwin;; cygwin*) OS_TYPE=cygwin;; -@@ -10469,7 +10470,7 @@ _ACEOF +@@ -5887,7 +5887,7 @@ done + + + +-for ac_header in linux/if.h linux/if_tun.h net/if.h net/if_tun.h ++for ac_header in linux/if.h linux/if_tun.h net/if.h net/if_tun.h net/if_tap.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -5905,6 +5905,9 @@ cat >>conftest.$ac_ext <<_ACEOF + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif ++#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif + + + #include <$ac_header> +@@ -11456,7 +11459,7 @@ _ACEOF irix*) - EXTRASYSSRCS="parameters_unix.cpp irix/unaligned.c" + EXTRASYSSRCS="Unix/parameters_unix.cpp Unix/irix/unaligned.c Unix/host_filesys_unix.cpp" ;; -- freebsd*) -+ freebsd* | dragonfly*) +- freebsd*|kfreebsd*-gnu) ++ freebsd*|dragonfly*|kfreebsd*-gnu) cat >>confdefs.h <<\_ACEOF #define HAVE_O_FSYNC 1 -@@ -11925,7 +11926,7 @@ echo "$as_me: error: Sorry, extended seg +@@ -11914,8 +11917,14 @@ cat >>conftest.$ac_ext <<_ACEOF + #include <linux/if_tun.h> + #endif + #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_IF_TUN_H) ++ #ifdef HAVE_SYS_TYPES_H ++ #include <sys/types.h> ++ #endif + #include <net/if.h> + #include <net/if_tun.h> ++ #if defined(HAVE_NET_IF_TAP_H) ++ #include <net/if_tap.h> ++ #endif + #endif + + int +@@ -13455,7 +13464,7 @@ echo "$as_me: error: Sorry, extended seg { (exit 1); exit 1; }; } fi ;; -- freebsd*) -+ freebsd* | dragonfly*) +- freebsd*|kfreebsd*-gnu) ++ freebsd*|dragonfly*|kfreebsd*-gnu) if [ "x$HAVE_I386" = "xyes" ]; then - SYSSRCS="$SYSSRCS xbsd/sigsegv_xbsd.cpp" + SYSSRCS="$SYSSRCS Unix/xbsd/sigsegv_xbsd.cpp" else +@@ -14975,7 +14984,7 @@ fi + + SDL_CFLAGS= + SDL_LIBS= +-if test "x$OS_TYPE" == "xdarwin" -a "x$WITH_FINK" = "xno"; then ++if test "x$OS_TYPE" = "xdarwin" -a "x$WITH_FINK" = "xno"; then + + { echo "$as_me:$LINENO: checking whether compiler supports framework SDL" >&5 + echo $ECHO_N "checking whether compiler supports framework SDL... $ECHO_C" >&6; } diff --git a/emulators/aranym/patches/patch-ab b/emulators/aranym/patches/patch-ab index 25d16347a47..c2b6ffe53f9 100644 --- a/emulators/aranym/patches/patch-ab +++ b/emulators/aranym/patches/patch-ab @@ -1,13 +1,10 @@ -$NetBSD: patch-ab,v 1.1 2006/03/28 20:11:34 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2008/07/30 14:08:59 hauke Exp $ ---- ../cdrom.cpp.orig 2006-03-28 18:18:45.000000000 +0000 -+++ ../cdrom.cpp -@@ -82,7 +82,7 @@ extern "C" { - #include "cdrom_beos.h" - #define BX_CD_FRAMESIZE 2048 +--- tools/arabridge.orig 2006-02-11 10:46:41.000000000 +0100 ++++ tools/arabridge +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh --#elif (defined (OS_netbsd) || defined(OS_openbsd) || defined(OS__freebsd)) -+#elif (defined (OS_netbsd) || defined(OS_openbsd) || defined(OS_freebsd)) - // OpenBSD pre version 2.7 may require extern "C" { } structure around - // all the includes, because the i386 sys/disklabel.h contains code which - // c++ considers invalid. + # ARAnyM - bridging network + # STanda (c) 2004 diff --git a/emulators/aranym/patches/patch-ac b/emulators/aranym/patches/patch-ac index 1ed7e827efe..da90fbbe3c4 100644 --- a/emulators/aranym/patches/patch-ac +++ b/emulators/aranym/patches/patch-ac @@ -1,15 +1,15 @@ -$NetBSD: patch-ac,v 1.1 2006/04/28 14:10:12 joerg Exp $ +$NetBSD: patch-ac,v 1.2 2008/07/30 14:08:59 hauke Exp $ ---- Makefile.in.orig 2006-04-28 13:11:06.000000000 +0000 +--- Makefile.in.orig 2008-01-29 00:07:52.000000000 +0100 +++ Makefile.in -@@ -140,8 +140,8 @@ $(APP_LIB): $(OBJ_DIR) $(OBJS) - - install: $(APP) $(TAPIF) $(APP).1.gz installdirs +@@ -237,8 +237,8 @@ $(APP_BUNDLE): $(APP) + install: $(APP) $(TAPIF) $(APP).1.gz $(APP)-jit.1.gz $(APP)-mmu.1.gz $(APP_IFC).1.gz installdirs $(INSTALL_PROGRAM) $(APP) $(DESTDIR)$(bindir)/$(APP) -- if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then\ + if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \ - $(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC);\ -+ if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \ +- $(INSTALL_DATA) $(APP_IFC).1.gz $(DESTDIR)$(man1dir)/$(APP_IFC).1.gz ;\ + $(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC); \ ++ $(INSTALL_DATA) $(APP_IFC).1.gz $(DESTDIR)$(man1dir)/$(APP_IFC).1.gz ; \ fi $(INSTALL_DATA) $(APP).1.gz $(DESTDIR)$(man1dir)/$(APP).1.gz - $(INSTALL_DATA) ../../ChangeLog $(DESTDIR)$(docdir)/$(APP)/changelog + $(INSTALL_DATA) $(APP)-jit.1.gz $(DESTDIR)$(man1dir)/$(APP)-jit.1.gz |