pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/43567: Please update emulators/aranym to 0.9.10



>Number:         43567
>Category:       pkg
>Synopsis:       Please update emulators/aranym to 0.9.10
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 04 00:50:00 +0000 2010
>Originator:     Ryo ONODERA
>Release:        NetBSD 5.99.34
>Organization:
        
>Environment:
        
        
System: NetBSD hydrogen.elements.tetera.org 5.99.34 NetBSD 5.99.34 
(BRIGHTGIRL7) #31: Sat Jul 3 12:28:57 JST 2010 
root%hydrogen.elements.tetera.org@localhost:/usr/obj/sys/arch/i386/compile/BRIGHTGIRL7
 i386
Architecture: i386
Machine: i386
>Description:
Please update emulators/aranym to 0.9.10 and emutos to 0.8.5.
        
>How-To-Repeat:
        
>Fix:
        

diff -x CVS -upNr ../emulators/aranym/Makefile aranym/Makefile
--- ../emulators/aranym/Makefile        2010-01-30 05:20:53.000000000 +0900
+++ aranym/Makefile     2010-07-04 09:37:33.000000000 +0900
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.21 2010/01/29 20:20:53 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2008/07/30 14:08:59 hauke Exp $
 #
 
-DISTNAME=                      aranym-0.9.6beta2
-PKGREVISION=                   1
+DISTNAME=                      aranym-0.9.10
 CATEGORIES=                    emulators
 MASTER_SITES=                  ${MASTER_SITE_SOURCEFORGE:=aranym/}
-SITES.emutos-512k-0.8.3.zip=   ${MASTER_SITE_SOURCEFORGE:=emutos/}
-DISTFILES=                     aranym-0.9.6beta2.tar.gz emutos-512k-0.8.3.zip
+SITES.emutos-512k-0.8.5.zip=   ${MASTER_SITE_SOURCEFORGE:=emutos/}
+DISTFILES=                     ${DISTNAME}.tar.gz emutos-512k-0.8.5.zip
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://aranym.sourceforge.net/
 COMMENT=               Atari Running on Any Machine
+LICENSE=               gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -19,11 +19,13 @@ USE_LANGUAGES=              c c++
 GNU_CONFIGURE=         yes
 MANCOMPRESSED=         yes
 
-CONFIGURE_ARGS+=       --enable-fullmmu
-
-EMUTOS_WRKSRC=         ${WRKDIR}/emutos-512k-0.8.3
-EMUTOS_DOC_DIR=                ${PREFIX}/share/doc/aranym/emutos
-EMUTOS_ROM_DIR=                ${PREFIX}/share/aranym
+CONFIGURE_ARGS+=       --enable-fullmmu \
+                       --enable-atc=full \
+                       --enable-lilo
+
+EMUTOS_WRKSRC=         ${WRKDIR}/emutos-512k-0.8.5
+EMUTOS_DOC_DIR=                ${DESTDIR}${PREFIX}/share/doc/aranym/emutos
+EMUTOS_ROM_DIR=                ${DESTDIR}${PREFIX}/share/aranym
 
 REQD_DIRS+=            ${EMUTOS_ROM_DIR} ${EMUTOS_DOC_DIR}
 
@@ -42,16 +44,21 @@ SUBST_MESSAGE.paths=        Fixing hardcoded pa
 CONFIGURE_ARGS+=       --enable-nfpci
 .endif
 
-INSTALLATION_DIRS+=    ${EMUTOS_DOC_DIR} ${EMUTOS_ROM_DIR}
+.if !empty(MACHINE_PLATFORM:MLinux-*-i386)
+CONFIGURE_ARGS+=       --enable-jit-compiler \
+                       --enable-jit-fpu
+.endif
 
 post-install:
