pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/emulators/BasiliskII BasiliskII: Update to git snapsho...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e22aec72f50
branches:  trunk
changeset: 336962:8e22aec72f50
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jul 30 08:08:22 2019 +0000

description:
BasiliskII: Update to git snapshot 20190405

Use GTK2 instead of GTK1.
Brings the package around 13 years forward.
Should hopefully allow this to build again.

diffstat:

 emulators/BasiliskII/Makefile                        |   42 +++-
 emulators/BasiliskII/distinfo                        |   24 +--
 emulators/BasiliskII/options.mk                      |   27 +-
 emulators/BasiliskII/patches/patch-aa                |   13 -
 emulators/BasiliskII/patches/patch-ab                |   13 -
 emulators/BasiliskII/patches/patch-ac                |   12 -
 emulators/BasiliskII/patches/patch-ad                |   77 +-------
 emulators/BasiliskII/patches/patch-ae                |   13 -
 emulators/BasiliskII/patches/patch-af                |  169 -------------------
 emulators/BasiliskII/patches/patch-ag                |   71 -------
 emulators/BasiliskII/patches/patch-ah                |   13 -
 emulators/BasiliskII/patches/patch-ai                |   22 --
 emulators/BasiliskII/patches/patch-aj                |   13 -
 emulators/BasiliskII/patches/patch-ak                |   13 -
 emulators/BasiliskII/patches/patch-src-slirp-misc.c  |   22 --
 emulators/BasiliskII/patches/patch-src-slirp-slirp.h |   15 -
 16 files changed, 52 insertions(+), 507 deletions(-)

diffs (truncated from 668 to 300 lines):

diff -r 4be1da865e55 -r 8e22aec72f50 emulators/BasiliskII/Makefile
--- a/emulators/BasiliskII/Makefile     Tue Jul 30 08:01:42 2019 +0000
+++ b/emulators/BasiliskII/Makefile     Tue Jul 30 08:08:22 2019 +0000
@@ -1,32 +1,46 @@
-# $NetBSD: Makefile,v 1.39 2018/07/18 00:06:14 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2019/07/30 08:08:22 nia Exp $
 
-DISTNAME=      BasiliskII_src_01052006
-PKGNAME=       BasiliskII-1.0.20060501
-PKGREVISION=   5
+DISTNAME=      BasiliskII-20190405
 CATEGORIES=    emulators
-#MASTER_SITES= http://gwenole.beauchesne.info/projects/basilisk2/files/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=cebix/}
+GITHUB_PROJECT=        macemu
+GITHUB_TAG=    01052ca89d22882c870b84c5498cd0ee9a843b6b
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://gwenole.beauchesne.info/projects/basilisk2/
+HOMEPAGE=      https://basilisk.cebix.net/
 COMMENT=       Open Source 68k Macintosh emulator
+LICENSE=       gnu-gpl-v2
+
+WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/BasiliskII
+CONFIGURE_DIRS=        src/Unix
+BUILD_DIRS=    src/Unix
 
-WRKSRC=                        ${WRKDIR}/BasiliskII-1.0
-USE_LANGUAGES=         c c++03
-USE_TOOLS+=            gmake
+USE_LANGUAGES= c c++03
+USE_TOOLS+=    aclocal autoheader autoconf automake
+USE_TOOLS+=    msgfmt msgmerge xgettext
+USE_TOOLS+=    pkg-config gmake
+
 GNU_CONFIGURE=         yes
-CONFIGURE_DIRS=                src/Unix
 CONFIGURE_ARGS+=       --disable-fbdev-dga
+CONFIGURE_ARGS+=       --disable-xf86-dga
+CONFIGURE_ARGS+=       --disable-xf86-vidmode
+
 CONFIGURE_ARGS+=       --enable-addressing=banks
 CONFIGURE_ARGS+=       --without-mon
-BUILD_DIRS=            ${CONFIGURE_DIRS}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=       --enable-macosx-gui
+CONFIGURE_ARGS+=       --enable-macosx-sound
+.endif
 
 .include "options.mk"
 
 INSTALLATION_DIRS=     share/doc/BasiliskII
 
