From 4dd15f9daf9de446393198dce015ba4cd2c3bfaa Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 27 May 2000 09:53:36 +0000 Subject: Use user/group instead of addnerd; while I'm here, make it compile again, and fix binary package. --- parallel/glunix/Makefile | 33 +++++++--- parallel/glunix/files/patch-sum | 15 +++-- parallel/glunix/patches/patch-ae | 21 ++++-- parallel/glunix/patches/patch-ah | 53 ++++++++++++--- parallel/glunix/patches/patch-aj | 130 ++++++++++++++++++++++++++++++------- parallel/glunix/patches/patch-by | 13 ++++ parallel/glunix/patches/patch-bz | 13 ++++ parallel/glunix/patches/patch-ca | 25 +++++++ parallel/glunix/patches/patch-cb | 13 ++++ parallel/glunix/patches/patch-cc | 13 ++++ parallel/glunix/patches/patch-cd | 13 ++++ parallel/glunix/patches/patch-ce | 13 ++++ parallel/glunix/pkg/DEINSTALL | 15 +++++ parallel/glunix/pkg/INSTALL | 35 ++++++++++ parallel/glunix/pkg/PLIST | 4 +- parallel/glunix/scripts/post-patch | 1 - 16 files changed, 356 insertions(+), 54 deletions(-) create mode 100644 parallel/glunix/patches/patch-by create mode 100644 parallel/glunix/patches/patch-bz create mode 100644 parallel/glunix/patches/patch-ca create mode 100644 parallel/glunix/patches/patch-cb create mode 100644 parallel/glunix/patches/patch-cc create mode 100644 parallel/glunix/patches/patch-cd create mode 100644 parallel/glunix/patches/patch-ce create mode 100644 parallel/glunix/pkg/DEINSTALL create mode 100644 parallel/glunix/pkg/INSTALL (limited to 'parallel') diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile index 8881bf0f34c..debae965e26 100644 --- a/parallel/glunix/Makefile +++ b/parallel/glunix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/02/19 01:30:43 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2000/05/27 09:53:36 wiz Exp $ DISTNAME= glunix-release-1-0a PKGNAME= glunix-1.0a @@ -11,7 +11,6 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://now.cs.berkeley.edu/Glunix/glunix.html DEPENDS+= ssh-1.2.27:../../security/ssh -DEPENDS+= addnerd-1.6:../../sysutils/addnerd USE_GMAKE= yes USE_PERL5= yes @@ -33,16 +32,22 @@ MAKE_ENV+= PORTSDIR=${PKGDIR} WRKDIR=${WRKDIR} FLAGS=${FLAGS} SCRIPTS_ENV+= ARCH=${MACHINE} RM=${RM} NOW_ROOT=${NOW_ROOT} +.if exists(/usr/sbin/user) +USER_CMD= /usr/sbin/user +GROUP_CMD= /usr/sbin/group +.else +DEPENDS+= user>=20000313:../../sysutils/user +USER_CMD= ${LOCALBASE}/sbin/user +GROUP_CMD= ${LOCALBASE}/sbin/group +.endif + # the glunix group needs to exist before building. pre-configure: ${CP} ${FILESDIR}/Makefile-2 ${WRKSRC}/Makefile - @addgroup=`${AWK} -F: 'BEGIN { found = gid = 0; } \ - $$1 == "glunix" { found = 1; exit 0; } \ - $$1 != "glunix" && $$1 != "nogroup" { if ($$3 > gid) { gid = $$3; } } \ - END { if (found) { printf("--exists--"); } else { printf("glunix:*:%d:\n", gid + 1); }}' /etc/group`;\ - if [ "$$addgroup" != "--exists--" ]; then \ - ${ECHO} "Adding group $$addgroup"; \ - ${ECHO} "$$addgroup" >> /etc/group; \ + @if `${GROUP_CMD} info -e glunix`; then \ + ${ECHO} Group \'glunix\' already exists.; \ + else \ + ${GROUP_CMD} add glunix; \ fi pre-install: @@ -52,6 +57,14 @@ pre-install: ( ${GREP} -v ${NOW_ROOT}/bin/glush /etc/shells.bak; \ ${ECHO} ${NOW_ROOT}/bin/glush \ ) >/etc/shells - -${LOCALBASE}/sbin/addnerd -g glunix -s ${NOW_ROOT}/bin/glush glunix + @if `${USER_CMD} info -e glunix`; then \ + ${ECHO} User \'glunix\' already exists.; \ + else \ + ${USER_CMD} add -g glunix -d /nonexistent \ + -s ${NOW_ROOT}/bin/glush glunix; \ + fi; + +post-install: + @${TOUCH} ${NOW_ROOT}/lib/${MACHINE_ARCH}-${OPSYS}-tcp/.keepme .include "../../mk/bsd.pkg.mk" diff --git a/parallel/glunix/files/patch-sum b/parallel/glunix/files/patch-sum index 50b16f94edd..970179fbc55 100644 --- a/parallel/glunix/files/patch-sum +++ b/parallel/glunix/files/patch-sum @@ -1,15 +1,15 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:14:54 agc Exp $ +$NetBSD: patch-sum,v 1.2 2000/05/27 09:53:37 wiz Exp $ MD5 (patch-aa) = f07a5edea1b3986a994019f889db2e16 MD5 (patch-ab) = a29f0a2b4373e5ae8992de12da412637 MD5 (patch-ac) = de7a4b97143d811dfcac3c347098abb1 MD5 (patch-ad) = 1db45565edbd778b8d606bf697e34a82 -MD5 (patch-ae) = 04d8ea36fdb4bb4471e2ce3c810df563 +MD5 (patch-ae) = 0ebd6a6641006be02470a755cc08a81a MD5 (patch-af) = 98bff8429752d701b71807ec7c523642 MD5 (patch-ag) = 8a7f82c2b368977f3a7cc244d07406d5 -MD5 (patch-ah) = f78d949d29e47fe819fc5af1a487b6c5 +MD5 (patch-ah) = 4f20a20d71cbd6e9ad2f432f140e3b65 MD5 (patch-ai) = 7af8388fd2e559b6c0a7b631a23be862 -MD5 (patch-aj) = a4a0ab1e5c933ebcabcbba3cd9bbb72b +MD5 (patch-aj) = 34f22fcb33900554aaf854e4e210379a MD5 (patch-ak) = 7301cf519dff38dc1af803ede30c9b2a MD5 (patch-al) = c1123254c24e6c90d0c3343f44daf0ca MD5 (patch-am) = 4b00af8bc9621552081e5c51db9b7474 @@ -50,3 +50,10 @@ MD5 (patch-bu) = 3ed32099299ccb8efa542836d6905e43 MD5 (patch-bv) = cdb0dfb5ad16246c4c91f314be704d31 MD5 (patch-bw) = 63f622de9e708f40da5dfbea57b01b53 MD5 (patch-bx) = 76ed81a4f3147f8919288c8936b0bbf2 +MD5 (patch-by) = 41eaea576fe77a6aea759812f2c0be97 +MD5 (patch-bz) = 0151815ba1d71dbb7311d15e79e0ddaa +MD5 (patch-ca) = fa28af9faa5d5d286e104d7b89f5496d +MD5 (patch-cb) = a12d38c019989340f3b8ca6827ea2a08 +MD5 (patch-cc) = ed34b21d01010e6d110731067c3e6001 +MD5 (patch-cd) = 7bf43d3b9981139957e530971b7f747d +MD5 (patch-ce) = 0325fe083c42fa08139012eb7d8996c5 diff --git a/parallel/glunix/patches/patch-ae b/parallel/glunix/patches/patch-ae index 7f18545b644..ffb911789c2 100644 --- a/parallel/glunix/patches/patch-ae +++ b/parallel/glunix/patches/patch-ae @@ -1,9 +1,22 @@ -$NetBSD: patch-ae,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +$NetBSD: patch-ae,v 1.2 2000/05/27 09:53:37 wiz Exp $ ---- glunix/src/perf/mperf.cc.orig Thu Feb 5 03:31:15 1998 -+++ glunix/src/perf/mperf.cc Thu Feb 5 03:32:02 1998 -@@ -190,3 +190,3 @@ +--- glunix/src/perf/mperf.cc.orig Fri May 26 12:38:00 2000 ++++ glunix/src/perf/mperf.cc Fri May 26 12:38:40 2000 +@@ -137,7 +137,7 @@ + Perf_IncomingReturnTimeTicket); + + #ifdef DEBUG +- debug_cleanupCallbacks->Add((void (*)(int, void *))Perf_Cleanup, NULL); ++ debug_cleanupCallbacks->Add((void (*)(int, void *))Perf_Cleanup, 0); + #endif + + return True; +@@ -188,7 +188,7 @@ + MsgPerf_CalibrateDaemonReply *reply; + struct timeval t1, t2; int ctr, offset; - longlong_t startTime, stopTime, remoteTime; + quad_t startTime, stopTime, remoteTime; double min, max, totalValue, var; + int numValues, totalEvents; + int minMsgTime; // The minimum round-trip message time diff --git a/parallel/glunix/patches/patch-ah b/parallel/glunix/patches/patch-ah index 965ec6456de..b3b0bbf1a31 100644 --- a/parallel/glunix/patches/patch-ah +++ b/parallel/glunix/patches/patch-ah @@ -1,14 +1,20 @@ -$NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +$NetBSD: patch-ah,v 1.2 2000/05/27 09:53:37 wiz Exp $ ---- glunix/src/signal/csignal.cc.orig Thu Oct 24 15:40:47 1996 -+++ glunix/src/signal/csignal.cc Fri Mar 13 04:53:45 1998 -@@ -113,2 +113,5 @@ +--- glunix/src/signal/csignal.cc.orig Fri Oct 25 00:40:47 1996 ++++ glunix/src/signal/csignal.cc Fri May 26 15:17:55 2000 +@@ -111,6 +111,9 @@ + #ifdef __svr4__ + #define MAX_SIGNAL 35 #endif +#ifdef __NetBSD__ +#define MAX_SIGNAL NSIG +#endif -@@ -218,8 +221,14 @@ + #define SIGNAL_MAX_HANDLERS 5 + +@@ -216,12 +219,18 @@ + sigaddset(&allSignals, SIGTERM); + sigaddset(&allSignals, SIGUSR1); sigaddset(&allSignals, SIGUSR2); +#ifndef __NetBSD__ sigaddset(&allSignals, SIGCLD); @@ -23,14 +29,31 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ sigaddset(&allSignals, SIGPOLL); +#endif sigaddset(&allSignals, SIGIO); -@@ -234,4 +243,5 @@ + sigaddset(&allSignals, SIGSTOP); + sigaddset(&allSignals, SIGTSTP); +@@ -232,8 +241,9 @@ + sigaddset(&allSignals, SIGPROF); + sigaddset(&allSignals, SIGXCPU); sigaddset(&allSignals, SIGXFSZ); +#ifndef __NetBSD__ sigaddset(&allSignals, SIGWAITING); - +#endif initialized = True; -@@ -440,3 +450,7 @@ + cleanedUp = False; + +@@ -243,7 +253,7 @@ + NULL /* callback function */, 0 /* callback arg */)); + + #ifdef DEBUG +- debug_cleanupCallbacks->Add((void (*)(int, void *))Signal_Cleanup, NULL); ++ debug_cleanupCallbacks->Add((void (*)(int, void *))Signal_Cleanup, 0); + #endif + + return True; +@@ -438,7 +448,11 @@ + } else { + if (found) { // Otherwise, we're not catching it and we should be +#ifdef __NetBSD__ + signal(sig, CatchSignal); @@ -38,7 +61,11 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ sigset(sig, CatchSignal); +#endif } -@@ -865,7 +879,14 @@ + } + return; +@@ -863,11 +877,18 @@ + Bool + Signal_Hold(int sig) { - if (sighold(sig) < 0) { - return False; @@ -47,7 +74,7 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ - } +#ifdef __NetBSD__ +int i; -+ i = sigsetmask(NULL); ++ i = sigsetmask(0); + i &= ~sigmask(sig); + if (sigsetmask(i) < 0) { +#else @@ -58,7 +85,11 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ + return True; + } } -@@ -887,3 +908,7 @@ + + /****************************************************************************** +@@ -885,7 +906,11 @@ + Bool + Signal_Release(int sig) { +#ifdef __NetBSD__ + if (sigsetmask(sigmask(sig)) < 0 ) { @@ -66,3 +97,5 @@ $NetBSD: patch-ah,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ if (sigrelse(sig) < 0) { +#endif return False; + } else { + return True; diff --git a/parallel/glunix/patches/patch-aj b/parallel/glunix/patches/patch-aj index 994ec58a268..6b8780009d4 100644 --- a/parallel/glunix/patches/patch-aj +++ b/parallel/glunix/patches/patch-aj @@ -1,8 +1,10 @@ -$NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +$NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $ ---- glunix/src/idle/didle_sysinfo.cc~ Thu Sep 18 12:04:55 1997 -+++ glunix/src/idle/didle_sysinfo.cc Fri Feb 27 06:42:28 1998 -@@ -97,2 +97,12 @@ +--- glunix/src/idle/didle_sysinfo.cc.orig Thu Sep 18 21:04:55 1997 ++++ glunix/src/idle/didle_sysinfo.cc Fri May 26 14:44:45 2000 +@@ -95,14 +95,29 @@ + #include + #include #include + +#ifdef __NetBSD__ @@ -15,7 +17,9 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +#include +#else #include -@@ -102,5 +112,10 @@ + #include + #include + #include #include +#endif + @@ -26,7 +30,11 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ #include // Contains defns for swap virtual memory info +#endif -@@ -122,8 +137,47 @@ + #include "clist.h" + #include "cidle.h" +@@ -120,12 +135,51 @@ + + #define LOADDOUBLE(la) ((double)(la) / FSCALE) #define HASH(x) ((x) >> 1) + +#ifdef __NetBSD__ @@ -75,12 +83,25 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +#else + /* definitions for indices in the nlist array */ -@@ -167,3 +221,3 @@ + #define X_AVENRUN 0 + #define X_MPID 1 +@@ -165,11 +219,11 @@ + + // These are offsets into kmem for the stats we need static ulong avenrunOffset, availrmemOffset, anoninfoOffset, swapfsOffset; - +#endif /*****************************************************************************/ -@@ -239,2 +293,41 @@ + + /* These two declarations are no longer necessary */ +-#ifdef 0 ++#if 0 + static int cpuStates[NUM_CPUSTATES]; + static int memoryStats[5]; + static char *cpuStateNames[] = +@@ -237,6 +291,45 @@ + * + * Side effects: *****************************************************************************/ +#ifdef __NetBSD__ +Bool @@ -122,12 +143,20 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +} +#else Bool -@@ -303,3 +396,3 @@ + Idle_InitializeSysinfo(void) + { +@@ -301,7 +394,7 @@ + + return True; } - +#endif /****************************************************************************** -@@ -335,4 +428,9 @@ + * Idle_CleanupSysinfo -- + * Description of purpose and function of the procedure +@@ -333,18 +426,30 @@ + * + * Side effects: *****************************************************************************/ +#ifdef __NetBSD__ +static ProcUsage * @@ -137,7 +166,7 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ FindEntry(struct prpsinfo *targProc, double usage) +#endif { -@@ -340,5 +438,8 @@ + int index, start; ProcUsage *candidate; +#ifdef __NetBSD__ + index = HASH(pid); @@ -147,7 +176,7 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ index = HASH(targProc->pr_pid); +#endif start = index; -@@ -346,3 +447,7 @@ + while (1) { candidate = &(procUsageTable[index]); +#ifdef __NetBSD__ + if (candidate->pid == pid) { @@ -155,7 +184,11 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ if (candidate->pid == targProc->pr_pid) { +#endif /* Has this pid been recycled? Are we hitting a very old process? -@@ -355,3 +460,7 @@ + If so, then reset the entry */ + if (usage < candidate->cpuUsage) { +@@ -353,7 +458,11 @@ + return candidate; + } if (candidate->pid == -1) { +#ifdef __NetBSD__ + candidate->pid = pid; @@ -163,7 +196,11 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ candidate->pid = targProc->pr_pid; +#endif candidate->cpuUsage = 0; -@@ -381,2 +490,8 @@ + return candidate; + } +@@ -379,10 +488,17 @@ + * + * Side effects: *****************************************************************************/ + +#ifdef __NetBSD__ @@ -172,11 +209,16 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +{ +#else static void -@@ -385,2 +500,3 @@ + UpdateEntry(ProcUsage *entry, struct prpsinfo *proc, double usage) + { UNUSED_PARAM(proc); +#endif ASSERT(entry != NULL); -@@ -410,3 +526,11 @@ + entry->cpuUsage = usage; + } +@@ -408,12 +524,24 @@ + void + Idle_GetSysInfo(Idle_Load *total, Idle_Load *seq, List_List *glunixProcs) { + +#ifndef __NetBSD__ @@ -187,8 +229,21 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ + size_t size; +#endif + ++#ifndef __NetBSD__ int fd; -@@ -461,2 +585,29 @@ ++#endif + int activeMemory[2]; + int vmInUse[2]; + int cpuUsage[2]; ++#ifndef __NetBSD__ + struct dirent *direntp; ++#endif + static struct timeval lastTime = {0, 0}; + struct timeval currTime; + double alpha, beta; +@@ -459,6 +587,33 @@ + vmInUse[TOTAL] = 0; vmInUse[SEQUENTIAL] = 0; + cpuUsage[TOTAL] = 0; cpuUsage[SEQUENTIAL] = 0; numProcs = 0; + +#ifdef __NetBSD__ @@ -218,11 +273,19 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ + } +#else rewinddir(procdir); -@@ -495,2 +646,3 @@ + + while ((direntp = readdir(procdir)) != 0) { +@@ -493,6 +648,7 @@ + (void) close(fd); + numProcs++; } +#endif total->mem = activeMemory[TOTAL]; -@@ -505,6 +657,15 @@ + total->cpu = cpuUsage[TOTAL]; + seq->mem = activeMemory[SEQUENTIAL]; +@@ -503,10 +659,21 @@ + void + Idle_GetSystemInfo(Idle_SystemLoad *sysLoad) { - struct anoninfo anoninfo; +#ifndef __NetBSD__ @@ -234,13 +297,19 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ +#else + int i; + double avenrun[3]; -+ struct vmmeter sum; ++ int mib[2]; ++ struct vmtotal total; ++ int sizeofvmtotal; + struct swapent *sep; + int totalsize, size, totalinuse, inuse, ncounted; + int rnswap, nswap; +#endif -@@ -517,3 +678,37 @@ + if (kd == NULL) { + sysLoad->loadAvg[0] = 0; +@@ -515,7 +682,48 @@ + sysLoad->memory = 0; + return; } +#ifdef __NetBSD__ @@ -249,7 +318,6 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ + sysLoad->loadAvg[i] = avenrun[i]; + } + -+ kvm_read(kd, cnt_offset, (int *)(&sum), sizeof(sum)); + sep = NULL; + do { + nswap = swapctl(SWAP_NSWAP, 0, 0); @@ -275,10 +343,24 @@ $NetBSD: patch-aj,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ + if (sep) + free(sep); + -+ sysLoad->memory = PAGETOK(dbtob(totalsize) - dbtob(totalinuse) + sum.v_free_count); ++ sizeofvmtotal = sizeof(total); ++ mib[0] = CTL_VM; ++ mib[1] = VM_METER; ++ if (sysctl(mib, 2, &total, &sizeofvmtotal, NULL, 0) < 0) { ++ printf("Can't get vmtotals: %s\n", ++ strerror(errno)); ++ memset(&total, 0, sizeof(total)); ++ } ++ sysLoad->memory = PAGETOK(dbtob(totalsize) - dbtob(totalinuse) + total.t_free); +#else /* get load average array */ -@@ -541,2 +736,3 @@ + ReadKernelData(avenrunOffset, (char *) avenrun, sizeof (avenrun)); + // +@@ -539,6 +747,7 @@ + sysLoad->memory = PAGETOK(MAX(ani_max - ani_resv, 0) + + availrmem - swapfs_minfree); +#endif return; + } + diff --git a/parallel/glunix/patches/patch-by b/parallel/glunix/patches/patch-by new file mode 100644 index 00000000000..3387bc8f3c1 --- /dev/null +++ b/parallel/glunix/patches/patch-by @@ -0,0 +1,13 @@ +$NetBSD: patch-by,v 1.1 2000/05/27 09:53:37 wiz Exp $ + +--- glunix/src/perf/cperf_msg.h.orig Fri Sep 5 21:30:08 1997 ++++ glunix/src/perf/cperf_msg.h Fri May 26 12:28:00 2000 +@@ -93,7 +93,7 @@ + + struct MsgPerf_ObjectEnablementReply { + Perf_Id id; +- int errno; ++ int Msg_errno; + Bool enabled; + }; + diff --git a/parallel/glunix/patches/patch-bz b/parallel/glunix/patches/patch-bz new file mode 100644 index 00000000000..e2e72e4519b --- /dev/null +++ b/parallel/glunix/patches/patch-bz @@ -0,0 +1,13 @@ +$NetBSD: patch-bz,v 1.1 2000/05/27 09:53:37 wiz Exp $ + +--- glunix/src/msg/cmsg_msg.h.orig Fri May 26 12:27:03 2000 ++++ glunix/src/msg/cmsg_msg.h Fri May 26 12:27:18 2000 +@@ -106,7 +106,7 @@ + + struct Msg_Error { + Msg_MsgType msgType; +- int errno; ++ int Msg_errno; + }; + + struct MsgMsg_Snoop { diff --git a/parallel/glunix/patches/patch-ca b/parallel/glunix/patches/patch-ca new file mode 100644 index 00000000000..2ca371dc901 --- /dev/null +++ b/parallel/glunix/patches/patch-ca @@ -0,0 +1,25 @@ +$NetBSD: patch-ca,v 1.1 2000/05/27 09:53:38 wiz Exp $ + +--- glunix/src/perf/cperf_msg.cc.orig Fri Sep 5 21:30:07 1997 ++++ glunix/src/perf/cperf_msg.cc Fri May 26 12:26:10 2000 +@@ -517,7 +517,7 @@ + ASSERT(msgPtr != NULL); + + fprintf(filePtr, "MSG_PERF_OBJECT_ENABLEMENT_REPLY id %d, errno = %d, enabled=%s\n", +- msgPtr->id, msgPtr->errno, Util_GetBoolStr(msgPtr->enabled)); ++ msgPtr->id, msgPtr->Msg_errno, Util_GetBoolStr(msgPtr->enabled)); + + return; + } +@@ -940,9 +940,9 @@ + reply.id = msg->id; + obj = Perf_FindObject(msg->id); + if (obj == NULL) { +- reply.errno = ESRCH; ++ reply.Msg_errno = ESRCH; + } else { +- reply.errno = ESUCCESS; ++ reply.Msg_errno = ESUCCESS; + reply.enabled = obj->IsEnabled(); + } + returnVal = Msg_Send(addr, MSG_PERF_OBJECT_ENABLEMENT_REPLY, (Msg_Msg *)&reply); diff --git a/parallel/glunix/patches/patch-cb b/parallel/glunix/patches/patch-cb new file mode 100644 index 00000000000..1e2466c9cb9 --- /dev/null +++ b/parallel/glunix/patches/patch-cb @@ -0,0 +1,13 @@ +$NetBSD: patch-cb,v 1.1 2000/05/27 09:53:38 wiz Exp $ + +--- glunix/src/msg/cmsg_msg.cc.orig Fri May 26 12:24:58 2000 ++++ glunix/src/msg/cmsg_msg.cc Fri May 26 12:25:18 2000 +@@ -186,7 +186,7 @@ + + fprintf(filePtr, "MSG_ERROR msgType "); + Msg_PrintMsgType(filePtr, newMsgPtr->msgType); +- fprintf(filePtr, ", errno %d\n", newMsgPtr->errno); ++ fprintf(filePtr, ", errno %d\n", newMsgPtr->Msg_errno); + + return; + } diff --git a/parallel/glunix/patches/patch-cc b/parallel/glunix/patches/patch-cc new file mode 100644 index 00000000000..b60c542e74a --- /dev/null +++ b/parallel/glunix/patches/patch-cc @@ -0,0 +1,13 @@ +$NetBSD: patch-cc,v 1.1 2000/05/27 09:53:38 wiz Exp $ + +--- glunix/src/perf/dperf.cc.orig Fri Sep 5 21:30:09 1997 ++++ glunix/src/perf/dperf.cc Fri May 26 14:50:36 2000 +@@ -125,7 +125,7 @@ + Perf_IncomingDaemonCalibrateReq); + + #ifdef DEBUG +- debug_cleanupCallbacks->Add((void (*)(int, void *))Perf_Cleanup, NULL); ++ debug_cleanupCallbacks->Add((void (*)(int, void *))Perf_Cleanup, 0); + #endif + + return True; diff --git a/parallel/glunix/patches/patch-cd b/parallel/glunix/patches/patch-cd new file mode 100644 index 00000000000..7dd63d47bf0 --- /dev/null +++ b/parallel/glunix/patches/patch-cd @@ -0,0 +1,13 @@ +$NetBSD: patch-cd,v 1.1 2000/05/27 09:53:38 wiz Exp $ + +--- glunix/src/part/lpart.cc.orig Mon Feb 3 03:42:06 1997 ++++ glunix/src/part/lpart.cc Fri May 26 14:53:35 2000 +@@ -100,7 +100,7 @@ + NULL /* callback function */, 0 /* callback arg */)); + + #ifdef DEBUG +- debug_cleanupCallbacks->Add((void (*)(int, void *))Part_Cleanup, NULL); ++ debug_cleanupCallbacks->Add((void (*)(int, void *))Part_Cleanup, 0); + #endif + + return True; diff --git a/parallel/glunix/patches/patch-ce b/parallel/glunix/patches/patch-ce new file mode 100644 index 00000000000..44eb8e81a5d --- /dev/null +++ b/parallel/glunix/patches/patch-ce @@ -0,0 +1,13 @@ +$NetBSD: patch-ce,v 1.1 2000/05/27 09:53:38 wiz Exp $ + +--- glunix/src/perf/lperf.cc.orig Fri Sep 5 21:30:09 1997 ++++ glunix/src/perf/lperf.cc Fri May 26 14:56:21 2000 +@@ -128,7 +128,7 @@ + NULL /* callback function */, 0 /* callback arg */)); + + #ifdef DEBUG +- debug_cleanupCallbacks->Add((void (*)(int, void *))Perf_Cleanup, NULL); ++ debug_cleanupCallbacks->Add((void (*)(int, void *))Perf_Cleanup, 0); + #endif + + return True; diff --git a/parallel/glunix/pkg/DEINSTALL b/parallel/glunix/pkg/DEINSTALL new file mode 100644 index 00000000000..89d14b8e1df --- /dev/null +++ b/parallel/glunix/pkg/DEINSTALL @@ -0,0 +1,15 @@ +# $NetBSD: DEINSTALL,v 1.1 2000/05/27 09:53:38 wiz Exp $ +# + +if [ "$2" != "POST-DEINSTALL" ]; then + exit 0 +fi + +if ! user del glunix +then + echo Removing user \'glunix\' failed, please remove him manually. +fi +if ! group del glunix +then + echo Removing group \'glunix\' failed, please remove it manually. +fi diff --git a/parallel/glunix/pkg/INSTALL b/parallel/glunix/pkg/INSTALL new file mode 100644 index 00000000000..0c4bc82066c --- /dev/null +++ b/parallel/glunix/pkg/INSTALL @@ -0,0 +1,35 @@ +# $NetBSD: INSTALL,v 1.1 2000/05/27 09:53:38 wiz Exp $ +# + +if [ "$2" != "PRE-INSTALL" ]; then + exit 0 +fi + +if [ -f /usr/sbin/user ] +then + USER_CMD=/usr/sbin/user + GROUP_CMD=/usr/sbin/group +else + if [ -f ${PKG_PREFIX}/sbin/user ] + then + USER_CMD=${PKG_PREFIX}/sbin/user + GROUP_CMD=${PKG_PREFIX}/sbin/group + else + echo + echo Please install the sysutils/user first! + echo + exit 0 + fi +fi + +if `${GROUP_CMD} info -e glunix` ; then \ + ${ECHO} Group \'glunix\' already exists.; \ +else \ + ${GROUP_CMD} add glunix; \ +fi +if `${USER_CMD} info -e glunix` ; then \ + ${ECHO} User \'glunix\' already exists.; \ +else \ + ${USER_CMD} add -g glunix -d /nonexistent -s \ + ${PKG_PREFIX}/now/bin/glush glunix; \ +fi diff --git a/parallel/glunix/pkg/PLIST b/parallel/glunix/pkg/PLIST index 828726eb21f..784b12bcae4 100644 --- a/parallel/glunix/pkg/PLIST +++ b/parallel/glunix/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/05/27 09:53:38 wiz Exp $ now/include/glib/debug.h now/include/glib/idle.h now/include/glib/perf.h @@ -15,6 +15,7 @@ now/lib/perl-lib/Time/Timezone.pm now/lib/perl-lib/set.pl now/lib/libglunix.a now/lib/libglunix.so.1.0 +now/lib/${MACHINE_ARCH}-${OPSYS}-tcp/.keepme now/bin/${MACHINE_ARCH}-${OPSYS}-tcp/master now/bin/${MACHINE_ARCH}-${OPSYS}-tcp/daemon now/bin/GLUnix-bin @@ -123,4 +124,5 @@ now/man/html1/glunix.html @dirrm now/bin @dirrm now/include/glib @dirrm now/include +@dirrm now @unexec /bin/rm -rf %D/now/data diff --git a/parallel/glunix/scripts/post-patch b/parallel/glunix/scripts/post-patch index e2b335e259b..7cd72d83385 100755 --- a/parallel/glunix/scripts/post-patch +++ b/parallel/glunix/scripts/post-patch @@ -17,4 +17,3 @@ mv bak glush/Makefile cd $WRKSRC/glunix sed "s+%%%NOW_ROOT%%%+$NOW_ROOT+" src/init/glunix.h > bak mv bak src/init/glunix.h - -- cgit v1.2.3