-       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/etos512k.img 
${DESTDIR}${EMUTOS_ROM_DIR}
-       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/readme.txt ${DESTDIR}${EMUTOS_DOC_DIR}
-       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/announce.txt 
${DESTDIR}${EMUTOS_DOC_DIR}
-       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/authors.txt 
${DESTDIR}${EMUTOS_DOC_DIR}
-       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/changelog.txt 
${DESTDIR}${EMUTOS_DOC_DIR}
-       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/license.txt 
${DESTDIR}${EMUTOS_DOC_DIR}
-       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/status.txt 
${DESTDIR}${EMUTOS_DOC_DIR}
+       ${INSTALL_DATA_DIR} ${EMUTOS_ROM_DIR}
+       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/etos512k.img ${EMUTOS_ROM_DIR}
+       ${INSTALL_DATA_DIR} ${EMUTOS_DOC_DIR}
+       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/readme.txt ${EMUTOS_DOC_DIR}
+       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/announce.txt ${EMUTOS_DOC_DIR}
+       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/authors.txt ${EMUTOS_DOC_DIR}
+       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/changelog.txt ${EMUTOS_DOC_DIR}
+       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/license.txt ${EMUTOS_DOC_DIR}
+       ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/status.txt ${EMUTOS_DOC_DIR}
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -x CVS -upNr ../emulators/aranym/PLIST aranym/PLIST
--- ../emulators/aranym/PLIST   2009-06-15 03:54:52.000000000 +0900
+++ aranym/PLIST        2010-01-01 07:22:20.000000000 +0900
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:54:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:51:01 joerg Exp $
 bin/aranym
 man/man1/aranym-jit.1
 man/man1/aranym-mmu.1
diff -x CVS -upNr ../emulators/aranym/TODO aranym/TODO
--- ../emulators/aranym/TODO    1970-01-01 09:00:00.000000000 +0900
+++ aranym/TODO 2010-01-03 14:07:40.000000000 +0900
@@ -0,0 +1 @@
+* On Linux/i386, check JIT.
diff -x CVS -upNr ../emulators/aranym/distinfo aranym/distinfo
--- ../emulators/aranym/distinfo        2008-08-08 01:19:34.000000000 +0900
+++ aranym/distinfo     2010-07-04 09:17:52.000000000 +0900
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.7 2008/08/07 16:19:34 hauke Exp $
+$NetBSD: distinfo,v 1.6 2008/07/30 14:08:59 hauke Exp $
 
-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 (emutos-512k-0.8.3.zip) = 5edb36b4f959c6ae258f30ac5107fd1a5725215d
-RMD160 (emutos-512k-0.8.3.zip) = ddc0fae3d332425f2b5b551544c78676d412a5be
-Size (emutos-512k-0.8.3.zip) = 211069 bytes
-SHA1 (patch-aa) = 8bf0ef529ce3cc2ff4e6436e00bdcf28e4a85905
-SHA1 (patch-ab) = 8796751780cc559acd089298f3e8a0918d36db3a
-SHA1 (patch-ac) = b9456fced8f9f89f5f9bd388f0329478f775b62f
+SHA1 (aranym-0.9.10.tar.gz) = b7d55756c3c6a73b26f1e504ceee1016b7d40231
+RMD160 (aranym-0.9.10.tar.gz) = d0f5beffbc81d9ffbe22c54ec49e7d3353359c0d
+Size (aranym-0.9.10.tar.gz) = 1737163 bytes
+SHA1 (emutos-512k-0.8.5.zip) = 63ec3326e65d07c64e529694b7cfbbc559188f47
+RMD160 (emutos-512k-0.8.5.zip) = 8440e97667dbdf3de7b484d98ae6ada3b5e1fe2a
+Size (emutos-512k-0.8.5.zip) = 213435 bytes
+SHA1 (patch-aa) = feaec5f42a654a3a626ef8fcafdcc3ca8c993c0a
+SHA1 (patch-ab) = 5292eeaadf1ae87257fe70c313b3f7e8e40a8d14
+SHA1 (patch-ac) = 2b9888987f55892603d16bf46321dc1557492f97
 SHA1 (patch-ad) = bb8d6b2ecd0c0066f3032a0ef196a1adb51d1786
