Bl3ify, and use mk/pthread.buildlink3.mk instead of hard-coding

a pthread package.

Bump PKGREVISION.

3 files changed, 14 insertions, 56 deletions

diff --git a/emulators/hercules/patches/patch-aa b/emulators/hercules/patches/patch-aa
index 2157bba3a4c..511ab3cce26 100644
--- a/emulators/hercules/patches/patch-aa
+++ b/emulators/hercules/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2001/05/08 23:23:49 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2004/05/29 23:32:19 kristerw Exp $
 
 Set up compilation flags for NetBSD
 
@@ -45,8 +45,8 @@ Set up compilation flags for NetBSD
 -#CFLAGS  += -I/usr/pkg/pthreads/include -I/usr/pkg/include
 -#LFLAGS	 += -L/usr/pkg/pthreads/lib -R/usr/pkg/pthreads
 -#LFLAGS	 += -L/usr/pkg/lib -R/usr/pkg/pthreads/lib
-+CFLAGS  += -I${PREFIX}/pthreads/include -I${PREFIX}/include
-+LFLAGS	 += -L${PREFIX}/pthreads/lib -R${PREFIX}/pthreads
-+LFLAGS	 += -L${PREFIX}/lib -R${PREFIX}/pthreads/lib
++CFLAGS  += -I${PREFIX}/include
++LFLAGS	 += -L${PREFIX}/lib -R${PREFIX}/lib
++LFLAGS	 += -L${PREFIX}/lib
  
  # Reverse the comments below to disable Compressed CKD Dasd support
diff --git a/emulators/hercules/patches/patch-ag b/emulators/hercules/patches/patch-ag
index 52562cb2625..a4dca77392d 100644
--- a/emulators/hercules/patches/patch-ag
+++ b/emulators/hercules/patches/patch-ag
@@ -1,35 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2001/02/26 14:49:35 agc Exp $
+$NetBSD: patch-ag,v 1.2 2004/05/29 23:32:19 kristerw Exp $
 
-Fix for coredump on exit on NetBSD from Wolfgang Solfrank
-
---- cpu.c	2001/02/26 14:35:56	1.1
-+++ cpu.c	2001/02/26 14:40:26
-@@ -741,19 +741,22 @@
- 
- void *cpu_thread (REGS *regs)
+--- cpu.c.orig	Sat Feb 10 11:48:23 2001
++++ cpu.c	Sun May 30 01:10:44 2004
+@@ -743,7 +743,7 @@
  {
--#define CPU_PRIORITY    15              /* CPU thread priority       */
- 
- #ifndef WIN32
--    /* Set CPU thread priority */
--    if (setpriority(PRIO_PROCESS, 0, CPU_PRIORITY))
--        logmsg ("HHC621I CPU thread set priority failed: %s\n",
--                strerror(errno));
-+    struct sched_param sp;
-+    int p;
-+
-+    if (pthread_getschedparam(pthread_self(), &p, &sp)
-+	|| (sp.sched_priority = sched_get_priority_min(p),
-+	    pthread_setschedparam(pthread_self(), p, &sp)))
-+	logmsg ("HHC621I CPU thread set priority failed: %s\n",
-+		strerror(errno));
- 
-     /* Display thread started message on control panel */
-     logmsg ("HHC620I CPU%4.4X thread started: tid=%8.8lX, pid=%d, "
-             "priority=%d\n",
-             regs->cpuad, thread_id(), getpid(),
--            getpriority(PRIO_PROCESS,0));
-+            sp.sched_priority);
- #endif
+ #define CPU_PRIORITY    15              /* CPU thread priority       */
  
-     logmsg ("HHC630I CPU%4.4X Architecture Mode %s\n",regs->cpuad,
+-#ifndef WIN32
++#if 0
+     /* Set CPU thread priority */
+     if (setpriority(PRIO_PROCESS, 0, CPU_PRIORITY))
+         logmsg ("HHC621I CPU thread set priority failed: %s\n",
diff --git a/emulators/hercules/patches/patch-ai b/emulators/hercules/patches/patch-ai
deleted file mode 100644
index 465b44512cb..00000000000
--- a/emulators/hercules/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/02/26 14:49:35 agc Exp $
-
-Fix for coredump on exit on NetBSD from Wolfgang Solfrank
-
---- panel.c	2001/02/26 14:36:27	1.1
-+++ panel.c	2001/02/26 14:40:30
-@@ -1798,6 +1798,13 @@
-     /* quit or exit command - terminate the emulator */
-     if (strcmp(cmd,"quit") == 0 || strcmp(cmd,"exit") == 0)
-     {
-+	struct sched_param sp;
-+	int p;
-+
-+	pthread_getschedparam(pthread_self(), &p, &sp);
-+	sp.sched_priority = sched_get_priority_max(p);
-+	pthread_setschedparam(pthread_self(), p, &sp);
-+
-         sysblk.msgpipew = stderr;
-         devascii = strtok(cmd+4," \t");
-         if (devascii == NULL || strcmp("now",devascii))