summaryrefslogtreecommitdiff
path: root/parallel/glunix
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2005-05-29 14:38:32 +0000
committerwiz <wiz@pkgsrc.org>2005-05-29 14:38:32 +0000
commit4c27260264ddbb67276679f86c988c243af2e979 (patch)
treee98102b8941e7e5f47848a566df22f0b243578ac /parallel/glunix
parentaa127a6bbf0685d1315c477f4e8d16743906ae80 (diff)
downloadpkgsrc-4c27260264ddbb67276679f86c988c243af2e979.tar.gz
Make build, install and deinstall on NetBSD-2.0/i386.
Diffstat (limited to 'parallel/glunix')
-rw-r--r--parallel/glunix/distinfo104
-rw-r--r--parallel/glunix/files/Makefile-22
-rw-r--r--parallel/glunix/patches/patch-aa50
-rw-r--r--parallel/glunix/patches/patch-ab34
-rw-r--r--parallel/glunix/patches/patch-ac14
-rw-r--r--parallel/glunix/patches/patch-ad12
-rw-r--r--parallel/glunix/patches/patch-ae10
-rw-r--r--parallel/glunix/patches/patch-af50
-rw-r--r--parallel/glunix/patches/patch-ag12
-rw-r--r--parallel/glunix/patches/patch-ah20
-rw-r--r--parallel/glunix/patches/patch-ai21
-rw-r--r--parallel/glunix/patches/patch-aj30
-rw-r--r--parallel/glunix/patches/patch-ak26
-rw-r--r--parallel/glunix/patches/patch-al28
-rw-r--r--parallel/glunix/patches/patch-am72
-rw-r--r--parallel/glunix/patches/patch-an10
-rw-r--r--parallel/glunix/patches/patch-ao12
-rw-r--r--parallel/glunix/patches/patch-aq12
-rw-r--r--parallel/glunix/patches/patch-ar69
-rw-r--r--parallel/glunix/patches/patch-as12
-rw-r--r--parallel/glunix/patches/patch-at20
-rw-r--r--parallel/glunix/patches/patch-au21
-rw-r--r--parallel/glunix/patches/patch-av20
-rw-r--r--parallel/glunix/patches/patch-aw20
-rw-r--r--parallel/glunix/patches/patch-ax20
-rw-r--r--parallel/glunix/patches/patch-ay20
-rw-r--r--parallel/glunix/patches/patch-az20
-rw-r--r--parallel/glunix/patches/patch-ba12
-rw-r--r--parallel/glunix/patches/patch-bb20
-rw-r--r--parallel/glunix/patches/patch-bc25
-rw-r--r--parallel/glunix/patches/patch-bd12
-rw-r--r--parallel/glunix/patches/patch-be12
-rw-r--r--parallel/glunix/patches/patch-bf4
-rw-r--r--parallel/glunix/patches/patch-bg44
-rw-r--r--parallel/glunix/patches/patch-bj29
-rw-r--r--parallel/glunix/patches/patch-bk24
-rw-r--r--parallel/glunix/patches/patch-bl12
-rw-r--r--parallel/glunix/patches/patch-bm20
-rw-r--r--parallel/glunix/patches/patch-bn12
-rw-r--r--parallel/glunix/patches/patch-bs46
-rw-r--r--parallel/glunix/patches/patch-bt19
-rw-r--r--parallel/glunix/patches/patch-bu23
-rw-r--r--parallel/glunix/patches/patch-bv14
-rw-r--r--parallel/glunix/patches/patch-bw19
-rw-r--r--parallel/glunix/patches/patch-cb16
-rw-r--r--parallel/glunix/patches/patch-ch12
-rw-r--r--parallel/glunix/patches/patch-ci13
-rw-r--r--parallel/glunix/patches/patch-cj12
-rw-r--r--parallel/glunix/patches/patch-ck12
-rw-r--r--parallel/glunix/patches/patch-cl12
-rw-r--r--parallel/glunix/patches/patch-cm21
-rw-r--r--parallel/glunix/patches/patch-cn12
-rw-r--r--parallel/glunix/patches/patch-co22
-rw-r--r--parallel/glunix/patches/patch-cp21
-rw-r--r--parallel/glunix/patches/patch-cq21
-rw-r--r--parallel/glunix/patches/patch-cr16
-rw-r--r--parallel/glunix/patches/patch-cs31
-rw-r--r--parallel/glunix/patches/patch-cu10
58 files changed, 976 insertions, 343 deletions
diff --git a/parallel/glunix/distinfo b/parallel/glunix/distinfo
index 4be806914b4..9c1a589ae32 100644
--- a/parallel/glunix/distinfo
+++ b/parallel/glunix/distinfo
@@ -1,65 +1,77 @@
-$NetBSD: distinfo,v 1.3 2003/03/31 03:46:29 jmc Exp $
+$NetBSD: distinfo,v 1.4 2005/05/29 14:38:32 wiz Exp $
SHA1 (glunix-release-1-0a.tar.gz) = 8c69f5252e00fc4143a088c9b555b5e0c5b350f8
+RMD160 (glunix-release-1-0a.tar.gz) = a718ebe775b697ebae14ba3a277994dc6c5a4c8d
Size (glunix-release-1-0a.tar.gz) = 1777769 bytes
-SHA1 (makedepend.tar.gz) = 9bbe5fb63d44860114fe4cbc57dbd37cb22aa725
-Size (makedepend.tar.gz) = 29283 bytes
-SHA1 (patch-aa) = a4f4e284ba4a473bc37640e6d5d71441613e97ac
-SHA1 (patch-ab) = 3632ab83e21db22f113c9aeb3a07493076c65303
-SHA1 (patch-ac) = eaa45b9caf6ecec7cd0184c680dc68633120a2a8
-SHA1 (patch-ad) = b0f7cda045433941342731322e05514842e52f4c
-SHA1 (patch-ae) = 4f516f1e53b07105190d3f07495a7dd5c6888ac7
-SHA1 (patch-af) = 5a1b33f647a228858e4e68a94b392e1e2d9b0696
-SHA1 (patch-ag) = 9f84ce0260db01001145d7ca58dcec441736deb1
-SHA1 (patch-ah) = ae0c9f0bbca261922677c0b132a064df059bc9cf
-SHA1 (patch-ai) = d42fa3494eb4c46c334cdd521a64b80e04374dde
-SHA1 (patch-aj) = 515c00a86ea1eb8ed9eb402736b6f3270745fec3
-SHA1 (patch-ak) = c20e4c7eb3a93636d30eb06e222c7b3b3584e759
-SHA1 (patch-al) = 275dab35fbcb5a65e1479b95075f2295de961893
-SHA1 (patch-am) = 5640d04dccae4633384c2f04f5e96f15e9919a0f
-SHA1 (patch-an) = 94013f2f31f1f6687f7696fc90e3de3e0b568b14
-SHA1 (patch-ao) = 842e72bb67ed545429fe33580aab772a0b9247a5
+SHA1 (patch-aa) = 57f42e338b85a975af268ea6364c1d8be37e95ff
+SHA1 (patch-ab) = d1a1e3648e4555bc9e021f5586fa7162cda9a9ed
+SHA1 (patch-ac) = 81c534eac115f8fe2c299c91a483ceef45fada87
+SHA1 (patch-ad) = 36dd855bc32f04f55c094133a1d3ee8cdc7c059e
+SHA1 (patch-ae) = 740e468a20e4361180c69fcba5726bde36a9eb48
+SHA1 (patch-af) = dc7e93a219a16811a3d2c1da70c32a75cd9421b2
+SHA1 (patch-ag) = 4746792d6e4fd35f375c38c8d9507baf5e1e7a11
+SHA1 (patch-ah) = 8ada1134bdb2719597367ae7b4f4727f8952c95f
+SHA1 (patch-ai) = 4c86409386c759a222befe410f8de7745f96000c
+SHA1 (patch-aj) = 10d50c36a7dda63dcc2f6d938e4fb86d5fa4e95f
+SHA1 (patch-ak) = 0f31712936b58af0a4198417ae49a7e0a15c86a0
+SHA1 (patch-al) = 6be15b6fe0c11920023ddb37af10d00fd9bf9077
+SHA1 (patch-am) = 7092b9a51f1d5ffabd0c2d1b70411e30f9205c4e
+SHA1 (patch-an) = 1bf08efff11e5ece054e12835a7200914c9445fc
+SHA1 (patch-ao) = 31521c9d58162a77d1934e6f38269a3f0ac1369b
SHA1 (patch-ap) = d562609a3c3f6d6fe7ccac5eca86a548ad0ec0bf
-SHA1 (patch-aq) = 3f10b837c6b32c59029996f6c79ff07765c930a5
-SHA1 (patch-ar) = 8215f07469e5aef82efc47769f564a673d0f1e5e
-SHA1 (patch-as) = a936e30f0405cf9b2bce9d72f7a06780ebd64bd6
-SHA1 (patch-at) = ba45641c113e5b7b85ed334eb9a4a0be99d74acf
-SHA1 (patch-au) = 51e14964b40856d0b5d05dce0d8434f8a88deec0
-SHA1 (patch-av) = 6dd892aefd60640ef2e4f11822796706320e067e
-SHA1 (patch-aw) = 246cf47a3461ecbba1948920fe45bbbbf6d2d65d
-SHA1 (patch-ax) = ea6320ded15ac14c22f6197a2b6698f1063f9052
-SHA1 (patch-ay) = 0a2ea09b569586d75790e1456912be8866458015
-SHA1 (patch-az) = 7f77b02d77bbfaf09df23e2d9f6caa21609ca751
-SHA1 (patch-ba) = bca96561c059fd72399f16a372c1088ab5971bb0
-SHA1 (patch-bb) = 61988ab63eac52dc7a8b07cc4c156daa6e918fbf
-SHA1 (patch-bc) = 96bee9569bb6ce2109e84f610b76a1fa9166fc19
-SHA1 (patch-bd) = 009e3801ae25a8c47a42c6092df41e74594582df
-SHA1 (patch-be) = 3aec07054ab791a04c6fc21666c3d8280b6881d5
-SHA1 (patch-bf) = a3c7d42a821449fe7c7ac60ad88713eca8b9651d
-SHA1 (patch-bg) = 973224efddb8fc9c7aad86025d43d7d5a4b1ae68
+SHA1 (patch-aq) = 03e56968decc9c9c10ddba8897abfa661bbdf7d3
+SHA1 (patch-ar) = a9cc31d3ab542bc1e9184d80a6393ba2690f4590
+SHA1 (patch-as) = 2645eb078ca711a9fa341803d4c7d2fe610f8330
+SHA1 (patch-at) = d6a678c3ef921f21bb3214e6930295f30b9249b9
+SHA1 (patch-au) = 0d9f26430bff91234329e60a215fb91338022cc4
+SHA1 (patch-av) = 5f1c544fd85fc78e2b0691650bf8b7fe2886012b
+SHA1 (patch-aw) = 7a270ec43f3dfde894b4e3def333e3a5291d234a
+SHA1 (patch-ax) = 71c65fc70e47b888c72e6bc69434f3e252bbf247
+SHA1 (patch-ay) = 7af49e818e4169e2543587c07d941ef63fb9720a
+SHA1 (patch-az) = b28388f10eddf3c824efffa354be5ff505b0a871
+SHA1 (patch-ba) = 4f49382fc1e2dc4833e9ae309db1ac6830298721
+SHA1 (patch-bb) = 2dacf458a50f8fbd44393a10199779ad805eff1b
+SHA1 (patch-bc) = 4ebb8a4038aced15ab9c72a23de0fe59f1d8af82
+SHA1 (patch-bd) = fc59f69150b9f583628ef7df03e177b4300b2da6
+SHA1 (patch-be) = 481fba775e923af18b4a03e04da2386bc77d5b8e
+SHA1 (patch-bf) = 6fb6373ffd2db2dc56f4046306d6a3e96320b86c
+SHA1 (patch-bg) = ac725879a72ed4ef058cd7aabf7ab348683fc250
SHA1 (patch-bh) = 3647f33e1a40088e70c022b30786f4f32f5de864
SHA1 (patch-bi) = 31075005048781f19e075e2576c863d39327f419
-SHA1 (patch-bj) = 2099f33661ca582d9238cdadf0c1c69962c0ebb0
-SHA1 (patch-bk) = da98edecdebdd4de6d97b08f6eea8e6471e8297d
-SHA1 (patch-bl) = 44ea847f5c5f4ee3f2122ed22599b9c68bc14a33
-SHA1 (patch-bm) = 15c325babd6c89f4bb78c75aef06fafd1fc291fa
-SHA1 (patch-bn) = fdbb89c4ba5a59a530f70e92444bd794340e0ae7
+SHA1 (patch-bj) = ca5d4111ae3bec84509092939ee6270dd3474b98
+SHA1 (patch-bk) = 196dfc9819c59f12225f0e4dba2e06288ef5c771
+SHA1 (patch-bl) = 81ed3e084c711805031ed605c142461323cfc52a
+SHA1 (patch-bm) = f16844e6bbc4a69d86a8dfadaa31626ca90f7a08
+SHA1 (patch-bn) = 96993d63525f2a1d1e2aca976029298fff445898
SHA1 (patch-bo) = 7eee6f368743ee188b4b55ff1f37e4b9e8d25b4e
SHA1 (patch-bp) = c0110554116ba3adeb954a3d3cdded2320615c01
SHA1 (patch-bq) = 29c8bb568fb08789ef9572b0ea6d9aa75cfa8b21
SHA1 (patch-br) = d013a9091c7270b83c76e80afb1178985bf35968
-SHA1 (patch-bs) = 3b60ffb9cc8cae48001dbe1190e99c58aedee9e2
-SHA1 (patch-bt) = 982ed721e6799e0de81b512fe26d9ae98c9532f7
-SHA1 (patch-bu) = 6ab578cdd0b2e336e2dfb785e0855b6fa1c9f83d
-SHA1 (patch-bv) = 2f8213258fc13c96a2e189c7a65f57f27eda7ee7
-SHA1 (patch-bw) = 9ba237b4c09749785685473634e8eff1cbed14e5
+SHA1 (patch-bs) = b625e5fefd631e8277574efc5cfe1e7604751a30
+SHA1 (patch-bt) = 328c06576c24a7fe4ce25ff4d816d4f51029023a
+SHA1 (patch-bu) = 80ba6229ebbbe981bacaece312b3882541a7a276
+SHA1 (patch-bv) = 32df71b44baba4bb47d0cdf124f7d620c534309a
+SHA1 (patch-bw) = 3f42749265da2b783b429ca357ee5c0f6f67f371
SHA1 (patch-bx) = ed841b216f4d41ed2777081dbd0eaa6bb426ff09
SHA1 (patch-by) = 7f15f359d307ba064f7cc3d0ed98d0a8189eff39
SHA1 (patch-bz) = 82da1aca0934696fb2b3e8ed8ae06504e526b6a4
SHA1 (patch-ca) = eac28b7866d38255ddda0936a2840611e235dafb
-SHA1 (patch-cb) = 5d121981c25b2c9f8efc4f284351ed0075782a27
+SHA1 (patch-cb) = 1340c6e9625558b9518b218c599659ddf0402bcc
SHA1 (patch-cc) = 41ab0ad1725e4f3c5121094c392f1340cacf4410
SHA1 (patch-cd) = 47a673f5e13051399aa2460b767c491774aa42b2
SHA1 (patch-ce) = b6e1d47e1c1cb326a35808dae36645a6cddbc2fd
SHA1 (patch-cf) = a1ed01f0ee10975c7be8a695d92c808d9f6bd9f2
SHA1 (patch-cg) = ebc1351a979be92b44ca7c75f71f532833a437e4
+SHA1 (patch-ch) = 81e2ef447772746956b0185981e5c03a85a927e2
+SHA1 (patch-ci) = 0908aaa6eec508f5a1f633e20db3b7cdf6fe28b3
+SHA1 (patch-cj) = c3d3ecca91f5eb4f04be1425e4c1eff967f52746
+SHA1 (patch-ck) = 44c126fe8c14bf8ec2f7118ac45790950f8bf43a
+SHA1 (patch-cl) = 2e39a666bbc5805c64bf287cb3f869fb9effaa3b
+SHA1 (patch-cm) = 934ecc8b61fe5bc23553b3d0845e312f4e3a3812
+SHA1 (patch-cn) = eaca0151e5971ba3d106ca12defa0311cee04357
+SHA1 (patch-co) = ed280de1b993fb813ff423a9e276f4c41f4b916b
+SHA1 (patch-cp) = 73aab836f36fa457e0210eabcb9b26a5b5f3d44e
+SHA1 (patch-cq) = 0eb7bede110a3a6dcaffc053eb12a0872d6fa5f7
+SHA1 (patch-cr) = b4e4a1405f7d13769974f793774374df5f3e936e
+SHA1 (patch-cs) = 7a1309a36779dbbc80898242e734c1a3d6b5bd96
+SHA1 (patch-cu) = f60c114929a98693ab3cb5149dca0202ebf86028
diff --git a/parallel/glunix/files/Makefile-2 b/parallel/glunix/files/Makefile-2
index d71beba19f1..5f72fc688aa 100644
--- a/parallel/glunix/files/Makefile-2
+++ b/parallel/glunix/files/Makefile-2
@@ -1,6 +1,4 @@
all:
- cd makedepend; $(MAKE) makedepend || exit 1; \
- cd .. ;
cd glunix/src; $(MAKE) DESTDIR=$(DESTDIR) $(MAKE_ENV) install || exit 1 ; \
cd ../.. ;
cd progs/tools; $(MAKE) mhtml2html $(MAKE_ENV) install || exit 1 ; \
diff --git a/parallel/glunix/patches/patch-aa b/parallel/glunix/patches/patch-aa
index 3c0afcd4ab4..202429aec2e 100644
--- a/parallel/glunix/patches/patch-aa
+++ b/parallel/glunix/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-aa,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/Makefile.orig Wed Nov 5 15:30:39 1997
-+++ glunix/src/Makefile Mon Oct 12 21:31:58 1998
+--- glunix/src/Makefile.orig 1997-11-05 23:30:39.000000000 +0100
++++ glunix/src/Makefile
@@ -2,7 +2,7 @@
#
# Basic path definitions
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
#
# This lists all of the modules in the system that should be compiled
-@@ -50,6 +50,11 @@
+@@ -50,6 +50,11 @@ endif
# If this Makefile was NOT invoked by glubuild, then we need to set up
# the architecture stuff here. glubuild does this for us if it was run.
#
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
ifndef GLUNIX_ARCH
GLUNIX_ARCH = sun4
endif
-@@ -59,11 +64,8 @@
+@@ -59,11 +64,8 @@ ifeq ($(GLUNIX_ARCH),sun4)
GLUNIX_NET := tcp
INSTALL := /usr/sww/bin/ginstall
endif
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
GLUNIX_PLATFORM = $(GLUNIX_ARCH)-$(GLUNIX_OS)-$(GLUNIX_NET)
MKDIR = $(INSTALL) -d -m 0775 -g glunix
-@@ -71,34 +73,43 @@
+@@ -71,38 +73,48 @@ INSTALL_BIN = $(INSTALL) -m 0775 -g glu
INSTALL_MAN = $(INSTALL) -m 0664 -g glunix
OBJROOT := ../obj
@@ -51,6 +51,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
CC := gcc
-LD := gcc
++C++ := g++
+LD := ld
INCLUDE_DIRS := -I../include $(addprefix -I./,$(ALL_MODULES))
@@ -83,13 +84,19 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$(OBJDIR)/%.so : %.cc $(OBJDIR)
+ "rm" -f $@ ; \
-+ echo $(CC) -fpic -DPIC -c $(CFLAGS) $(CPPFLAGS) $< -o $@ ; \
-+ $(CC) -fpic -DPIC -c $(CFLAGS) $(CPPFLAGS) $< -o $@ ; \
++ echo $(C++) -fpic -DPIC -c $(CFLAGS) $(CPPFLAGS) $< -o $@ ; \
++ $(C++) -fpic -DPIC -c $(CFLAGS) $(CPPFLAGS) $< -o $@ ; \
+
$(OBJDIR)/%.o : %.cc $(OBJDIR)
"rm" -f $@ ; \
- echo $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ ; \
-@@ -136,6 +147,7 @@
+- echo $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ ; \
+- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
++ echo $(C++) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ ; \
++ $(C++) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+
+ $(OBJDIR)/%.o : %.c $(OBJDIR)
+ "rm" -f $@ ; \
+@@ -136,6 +148,7 @@ clean:
"rm" -f $(DOBJS) $(OBJDIR)/daemon; \
echo Deleting library objects; \
"rm" -f $(LOBJS) $(OBJDIR)/libglunix.*
@@ -97,7 +104,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
tags:
echo 'etags -C ../include/*.h ../include/glib/*.h */*.h */*.cc */*.c'
-@@ -143,7 +155,7 @@
+@@ -143,7 +156,7 @@ tags:
master: $(OBJDIR)/master
daemon: $(OBJDIR)/daemon
@@ -106,7 +113,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
install: master daemon library
$(MKDIR) $(BINDIR); \
-@@ -155,9 +167,9 @@
+@@ -155,9 +168,9 @@ install: master daemon library
$(INSTALL_BIN) $(OBJDIR)/daemon $(BINDIR)/daemon; \
echo Installing library; \
$(MKDIR) $(LIBDIR); \
@@ -118,14 +125,14 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
$(INSTALL_BIN) $(OBJDIR)/libglunix.a $(LIBDIR)/libglunix.a
endif
-@@ -165,30 +177,32 @@
+@@ -165,30 +178,32 @@ $(OBJDIR)/master: $(MOBJS)
echo " " ; \
echo Linking master; \
$(INSTALL_BIN) $(OBJDIR)/master $(OBJDIR)/master.old ; \
- echo $(PURIFY_COMMAND) $(LD) -g -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS) ; \
- $(PURIFY_COMMAND) $(LD) -g -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS); \
-+ echo $(PURIFY_COMMAND) $(CC) -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS) ; \
-+ $(PURIFY_COMMAND) $(CC) -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS); \
++ echo $(PURIFY_COMMAND) $(C++) -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS) ; \
++ $(PURIFY_COMMAND) $(C++) -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS); \
echo Master done.
$(OBJDIR)/daemon: $(DOBJS)
@@ -134,8 +141,8 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
$(INSTALL_BIN) $(OBJDIR)/daemon $(OBJDIR)/daemon.old ; \
- echo $(PURIFY_COMMAND) $(LD) -g -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS) ; \
- $(PURIFY_COMMAND) $(LD) -g -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS); \
-+ echo $(PURIFY_COMMAND) $(CC) -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS) ; \
-+ $(PURIFY_COMMAND) $(CC) -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS); \
++ echo $(PURIFY_COMMAND) $(C++) -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS) ; \
++ $(PURIFY_COMMAND) $(C++) -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS); \
echo Daemon done.
-$(OBJDIR)/libglunix.so: $(LOBJS)
@@ -161,12 +168,3 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
echo Library done.
#$(sort $(MOBJS) $(DOBJS) $(LOBJS)): $(OBJDIR)
-@@ -202,7 +216,7 @@
- echo Rebuilding dependencies.; \
- touch $@.new; \
- echo makedepend -f$@ -p$(OBJDIR)/ -- $(CFLAGS) -- ... ; \
-- makedepend -f$@.new -w256 -p$(OBJDIR)/ -- $(CFLAGS) -- $(DEPEND_SRC) ;\
-+ ../../makedepend/makedepend -f$@.new -w256 -p$(OBJDIR)/ -- $(CFLAGS) -- $(DEPEND_SRC) ;\
- cat $@.new | sed -e 's,/usr/include[^ ]*,,g' | sed -e 's,[^:]*: *$$,,' | sed -e 's,$(OBJDIR)/[^/]*,$(OBJDIR),' | uniq >$@ ; \
- rm -f $@.new.bak $@.new ; \
- echo " " ; \
diff --git a/parallel/glunix/patches/patch-ab b/parallel/glunix/patches/patch-ab
index 3221bc35186..af643630777 100644
--- a/parallel/glunix/patches/patch-ab
+++ b/parallel/glunix/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
+$NetBSD: patch-ab,v 1.3 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/comm/ccomm_net.cc.orig Wed Oct 15 19:24:52 1997
-+++ glunix/src/comm/ccomm_net.cc Sun Mar 30 21:48:41 2003
+--- glunix/src/comm/ccomm_net.cc.orig 1997-10-15 21:24:52.000000000 +0200
++++ glunix/src/comm/ccomm_net.cc
@@ -73,7 +73,8 @@
#include <netinet/tcp.h>
#include <sys/socket.h>
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
#include "glib/types.h"
#include "cdebug.h"
-@@ -258,7 +259,7 @@
+@@ -258,7 +259,7 @@ Comm_GetIpByHostName(char *hostName)
h = gethostbyname(hostName);
if (!h) {
@@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
// BUGBUG set error code
return 0;
}
-@@ -328,14 +329,15 @@
+@@ -328,14 +329,15 @@ Comm_GetMyIpAddr(uint *ipPtr)
}
// Get my IP address
@@ -43,7 +43,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
// BUGBUG error code
*ipPtr = 0;
return False;
-@@ -365,7 +367,7 @@
+@@ -365,7 +367,7 @@ Bool
Comm_SocketGetPort(int sock, int *port)
{
struct sockaddr_in s;
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
ASSERT(port != NULL);
-@@ -376,7 +378,11 @@
+@@ -376,7 +378,11 @@ Comm_SocketGetPort(int sock, int *port)
return False;
}
// use ntohs to convert it back to host order for pc's
@@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
return True;
}
-@@ -397,7 +403,7 @@
+@@ -397,7 +403,7 @@ int
Comm_SocketGetPeerPort(int sock)
{
struct sockaddr_in s;
@@ -73,7 +73,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
len = sizeof(struct sockaddr_in);
if (getpeername(sock, (struct sockaddr *)&s, &len)
-@@ -425,7 +431,7 @@
+@@ -425,7 +431,7 @@ Bool
Comm_SocketGetPeerIpAddr(int sock, uint *ipAddrPtr)
{
struct sockaddr_in s;
@@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
ASSERT(ipAddrPtr != NULL);
*ipAddrPtr = 0;
-@@ -435,8 +441,11 @@
+@@ -435,8 +441,11 @@ Comm_SocketGetPeerIpAddr(int sock, uint
DE("getpeername: %s\n", strerror(errno));
return False;
}
@@ -95,7 +95,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
return True;
}
-@@ -528,8 +537,13 @@
+@@ -528,8 +537,13 @@ Comm_CreateListenSock(int port, int *soc
// Bind the socket to a well-known port
s.sin_family = AF_INET;
@@ -109,7 +109,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
val = bind(sock, (struct sockaddr *) &s, sizeof(s));
if (val < 0) {
-@@ -637,9 +651,13 @@
+@@ -637,9 +651,13 @@ Comm_Connect(int *sockPtr, uint ipAddr,
// Now connect to the requested host
s.sin_family = AF_INET ;
@@ -124,7 +124,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
if (connect(sock, (struct sockaddr *) &s, sizeof(s)) < 0) {
if (errno == EINTR) {
while(1) {
-@@ -700,7 +718,7 @@
+@@ -700,7 +718,7 @@ Comm_Accept(int listenFd, int *newFd)
{
struct sockaddr_in s;
int fd;
@@ -133,7 +133,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
ASSERT(newFd != NULL);
*newFd = -1;
-@@ -754,7 +772,7 @@
+@@ -754,7 +772,7 @@ Comm_SureWrite(int sock, void *bufPtr, i
ASSERT(bufLen > 0);
errno = 0; // BUGBUG, we should do this for ALL related funcs
@@ -142,7 +142,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
val = write(sock, (const char *)bufPtr, bufLen);
writeErrno = errno;
-@@ -880,7 +898,7 @@
+@@ -880,7 +898,7 @@ Comm_SureWriteV(int sock, struct iovec *
vecLen--;
} else {
vecPtr[0].iov_len -= val;
@@ -151,7 +151,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
break;
}
}
-@@ -915,7 +933,7 @@
+@@ -915,7 +933,7 @@ Comm_SureRead(int sock, void *bufPtr, in
ASSERT(bufLen > 0);
errno = 0; // BUGBUG, we should do this for ALL related funcs
@@ -160,7 +160,7 @@ $NetBSD: patch-ab,v 1.2 2003/03/31 03:46:30 jmc Exp $
val = read(sock, (char *)bufPtr, bufLen);
readErrno = errno;
D9("Read from sock %d, bufPtr %08x, bufLen %d, bytes %d\n",
-@@ -1045,7 +1063,7 @@
+@@ -1045,7 +1063,7 @@ Comm_SureReadV(int sock, struct iovec *v
D3("Read fewer bytes than asked for:%d < %d\n",
totRead, vecPtr[currVec].iov_len);
vecPtr[currVec].iov_len -= val;
diff --git a/parallel/glunix/patches/patch-ac b/parallel/glunix/patches/patch-ac
index 6787350c37c..23160e8df27 100644
--- a/parallel/glunix/patches/patch-ac
+++ b/parallel/glunix/patches/patch-ac
@@ -1,14 +1,18 @@
-$NetBSD: patch-ac,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+$NetBSD: patch-ac,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/init/bsd.h.orig Thu Feb 5 03:07:31 1998
-+++ glunix/src/init/bsd.h Thu Feb 5 03:08:27 1998
-@@ -88,3 +88,3 @@
+--- glunix/src/init/bsd.h.orig 1997-09-18 21:08:23.000000000 +0200
++++ glunix/src/init/bsd.h
+@@ -86,11 +86,11 @@ extern "C" {
+ //int bind(int socket, struct sockaddr *address, int address_len);
+ //ssize_t read(int filedes, char *buffer, size_t nbytes);
//ssize_t write(int filedes, const char *buffer, size_t nbytes);
-int connect(int socket, struct sockaddr *address, int address_len);
+//int connect(int socket, struct sockaddr *address, int address_len);
//int setsockopt(int socket, int level, int option_name, char *option_value,
-@@ -92,3 +92,3 @@
+ // int option_len);
int socket(int addr_family, int type, int protocol);
-void bzero(char *string, int length);
+//void bzero(char *string, int length);
int listen(int socket, int backlog);
+ int wait3(int *statusp, int options, struct rusage *rusage);
+ mode_t umask(mode_t cmask);
diff --git a/parallel/glunix/patches/patch-ad b/parallel/glunix/patches/patch-ad
index 2e6cf96e696..a364ea0de60 100644
--- a/parallel/glunix/patches/patch-ad
+++ b/parallel/glunix/patches/patch-ad
@@ -1,11 +1,15 @@
-$NetBSD: patch-ad,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+$NetBSD: patch-ad,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/debug/cdebug.cc.orig Thu Feb 5 03:21:37 1998
-+++ glunix/src/debug/cdebug.cc Thu Feb 5 03:25:35 1998
-@@ -148,4 +148,4 @@
+--- glunix/src/debug/cdebug.cc.orig 1997-09-18 21:04:52.000000000 +0200
++++ glunix/src/debug/cdebug.cc
+@@ -146,8 +146,8 @@
+ #include "cdebug_internal.h"
+ #include "cdebug_msg.h"
-#include <sys/varargs.h>
-#include <sys/va_list.h>
+/*#include <varargs.h>*/
+/*#include <sys/va_list.h>*/
+ /*****************************************************************************/
+
diff --git a/parallel/glunix/patches/patch-ae b/parallel/glunix/patches/patch-ae
index ffb911789c2..899f4be3cdf 100644
--- a/parallel/glunix/patches/patch-ae
+++ b/parallel/glunix/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2000/05/27 09:53:37 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2005/05/29 14:38:33 wiz Exp $
---- 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 @@
+--- glunix/src/perf/mperf.cc.orig 1997-09-05 21:30:10.000000000 +0200
++++ glunix/src/perf/mperf.cc
+@@ -137,7 +137,7 @@ Perf_Initialize(void)
Perf_IncomingReturnTimeTicket);
#ifdef DEBUG
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/27 09:53:37 wiz Exp $
#endif
return True;
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ Perf_CalibrateDaemon(Ndb_Node *node, int
MsgPerf_CalibrateDaemonReply *reply;
struct timeval t1, t2;
int ctr, offset;
diff --git a/parallel/glunix/patches/patch-af b/parallel/glunix/patches/patch-af
index b2c5b000cf9..49d9e4dc16d 100644
--- a/parallel/glunix/patches/patch-af
+++ b/parallel/glunix/patches/patch-af
@@ -1,8 +1,10 @@
-$NetBSD: patch-af,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+$NetBSD: patch-af,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/sched/csched.cc.orig Thu Jul 25 15:01:27 1996
-+++ glunix/src/sched/csched.cc Thu Mar 12 03:52:15 1998
-@@ -86,2 +86,8 @@
+--- glunix/src/sched/csched.cc.orig 1996-07-26 00:01:27.000000000 +0200
++++ glunix/src/sched/csched.cc
+@@ -84,9 +84,16 @@
+ #include <stdio.h>
+ #include <string.h>
#include <errno.h>
+
+#ifdef __NetBSD__
@@ -11,30 +13,50 @@ $NetBSD: patch-af,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+typedef short pri_t;
+#else
#include <sys/priocntl.h>
-@@ -89,2 +95,3 @@
+ #include <sys/rtpriocntl.h>
#include <sys/tspriocntl.h>
+#endif
-@@ -104,2 +111,3 @@
+ #include "glib/types.h"
+ #include "cdebug.h"
+@@ -102,6 +109,7 @@
+ *
+ * Side effects:
*****************************************************************************/
+#ifndef __NetBSD__
static short
-@@ -122,2 +130,3 @@
+ Sched_GetMaxPriority(void)
+ {
+@@ -120,6 +128,7 @@ Sched_GetMaxPriority(void)
+ D9("%d\n", maxPriority);
+ return maxPriority;
}
+#endif
-@@ -133,2 +142,5 @@
+ /******************************************************************************
+ * Sched_GetMyCid --
+@@ -131,6 +140,9 @@ Sched_GetMaxPriority(void)
+ *
+ * Side effects:
*****************************************************************************/
+#ifdef __NetBSD__
+
+#else
static id_t
-@@ -154,3 +166,3 @@
+ Sched_GetMyCid(void)
+ {
+@@ -152,7 +164,7 @@ Sched_GetMyCid(void)
+ return myCid;
+
}
-
+#endif
/******************************************************************************
-@@ -170,4 +182,10 @@
+ * Sched_SetSchedPriority --
+ * Set the priority of the target pid to be higher than normal processes
+@@ -168,8 +180,14 @@ Sched_GetMyCid(void)
+ * The target processes UNIX scheduling priority is increased.
+ *****************************************************************************/
void
-Sched_SetSchedPriority(pid_t targPid, pri_t offset)
+Sched_SetSchedPriority(pid_t targPid, short offset)
@@ -46,7 +68,13 @@ $NetBSD: patch-af,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+
+#else
pcparms_t parms;
-@@ -184,2 +202,3 @@
+ short maxPriority;
+
+@@ -182,6 +200,7 @@ Sched_SetSchedPriority(pid_t targPid, pr
+ DE("priocntl: %s\n", strerror(errno));
+ }
return;
+#endif
}
+
+ /*****************************************************************************/
diff --git a/parallel/glunix/patches/patch-ag b/parallel/glunix/patches/patch-ag
index 27c67b30375..f23c7df4a6f 100644
--- a/parallel/glunix/patches/patch-ag
+++ b/parallel/glunix/patches/patch-ag
@@ -1,9 +1,13 @@
-$NetBSD: patch-ag,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+$NetBSD: patch-ag,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/sched/csched.h~ Fri Feb 27 06:54:16 1998
-+++ glunix/src/sched/csched.h Fri Feb 27 06:54:33 1998
-@@ -98,3 +98,3 @@
+--- glunix/src/sched/csched.h.orig 1996-07-20 00:58:56.000000000 +0200
++++ glunix/src/sched/csched.h
+@@ -96,7 +96,7 @@
+
+ /*****************************************************************************/
-extern void Sched_SetSchedPriority(pid_t targPid, pri_t offset);
+extern void Sched_SetSchedPriority(pid_t targPid, short offset);
+ /*****************************************************************************/
+
diff --git a/parallel/glunix/patches/patch-ah b/parallel/glunix/patches/patch-ah
index b3b0bbf1a31..8ac94836c19 100644
--- a/parallel/glunix/patches/patch-ah
+++ b/parallel/glunix/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2000/05/27 09:53:37 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2005/05/29 14:38:33 wiz Exp $
---- 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 @@
+--- glunix/src/signal/csignal.cc.orig 1996-10-25 00:40:47.000000000 +0200
++++ glunix/src/signal/csignal.cc
+@@ -111,6 +111,9 @@ static Debug_Level signal_debugLevel;
#ifdef __svr4__
#define MAX_SIGNAL 35
#endif
@@ -12,7 +12,7 @@ $NetBSD: patch-ah,v 1.2 2000/05/27 09:53:37 wiz Exp $
#define SIGNAL_MAX_HANDLERS 5
-@@ -216,12 +219,18 @@
+@@ -216,12 +219,18 @@ Signal_Initialize(void)
sigaddset(&allSignals, SIGTERM);
sigaddset(&allSignals, SIGUSR1);
sigaddset(&allSignals, SIGUSR2);
@@ -31,7 +31,7 @@ $NetBSD: patch-ah,v 1.2 2000/05/27 09:53:37 wiz Exp $
sigaddset(&allSignals, SIGIO);
sigaddset(&allSignals, SIGSTOP);
sigaddset(&allSignals, SIGTSTP);
-@@ -232,8 +241,9 @@
+@@ -232,8 +241,9 @@ Signal_Initialize(void)
sigaddset(&allSignals, SIGPROF);
sigaddset(&allSignals, SIGXCPU);
sigaddset(&allSignals, SIGXFSZ);
@@ -42,7 +42,7 @@ $NetBSD: patch-ah,v 1.2 2000/05/27 09:53:37 wiz Exp $
initialized = True;
cleanedUp = False;
-@@ -243,7 +253,7 @@
+@@ -243,7 +253,7 @@ Signal_Initialize(void)
NULL /* callback function */, 0 /* callback arg */));
#ifdef DEBUG
@@ -51,7 +51,7 @@ $NetBSD: patch-ah,v 1.2 2000/05/27 09:53:37 wiz Exp $
#endif
return True;
-@@ -438,7 +448,11 @@
+@@ -438,7 +448,11 @@ Signal_CheckInterest(int sig)
} else {
if (found) {
// Otherwise, we're not catching it and we should be
@@ -63,7 +63,7 @@ $NetBSD: patch-ah,v 1.2 2000/05/27 09:53:37 wiz Exp $
}
}
return;
-@@ -863,11 +877,18 @@
+@@ -863,11 +877,18 @@ Signal_DispatchMode(void)
Bool
Signal_Hold(int sig)
{
@@ -87,7 +87,7 @@ $NetBSD: patch-ah,v 1.2 2000/05/27 09:53:37 wiz Exp $
}
/******************************************************************************
-@@ -885,7 +906,11 @@
+@@ -885,7 +906,11 @@ Signal_Hold(int sig)
Bool
Signal_Release(int sig)
{
diff --git a/parallel/glunix/patches/patch-ai b/parallel/glunix/patches/patch-ai
index 9fc9e0b0cbb..1d04aa822b7 100644
--- a/parallel/glunix/patches/patch-ai
+++ b/parallel/glunix/patches/patch-ai
@@ -1,8 +1,10 @@
-$NetBSD: patch-ai,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+$NetBSD: patch-ai,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/util/cutil.cc~ Fri Sep 5 12:30:13 1997
-+++ glunix/src/util/cutil.cc Fri Feb 27 02:17:05 1998
-@@ -84,3 +84,7 @@
+--- glunix/src/util/cutil.cc.orig 1997-09-05 21:30:13.000000000 +0200
++++ glunix/src/util/cutil.cc
+@@ -82,7 +82,11 @@
+ #define __THIS_MODULE MODULE_UTIL
+
#include <stdio.h>
+#ifndef __NetBSD__
#include <sys/systeminfo.h>
@@ -10,7 +12,11 @@ $NetBSD: patch-ai,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+#include <unistd.h>
+#endif
#include <string.h>
-@@ -139,3 +143,8 @@
+ #include <errno.h>
+
+@@ -137,11 +141,17 @@ Util_GetMyHostName(void)
+ if (init) {
+ return hostname;
}
-
+#ifdef __NetBSD__
@@ -20,7 +26,10 @@ $NetBSD: patch-ai,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $
+ }
+#else
if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)-1) < 0) {
-@@ -144,2 +153,3 @@
+ DE("sysinfo(SI_HOSTNAME): %s\n", strerror(errno));
+ return NULL;
}
+#endif
init = True;
+ return hostname;
+ }
diff --git a/parallel/glunix/patches/patch-aj b/parallel/glunix/patches/patch-aj
index 6e3e6c5acca..3aab414ed67 100644
--- a/parallel/glunix/patches/patch-aj
+++ b/parallel/glunix/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
+$NetBSD: patch-aj,v 1.5 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/idle/didle_sysinfo.cc.orig Thu Sep 18 19:04:55 1997
-+++ glunix/src/idle/didle_sysinfo.cc Sun Mar 30 21:52:53 2003
+--- glunix/src/idle/didle_sysinfo.cc.orig 1997-09-18 21:04:55.000000000 +0200
++++ glunix/src/idle/didle_sysinfo.cc
@@ -95,14 +95,34 @@
#include <kvm.h>
#include <nlist.h>
@@ -90,7 +90,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
/* definitions for indices in the nlist array */
#define X_AVENRUN 0
#define X_MPID 1
-@@ -165,11 +224,11 @@
+@@ -165,11 +224,11 @@ static struct nlist nlst[] =
// These are offsets into kmem for the stats we need
static ulong avenrunOffset, availrmemOffset, anoninfoOffset, swapfsOffset;
@@ -104,7 +104,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
static int cpuStates[NUM_CPUSTATES];
static int memoryStats[5];
static char *cpuStateNames[] =
-@@ -237,6 +296,45 @@
+@@ -237,6 +296,45 @@ ReadKernelData(unsigned long addr, char
*
* Side effects:
*****************************************************************************/
@@ -150,7 +150,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
Bool
Idle_InitializeSysinfo(void)
{
-@@ -301,7 +399,7 @@
+@@ -301,7 +399,7 @@ Idle_InitializeSysinfo(void)
return True;
}
@@ -159,7 +159,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
/******************************************************************************
* Idle_CleanupSysinfo --
* Description of purpose and function of the procedure
-@@ -333,18 +431,30 @@
+@@ -333,18 +431,30 @@ Idle_CleanupSysinfo(void)
*
* Side effects:
*****************************************************************************/
@@ -191,7 +191,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
/* Has this pid been recycled? Are we hitting a very old process?
If so, then reset the entry */
if (usage < candidate->cpuUsage) {
-@@ -353,7 +463,11 @@
+@@ -353,7 +463,11 @@ FindEntry(struct prpsinfo *targProc, dou
return candidate;
}
if (candidate->pid == -1) {
@@ -203,7 +203,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
candidate->cpuUsage = 0;
return candidate;
}
-@@ -379,10 +493,17 @@
+@@ -379,10 +493,17 @@ FindEntry(struct prpsinfo *targProc, dou
*
* Side effects:
*****************************************************************************/
@@ -221,7 +221,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
ASSERT(entry != NULL);
entry->cpuUsage = usage;
}
-@@ -408,12 +529,24 @@
+@@ -408,12 +529,24 @@ UpdateEntry(ProcUsage *entry, struct prp
void
Idle_GetSysInfo(Idle_Load *total, Idle_Load *seq, List_List *glunixProcs)
{
@@ -246,7 +246,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
static struct timeval lastTime = {0, 0};
struct timeval currTime;
double alpha, beta;
-@@ -459,6 +592,33 @@
+@@ -459,6 +592,33 @@ Idle_GetSysInfo(Idle_Load *total, Idle_L
vmInUse[TOTAL] = 0; vmInUse[SEQUENTIAL] = 0;
cpuUsage[TOTAL] = 0; cpuUsage[SEQUENTIAL] = 0;
numProcs = 0;
@@ -280,7 +280,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
rewinddir(procdir);
while ((direntp = readdir(procdir)) != 0) {
-@@ -493,6 +653,7 @@
+@@ -493,6 +653,7 @@ Idle_GetSysInfo(Idle_Load *total, Idle_L
(void) close(fd);
numProcs++;
}
@@ -288,7 +288,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
total->mem = activeMemory[TOTAL];
total->cpu = cpuUsage[TOTAL];
seq->mem = activeMemory[SEQUENTIAL];
-@@ -503,10 +664,21 @@
+@@ -503,10 +664,21 @@ Idle_GetSysInfo(Idle_Load *total, Idle_L
void
Idle_GetSystemInfo(Idle_SystemLoad *sysLoad)
{
@@ -311,7 +311,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
if (kd == NULL) {
sysLoad->loadAvg[0] = 0;
-@@ -515,7 +687,48 @@
+@@ -515,7 +687,48 @@ Idle_GetSystemInfo(Idle_SystemLoad *sysL
sysLoad->memory = 0;
return;
}
@@ -360,7 +360,7 @@ $NetBSD: patch-aj,v 1.4 2003/03/31 03:46:30 jmc Exp $
/* get load average array */
ReadKernelData(avenrunOffset, (char *) avenrun, sizeof (avenrun));
//
-@@ -539,6 +752,7 @@
+@@ -539,6 +752,7 @@ Idle_GetSystemInfo(Idle_SystemLoad *sysL
sysLoad->memory = PAGETOK(MAX(ani_max - ani_resv, 0) +
availrmem - swapfs_minfree);
diff --git a/parallel/glunix/patches/patch-ak b/parallel/glunix/patches/patch-ak
index 5e21f5d447d..a632a3d650e 100644
--- a/parallel/glunix/patches/patch-ak
+++ b/parallel/glunix/patches/patch-ak
@@ -1,22 +1,34 @@
-$NetBSD: patch-ak,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-ak,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/idle/didle_sysinfo.h~ Thu Sep 21 16:57:04 1995
-+++ glunix/src/idle/didle_sysinfo.h Fri Feb 27 06:33:45 1998
-@@ -96,2 +96,4 @@
+--- glunix/src/idle/didle_sysinfo.h.orig 1995-09-22 01:57:04.000000000 +0200
++++ glunix/src/idle/didle_sysinfo.h
+@@ -94,6 +94,8 @@
+
+ #define PROCFS "/proc"
+#ifndef __NetBSD__
+
#define X_AVENRUN 0
-@@ -108,2 +110,3 @@
+ #define X_MPID 1
+ #define X_CPU 2
+@@ -106,6 +108,7 @@
+ #define X_SWAPFS_MINFREE 9
+ #define X_NCPUS 10
#define X_VMINFO 11
+#endif
-@@ -118,2 +121,3 @@
+ #define TOTAL 0
+ #define SEQUENTIAL 1
+@@ -116,10 +119,11 @@
+ * Thus we'll get a coredump when going through array. The
+ * following is a size rounded up to 8.
*/
+#ifndef __NetBSD__
#define PRPSINFOSIZE (((sizeof(struct prpsinfo) + 7) / 8) * 8)
-@@ -121,3 +125,3 @@
+
#define PAGE_SIZE 4096 /* operating system page size */
-
+#endif
#define NUM_CPUSTATES 5
+
+ /*****************************************************************************/
diff --git a/parallel/glunix/patches/patch-al b/parallel/glunix/patches/patch-al
index 0afa6d0c00f..448afdb19a6 100644
--- a/parallel/glunix/patches/patch-al
+++ b/parallel/glunix/patches/patch-al
@@ -1,15 +1,25 @@
-$NetBSD: patch-al,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-al,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/nmgt/dnmgt.cc.orig Thu Sep 18 12:05:03 1997
-+++ glunix/src/nmgt/dnmgt.cc Thu Apr 9 09:13:12 1998
-@@ -143,3 +143,6 @@
+--- glunix/src/nmgt/dnmgt.cc.orig 1997-09-18 21:05:03.000000000 +0200
++++ glunix/src/nmgt/dnmgt.cc
+@@ -138,10 +138,14 @@
+ #define __THIS_MODULE MODULE_NMGT
+
+ #include <signal.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
#include <string.h>
+
+#ifndef __NetBSD__
#include <sys/processor.h>
+#endif
-@@ -202,2 +205,23 @@
+ #include "glib/types.h"
+ #include "cdebug.h"
+@@ -200,6 +204,27 @@ Nmgt_IncomingWelcome(int callbackValue,
+ Bool
+ Nmgt_GetMachineInfo(MsgNmgt_Hello *hello)
{
+#ifdef __NetBSD__
+
@@ -33,8 +43,14 @@ $NetBSD: patch-al,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+#else
+
processor_info_t info;
-@@ -218,3 +242,3 @@
+
+ ASSERT(hello != NULL);
+@@ -216,7 +241,7 @@ Nmgt_GetMachineInfo(MsgNmgt_Hello *hello
+ }
+
// Could use uname() to get the os type and version.
-
+#endif
return True;
+ }
+
diff --git a/parallel/glunix/patches/patch-am b/parallel/glunix/patches/patch-am
index d5968e4f4bf..8277a157977 100644
--- a/parallel/glunix/patches/patch-am
+++ b/parallel/glunix/patches/patch-am
@@ -1,8 +1,10 @@
-$NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-am,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/rexec/drexec.cc.orig Thu Oct 2 12:34:05 1997
-+++ glunix/src/rexec/drexec.cc Fri Apr 3 16:58:09 1998
-@@ -308,3 +308,10 @@
+--- glunix/src/rexec/drexec.cc.orig 1997-10-02 21:34:05.000000000 +0200
++++ glunix/src/rexec/drexec.cc
+@@ -306,7 +306,14 @@
+ #include <errno.h>
+ #include <string.h>
#include <stdlib.h>
+
+#ifdef __NetBSD__
@@ -13,7 +15,11 @@ $NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+#endif
+
#include <grp.h>
-@@ -355,5 +362,7 @@
+ #include <pwd.h>
+ #include <bsd.h>
+@@ -353,9 +360,11 @@ static Bool FinalizeParentPtyPiping(int
+ static Bool ChildPtyPiping(char *ptyName, char *ptyErrorName, int ptyMasterFd,
+ int ptyErrorMasterFd, MsgRexec_ExecCommand *msg);
static int PtyMasterOpen(char *ptyName);
-/*static int PtySlaveOpen(char *ptyName, int uid, int gid);*/
+#ifdef __NetBSD__
@@ -23,7 +29,11 @@ $NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
-
+#endif
/*****************************************************************************/
-@@ -1143,4 +1152,8 @@
+
+ // All of the routines on this list are called before this module
+@@ -1141,72 +1150,82 @@ ChildPtyPiping(char *ptyName, char *ptyE
+ windowSize = msg->windowSize;
+
// Open the stderr pty
+#ifdef __NetBSD__
+ if((ptyErrorSlaveFd = PtySlaveOpen(ptyErrorName, msg->uid, msg->gid)) == -1) {
@@ -32,7 +42,9 @@ $NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
== -1) {
+#endif
DE("PtySlaveOpen() failed\n");
-@@ -1150,13 +1163,17 @@
+ return False;
+ }
+ close(ptyErrorMasterFd);
-/* if(setsid() == -1) {
- Debug_Print(MODULE_REXEC, DEBUG_ERROR, "(rexec)ChildPtyPiping: "
@@ -57,7 +69,9 @@ $NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
-/* if((ptySlaveFd = PtySlaveOpen(ptyName, msg->uid, msg->gid)) == -1) {*/
+#endif
DE("PtySlaveOpen() failed\n");
-@@ -1166,22 +1183,21 @@
+ return False;
+ }
+ close(ptyMasterFd);
-/* This should work on BSD, but doesn't on SysV
-#if defined(TIOCSCTTY) && !defined(CIBAUD)
@@ -94,7 +108,7 @@ $NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+ DE("ioctl: %s\n", strerror(errno));
+ }
}
-@@ -1189,16 +1205,18 @@
+
if(ioctl(ptySlaveFd, TIOCSWINSZ, (char *) &windowSize) == -1) {
- * BUGBUG maybe should return failure here? *
- DE("ioctl: %s\n", strerror(errno));
@@ -124,7 +138,7 @@ $NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+ DE("ioctl: %s\n", strerror(errno));
+ }
}
-@@ -1206,5 +1224,6 @@
+
if(ioctl(ptyErrorSlaveFd, TIOCSWINSZ, (char *) &windowSize) == -1) {
- * BUGBUG maybe should return failure here? *
- DE("ioctl: %s\n", strerror(errno));
@@ -134,16 +148,28 @@ $NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+ }
+#endif
-@@ -1253,2 +1272,3 @@
+ if(msg->validIoFds[IO_INPUT]) {
+ while(dup2(ptySlaveFd, STDIN_FILENO) == -1) {
+@@ -1251,6 +1270,7 @@ ChildPtyPiping(char *ptyName, char *ptyE
+ return True;
+ }
+#ifndef __NetBSD__
int
-@@ -1273,3 +1293,3 @@
+ PtyMasterOpen(char *ptyName)
+ {
+@@ -1271,7 +1291,7 @@ PtyMasterOpen(char *ptyName)
+
+ return ptyMasterFd;
}
-
+#else
/******************************************************************************
-@@ -1286,36 +1306,39 @@
+ * PtyMasterOpen --
+ * This is the actual procedure that opens up a master pty. (BSD STYLE)
+@@ -1284,40 +1304,43 @@ PtyMasterOpen(char *ptyName)
+ *
+ * Side effects:
****************************************************************************/
-/*int
+
@@ -211,17 +237,29 @@ $NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+#ifndef __NetBSD__
int
-@@ -1366,3 +1389,3 @@
+ PtySlaveOpen(char *ptyName, int ptyMasterFd)
+ {
+@@ -1364,7 +1387,7 @@ PtySlaveOpen(char *ptyName, int ptyMaste
+
+ return ptySlaveFd;
}
-
+#else
/******************************************************************************
-@@ -1399,3 +1422,3 @@
+ * PtySlaveOpen --
+ * This is the actual procedure that opens up a slave pty. (BSD STYLE)
+@@ -1397,7 +1420,7 @@ PtySlaveOpen(char *ptyName, int uid, int
+
+ return ptySlaveFd;
}
-
+#endif
/******************************************************************************
-@@ -1802,3 +1825,7 @@
+ * Rexec_AbortProgramCallback --
+ *
+@@ -1800,7 +1823,11 @@ ChildDeathCallback(int sig, int arg) {
+
+ /* If it didn't exit, but something else happened
(received the SIG_STOP or SIG_CONT possibly) */
+#ifdef __NetBSD__
+ if ((WIFSTOPPED(procStat)) || (WIFSIGNALED(procStat))) {
@@ -229,3 +267,5 @@ $NetBSD: patch-am,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
if ((WIFSTOPPED(procStat)) || (WIFCONTINUED(procStat))) {
+#endif
// BUGBUG Shouldn't we signal the startup here????
+ D5("process status says it didn't exit!\n");
+ continue;
diff --git a/parallel/glunix/patches/patch-an b/parallel/glunix/patches/patch-an
index 652407c5063..0782ba18f1e 100644
--- a/parallel/glunix/patches/patch-an
+++ b/parallel/glunix/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.2 2003/03/31 03:46:30 jmc Exp $
+$NetBSD: patch-an,v 1.3 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/rexec/lrexec.cc.orig Thu Oct 2 19:34:06 1997
-+++ glunix/src/rexec/lrexec.cc Sun Mar 30 21:55:03 2003
+--- glunix/src/rexec/lrexec.cc.orig 1997-10-02 21:34:06.000000000 +0200
++++ glunix/src/rexec/lrexec.cc
@@ -293,6 +293,9 @@
#include <termios.h>
#include <unistd.h>
@@ -12,7 +12,7 @@ $NetBSD: patch-an,v 1.2 2003/03/31 03:46:30 jmc Exp $
#include "glib/types.h"
#include "glib.h"
-@@ -375,39 +378,30 @@
+@@ -375,39 +378,30 @@ SetupTerminal()
{
struct termios buf;
@@ -63,7 +63,7 @@ $NetBSD: patch-an,v 1.2 2003/03/31 03:46:30 jmc Exp $
buf.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG);
buf.c_cflag &= ~(CSIZE | PARENB);
buf.c_cflag |= CS8;
-@@ -426,14 +420,20 @@
+@@ -426,14 +420,20 @@ SetupTerminal()
continue;
} else {
D1("tcsetattr(): %s\n", strerror(errno));
diff --git a/parallel/glunix/patches/patch-ao b/parallel/glunix/patches/patch-ao
index 9ea6d54355b..a2790b547b4 100644
--- a/parallel/glunix/patches/patch-ao
+++ b/parallel/glunix/patches/patch-ao
@@ -1,9 +1,13 @@
-$NetBSD: patch-ao,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-ao,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/tools/timelimit.c~ Wed Sep 3 15:34:40 1997
-+++ progs/tools/timelimit.c Sat Feb 28 04:02:55 1998
-@@ -41,3 +41,3 @@
+--- progs/tools/timelimit.c.orig 1997-09-04 00:34:40.000000000 +0200
++++ progs/tools/timelimit.c
+@@ -39,7 +39,7 @@ main(int argc, char ** argv) {
+
+ /* IN CHILD */
- setpgrp();
+ setpgrp(0,0);
execv(argv[2], &(argv[2]));
+ perror("Exec error");
+ return -21;
diff --git a/parallel/glunix/patches/patch-aq b/parallel/glunix/patches/patch-aq
index 407b16ed57a..db2c0ae9a91 100644
--- a/parallel/glunix/patches/patch-aq
+++ b/parallel/glunix/patches/patch-aq
@@ -1,8 +1,10 @@
-$NetBSD: patch-aq,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-aq,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/tools/Makefile.orig Wed Oct 29 16:11:27 1997
-+++ progs/tools/Makefile Sat Feb 28 05:51:55 1998
-@@ -12,5 +12,5 @@
+--- progs/tools/Makefile.orig 1997-10-30 00:11:27.000000000 +0100
++++ progs/tools/Makefile
+@@ -10,9 +10,9 @@ SCRIPTS = run_glunix_script run_glunix_a
+ NOT_INSTALLED_SCRIPTS = gluinstall
+
# These are things that need to be installed
-BINS = $(TARGETS) $(SCRIPTS)
+BINS = $(TARGETS) $(SCRIPTS) gluinstall
@@ -10,3 +12,5 @@ $NetBSD: patch-aq,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
-LIBS = -lnsl
+LIBS =
MANPAGES = MHTML.1
+
+ ###########################################################################
diff --git a/parallel/glunix/patches/patch-ar b/parallel/glunix/patches/patch-ar
index 2735f732255..22fe8bb5a24 100644
--- a/parallel/glunix/patches/patch-ar
+++ b/parallel/glunix/patches/patch-ar
@@ -1,8 +1,9 @@
-$NetBSD: patch-ar,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-ar,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/tools/gluinstall.pl.orig Thu Sep 11 16:28:03 1997
-+++ progs/tools/gluinstall.pl Sat May 23 14:16:26 1998
-@@ -2,3 +2,6 @@
+--- progs/tools/gluinstall.pl.orig 1997-09-12 01:28:03.000000000 +0200
++++ progs/tools/gluinstall.pl
+@@ -1,6 +1,9 @@
+ #!%%PERL_PATH%%
-$glunix_base = "%%GLUNIX_DIR%%/release";
+$install_man = "/usr/bin/install -c -m 644 -o glunix -g glunix ";
@@ -10,7 +11,11 @@ $NetBSD: patch-ar,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$imkdir = "/usr/bin/install -d -m 755 -o glunix -g glunix";
+$glunix_base = "%%GLUNIX_BASE%%";
$now_base = "%%INSTALL_DIR%%";
-@@ -23,9 +26,9 @@
+ $http_base = "%%HTTP_BASE%%";
+ $util_base = "%%GLUNIX_DIR%%/util";
+@@ -21,13 +24,13 @@ if ($ARGV[0] eq "-test") {
+ # Create directories
+ #
-&my_mkdir("$now_base/bin");
-&my_mkdir("$now_base/lib");
@@ -27,7 +32,11 @@ $NetBSD: patch-ar,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+# &my_mkdir("$http_base/man/html");
+#}
-@@ -50,18 +53,39 @@
+ #######################################################################
+ #
+@@ -48,22 +51,43 @@ if ($http_base ne "") {
+ # Install include files/directories
+ #
-@files = <$glunix_base/glunix/include/*>;
-@files = &strip_garbage(@files);
@@ -80,12 +89,17 @@ $NetBSD: patch-ar,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
}
-
print "\n";
-@@ -74,3 +98,3 @@
+
+ #######################################################################
+@@ -72,37 +96,38 @@ print "\n";
+ #
+
# Find all of the man pages in the release directory
-@dirs = <$glunix_base/man/man?>;
+@dirs = <$glunix_base/glunix/man/man?>;
push(@dirs, <$glunix_base/glunix/man/man?>);
-@@ -79,21 +103,22 @@
+
+ # print "Found man directories: ", join(" ", @dirs), "\n";
-foreach $val (@dirs) {
- @f = <$val/*.*>;
@@ -124,17 +138,28 @@ $NetBSD: patch-ar,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+# print "Done with catman!\n";
+#}
-@@ -104,3 +129,3 @@
+ #######################################################################
+ #
+ # Install libraries
+ #
-@files = <$glunix_base/lib/$glunix_arch/*>;
+@files = <$glunix_base/glunix/lib/$glunix_arch/*>;
@files = &strip_garbage(@files);
-@@ -115,3 +140,3 @@
+ #print "Found include files: ", join(" ", @dirs), "\n";
+
+@@ -113,7 +138,7 @@ foreach $val (@files) {
+ # print "Unlinking $install_path\n";
+ unlink($install_path);
# print "Linking $install_path to $val\n";
- symlink($val, $install_path);
+ system("$install_man $val $install_path");
}
-@@ -131,9 +156,9 @@
+ }
+
+@@ -129,18 +154,18 @@ undef @f;
+ undef @files;
+
foreach $val (@copy_progs) {
- if (-e "$glunix_base/bin/$glunix_arch/$val") {
- print "Copying $glunix_base/bin/$glunix_arch/$val to $now_base/bin/$val\n";
@@ -148,25 +173,39 @@ $NetBSD: patch-ar,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
- print "Cannot find $glunix_base/bin/$glunix_arch/$val to copy\n";
+ print "Cannot find $glunix_base/glunix/bin/$glunix_arch/$val to copy\n";
}
-@@ -142,3 +167,3 @@
+ }
+
# Find all of the programs in the release directory
-@dirs = <$glunix_base/bin/*>;
+@dirs = <$glunix_base/glunix/bin/*>;
-@@ -181,3 +206,3 @@
+ #print "Found program directories: ", join(" ", @dirs), "\n";
+
+@@ -179,14 +204,16 @@ foreach $val (@files) {
+ if (!$justTesting) {
+ unlink($install_path);
# print "symlink(\"GLUnix-bin\", $install_path);\n";
- symlink("GLUnix-bin", $install_path);
+ system("$install_bin $val $install_path");
}
-@@ -188,3 +213,5 @@
+ }
+
+ foreach $val (@setuid_progs) {
+ print "Marking file setuid root: $val\n";
if (!$justTesting) {
- chmod 06511, $val;
+# chmod 06511, $val;
+ system("chown root:glunix $now_base/bin/$val");
+ system("chmod 6511 $now_base/bin/$val");
}
-@@ -227,3 +254,3 @@
+ }
+
+@@ -225,7 +252,7 @@ sub install_manpages {
+ if (!$justTesting) {
+ unlink($install_path);
# print "symlink($val, $install_path)\n";
- symlink($val, $install_path);
+ system("$install_man $val $install_path");
}
+ }
+
diff --git a/parallel/glunix/patches/patch-as b/parallel/glunix/patches/patch-as
index deccdf06f58..c7b5da5b621 100644
--- a/parallel/glunix/patches/patch-as
+++ b/parallel/glunix/patches/patch-as
@@ -1,9 +1,13 @@
-$NetBSD: patch-as,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-as,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/examples/Makefile~ Wed Nov 5 13:43:42 1997
-+++ progs/examples/Makefile Sat Feb 28 07:21:19 1998
-@@ -10,3 +10,3 @@
+--- progs/examples/Makefile.orig 1997-11-05 21:43:42.000000000 +0100
++++ progs/examples/Makefile
+@@ -8,7 +8,7 @@ SCRIPTS =
+ # These are things that need to be installed
+ BINS = $(TARGETS) $(SCRIPTS)
-LIBS = -lnsl -lglunix -lsocket
+LIBS = -lglunix
MANPAGES =
+
+ ###########################################################################
diff --git a/parallel/glunix/patches/patch-at b/parallel/glunix/patches/patch-at
index 35a9dd87f49..98d1ff48200 100644
--- a/parallel/glunix/patches/patch-at
+++ b/parallel/glunix/patches/patch-at
@@ -1,9 +1,21 @@
-$NetBSD: patch-at,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-at,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/gluadmin/Makefile~ Fri Dec 6 17:19:00 1996
-+++ progs/gluadmin/Makefile Sat Feb 28 07:21:31 1998
-@@ -2,3 +2,3 @@
+--- progs/gluadmin/Makefile.orig 1996-12-07 01:19:00.000000000 +0100
++++ progs/gluadmin/Makefile
+@@ -1,6 +1,6 @@
+ TARGET = gluadmin
SRCS = gluadmin.c
-LIBS = -lglunix -lsocket -lnsl
+LIBS = -lglunix
+ BINS = $(TARGET)
+ MANPAGES = $(addsuffix .1,$(BINS))
+@@ -15,7 +15,7 @@ all: $(TARGET)
+
+ # note that the use of -R makes the use of LD_LIBRARY_PATH unnecessary...
+ $(TARGET): $(SRCS)
+- gcc $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
++ g++ $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
+
+ clean:
+ rm -f $(BINS) core *~ *.o
diff --git a/parallel/glunix/patches/patch-au b/parallel/glunix/patches/patch-au
index 49ebb724d30..7ebb83b37c2 100644
--- a/parallel/glunix/patches/patch-au
+++ b/parallel/glunix/patches/patch-au
@@ -1,8 +1,10 @@
-$NetBSD: patch-au,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-au,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/gludebug/Makefile.orig Fri Dec 6 17:19:06 1996
-+++ progs/gludebug/Makefile Thu Mar 12 01:13:22 1998
-@@ -16,5 +16,5 @@
+--- progs/gludebug/Makefile.orig 1996-12-07 01:19:06.000000000 +0100
++++ progs/gludebug/Makefile
+@@ -14,9 +14,9 @@
+ TARGET = gludebug
+ TARGET2 = tkGludebug
SRCS = gludebug.c
-LIBS = -lglunix -lsocket -lnsl
+LIBS = -lglunix
@@ -10,3 +12,14 @@ $NetBSD: patch-au,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
-BINS = $(TARGET) $(TARGET2)
+BINS = $(TARGET) #$(TARGET2)
MANPAGES = $(addsuffix .1,$(BINS))
+
+ ###########################################################################
+@@ -29,7 +29,7 @@ all: $(TARGET)
+
+ # note that the use of -R makes the use of LD_LIBRARY_PATH unnecessary...
+ $(TARGET): $(SRCS)
+- $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
++ g++ $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
+
+ clean:
+ rm -f $(TARGET) core *.o *~
diff --git a/parallel/glunix/patches/patch-av b/parallel/glunix/patches/patch-av
index 5398978d17a..88c014df3a4 100644
--- a/parallel/glunix/patches/patch-av
+++ b/parallel/glunix/patches/patch-av
@@ -1,9 +1,21 @@
-$NetBSD: patch-av,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-av,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/glukill/Makefile~ Fri Dec 6 17:19:09 1996
-+++ progs/glukill/Makefile Sat Feb 28 07:21:57 1998
-@@ -2,3 +2,3 @@
+--- progs/glukill/Makefile.orig 1996-12-07 01:19:09.000000000 +0100
++++ progs/glukill/Makefile
+@@ -1,6 +1,6 @@
+ TARGET = glukill
SRCS = glukill.c
-LIBS = -lglunix -lsocket -lnsl
+LIBS = -lglunix
+ BINS = $(TARGET)
+ MANPAGES = $(addsuffix .1,$(BINS))
+@@ -16,7 +16,7 @@ all: $(TARGET)
+
+ # note that the use of -R makes the use of LD_LIBRARY_PATH unnecessary...
+ $(TARGET): $(SRCS)
+- $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
++ g++ $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
+
+ clean:
+ rm -f $(BINS) core *~ *.o
diff --git a/parallel/glunix/patches/patch-aw b/parallel/glunix/patches/patch-aw
index a72a590021f..d50d3e89837 100644
--- a/parallel/glunix/patches/patch-aw
+++ b/parallel/glunix/patches/patch-aw
@@ -1,9 +1,21 @@
-$NetBSD: patch-aw,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-aw,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/glups/Makefile~ Fri Dec 6 17:19:18 1996
-+++ progs/glups/Makefile Sat Feb 28 07:24:39 1998
-@@ -2,3 +2,3 @@
+--- progs/glups/Makefile.orig 1996-12-07 01:19:18.000000000 +0100
++++ progs/glups/Makefile
+@@ -1,6 +1,6 @@
+ TARGET = glups
SRCS = glups.c
-LIBS = -lglunix -lsocket -lnsl
+LIBS = -lglunix
+ BINS = $(TARGET)
+ MANPAGES = $(addsuffix .1,$(BINS))
+@@ -16,7 +16,7 @@ all: $(TARGET)
+
+ # note that the use of -R makes the use of LD_LIBRARY_PATH unnecessary...
+ $(TARGET): $(SRCS)
+- $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
++ g++ $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
+
+ clean:
+ rm -f $(BINS) core *~ *.o
diff --git a/parallel/glunix/patches/patch-ax b/parallel/glunix/patches/patch-ax
index 4aba7bd1ba9..850b56e09cf 100644
--- a/parallel/glunix/patches/patch-ax
+++ b/parallel/glunix/patches/patch-ax
@@ -1,9 +1,21 @@
-$NetBSD: patch-ax,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-ax,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/gluptime/Makefile~ Fri Dec 6 17:19:21 1996
-+++ progs/gluptime/Makefile Sat Feb 28 07:24:51 1998
-@@ -2,3 +2,3 @@
+--- progs/gluptime/Makefile.orig 1996-12-07 01:19:21.000000000 +0100
++++ progs/gluptime/Makefile
+@@ -1,6 +1,6 @@
+ TARGET = gluptime
SRCS = gluptime.c
-LIBS = -lglunix -lsocket -lnsl
+LIBS = -lglunix
+ BINS = $(TARGET)
+ MANPAGES = $(addsuffix .1,$(BINS))
+@@ -16,7 +16,7 @@ all: $(TARGET)
+
+ # note that the use of -R makes the use of LD_LIBRARY_PATH unnecessary...
+ $(TARGET): $(SRCS)
+- $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
++ g++ $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
+
+ clean:
+ rm -f $(BINS) core *~ *.o
diff --git a/parallel/glunix/patches/patch-ay b/parallel/glunix/patches/patch-ay
index f3747cc9198..c827ed56621 100644
--- a/parallel/glunix/patches/patch-ay
+++ b/parallel/glunix/patches/patch-ay
@@ -1,9 +1,21 @@
-$NetBSD: patch-ay,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-ay,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/glurun/Makefile~ Fri Dec 6 17:19:24 1996
-+++ progs/glurun/Makefile Sat Feb 28 07:26:45 1998
-@@ -2,3 +2,3 @@
+--- progs/glurun/Makefile.orig 1996-12-07 01:19:24.000000000 +0100
++++ progs/glurun/Makefile
+@@ -1,6 +1,6 @@
+ TARGET = glurun
SRCS = glurun.c
-LIBS = -lglunix -lsocket -lnsl
+LIBS = -lglunix
+ BINS = $(TARGET)
+ MANPAGES = $(addsuffix .1,$(BINS))
+@@ -16,7 +16,7 @@ all: $(TARGET)
+
+ # note that the use of -R makes the use of LD_LIBRARY_PATH unnecessary...
+ $(TARGET): $(SRCS)
+- $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
++ g++ $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
+
+ clean:
+ rm -f $(BINS) core *~ *.o
diff --git a/parallel/glunix/patches/patch-az b/parallel/glunix/patches/patch-az
index db177e5aed9..9a412ef6825 100644
--- a/parallel/glunix/patches/patch-az
+++ b/parallel/glunix/patches/patch-az
@@ -1,9 +1,21 @@
-$NetBSD: patch-az,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-az,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/glustat/Makefile~ Sun Dec 1 16:23:04 1996
-+++ progs/glustat/Makefile Sat Feb 28 07:27:52 1998
-@@ -2,3 +2,3 @@
+--- progs/glustat/Makefile.orig 1996-12-02 00:23:04.000000000 +0100
++++ progs/glustat/Makefile
+@@ -1,6 +1,6 @@
+ TARGET = glustat
SRCS = glustat.c
-LIBS = -lglunix -lsocket -lnsl
+LIBS = -lglunix
+ BINS = $(TARGET)
+ MANPAGES = $(addsuffix .1,$(BINS))
+@@ -15,7 +15,7 @@ all: $(TARGET)
+
+
+ $(TARGET): $(SRCS)
+- $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
++ g++ $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
+
+ clean:
+ rm -f $(BINS) core *~ *.o
diff --git a/parallel/glunix/patches/patch-ba b/parallel/glunix/patches/patch-ba
index 13729d85f09..c533b3f5e67 100644
--- a/parallel/glunix/patches/patch-ba
+++ b/parallel/glunix/patches/patch-ba
@@ -1,9 +1,13 @@
-$NetBSD: patch-ba,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-ba,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/ms/Makefile~ Wed Nov 5 13:44:23 1997
-+++ progs/ms/Makefile Sat Feb 28 07:30:02 1998
-@@ -57,3 +57,3 @@
+--- progs/ms/Makefile.orig 1997-11-05 21:44:23.000000000 +0100
++++ progs/ms/Makefile
+@@ -55,7 +55,7 @@ INCPATH = $(addprefix -I,$(INCLUDEPATH)
+ #CFLAGS = -g -O $(INCPATH) -I/usr/sww/X11R6/include -DCYCLE_DETECT
+ CFLAGS = -g -O $(INCPATH) -I/usr/sww/X11R6/include
LDDIRS = -L/usr/sww/X11/lib -R/usr/sww/X11/lib $(LLIBPATH) $(RLIBPATH)
-LDFLAGS = $(LDDIRS) -lglunix-lsocket -lnsl -lm
+LDFLAGS = $(LDDIRS) -lglunix -lm
+ MOBJS = glu.o cmap.o parse.o work.o mspawn.o io.o strdup.o gslave.o
+ XOBJS = xms.o Ms.o Mama.o menu.o label.o xio.o
diff --git a/parallel/glunix/patches/patch-bb b/parallel/glunix/patches/patch-bb
index e14207bf678..26aa853edce 100644
--- a/parallel/glunix/patches/patch-bb
+++ b/parallel/glunix/patches/patch-bb
@@ -1,9 +1,21 @@
-$NetBSD: patch-bb,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bb,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/gluperf/Makefile~ Thu Sep 11 13:50:55 1997
-+++ progs/gluperf/Makefile Sat Feb 28 07:24:26 1998
-@@ -2,3 +2,3 @@
+--- progs/gluperf/Makefile.orig 1997-09-11 22:50:55.000000000 +0200
++++ progs/gluperf/Makefile
+@@ -1,6 +1,6 @@
+ TARGET = gluperf
SRCS = gluperf.c
-LIBS = -lm -lglunix -lsocket -lnsl
+LIBS = -lm -lglunix
+ BINS = $(TARGET)
+ MANPAGES = $(addsuffix .1,$(BINS))
+@@ -16,7 +16,7 @@ all: $(TARGET)
+
+ # note that the use of -R makes the use of LD_LIBRARY_PATH unnecessary...
+ $(TARGET): $(SRCS)
+- $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
++ g++ $(CFLAGS) -o $(TARGET) $(SRCS) $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS)
+
+ clean:
+ rm -f $(BINS) core *~ *.o
diff --git a/parallel/glunix/patches/patch-bc b/parallel/glunix/patches/patch-bc
index b69367cae94..10810a27577 100644
--- a/parallel/glunix/patches/patch-bc
+++ b/parallel/glunix/patches/patch-bc
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bc,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/glumake/Makefile.orig Wed Nov 5 13:43:50 1997
-+++ progs/glumake/Makefile Mon Oct 12 22:05:32 1998
+--- progs/glumake/Makefile.orig 1997-11-05 21:43:50.000000000 +0100
++++ progs/glumake/Makefile
@@ -27,26 +27,17 @@
#
# Configure the GLUnix modifications here
@@ -37,7 +37,7 @@ $NetBSD: patch-bc,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
############################################################################
-@@ -56,7 +47,7 @@
+@@ -56,7 +47,7 @@ srcdir = .
CC = gcc
@@ -46,7 +46,7 @@ $NetBSD: patch-bc,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
CPPFLAGS =
LDFLAGS =
-@@ -70,6 +61,7 @@
+@@ -70,6 +61,7 @@ LDFLAGS =
# NeXT 1.0a uses an old version of GCC, which required -D__inline=inline.
# See also `config.h'.
defines = -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\"
@@ -54,7 +54,7 @@ $NetBSD: patch-bc,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
# Which flavor of remote job execution support to use.
# The code is found in `remote-$(REMOTE).c'.
-@@ -97,16 +89,16 @@
+@@ -97,16 +89,16 @@ ALLOCA_SRC = $(srcdir)/alloca.c
# libPW.a is broken on HP9000s300 and HP9000s400 machines. Use
# alloca.c instead on those machines.
ifneq ($(origin GLUNIX_DEVEL),undefined)
@@ -74,7 +74,7 @@ $NetBSD: patch-bc,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
# Common prefix for machine-dependent installed files.
exec_prefix = ${prefix}
-@@ -138,7 +130,7 @@
+@@ -138,7 +130,7 @@ group = sys
# Program to install `glumake'.
INSTALL_PROGRAM = ${INSTALL}
# Program to install the man page.
@@ -83,7 +83,16 @@ $NetBSD: patch-bc,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
# Program to format Texinfo source into Info files.
MAKEINFO = makeinfo
-@@ -259,9 +251,9 @@
+@@ -186,7 +178,7 @@ make.ps: make.dvi
+ dvi2ps make.dvi > make.ps
+
+ make: $(objs)
+- $(CC) $(LDFLAGS) $(objs) $(LOADLIBES) -o make.new
++ g++ $(LDFLAGS) $(objs) $(LOADLIBES) -o make.new
+ mv -f make.new make
+
+ # -I. is needed to find config.h in the build directory.
+@@ -259,9 +251,9 @@ $(infodir)/make.info: make.info
installman $(mandir)/$(manprefix)make.$(manext):
if test -x $(GLUNIX_BASE)/bin/mhtml2html; then \
diff --git a/parallel/glunix/patches/patch-bd b/parallel/glunix/patches/patch-bd
index dc5fd9f5e06..319bd678af0 100644
--- a/parallel/glunix/patches/patch-bd
+++ b/parallel/glunix/patches/patch-bd
@@ -1,11 +1,15 @@
-$NetBSD: patch-bd,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bd,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/glumake/signame.c~ Fri Aug 2 12:06:04 1996
-+++ progs/glumake/signame.c Mon Mar 2 07:37:03 1998
-@@ -58,6 +58,2 @@
+--- progs/glumake/signame.c.orig 1996-08-02 21:06:04.000000000 +0200
++++ progs/glumake/signame.c
+@@ -56,10 +56,6 @@ const char *sys_siglist[NSIG];
+
+ #else /* HAVE_SYS_SIGLIST. */
-#ifndef SYS_SIGLIST_DECLARED
-extern char *sys_siglist[];
-#endif /* Not SYS_SIGLIST_DECLARED. */
-
#endif /* Not HAVE_SYS_SIGLIST. */
+
+ /* Table of abbreviations for signals. Note: A given number can
diff --git a/parallel/glunix/patches/patch-be b/parallel/glunix/patches/patch-be
index 4a589e92790..49317e3da8e 100644
--- a/parallel/glunix/patches/patch-be
+++ b/parallel/glunix/patches/patch-be
@@ -1,8 +1,10 @@
-$NetBSD: patch-be,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-be,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/glumake/make.h~ Fri Aug 2 12:05:32 1996
-+++ progs/glumake/make.h Mon Mar 2 07:44:05 1998
-@@ -88,7 +88,3 @@
+--- progs/glumake/make.h.orig 1996-08-02 21:05:32.000000000 +0200
++++ progs/glumake/make.h
+@@ -86,11 +86,7 @@ extern int errno;
+ #define SYS_SIGLIST_DECLARED
+ #endif
-#ifdef HAVE_SYS_SIGLIST
-#ifndef SYS_SIGLIST_DECLARED
@@ -11,3 +13,5 @@ $NetBSD: patch-be,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
-#else
+#ifndef HAVE_SYS_SIGLIST
#include "signame.h"
+ #endif
+
diff --git a/parallel/glunix/patches/patch-bf b/parallel/glunix/patches/patch-bf
index 3a145a74887..163180a4a99 100644
--- a/parallel/glunix/patches/patch-bf
+++ b/parallel/glunix/patches/patch-bf
@@ -1,4 +1,4 @@
-$NetBSD: patch-bf,v 1.2 1998/10/22 16:06:48 garbled Exp $
+$NetBSD: patch-bf,v 1.3 2005/05/29 14:38:33 wiz Exp $
--- progs/glush/Makefile.ror Wed May 27 11:19:41 1998
+++ progs/glush/Makefile Wed May 27 11:20:21 1998
@@ -761,7 +761,7 @@ $NetBSD: patch-bf,v 1.2 1998/10/22 16:06:48 garbled Exp $
@@ -639,3 +821,3 @@
$(RM) $@
- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LDLIBS) $(GLUNIX_LIBS) $(ALIB) $(EXTRA_LOAD_FLAGS)
-+ $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LDLIBS) $(ALIB) $(EXTRA_LOAD_FLAGS)
++ $(CXXLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LDLIBS) $(ALIB) $(EXTRA_LOAD_FLAGS)
@@ -646,3 +828,3 @@
$(RM) $@
diff --git a/parallel/glunix/patches/patch-bg b/parallel/glunix/patches/patch-bg
index 69412d1e4f8..f12f088da5f 100644
--- a/parallel/glunix/patches/patch-bg
+++ b/parallel/glunix/patches/patch-bg
@@ -1,46 +1,66 @@
-$NetBSD: patch-bg,v 1.3 2000/07/10 23:54:23 wiz Exp $
+$NetBSD: patch-bg,v 1.4 2005/05/29 14:38:33 wiz Exp $
---- progs/glupart/glupart_script.pl.orig Wed Nov 5 17:30:11 1997
-+++ progs/glupart/glupart_script.pl Thu Jun 29 15:48:34 2000
-@@ -75,3 +75,3 @@
+--- progs/glupart/glupart_script.pl.orig 1997-11-05 23:30:11.000000000 +0100
++++ progs/glupart/glupart_script.pl
+@@ -73,7 +73,7 @@ my $gl_reservationFile = "$gl_dataDir/re
+ my $gl_lockFile = "$gl_dataDir/glupart.lock";
+ my $gl_logFile = "$gl_dataDir/reservation-log";
my $gl_tmpFile = "$gl_dataDir/.__glupart$$-tmp";
-my $gl_emailAdmin = "glunix-admin\@now.CS.Berkeley.EDU";
+my $gl_emailAdmin = "root";
my $gl_datePath = "/bin/date";
-@@ -136,3 +136,3 @@
+ my $gl_emailPath = "%%MAIL_PATH%%";
+
+@@ -134,7 +134,7 @@ sub usage {
+ my($pager);
+
&unlock();
- open(USAGE, "|/usr/sww/bin/less") || open(USAGE, "|/bin/less") ||
+ open(USAGE, "|/usr/bin/less") || open(USAGE, "|/bin/less") ||
open(USAGE, "|/bin/more") || open(USAGE, ">&STDOUT");
-@@ -1491,3 +1491,4 @@
+ print USAGE $str;
+ print USAGE "---------------------------------------\n";
+@@ -1489,7 +1489,8 @@ sub my_mkdir {
+ $tmp = "$tmp/$s";
+ if (!(-e $tmp)) {
print "Creating directory $tmp\n";
- mkdir($tmp, 0755);
+ mkdir $tmp, 0755 || die("$!");
+ system("/usr/sbin/chown glunix:glunix $tmp");
}
-@@ -1501,3 +1502,3 @@
+ }
+ }
+@@ -1499,12 +1500,13 @@ sub my_touch {
+ my(@files) = @_;
+ my($f);
- umask 0755;
+ umask 0022;
foreach $f (@files) {
-@@ -1507,2 +1508,3 @@
+ if (!(-e $f)) {
+ open(TOUCHFD,">$f");
+ close(TOUCHFD);
print "Created file $f\n";
+ system("/usr/sbin/chown glunix:glunix $f");
}
-@@ -1995,3 +1997,5 @@
+ }
+ }
+@@ -1993,13 +1995,23 @@ if ($command eq "help" || $command eq "h
+ }
+
if ($command eq "install") {
- if ($> != 0) {
+ my $tid = $>;
+
+ if ($< != 0) {
print STDERR "You must be root to do \"glupart install\"\n";
-@@ -1999,2 +2003,5 @@
+ exit(-2);
}
+ if ($< == 0 && $> != 0) {
+ $> = $<;
+ }
&my_mkdir($gl_dataDir);
-@@ -2002,2 +2009,7 @@
+ &my_touch($gl_machineFile, $gl_groupFile, $gl_aliasFile,
$gl_reservationFile, $gl_lockFile, $gl_logFile);
+
+ if ($> != $tid) {
@@ -48,3 +68,5 @@ $NetBSD: patch-bg,v 1.3 2000/07/10 23:54:23 wiz Exp $
+ }
+
exit(0);
+ }
+
diff --git a/parallel/glunix/patches/patch-bj b/parallel/glunix/patches/patch-bj
index 9b18341354f..8a2efc99118 100644
--- a/parallel/glunix/patches/patch-bj
+++ b/parallel/glunix/patches/patch-bj
@@ -1,14 +1,25 @@
-$NetBSD: patch-bj,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bj,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/part/mpart.cc~ Fri Sep 5 12:30:01 1997
-+++ glunix/src/part/mpart.cc Thu Apr 2 09:15:10 1998
-@@ -272,3 +272,5 @@
+--- glunix/src/part/mpart.cc.orig 1997-09-05 21:30:01.000000000 +0200
++++ glunix/src/part/mpart.cc
+@@ -46,6 +46,7 @@
+ #define __THIS_MODULE MODULE_PART
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -270,13 +271,18 @@ Part_SpawnDaemon(char *path, char **argv
+ }
+ if (pid == 0) {
// Child executes here
+#ifndef __NetBSD__
close(pipeFds[1]);
+#endif
if (dup2(pipeFds[0], STDIN_FILENO) < 0) {
-@@ -277,4 +279,7 @@
+ DE("dup2(STDIN) failed: %s\n", strerror(errno));
+ exit(-1);
}
-
+#ifdef __NetBSD__
@@ -17,7 +28,11 @@ $NetBSD: patch-bj,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
if (dup2(pipeFds[0], STDOUT_FILENO) < 0) {
+#endif
DE("dup2(STDOUT) failed: %s\n", strerror(errno));
-@@ -293,6 +298,11 @@
+ exit(-1);
+ }
+@@ -291,10 +297,15 @@ Part_SpawnDaemon(char *path, char **argv
+ DE("CloseOneExec(%d) failed, pipeFds[0,1] = (%d,%d): %s\n",
+ pipeFds[1], pipeFds[0], pipeFds[1], strerror(errno));
}
+#ifndef __NetBSD__
close(pipeFds[0]);
@@ -30,3 +45,5 @@ $NetBSD: patch-bj,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
*fdPtr = pipeFds[1];
+#endif
+ return True;
+ }
diff --git a/parallel/glunix/patches/patch-bk b/parallel/glunix/patches/patch-bk
index 063c2e72192..3d4397b9a06 100644
--- a/parallel/glunix/patches/patch-bk
+++ b/parallel/glunix/patches/patch-bk
@@ -1,19 +1,31 @@
-$NetBSD: patch-bk,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bk,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- progs/tools/run_glunix_agent.pl~ Thu Oct 2 11:42:13 1997
-+++ progs/tools/run_glunix_agent.pl Fri Apr 3 11:22:25 1998
-@@ -62,3 +62,3 @@
+--- progs/tools/run_glunix_agent.pl.orig 1997-10-02 20:42:13.000000000 +0200
++++ progs/tools/run_glunix_agent.pl
+@@ -60,7 +60,7 @@ sub get_pid {
+ sub do_ps {
+ local($pid, $path) = @_;
- open(FD,"/bin/ps -edaf -p $pid | grep $path | grep -v grep|");
+ open(FD,"/bin/ps -ax -p $pid | grep $path | grep -v grep|");
while (<FD>) {
-@@ -190,3 +190,3 @@
+ m/^\s*[a-zA-Z0-9\-]+\s+([0-9]+)/;
+ if ($pid == $1) {
+@@ -188,7 +188,7 @@ if ($command eq "dquery") {
+ } elsif ($command eq "dnuke") {
+ $killed_some = 0;
while (1) {
- $str = `/bin/ps -edaf | grep daemon | grep now/glunix/ | grep -v grep`;
+ $str = `/bin/ps -ax | grep '(daemon)' | grep -v grep`;
$str =~ s/^\s*//;
-@@ -211,3 +211,3 @@
+ @pid = split(/\s+/, $str);
+ if ($#pid > 2) {
+@@ -209,7 +209,7 @@ if ($command eq "dquery") {
+ } elsif ($command eq "mnuke") {
+ $killed_some = 0;
while (1) {
- $str = `/bin/ps -edaf | grep master | grep now/glunix/ | grep -v grep`;
+ $str = `/bin/ps -ax | grep '(master)' | grep -v grep`;
$str =~ s/^\s*//;
+ @pid = split(/\s+/, $str);
+ if ($#pid > 2) {
diff --git a/parallel/glunix/patches/patch-bl b/parallel/glunix/patches/patch-bl
index 3b91149b0db..c068ce1f7c2 100644
--- a/parallel/glunix/patches/patch-bl
+++ b/parallel/glunix/patches/patch-bl
@@ -1,8 +1,12 @@
-$NetBSD: patch-bl,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bl,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/rexec/mrexec.cc~ Thu Oct 2 12:34:06 1997
-+++ glunix/src/rexec/mrexec.cc Fri Apr 3 16:56:16 1998
-@@ -263,3 +263,2 @@
+--- glunix/src/rexec/mrexec.cc.orig 1997-10-02 21:34:06.000000000 +0200
++++ glunix/src/rexec/mrexec.cc
+@@ -261,7 +261,6 @@
+
+ #include <signal.h>
#include <pwd.h>
-#include <time.h>
#include <stdio.h>
+ #include <string.h>
+ #include <time.h>
diff --git a/parallel/glunix/patches/patch-bm b/parallel/glunix/patches/patch-bm
index d779cd4fcc9..e1e7a7fd467 100644
--- a/parallel/glunix/patches/patch-bm
+++ b/parallel/glunix/patches/patch-bm
@@ -1,8 +1,20 @@
-$NetBSD: patch-bm,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bm,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/glib/glib.cc~ Thu Oct 2 12:33:49 1997
-+++ glunix/src/glib/glib.cc Fri Apr 3 16:59:37 1998
-@@ -205,3 +205,2 @@
+--- glunix/src/glib/glib.cc.orig 1997-10-02 21:33:49.000000000 +0200
++++ glunix/src/glib/glib.cc
+@@ -182,6 +182,7 @@
+ #define __THIS_MODULE MODULE_GLIB
+
+ #include <stdio.h>
++#include <string.h>
+ #include <netinet/in.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+@@ -203,7 +204,6 @@
+ #include "cdebug.h"
+ #include "cperf.h"
#include "csignal.h"
-#include "lpdb.h"
#include "lidle.h"
+ #include "lpart.h"
+ #include "ctime.h"
diff --git a/parallel/glunix/patches/patch-bn b/parallel/glunix/patches/patch-bn
index aa0e01bcd74..bc4977675e2 100644
--- a/parallel/glunix/patches/patch-bn
+++ b/parallel/glunix/patches/patch-bn
@@ -1,8 +1,12 @@
-$NetBSD: patch-bn,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bn,v 1.2 2005/05/29 14:38:33 wiz Exp $
---- glunix/src/comm/ccomm.cc~ Thu Oct 2 12:33:46 1997
-+++ glunix/src/comm/ccomm.cc Fri Apr 3 17:04:02 1998
-@@ -397,3 +397,2 @@
+--- glunix/src/comm/ccomm.cc.orig 1997-10-02 21:33:46.000000000 +0200
++++ glunix/src/comm/ccomm.cc
+@@ -395,7 +395,6 @@
+ #include "ccomm_cback.h"
+ #include "ccomm_internal.h"
#include "cdebug.h"
-#include "ctime.h"
#include "clist.h"
+ #include "glunix.h"
+ #include "cam.h"
diff --git a/parallel/glunix/patches/patch-bs b/parallel/glunix/patches/patch-bs
index ab213779bfe..58380a999c8 100644
--- a/parallel/glunix/patches/patch-bs
+++ b/parallel/glunix/patches/patch-bs
@@ -1,29 +1,45 @@
-$NetBSD: patch-bs,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bs,v 1.2 2005/05/29 14:38:33 wiz Exp $
-diff -U 1 progs/glush/config.h ../old/progs/glush/config.h
---- progs/glush/config.h Wed Nov 5 13:43:59 1997
-+++ ../old/progs/glush/config.h Thu Mar 12 02:19:30 1998
-@@ -40,3 +40,3 @@
+--- progs/glush/config.h.orig 1997-11-05 21:43:59.000000000 +0100
++++ progs/glush/config.h
+@@ -38,7 +38,7 @@
+ * Note that some machines eg. rs6000 have a vfork, but not
+ * with the berkeley semantics, so we cannot use it there either.
*/
-#undef VFORK
+#define VFORK
-@@ -53,3 +53,3 @@
+ /*
+ * BSDJOBS You have BSD-style job control (both process groups and
+@@ -51,14 +51,14 @@
+ * Note: POSIX systems should not define this unless they
+ * have sigvec() and friends (ie: 4.3BSD-RENO, HP-UX).
*/
-#undef BSDSIGS
+#define BSDSIGS
-@@ -60,3 +60,3 @@
+ /*
+ * BSDTIMES You have BSD-style process time stuff (like rusage)
+ * This may or may not be true. For example, Apple Unix
+ * (OREO) has BSDJOBS and BSDSIGS but not BSDTIMES.
*/
-#undef BSDTIMES
+#define BSDTIMES
-@@ -71,3 +71,3 @@
+ /*
+ * BSDLIMIT You have BSD-style resource limit stuff (getrlimit/setrlimit)
+@@ -69,7 +69,7 @@
+ * BSDNICE Your system uses setpriority() instead of nice, to
+ * change a processes scheduling priority
*/
-#undef BSDNICE
+#define BSDNICE
-@@ -85,6 +85,6 @@
+ /*
+ * TERMIO You have struct termio instead of struct sgttyb.
+@@ -83,10 +83,10 @@
+ * SYSVREL Your machine is SYSV based (HPUX, A/UX)
+ * NOTE: don't do this if you are on a Pyramid -- tcsh is
* built in a BSD universe.
- * Set SYSVREL to 1, 2, or 3, depending the version of System V
+ * Set SYSVREL to 1, 2, 3, or 4, depending the version of System V
@@ -32,7 +48,11 @@ diff -U 1 progs/glush/config.h ../old/progs/glush/config.h
-#define SYSVREL 4
+#define SYSVREL 0
-@@ -108,15 +108,5 @@
+ /*
+ * YPBUGS Work around Sun YP bugs that cause expansion of ~username
+@@ -106,47 +106,16 @@
+ #define HAVEDUP2
+
/*
- * HAVEUTMPX Define if you have extended utmp (utmpx).
- * (common for svr4 systems)
@@ -49,7 +69,9 @@ diff -U 1 progs/glush/config.h ../old/progs/glush/config.h
-#endif /* HAVEUTMPX */
+#define UTHOST
-@@ -126,23 +116,3 @@
+ /*
+ * DIRENT Your system has <dirent.h> instead of <sys/dir.h>
+ */
#define DIRENT
-
-/*
@@ -73,7 +95,7 @@ diff -U 1 progs/glush/config.h ../old/progs/glush/config.h
-#define SOLARIS2 23
-
/****************** configurable hacks ****************/
-@@ -150,3 +120,2 @@
+ /* have been moved to config_f.h */
#include "config_f.h"
-
#endif /* _h_config */
diff --git a/parallel/glunix/patches/patch-bt b/parallel/glunix/patches/patch-bt
index 4ea97b888a7..02f97fb5479 100644
--- a/parallel/glunix/patches/patch-bt
+++ b/parallel/glunix/patches/patch-bt
@@ -1,15 +1,22 @@
-$NetBSD: patch-bt,v 1.2 1998/10/22 16:06:48 garbled Exp $
+$NetBSD: patch-bt,v 1.3 2005/05/29 14:38:33 wiz Exp $
-diff -U 1 progs/glush/config_f.h ../old/progs/glush/config_f.h
---- progs/glush/config_f.h Thu Jul 20 11:08:43 1995
-+++ ../old/progs/glush/config_f.h Thu Mar 12 01:24:31 1998
-@@ -58,3 +58,3 @@
+--- progs/glush/config_f.h.orig 1995-07-20 20:08:43.000000000 +0200
++++ progs/glush/config_f.h
+@@ -56,7 +56,7 @@
+ * if you don't have <locale.h>, you don't want
+ * to define this.
*/
-#undef NLS
+#define NLS
-@@ -92,3 +92,3 @@
+ /*
+ * LOGINFIRST Source ~/.login before ~/.cshrc
+@@ -90,7 +90,7 @@
+ * on the name of the tty, and environment.
+ * Does not make sense in the modern window systems!
*/
-#define AUTOLOGOUT
+#undef AUTOLOGOUT
+ /*
+ * SUSPENDED Newer shells say 'Suspended' instead of 'Stopped'.
diff --git a/parallel/glunix/patches/patch-bu b/parallel/glunix/patches/patch-bu
index 9f62fb4b34c..64265115d12 100644
--- a/parallel/glunix/patches/patch-bu
+++ b/parallel/glunix/patches/patch-bu
@@ -1,17 +1,24 @@
-$NetBSD: patch-bu,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bu,v 1.2 2005/05/29 14:38:33 wiz Exp $
-diff -U 1 progs/glush/sh.c ../old/progs/glush/sh.c
---- progs/glush/sh.c Tue Sep 19 11:02:07 1995
-+++ ../old/progs/glush/sh.c Thu Mar 12 01:46:30 1998
-@@ -38,3 +38,3 @@
+--- progs/glush/sh.c.orig 1995-09-19 20:02:07.000000000 +0200
++++ progs/glush/sh.c
+@@ -36,7 +36,7 @@
+ */
+ #define EXTERN /* Intern */
#include "sh.h"
-#include "glib.h"
+/*#include "glib.h"*/
-@@ -1172,6 +1172,2 @@
+ #ifndef lint
+ char copyright[] =
+@@ -1171,10 +1171,6 @@ main(argc, argv)
+ int osetintr = setintr;
sigret_t (*oparintr)() = parintr;
--
+
-/********** GLUnix -- Doug's changes ***********/
- srcfile("/disks/barad-dur/now/glunix/data/glush.cshrc", 0, 0, NULL);
-/***********************************************/
-
+-
+ #ifdef BSDSIGS
+ sigmask_t omask = sigblock(sigmask(SIGINT));
+ #else
diff --git a/parallel/glunix/patches/patch-bv b/parallel/glunix/patches/patch-bv
index d552e7b2b6e..1a52c51a3d4 100644
--- a/parallel/glunix/patches/patch-bv
+++ b/parallel/glunix/patches/patch-bv
@@ -1,11 +1,13 @@
-$NetBSD: patch-bv,v 1.2 1998/10/22 16:06:48 garbled Exp $
+$NetBSD: patch-bv,v 1.3 2005/05/29 14:38:33 wiz Exp $
-diff -U 1 progs/glush/sh.sem.c ../old/progs/glush/sh.sem.c
---- progs/glush/sh.sem.c Thu Jul 20 11:09:24 1995
-+++ ../old/progs/glush/sh.sem.c Thu Mar 12 01:24:34 1998
-@@ -52,3 +52,3 @@
+--- progs/glush/sh.sem.c.orig 1995-07-20 20:09:24.000000000 +0200
++++ progs/glush/sh.sem.c
+@@ -50,7 +50,7 @@ RCSID("$Id: sh.sem.c,v 1.1 1995/07/20 18
+ #endif /* CLOSE_ON_EXEC */
+
#if defined(__sparc__) || defined(sparc)
-# if !defined(MACH) && SYSVREL == 0 && !defined(Lynx)
+# if !defined(MACH) && SYSVREL == 0 && !defined(Lynx) && !defined(__NetBSD__)
# include <vfork.h>
-
+ # endif /* !MACH && SYSVREL == 0 */
+ #endif /* __sparc__ || sparc */
diff --git a/parallel/glunix/patches/patch-bw b/parallel/glunix/patches/patch-bw
index 45324142967..abbc7894030 100644
--- a/parallel/glunix/patches/patch-bw
+++ b/parallel/glunix/patches/patch-bw
@@ -1,15 +1,22 @@
-$NetBSD: patch-bw,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bw,v 1.2 2005/05/29 14:38:33 wiz Exp $
-diff -U 1 progs/glush/sh.exec.c ../old/progs/glush/sh.exec.c
---- progs/glush/sh.exec.c Tue Jul 25 12:13:14 1995
-+++ ../old/progs/glush/sh.exec.c Thu Mar 12 02:12:42 1998
-@@ -153,3 +153,3 @@
+--- progs/glush/sh.exec.c.orig 1995-07-25 21:13:14.000000000 +0200
++++ progs/glush/sh.exec.c
+@@ -151,7 +151,7 @@ static void pexerr __P((void));
+ static void texec __P((Char *, Char **));
+ static int hashname __P((Char *));
static int iscommand __P((Char *));
-
+/*
char *index(a, b)
-@@ -167,3 +167,3 @@
+ char *a;
+ char b;
+@@ -165,7 +165,7 @@ char *rindex(a, b)
+ {
+ return strrchr(a, b);
}
-
+*/
void
+ doexec(t)
+ register struct command *t;
diff --git a/parallel/glunix/patches/patch-cb b/parallel/glunix/patches/patch-cb
index 1e2466c9cb9..d9337c673ac 100644
--- a/parallel/glunix/patches/patch-cb
+++ b/parallel/glunix/patches/patch-cb
@@ -1,8 +1,16 @@
-$NetBSD: patch-cb,v 1.1 2000/05/27 09:53:38 wiz Exp $
+$NetBSD: patch-cb,v 1.2 2005/05/29 14:38:33 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 @@
+--- glunix/src/msg/cmsg_msg.cc.orig 1996-10-25 00:39:59.000000000 +0200
++++ glunix/src/msg/cmsg_msg.cc
+@@ -109,6 +109,7 @@
+ *
+ *****************************************************************************/
+
++#include <stdlib.h>
+ #include "glib/types.h"
+ #include "cmsg.h"
+ #include "cmsg_msg.h"
+@@ -186,7 +187,7 @@ Msg_PrintError(int callbackValue, FILE *
fprintf(filePtr, "MSG_ERROR msgType ");
Msg_PrintMsgType(filePtr, newMsgPtr->msgType);
diff --git a/parallel/glunix/patches/patch-ch b/parallel/glunix/patches/patch-ch
new file mode 100644
index 00000000000..aabde402e0d
--- /dev/null
+++ b/parallel/glunix/patches/patch-ch
@@ -0,0 +1,12 @@
+$NetBSD: patch-ch,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- glunix/src/debug/cdebug_msg.cc.orig 1997-09-05 21:29:47.000000000 +0200
++++ glunix/src/debug/cdebug_msg.cc
+@@ -105,6 +105,7 @@
+ #include "cdebug_print.h"
+ #include "cutil.h"
+ #include "glib/types.h"
++#include <string.h>
+
+ #define MAX_TYPE_LEN 80
+
diff --git a/parallel/glunix/patches/patch-ci b/parallel/glunix/patches/patch-ci
new file mode 100644
index 00000000000..8550d636a71
--- /dev/null
+++ b/parallel/glunix/patches/patch-ci
@@ -0,0 +1,13 @@
+$NetBSD: patch-ci,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- glunix/src/init/cinit_main.cc.orig 1997-10-02 21:51:43.000000000 +0200
++++ glunix/src/init/cinit_main.cc
+@@ -193,7 +193,7 @@ cinit_main(int argc, char **argv)
+
+ sigemptyset(&act.sa_mask);
+ act.sa_flags = 0;
+- act.sa_handler = (void (*) (...)) SIG_IGN;
++ act.sa_handler = SIG_IGN;
+ if (sigaction(SIGPIPE, &act, 0) == -1) {
+ perror("cinit_main: sigaction");
+ ASSERT(0);
diff --git a/parallel/glunix/patches/patch-cj b/parallel/glunix/patches/patch-cj
new file mode 100644
index 00000000000..9549ca5b86f
--- /dev/null
+++ b/parallel/glunix/patches/patch-cj
@@ -0,0 +1,12 @@
+$NetBSD: patch-cj,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- glunix/src/msg/cmsg.cc.orig 1997-10-02 21:33:55.000000000 +0200
++++ glunix/src/msg/cmsg.cc
+@@ -228,6 +228,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include "glib/types.h"
+ #include "cdebug.h"
diff --git a/parallel/glunix/patches/patch-ck b/parallel/glunix/patches/patch-ck
new file mode 100644
index 00000000000..89b3d72cf79
--- /dev/null
+++ b/parallel/glunix/patches/patch-ck
@@ -0,0 +1,12 @@
+$NetBSD: patch-ck,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- glunix/src/msg/cmsg_pack.cc.orig 1997-10-02 21:33:56.000000000 +0200
++++ glunix/src/msg/cmsg_pack.cc
+@@ -210,6 +210,7 @@
+
+ #include <sys/time.h>
+ #include <sys/uio.h>
++#include <string.h>
+ #include "cutil.h"
+ #include "glib/types.h"
+ #include "cdebug.h"
diff --git a/parallel/glunix/patches/patch-cl b/parallel/glunix/patches/patch-cl
new file mode 100644
index 00000000000..2d9fc3a9650
--- /dev/null
+++ b/parallel/glunix/patches/patch-cl
@@ -0,0 +1,12 @@
+$NetBSD: patch-cl,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- glunix/src/perf/cperf_obj.cc.orig 1997-09-05 21:30:08.000000000 +0200
++++ glunix/src/perf/cperf_obj.cc
+@@ -54,6 +54,7 @@
+ #define __THIS_MODULE MODULE_PERF
+
+ #include <math.h>
++#include <string.h>
+ #include "cperf.h"
+ #include "cperf_obj.h"
+ #include "cperf_internal.h"
diff --git a/parallel/glunix/patches/patch-cm b/parallel/glunix/patches/patch-cm
new file mode 100644
index 00000000000..6bf7e44f8ba
--- /dev/null
+++ b/parallel/glunix/patches/patch-cm
@@ -0,0 +1,21 @@
+$NetBSD: patch-cm,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- glunix/src/sched/dsched.cc.orig 1997-11-05 21:45:08.000000000 +0100
++++ glunix/src/sched/dsched.cc
+@@ -181,14 +181,14 @@ IncomingStartProcess(int arg, Comm_Addr
+ return True;
+ }
+ /* Switching to priocntl, this should no longer be necessary */
+-#ifdef 0
++#if 0
+ if (setpriority(PRIO_PROCESS, startProc->GetMyPid(),
+ SCHED_HIGHEST_PRIORITY) < 0) {
+ DE("set priority: %s\n", strerror(errno));
+ }
+ #endif
+ // New Sys-V call
+-#ifdef 0
++#if 0
+ pri.sched_priority = sched_get_priority_max(SCHED_RR) - 10;
+ max = sched_get_priority_max(SCHED_RR);
+ if (max < 0) {
diff --git a/parallel/glunix/patches/patch-cn b/parallel/glunix/patches/patch-cn
new file mode 100644
index 00000000000..2962feb6ed9
--- /dev/null
+++ b/parallel/glunix/patches/patch-cn
@@ -0,0 +1,12 @@
+$NetBSD: patch-cn,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- progs/gluadmin/gluadmin.c.orig 1997-02-03 04:05:10.000000000 +0100
++++ progs/gluadmin/gluadmin.c
+@@ -4,6 +4,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ #include <glib/idle.h>
+ #include <glib.h>
diff --git a/parallel/glunix/patches/patch-co b/parallel/glunix/patches/patch-co
new file mode 100644
index 00000000000..fc318f5ea84
--- /dev/null
+++ b/parallel/glunix/patches/patch-co
@@ -0,0 +1,22 @@
+$NetBSD: patch-co,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- progs/gludebug/gludebug.c.orig 1995-10-12 23:57:10.000000000 +0100
++++ progs/gludebug/gludebug.c
+@@ -49,7 +49,7 @@ Bool PrintDebug (int pnn, Module module,
+ void ExtractArgs (int argc, char **argv, int *pnn, Module *module);
+ void PrintError (char *msg);
+ void strtoupper (char *str);
+-Bool get_level (char *levelStr, int *level);
++Bool get_level (char *levelStr, Debug_Level *level);
+ Bool get_module (char *moduleStr, Module *module);
+ int get_pnn (char *str);
+ int do_change (int argc, char *argv[], int pnn, Module module);
+@@ -221,7 +221,7 @@ get_module (char *moduleStr, Module *mod
+ **
+ ****************************************************************************/
+ Bool
+-get_level (char *levelStr, int *level)
++get_level (char *levelStr, Debug_Level *level)
+ {
+ Bool ret;
+ char temp[MAX_STRING_LEN];
diff --git a/parallel/glunix/patches/patch-cp b/parallel/glunix/patches/patch-cp
new file mode 100644
index 00000000000..a17559b2b92
--- /dev/null
+++ b/parallel/glunix/patches/patch-cp
@@ -0,0 +1,21 @@
+$NetBSD: patch-cp,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- progs/gluperf/gluperf.c.orig 1997-09-11 22:50:55.000000000 +0200
++++ progs/gluperf/gluperf.c
+@@ -6,6 +6,7 @@
+ #include <sys/socket.h>
+ #include <string.h>
+ #include <math.h>
++#include <time.h>
+
+ #include "glib.h"
+ #include "glib_perf.h"
+@@ -272,7 +273,7 @@ myGetHostByAddress (int address)
+ return name;
+ }
+
+- name = malloc (strlen (tempHost->h_name) + 1); /* Size of name */
++ name = (char *)malloc (strlen (tempHost->h_name) + 1); /* Size of name */
+ if (name == NULL) {
+ fprintf (stderr, "ERROR: out of memory\n");
+ exit (1);
diff --git a/parallel/glunix/patches/patch-cq b/parallel/glunix/patches/patch-cq
new file mode 100644
index 00000000000..3b148e4347c
--- /dev/null
+++ b/parallel/glunix/patches/patch-cq
@@ -0,0 +1,21 @@
+$NetBSD: patch-cq,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- progs/glurun/glurun.c.orig 1997-04-04 23:45:11.000000000 +0200
++++ progs/glurun/glurun.c
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <string.h>
+
+ #include "glib.h"
+
+@@ -26,7 +27,7 @@ print_usage(char *name)
+ return;
+ }
+
+-void
++int
+ main(int argc, char **argv)
+ {
+ int parallelDegree, argCtr, ctr;
diff --git a/parallel/glunix/patches/patch-cr b/parallel/glunix/patches/patch-cr
new file mode 100644
index 00000000000..202a43d6366
--- /dev/null
+++ b/parallel/glunix/patches/patch-cr
@@ -0,0 +1,16 @@
+$NetBSD: patch-cr,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- progs/glush/sh.h.orig 1995-07-20 20:09:17.000000000 +0200
++++ progs/glush/sh.h
+@@ -1059,11 +1059,5 @@ extern Char **INVPPTR;
+ /*
+ * To print system call errors...
+ */
+-#ifndef linux
+-#ifdef NEEDstrerror
+-extern char *sys_errlist[];
+-#endif
+-extern int errno, sys_nerr;
+-#endif /* !linux */
+
+ #endif /* _h_sh */
diff --git a/parallel/glunix/patches/patch-cs b/parallel/glunix/patches/patch-cs
new file mode 100644
index 00000000000..87f70aa4161
--- /dev/null
+++ b/parallel/glunix/patches/patch-cs
@@ -0,0 +1,31 @@
+$NetBSD: patch-cs,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- progs/glustat/glustat.c.orig 1997-03-27 18:11:21.000000000 +0100
++++ progs/glustat/glustat.c
+@@ -151,7 +151,7 @@ main(int argc, char **argv)
+ exit(-1);
+ }
+
+- nodeInfo = malloc (totalNodes * NODE_SIZE);
++ nodeInfo = (statInfo*)malloc (totalNodes * NODE_SIZE);
+ if (nodeInfo == NULL) {
+ fprintf (stderr, "ERROR: couldn't allocate memory.");
+ exit (1);
+@@ -250,7 +250,7 @@ myGetHostByAddress (int address, char **
+ char *ptr; /* For parsing hostname */
+
+ if (ipAddrOption) {
+- *name = malloc(17);
++ *name = (char *)malloc(17);
+ sprintf(*name, "%d.%d.%d.%d",
+ (address >> 24) & 0xff, (address >> 16) & 0xff,
+ (address >> 8) & 0xff, address & 0xff);
+@@ -264,7 +264,7 @@ myGetHostByAddress (int address, char **
+ return;
+ }
+
+- *name = malloc (strlen (tempHost->h_name) + 1); /* Size of name */
++ *name = (char *)malloc (strlen (tempHost->h_name) + 1); /* Size of name */
+ if (*name == NULL) {
+ fprintf (stderr, "ERROR: out of memory\n");
+ exit (1);
diff --git a/parallel/glunix/patches/patch-cu b/parallel/glunix/patches/patch-cu
new file mode 100644
index 00000000000..31929f8fcee
--- /dev/null
+++ b/parallel/glunix/patches/patch-cu
@@ -0,0 +1,10 @@
+$NetBSD: patch-cu,v 1.1 2005/05/29 14:38:33 wiz Exp $
+
+--- progs/glukill/glukill.c.orig 1997-03-27 18:11:00.000000000 +0100
++++ progs/glukill/glukill.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <string.h>
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <unistd.h>