+SHA1 (patch-ae) = 6c7ab7cf17bb9da5944c9a09474079bcfe7e7f43
diff -x CVS -upNr ../emulators/aranym/options.mk aranym/options.mk
--- ../emulators/aranym/options.mk      2008-07-30 23:08:59.000000000 +0900
+++ aranym/options.mk   2010-01-01 07:22:20.000000000 +0900
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/07/30 14:08:59 hauke Exp $
+# $NetBSD$
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.aranym
 PKG_SUPPORTED_OPTIONS= opengl
diff -x CVS -upNr ../emulators/aranym/patches/patch-aa aranym/patches/patch-aa
--- ../emulators/aranym/patches/patch-aa        2008-07-30 23:08:59.000000000 
+0900
+++ aranym/patches/patch-aa     2010-07-04 09:09:33.000000000 +0900
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2008/07/30 14:08:59 hauke Exp $
+$NetBSD$
 
---- configure.orig     2008-01-29 20:26:32.000000000 +0100
+--- configure.orig     2010-06-01 13:42:21.000000000 +0000
 +++ configure
-@@ -2335,7 +2335,7 @@ case "$host_os" in
+@@ -3069,7 +3069,7 @@ case "$host_os" in
    linux*)     OS_TYPE=linux;;
    openbsd*)   OS_TYPE=openbsd;;
    netbsd*)    OS_TYPE=netbsd;;
@@ -11,35 +11,35 @@ $NetBSD: patch-aa,v 1.4 2008/07/30 14:08
    solaris*)   OS_TYPE=solaris;;
    darwin*)    OS_TYPE=darwin;;
    cygwin*)    OS_TYPE=cygwin;;
-@@ -5887,7 +5887,7 @@ done
- 
+@@ -5154,13 +5154,17 @@ fi
  
+ 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
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
  #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
+ "
+ eval as_val=\$$as_ac_Header
+@@ -6424,7 +6428,7 @@ $as_echo "#define _POSIX_C_SOURCE 199506
    irix*)
      EXTRASYSSRCS="Unix/parameters_unix.cpp Unix/irix/unaligned.c 
Unix/host_filesys_unix.cpp"
      ;;
 -  freebsd*|kfreebsd*-gnu)
 +  freebsd*|dragonfly*|kfreebsd*-gnu)
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_O_FSYNC 1
-@@ -11914,8 +11917,14 @@ cat >>conftest.$ac_ext <<_ACEOF
+ $as_echo "#define HAVE_O_FSYNC 1" >>confdefs.h
+ 
+@@ -6720,8 +6724,14 @@ else
        #include <linux/if_tun.h>
        #endif
        #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_IF_TUN_H)
@@ -54,8 +54,8 @@ $NetBSD: patch-aa,v 1.4 2008/07/30 14:08
        #endif
  
  int
-@@ -13455,7 +13464,7 @@ echo "$as_me: error: Sorry, extended seg
-    { (exit 1); exit 1; }; }
+@@ -7775,7 +7785,7 @@ $as_echo "#define NO_NESTED_SIGSEGV 1 " 
+         as_fn_error "Sorry, extended segfault handler not supported on your 
platform" "$LINENO" 5
        fi
        ;;
 -    freebsd*|kfreebsd*-gnu)
@@ -63,12 +63,12 @@ $NetBSD: patch-aa,v 1.4 2008/07/30 14:08
        if [ "x$HAVE_I386" = "xyes" ]; then
          SYSSRCS="$SYSSRCS Unix/xbsd/sigsegv_xbsd.cpp"
        else
-@@ -14975,7 +14984,7 @@ fi
+@@ -8486,7 +8496,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; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler 
supports framework SDL" >&5
+ $as_echo_n "checking whether compiler supports framework SDL... " >&6; }
diff -x CVS -upNr ../emulators/aranym/patches/patch-ab aranym/patches/patch-ab
--- ../emulators/aranym/patches/patch-ab        2008-07-30 23:08:59.000000000 
+0900
+++ aranym/patches/patch-ab     2010-07-04 09:33:30.000000000 +0900
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2008/07/30 14:08:59 hauke Exp $
+$NetBSD$
 
---- tools/arabridge.orig       2006-02-11 10:46:41.000000000 +0100
+--- tools/arabridge.orig       2008-12-09 06:54:08.000000000 +0000
 +++ tools/arabridge
 @@ -1,4 +1,4 @@
 -#!/bin/bash
