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

a pthread package.

Bump PKGREVISION.

5 files changed, 23 insertions, 63 deletions

diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index 16dbe3e7744..d356cb27cec 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/01/22 08:36:04 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/29 23:32:19 kristerw Exp $
 
 DISTNAME=		hercules-2.11
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.conmicro.cx/hercules/
 
@@ -9,16 +9,19 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.conmicro.cx/hercules/
 COMMENT=		S370 emulator
 
-DEPENDS=		unproven-pthreads>0.17nb1:../../devel/unproven-pthreads
 DEPENDS+=		hercules-images-[0-9]*:../../emulators/hercules-images
 
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 MAKEFILE=		makefile
 MAKE_ENV+=		HOST_ARCH=${MACHINE_ARCH}
 
+PTHREAD_OPTS+=		require
+
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/hercules
 	${INSTALL_DATA} ${WRKSRC}/hercules.cnf ${PREFIX}/share/examples/hercules/
 	${INSTALL_DATA} ${WRKSRC}/zzsa.cnf ${PREFIX}/share/examples/hercules/
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/hercules/distinfo b/emulators/hercules/distinfo
index c8d7e00faf9..01d5bb137ad 100644
--- a/emulators/hercules/distinfo
+++ b/emulators/hercules/distinfo
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.5 2001/05/11 11:17:39 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2004/05/29 23:32:19 kristerw Exp $
 
 SHA1 (hercules-2.11.tar.gz) = ec84388e29cfd070055afa5fc11a33c896f2333a
 Size (hercules-2.11.tar.gz) = 616554 bytes
-SHA1 (patch-aa) = 7d233b6ea857d97cc465270d704dbe547fe7ea83
+SHA1 (patch-aa) = b2b9b1685730ab0ffb74c9d4a6dd027b925d0080
 SHA1 (patch-ab) = ea2802d8752411e964ba150d3a54f64a40fc2e70
 SHA1 (patch-ac) = 59bfb3d67ab88a580a252245c3089d0952b4da56
 SHA1 (patch-ad) = dab44fa2ee216a8250c40675211126f61039abf3
 SHA1 (patch-ae) = 14aafa5462a858e44c00ea6d43efd0f1cfef190e
 SHA1 (patch-af) = 759ad1ee2737ed8021b5a5fd956851677e99879a
-SHA1 (patch-ag) = 88b26f01e69f6d87d0374c986aefed0e937e7735
+SHA1 (patch-ag) = 6dcec345641bdde0c617da10f57b6f2dd6b702ac
 SHA1 (patch-ah) = ede54de0b63ebf02a9589cc57a5c41d4693ee8ef
-SHA1 (patch-ai) = 1df78a54ea2a81ac552587d170f88d2923956664
 SHA1 (patch-aj) = b4beda52ced42d6d58f02b24c0eaf56109eab092
 SHA1 (patch-ak) = b727b0fad00ee546854cfbc4342e4c759fe7b0d2
 SHA1 (patch-al) = 60d90ed9c1476b8fcf0a905a8316f3aec9108169
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))