diff options
| -rw-r--r-- | emulators/aranym/Makefile | 20 | ||||
| -rw-r--r-- | emulators/aranym/distinfo | 16 | ||||
| -rw-r--r-- | emulators/aranym/patches/patch-aa | 73 | ||||
| -rw-r--r-- | emulators/aranym/patches/patch-configure.ac | 70 |
4 files changed, 92 insertions, 87 deletions
diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile index 7de38b7d917..5403a2468cf 100644 --- a/emulators/aranym/Makefile +++ b/emulators/aranym/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.22 2010/07/08 11:28:05 obache Exp $ +# $NetBSD: Makefile,v 1.23 2012/04/15 02:05:28 ryoon Exp $ # -DISTNAME= aranym-0.9.10 +DISTNAME= aranym_0.9.13.orig +PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aranym/} -SITES.emutos-512k-0.8.5.zip= ${MASTER_SITE_SOURCEFORGE:=emutos/} -DISTFILES= ${DEFAULT_DISTFILES} emutos-512k-0.8.5.zip +SITES.emutos-512k-0.8.6.zip= ${MASTER_SITE_SOURCEFORGE:=emutos/} +DISTFILES= ${DEFAULT_DISTFILES} emutos-512k-0.8.6.zip MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://aranym.sourceforge.net/ @@ -14,7 +15,11 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir -USE_TOOLS+= gmake gzip +WRKSRC= ${WRKDIR}/${PKGNAME} + +AUTOCONF_REQD= 2..50 + +USE_TOOLS+= autoconf gmake gzip USE_LANGUAGES= c c++ GNU_CONFIGURE= yes MANCOMPRESSED= yes @@ -22,7 +27,7 @@ MANCOMPRESSED= yes CONFIGURE_ARGS+= --enable-fullmmu CONFIGURE_ARGS+= --enable-atc=full -EMUTOS_WRKSRC= ${WRKDIR}/emutos-512k-0.8.5 +EMUTOS_WRKSRC= ${WRKDIR}/emutos-512k-0.8.6 EMUTOS_DOC_DIR= ${PREFIX}/share/doc/aranym/emutos EMUTOS_ROM_DIR= ${PREFIX}/share/aranym @@ -50,6 +55,9 @@ CONFIGURE_ARGS+= --enable-jit-fpu INSTALLATION_DIRS+= ${EMUTOS_DOC_DIR} ${EMUTOS_ROM_DIR} +pre-configure: + cd ${WRKSRC} && autoconf + post-install: ${INSTALL_DATA} ${EMUTOS_WRKSRC}/etos512k.img ${DESTDIR}${EMUTOS_ROM_DIR} ${INSTALL_DATA} ${EMUTOS_WRKSRC}/readme.txt ${DESTDIR}${EMUTOS_DOC_DIR} diff --git a/emulators/aranym/distinfo b/emulators/aranym/distinfo index 302a16a4f56..50fc4792793 100644 --- a/emulators/aranym/distinfo +++ b/emulators/aranym/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.8 2010/07/08 11:28:05 obache Exp $ +$NetBSD: distinfo,v 1.9 2012/04/15 02:05:28 ryoon Exp $ -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) = 4b45ad6cf60d7c0766756db69cf33fe612d56025 +SHA1 (aranym_0.9.13.orig.tar.gz) = fa06e8204eef848c16411e4fbfdc2a19c64599c5 +RMD160 (aranym_0.9.13.orig.tar.gz) = c6e7303b56d8c63b836e573755cf592f935bb85e +Size (aranym_0.9.13.orig.tar.gz) = 1779673 bytes +SHA1 (emutos-512k-0.8.6.zip) = 9549027b6a1759f86d7d4467dac6377768fbd0bf +RMD160 (emutos-512k-0.8.6.zip) = bc08eb71260fd11cf9531022603ff25a673140f3 +Size (emutos-512k-0.8.6.zip) = 240998 bytes SHA1 (patch-ab) = 8796751780cc559acd089298f3e8a0918d36db3a SHA1 (patch-ac) = 8899894456b01c84efd9f96f553750c87df7c21a SHA1 (patch-ad) = bb8d6b2ecd0c0066f3032a0ef196a1adb51d1786 SHA1 (patch-ae) = 6c7ab7cf17bb9da5944c9a09474079bcfe7e7f43 +SHA1 (patch-configure.ac) = 528076ace6ef57332e051109ccbd07eda6eaed72 diff --git a/emulators/aranym/patches/patch-aa b/emulators/aranym/patches/patch-aa deleted file mode 100644 index a58549bc85a..00000000000 --- a/emulators/aranym/patches/patch-aa +++ /dev/null @@ -1,73 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2010/07/08 11:28:05 obache Exp $ - ---- configure.orig 2010-06-01 13:42:21.000000000 +0000 -+++ configure -@@ -3069,7 +3069,7 @@ case "$host_os" in - linux*) OS_TYPE=linux;; - openbsd*) OS_TYPE=openbsd;; - netbsd*) OS_TYPE=netbsd;; -- 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;; -@@ -5154,13 +5154,16 @@ 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=`$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 - - " - eval as_val=\$$as_ac_Header -@@ -6424,7 +6427,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) - - $as_echo "#define HAVE_O_FSYNC 1" >>confdefs.h - -@@ -6720,8 +6723,14 @@ else - #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 -@@ -7775,7 +7784,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) -+ freebsd*|dragonfly*|kfreebsd*-gnu) - if [ "x$HAVE_I386" = "xyes" ]; then - SYSSRCS="$SYSSRCS Unix/xbsd/sigsegv_xbsd.cpp" - else -@@ -8486,7 +8495,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 - - { $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 --git a/emulators/aranym/patches/patch-configure.ac b/emulators/aranym/patches/patch-configure.ac new file mode 100644 index 00000000000..72a978b234a --- /dev/null +++ b/emulators/aranym/patches/patch-configure.ac @@ -0,0 +1,70 @@ +$NetBSD: patch-configure.ac,v 1.1 2012/04/15 02:05:28 ryoon Exp $ + +--- configure.ac.orig 2012-03-23 09:33:34.000000000 +0000 ++++ configure.ac +@@ -193,7 +193,7 @@ case "$host_os" in + linux*) OS_TYPE=linux;; + openbsd*) OS_TYPE=openbsd;; + netbsd*) OS_TYPE=netbsd;; +- 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;; +@@ -269,10 +269,13 @@ AC_CHECK_HEADERS(termios.h termio.h allo + AC_CHECK_HEADERS(sys/types.h sys/stat.h sys/vfs.h utime.h sys/param.h) + AC_CHECK_HEADERS(sys/mount.h types.h stat.h) + AC_CHECK_HEADERS(sys/socket.h) +-AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [ ++AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h net/if_tap.h, [], [], [ + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif ++#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif + ]) + + dnl Checks for typedefs, structures, and compiler characteristics. +@@ -342,7 +345,7 @@ case "$host_os" in + irix*) + EXTRASYSSRCS="Unix/parameters_unix.cpp Unix/irix/unaligned.c Unix/host_filesys_unix.cpp" + ;; +- freebsd*|kfreebsd*-gnu) ++ freebsd*|dragonfly*|kfreebsd*-gnu) + AC_DEFINE([HAVE_O_FSYNC], 1, [Define if you want to use FreeBSD's imitation of O_SYNC]) + EXTRASYSSRCS="Unix/parameters_unix.cpp Unix/host_filesys_unix.cpp" + ;; +@@ -431,8 +434,14 @@ else + #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 + ], [ + struct ifreq ifr; +@@ -1003,7 +1012,7 @@ if [[ "x$WANT_EXSIGSEGV" = "xyes" ]]; th + AC_MSG_ERROR([Sorry, extended segfault handler not supported on your platform]) + fi + ;; +- freebsd*|kfreebsd*-gnu) ++ freebsd*|dragonfly*|kfreebsd*-gnu) + if [[ "x$HAVE_I386" = "xyes" ]]; then + SYSSRCS="$SYSSRCS Unix/xbsd/sigsegv_xbsd.cpp" + else +@@ -1408,7 +1417,7 @@ fi + dnl Check for SDL + 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 + ARANYM_CHECK_FRAMEWORK(SDL, []) + fi + if test "x$have_framework_SDL" = "xyes" ; then |