diff -x CVS -upNr ../emulators/aranym/patches/patch-ac aranym/patches/patch-ac
--- ../emulators/aranym/patches/patch-ac        2008-07-30 23:08:59.000000000 
+0900
+++ aranym/patches/patch-ac     2010-07-04 09:13:20.000000000 +0900
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2008/07/30 14:08:59 hauke Exp $
+$NetBSD$
 
---- Makefile.in.orig   2008-01-29 00:07:52.000000000 +0100
+--- Makefile.in.orig   2010-05-27 18:40:47.000000000 +0000
 +++ Makefile.in
-@@ -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)
+@@ -337,8 +337,8 @@ bindistdirs:
+ bindist: $(APP) $(TAPIF) doc/$(APP).1 doc/$(APP)-jit.1 doc/$(APP)-mmu.1 
doc/$(APP_IFC).1 bindistdirs
+       $(INSTALL_PROGRAM) $(APP) tmpdist$(bindir)/$(APP)
        if [ "x$(APP_IFC)" = "x$(TAPIF)" ]; then \
--      $(INSTALL_PROGRAM) $(APP_IFC) $(DESTDIR)$(bindir)/$(APP_IFC);\
--      $(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 ; \
+-      $(INSTALL_PROGRAM) $(APP_IFC) tmpdist$(bindir)/$(APP_IFC);\
+-      $(INSTALL_DATA) doc/$(APP_IFC).1 tmpdist$(man1dir)/$(APP_IFC).1 ;\
++      $(INSTALL_PROGRAM) $(APP_IFC) tmpdist$(bindir)/$(APP_IFC); \
++      $(INSTALL_DATA) doc/$(APP_IFC).1 tmpdist$(man1dir)/$(APP_IFC).1 ; \
        fi
-       $(INSTALL_DATA) $(APP).1.gz $(DESTDIR)$(man1dir)/$(APP).1.gz
-       $(INSTALL_DATA) $(APP)-jit.1.gz $(DESTDIR)$(man1dir)/$(APP)-jit.1.gz
+       $(INSTALL_DATA) doc/$(APP).1 tmpdist$(man1dir)/$(APP).1
+       $(INSTALL_DATA) doc/$(APP)-jit.1 tmpdist$(man1dir)/$(APP)-jit.1
diff -x CVS -upNr ../emulators/aranym/patches/patch-ad aranym/patches/patch-ad
--- ../emulators/aranym/patches/patch-ad        2008-08-08 01:19:34.000000000 
+0900
+++ aranym/patches/patch-ad     2010-01-01 07:22:20.000000000 +0900
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2008/08/07 16:19:34 hauke Exp $
+$NetBSD$
 
 --- doc/config.orig    2008-01-26 12:01:41.000000000 +0100
 +++ doc/config
diff -x CVS -upNr ../emulators/aranym/patches/patch-ae aranym/patches/patch-ae
--- ../emulators/aranym/patches/patch-ae        1970-01-01 09:00:00.000000000 
+0900
+++ aranym/patches/patch-ae     2010-01-01 08:31:50.000000000 +0900
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/Unix/darwin/aratapif.sh.orig   2008-02-05 21:37:06.000000000 +0000
++++ src/Unix/darwin/aratapif.sh
+@@ -25,7 +25,7 @@ DNSFWNATD_PORT=8669
+ DNSFW_RULENUM=00100
+ IPFW_RULENUM=00200
+ 
+-if [ "$FW_INTERFACE" == "" ]
++if [ "$FW_INTERFACE" = "" ]
+ then
+       ifconfig -u -a inet >/tmp/ifchk 2>/dev/null
+       
+@@ -51,7 +51,7 @@ then
+       echo $FW_INTERFACE - $ADDR
+ fi
+ 
+-if [ "$NAMESERVER" == "" ]
++if [ "$NAMESERVER" = "" ]
+ then
+       while read -r line
+     do


>Unformatted:
        
        


Home | Main Index | Thread Index | Old Index