-post-extract:
-       ${MKDIR} ${WRKSRC}/src/Unix/obj
+pre-configure:
+       cd ${WRKSRC}/src/Unix && NO_CONFIGURE=x ./autogen.sh
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/BasiliskII/
diff -r 4be1da865e55 -r 8e22aec72f50 emulators/BasiliskII/distinfo
--- a/emulators/BasiliskII/distinfo     Tue Jul 30 08:01:42 2019 +0000
+++ b/emulators/BasiliskII/distinfo     Tue Jul 30 08:08:22 2019 +0000
@@ -1,19 +1,7 @@
-$NetBSD: distinfo,v 1.19 2015/11/03 20:30:54 agc Exp $
+$NetBSD: distinfo,v 1.20 2019/07/30 08:08:22 nia Exp $
 
-SHA1 (BasiliskII_src_01052006.tar.bz2) = 6373b33adf6caec53c5d1ed46a00adcac89ad3bb
-RMD160 (BasiliskII_src_01052006.tar.bz2) = bb1a061c504bd7d28b869e0eec2806cf8a79cf8d
-SHA512 (BasiliskII_src_01052006.tar.bz2) = cbe78f525e729aedafc98d8f469b4eaddc93e1088f2341fe4eef612d5ba1d076d7a9e3c7547392a1ddb80280a5bd48dbbcee6ff80d405954c60bd52f2cb28171
-Size (BasiliskII_src_01052006.tar.bz2) = 1310908 bytes
-SHA1 (patch-aa) = 387f7a3f6edac21b99d81ba88a0eeed4591c75ef
-SHA1 (patch-ab) = 4ada93db64772e70e95c58b6a324019c1da6a72d
-SHA1 (patch-ac) = ac4d313a8c60a807a5ea563dcca995e092be9c15
-SHA1 (patch-ad) = 6a215532e891848fe449ef5fe4307793c34bb9d6
-SHA1 (patch-ae) = dcac9287614535fa72fe9c8b0e3c516575e40887
-SHA1 (patch-af) = 285b46cc6e1b761e12498603579424b4f49689c1
-SHA1 (patch-ag) = 962620071eec777d22c49a35795b819432aa8974
-SHA1 (patch-ah) = 0f67eed6f59e6c381c1a6fbeb98261cad4697760
-SHA1 (patch-ai) = fc527be478576f157bffbd6a91eb1bdc85903fb1
-SHA1 (patch-aj) = c331aa7080b330cf58f58c72456b91b0e5a2156f
-SHA1 (patch-ak) = 1dad263b22ae3257a6e34b90972ba264ada7b287
-SHA1 (patch-src-slirp-misc.c) = c9209ae4f3b142a506d42d296ed854974ec47117
-SHA1 (patch-src-slirp-slirp.h) = c0c93d01e5b8d5182ddeed87b1434a7b113175e0
+SHA1 (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = b83f76e9b37318b6bc4e43e73db0d2ed00fc2981
+RMD160 (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = 1c16c477fd1e2980ceb4e172d896fb2da4d9580b
+SHA512 (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = 
82a7720c369489d8a27f175550973a72fa77c76553e38734fb2efef6ecf29a2a1c195797d4d487b1e6cca0f21f778a640d69c2686af6ae1687e3e8234dbf7245
+Size (BasiliskII-20190405-01052ca89d22882c870b84c5498cd0ee9a843b6b.tar.gz) = 2198906 bytes
+SHA1 (patch-ad) = 1d8bc61f6386855c6d83ff4e5a13f55d5e22325a
diff -r 4be1da865e55 -r 8e22aec72f50 emulators/BasiliskII/options.mk
--- a/emulators/BasiliskII/options.mk   Tue Jul 30 08:01:42 2019 +0000
+++ b/emulators/BasiliskII/options.mk   Tue Jul 30 08:08:22 2019 +0000
@@ -1,8 +1,14 @@
-# $NetBSD: options.mk,v 1.6 2012/10/23 10:24:03 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2019/07/30 08:08:22 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.BasiliskII
+PKG_SUPPORTED_OPTIONS=         esound gtk2 sdl
+PKG_OPTIONS_LEGACY_OPTS+=      esd:esound
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.BasiliskII
-PKG_SUPPORTED_OPTIONS= esound gtk sdl
-PKG_OPTIONS_LEGACY_OPTS+=      esd:esound
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS+=                gtk2 sdl
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,9 +19,9 @@
 CONFIGURE_ARGS+=       --without-esd
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk)
+.if !empty(PKG_OPTIONS:Mgtk2)
 CONFIGURE_ARGS+=       --with-gtk
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-gtk
 .endif
@@ -24,13 +30,4 @@
 CONFIGURE_ARGS+=       --enable-sdl-audio
 CONFIGURE_ARGS+=       --enable-sdl-video
 .include "../../devel/SDL/buildlink3.mk"
-.else
-BUILDLINK_DEPMETHOD.libXt?=    build
-
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
 .endif
diff -r 4be1da865e55 -r 8e22aec72f50 emulators/BasiliskII/patches/patch-aa
--- a/emulators/BasiliskII/patches/patch-aa     Tue Jul 30 08:01:42 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/11/23 12:17:56 adam Exp $
-
---- src/dummy/ether_dummy.cpp.orig     2005-05-14 10:10:09.000000000 +0200
-+++ src/dummy/ether_dummy.cpp
-@@ -174,7 +174,7 @@ void EtherInterrupt(void)
-                       length = recvfrom(fd, Mac2HostAddr(packet), 1514, 0, (struct sockaddr *)&from, &from_len);
-                       if (length < 14)
-                               break;
--                      ether_udp_read(packet, length, &from);
-+                      ether_udp_read((uint32)packet, length, &from);
-               }
-       }
- #endif
diff -r 4be1da865e55 -r 8e22aec72f50 emulators/BasiliskII/patches/patch-ab
--- a/emulators/BasiliskII/patches/patch-ab     Tue Jul 30 08:01:42 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/05/13 20:52:35 adam Exp $
-
---- src/Unix/video_x.cpp.orig  2006-01-03 23:03:27.000000000 +0100
-+++ src/Unix/video_x.cpp
-@@ -2326,7 +2326,7 @@ static void update_display_dynamic(int t
- static void update_display_static(driver_window *drv)
- {
-       // Incremental update code
--      unsigned wide = 0, high = 0, x1, x2, y1, y2, i, j;
-+      int wide = 0, high = 0, x1, x2, y1, y2, i, j;
-       const video_mode &mode = drv->monitor.get_current_mode();
-       int bytes_per_row = mode.bytes_per_row;
-       int bytes_per_pixel = mode.bytes_per_row / mode.x;
diff -r 4be1da865e55 -r 8e22aec72f50 emulators/BasiliskII/patches/patch-ac
--- a/emulators/BasiliskII/patches/patch-ac     Tue Jul 30 08:01:42 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/11/03 21:34:23 rillig Exp $
-
---- src/Unix/vm_alloc.cpp.orig 2005-01-30 21:42:14.000000000 +0000
-+++ src/Unix/vm_alloc.cpp
-@@ -39,6 +39,7 @@
- #include "vm_alloc.h"
- 
- #ifdef HAVE_MACH_VM
-+#include <mach/mach.h>
- #ifndef HAVE_MACH_TASK_SELF
- #ifdef HAVE_TASK_SELF
- #define mach_task_self task_self
diff -r 4be1da865e55 -r 8e22aec72f50 emulators/BasiliskII/patches/patch-ad
--- a/emulators/BasiliskII/patches/patch-ad     Tue Jul 30 08:01:42 2019 +0000
+++ b/emulators/BasiliskII/patches/patch-ad     Tue Jul 30 08:08:22 2019 +0000
@@ -1,80 +1,15 @@
-$NetBSD: patch-ad,v 1.4 2005/11/03 21:34:23 rillig Exp $
+$NetBSD: patch-ad,v 1.5 2019/07/30 08:08:22 nia Exp $
 
---- src/Unix/sshpty.c.orig     2003-08-17 10:20:22.000000000 +0000
+NetBSD does not have this pts ioctl.
+
+--- src/Unix/sshpty.c.orig     2019-04-05 05:12:49.000000000 +0000
 +++ src/Unix/sshpty.c
-@@ -18,6 +18,7 @@ RCSID("$OpenBSD: sshpty.c,v 1.4 2001/12/
- /* Selections from openssh's "includes.h" */
- #include "config.h"
- 
-+#include <signal.h>
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
-@@ -145,19 +146,30 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
-        */
-       int ptm;
-       char *pts;
-+#ifdef __sunos__
-       mysig_t old_signal;
--
-+#else
-+      sig_t old_signal;
-+#endif
-       ptm = open("/dev/ptmx", O_RDWR | O_NOCTTY);
-       if (ptm < 0) {
-               error("/dev/ptmx: %.100s", strerror(errno));
-               return 0;
-       }
-+#ifdef __sunos__
-       old_signal = mysignal(SIGCHLD, SIG_DFL);
-+#else
-+      old_signal = signal(SIGCHLD, SIG_DFL);
-+#endif
-       if (grantpt(ptm) < 0) {
-               error("grantpt: %.100s", strerror(errno));
-               return 0;
-       }
-+#ifdef __sunos__
-       mysignal(SIGCHLD, old_signal);
-+#else
-+      signal(SIGCHLD, old_signal);
-+#endif
-       if (unlockpt(ptm) < 0) {
-               error("unlockpt: %.100s", strerror(errno));
-               return 0;
-@@ -175,7 +187,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
+@@ -182,7 +182,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
                close(*ptyfd);
                return 0;
        }
 -#ifndef HAVE_CYGWIN
-+#if !defined(__NetBSD__)
++#if !defined(HAVE_CYGWIN) && !defined(__NetBSD__)
        /*
         * Push the appropriate streams modules, as described in Solaris pts(7).
         * HP-UX pts(7) doesn't have ttcompat module.
-@@ -184,7 +196,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
-               error("ioctl I_PUSH ptem: %.100s", strerror(errno));
-       if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0)
-               error("ioctl I_PUSH ldterm: %.100s", strerror(errno));
--#ifndef __hpux
-+#if !defined(__NetBSD__)
-       if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0)
-               error("ioctl I_PUSH ttcompat: %.100s", strerror(errno));
- #endif
-@@ -277,7 +289,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
-               }
-               /* set tty modes to a sane state for broken clients */
-               if (tcgetattr(*ptyfd, &tio) < 0)
--                      log("Getting tty modes for pty failed: %.100s", strerror(errno));
-+                      error("Getting tty modes for pty failed: %.100s", strerror(errno));
-               else {
-                       tio.c_lflag |= (ECHO | ISIG | ICANON);
-                       tio.c_oflag |= (OPOST | ONLCR);
-@@ -285,7 +297,7 @@ pty_allocate(int *ptyfd, int *ttyfd, cha
- 
-                       /* Set the new modes for the terminal. */
-                       if (tcsetattr(*ptyfd, TCSANOW, &tio) < 0)
--                              log("Setting tty modes for pty failed: %.100s", strerror(errno));
-+                              error("Setting tty modes for pty failed: %.100s", strerror(errno));
-               }
- 
-               return 1;
diff -r 4be1da865e55 -r 8e22aec72f50 emulators/BasiliskII/patches/patch-ae
--- a/emulators/BasiliskII/patches/patch-ae     Tue Jul 30 08:01:42 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/11/17 16:56:39 joerg Exp $
-
---- src/Unix/timer_unix.cpp.orig       2005-11-17 14:22:31.000000000 +0000
-+++ src/Unix/timer_unix.cpp
-@@ -228,7 +228,7 @@ uint64 GetTicks_usec(void)
- // Linux select() changes its timeout parameter upon return to contain
- // the remaining time. Most other unixen leave it unchanged or undefined.
- #define SELECT_SETS_REMAINING
--#elif defined(__FreeBSD__) || defined(__sun__) || (defined(__MACH__) && defined(__APPLE__))
-+#elif defined(__FreeBSD__) || defined(__sun__) || (defined(__MACH__) && defined(__APPLE__)) || defined(__DragonFly__)
- #define USE_NANOSLEEP
- #elif defined(HAVE_PTHREADS) && defined(sgi)
- // SGI pthreads has a bug when using pthreads+signals+nanosleep,
diff -r 4be1da865e55 -r 8e22aec72f50 emulators/BasiliskII/patches/patch-af
--- a/emulators/BasiliskII/patches/patch-af     Tue Jul 30 08:01:42 2019 +0000



Home | Main Index | Thread Index | Old Index