diff options
| author | joerg <joerg@pkgsrc.org> | 2009-11-26 17:04:18 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-11-26 17:04:18 +0000 |
| commit | e2e97480eb855cc5674531c63d7fd595bc9711b0 (patch) | |
| tree | c041fb267f0c0dab773ab69e12eae69b2d53594b /parallel | |
| parent | 9e8697dfec2dc5bd7ac5e2bb71ec5af11e50b80f (diff) | |
| download | pkgsrc-e2e97480eb855cc5674531c63d7fd595bc9711b0.tar.gz | |
Remove parallel/glunix. It fails in the patch phase on NetBSD 4 and
later. After fixing that, it fails with C++ errors, so it couldn't have
been build at least for 3 years. Assume noone cares.
Diffstat (limited to 'parallel')
79 files changed, 1 insertions, 4220 deletions
diff --git a/parallel/Makefile b/parallel/Makefile index 39192718a56..d2e33c50d5d 100644 --- a/parallel/Makefile +++ b/parallel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/10/26 09:19:07 asau Exp $ +# $NetBSD: Makefile,v 1.14 2009/11/26 17:04:18 joerg Exp $ # COMMENT= Applications dealing with parallelism in computing @@ -7,7 +7,6 @@ SUBDIR+= GridSim SUBDIR+= clusterit SUBDIR+= dqs SUBDIR+= ganglia-monitor-core -SUBDIR+= glunix SUBDIR+= linda SUBDIR+= mpi-ch SUBDIR+= openpa diff --git a/parallel/glunix/DESCR b/parallel/glunix/DESCR deleted file mode 100644 index d835d22910a..00000000000 --- a/parallel/glunix/DESCR +++ /dev/null @@ -1,16 +0,0 @@ -Recent technology trends in high-speed/low-latency local area networks has -lead to a convergence of hardware in massively parallel processors (MPPs) -and Networks of Workstations (NOWs). Relative to traditional MPPs, a NOW -offers the potential for better cost-effectiveness, increased scalability, -and decreased hardware and software development time. The main -differentiating point between NOWs and MPPs will soon be the operating -system software. - -Our system, called GLUnix, is built as a layer on top of existing -operating systems. This strategy makes the system quickly portable, tracks -vendor software upgrades, and reduces development time. Our work is an -example of "higher-order" systems research where new systems can be built -quickly by mapping new services onto the functionality provided by the -layer beneath. - -see: http://now.cs.berkeley.edu diff --git a/parallel/glunix/MESSAGE b/parallel/glunix/MESSAGE deleted file mode 100644 index 080394f8508..00000000000 --- a/parallel/glunix/MESSAGE +++ /dev/null @@ -1,35 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:30 wiz Exp $ - -QUICK START GUIDE: - -Change your directory to the now installation base, eg: -${NOW_ROOT}/bin. Run ./glupart install as root. - -You must initialize the partition management system to -understand the machines in your cluster. The tool to use is -"glupart". You will need to do a "glupart machine <name> new" for -each new machine. Multiple machines can be added at a time using a -comma-separated list of names. You can also do "glupart -help" for -more detailed information. - -To run GLUnix, you need a single machine which is able to do a root -rsh (or ssh or kerberized rsh) without a password to all of the -machines you want to run GLUnix on. Call this trusted machine the -"master" machine. The scripts that get GLUnix running initially (the -run_glunix_* scripts) need to run an rsh command on each node in order -to set up GLUnix. Log on to the master machine and run "run_glunix --start <nodes>" where "<nodes>" is the list of nodes you want to run -GLUnix on: generally a comma-separated list of machines. (You can do -"run_glunix -help" to see all the options.) If the names of some of -the machines are of the form of some base string followed by -consecutive numbers (our machines are u0, u1, u2, u3, u4), then these -machines can be abbreviated to the run_glunix command as "u0..u4". -Here is a sample run_glunix command: - - run_glunix -start thunk,sparc,u0..u110,pc0..pc9,dawn0..dawn30,cayuse - -Once the run_glunix command has successfully completed, you can run -"glustat" to find out how many nodes came up. - -=========================================================================== diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile deleted file mode 100644 index a02d2dbfac7..00000000000 --- a/parallel/glunix/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# $NetBSD: Makefile,v 1.37 2009/04/08 22:43:24 joerg Exp $ - -DISTNAME= glunix-release-1-0a -PKGNAME= glunix-1.0a -PKGREVISION= 2 -CATEGORIES= parallel -MASTER_SITES= http://now.cs.berkeley.edu/Glunix/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://now.cs.berkeley.edu/Glunix/glunix.html -COMMENT= Global Layer Unix for NOW (Network Of Workstations) - -.if exists(/usr/bin/ssh) -SSH= /usr/bin/ssh -.else -DEPENDS+= {openssh-[0-9]*,ssh{,6}-1.2.27*}:../../security/openssh -SSH= ${LOCALBASE}/bin/ssh -.endif - -WRKSRC= ${WRKDIR} -USE_TOOLS+= gmake perl -INTERACTIVE_STAGE= fetch - -NOW_ROOT= ${LOCALBASE}/now -MESSAGE_SUBST+= NOW_ROOT=${NOW_ROOT} - -.include "../../mk/endian.mk" -.if (${MACHINE_ENDIAN} == "little") -FLAGS+=-DL_ENDIAN -.endif - -MAKE_ENV+= OPSYS=${OPSYS:Q} ARCH=${MACHINE_ARCH:Q} NOW_ROOT=${NOW_ROOT:Q} -MAKE_ENV+= PORTSDIR=${PKGDIR:Q} WRKDIR=${WRKDIR:Q} FLAGS=${FLAGS:Q} -MAKE_ENV+= SSH=${SSH:Q} - -PKG_GROUPS= glunix -PKG_USERS= glunix:glunix -PKG_SHELL.glunix= ${NOW_ROOT}/bin/glush -USERGROUP_PHASE= configure - -PKG_SHELL= ${NOW_ROOT}/bin/glush - -post-patch: - cd ${WRKSRC}; \ - for f in progs/glupart/glupart.c \ - progs/glunix/glunix.1 \ - progs/glurun/glurun-wrapper.pl \ - progs/tools/run_glunix.c \ - glunix/src/init/glunix.h; do \ - ${MV} -f $$f $$f.input && \ - ${SED} -e 's|%%%NOW_ROOT%%%|${NOW_ROOT}|' $$f.input > $$f; \ - done; \ - ${MV} -f progs/glush/Makefile progs/glush/Makefile.input && \ - ${SED} -e 's|%%%PLAT%%%|${MACHINE_ARCH}-NetBSD-tcp|' \ - progs/glush/Makefile.input > progs/glush/Makefile - -pre-configure: - ${CP} ${FILESDIR}/Makefile-2 ${WRKSRC}/Makefile - -post-install: - ${LN} -s libglunix.so.1.0 ${PREFIX}/now/lib/libglunix.so.1 - ${LN} -s libglunix.so.1.0 ${PREFIX}/now/lib/libglunix.so - ${TOUCH} ${NOW_ROOT}/lib/${MACHINE_ARCH}-${OPSYS}-tcp/.keepme - -.include "../../mk/bsd.pkg.mk" diff --git a/parallel/glunix/PLIST b/parallel/glunix/PLIST deleted file mode 100644 index e0dcbab268e..00000000000 --- a/parallel/glunix/PLIST +++ /dev/null @@ -1,114 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:10:40 joerg Exp $ -now/bin/${MACHINE_ARCH}-${OPSYS}-tcp/daemon -now/bin/${MACHINE_ARCH}-${OPSYS}-tcp/master -now/bin/GLUnix-bin -now/bin/GLUnix-bin-script -now/bin/S99gluguard-admin -now/bin/S99gluguard-d -now/bin/S99gluguard-m -now/bin/gluadmin -now/bin/glubatch -now/bin/gludebug -now/bin/gluenv -now/bin/gluguard -now/bin/gluguard-admin -now/bin/gluguard-d -now/bin/gluguard-m -now/bin/gluinstall -now/bin/glukill -now/bin/glumake -now/bin/glumonitor -now/bin/glupart -now/bin/glupartInit -now/bin/glupart_script -now/bin/gluperf -now/bin/glups -now/bin/gluptime -now/bin/glurun -now/bin/glush -now/bin/glustat -now/bin/glutestnode -now/bin/mhtml2html -now/bin/msleep -now/bin/run_glunix -now/bin/run_glunix_agent -now/bin/run_glunix_script -now/bin/sudoas -now/bin/timelimit -now/include/glib.h -now/include/glib/debug.h -now/include/glib/idle.h -now/include/glib/perf.h -now/include/glib/types.h -now/include/glib_idle.h -now/include/glib_perf.h -now/include/glib_stat.h -now/lib/${MACHINE_ARCH}-${OPSYS}-tcp/.keepme -now/lib/libglunix.a -now/lib/libglunix.so -now/lib/libglunix.so.1 -now/lib/libglunix.so.1.0 -now/lib/perl-lib/Time/CTime.pm -now/lib/perl-lib/Time/DaysInMonth.pm -now/lib/perl-lib/Time/JulianDay.pm -now/lib/perl-lib/Time/ParseDate.pm -now/lib/perl-lib/Time/Timezone.pm -now/lib/perl-lib/set.pl -now/man/html1/MHTML.html -now/man/html1/gluadmin.html -now/man/html1/glubatch.html -now/man/html1/gludebug.html -now/man/html1/gluenv.html -now/man/html1/glukill.html -now/man/html1/glunix.html -now/man/html1/glupart.html -now/man/html1/glupartInit.html -now/man/html1/gluperf.html -now/man/html1/glups.html -now/man/html1/gluptime.html -now/man/html1/glurun.html -now/man/html1/glush.html -now/man/html1/glustat.html -now/man/man1/MHTML.1 -now/man/man1/gluadmin.1 -now/man/man1/glubatch.1 -now/man/man1/gludebug.1 -now/man/man1/gluenv.1 -now/man/man1/glukill.1 -now/man/man1/glunix.1 -now/man/man1/glupart.1 -now/man/man1/glupartInit.1 -now/man/man1/gluperf.1 -now/man/man1/glups.1 -now/man/man1/gluptime.1 -now/man/man1/glurun.1 -now/man/man1/glush.1 -now/man/man1/glustat.1 -now/man/mhtml1/MHTML.1 -now/man/mhtml1/gluadmin.1 -now/man/mhtml1/glubatch.1 -now/man/mhtml1/gludebug.1 -now/man/mhtml1/gluenv.1 -now/man/mhtml1/glukill.1 -now/man/mhtml1/glunix.1 -now/man/mhtml1/glupart.1 -now/man/mhtml1/glupartInit.1 -now/man/mhtml1/gluperf.1 -now/man/mhtml1/glups.1 -now/man/mhtml1/gluptime.1 -now/man/mhtml1/glurun.1 -now/man/mhtml1/glush.1 -now/man/mhtml1/glustat.1 -now/man/mhtml3/Glib.3 -now/man/mhtml3/Glib_AmIStartup.3 -now/man/mhtml3/Glib_GetHostByVnn.3 -now/man/mhtml3/Glib_GetMyNpid.3 -now/man/mhtml3/Glib_GetMyVnn.3 -now/man/mhtml3/Glib_GetNumAvailableNodes.3 -now/man/mhtml3/Glib_GetParallelDegree.3 -now/man/mhtml3/Glib_GetPartition.3 -now/man/mhtml3/Glib_GetTotalNodes.3 -now/man/mhtml3/Glib_Initialize.3 -now/man/mhtml3/Glib_SetPartition.3 -now/man/mhtml3/Glib_Spawn.3 -@unexec /bin/rm -rf %D/now/data diff --git a/parallel/glunix/distinfo b/parallel/glunix/distinfo deleted file mode 100644 index d38731af170..00000000000 --- a/parallel/glunix/distinfo +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: distinfo,v 1.5 2005/12/05 20:50:51 rillig 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 (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) = 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) = 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) = b625e5fefd631e8277574efc5cfe1e7604751a30 -SHA1 (patch-bt) = 328c06576c24a7fe4ce25ff4d816d4f51029023a -SHA1 (patch-bu) = 80ba6229ebbbe981bacaece312b3882541a7a276 -SHA1 (patch-bv) = fbe100fa1a6bd8c3a4dd7c1ae401a129122537e1 -SHA1 (patch-bw) = 3f42749265da2b783b429ca357ee5c0f6f67f371 -SHA1 (patch-bx) = ed841b216f4d41ed2777081dbd0eaa6bb426ff09 -SHA1 (patch-by) = 7f15f359d307ba064f7cc3d0ed98d0a8189eff39 -SHA1 (patch-bz) = 82da1aca0934696fb2b3e8ed8ae06504e526b6a4 -SHA1 (patch-ca) = eac28b7866d38255ddda0936a2840611e235dafb -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 deleted file mode 100644 index 5f72fc688aa..00000000000 --- a/parallel/glunix/files/Makefile-2 +++ /dev/null @@ -1,12 +0,0 @@ -all: - cd glunix/src; $(MAKE) DESTDIR=$(DESTDIR) $(MAKE_ENV) install || exit 1 ; \ - cd ../.. ; - cd progs/tools; $(MAKE) mhtml2html $(MAKE_ENV) install || exit 1 ; \ - cd ../.. ; - cd progs; $(MAKE) DESTDIR=$(DESTDIR) $(MAKE_ENV) install || exit 1 ; \ - cd .. ; - cd progs/tools; $(MAKE) DESTDIR=$(DESTDIR) $(MAKE_ENV) install || exit 1 ; \ - cd ../.. ; \ - -install: - glunix/bin/$(ARCH)-$(OPSYS)-tcp/gluinstall diff --git a/parallel/glunix/patches/patch-aa b/parallel/glunix/patches/patch-aa deleted file mode 100644 index 202429aec2e..00000000000 --- a/parallel/glunix/patches/patch-aa +++ /dev/null @@ -1,170 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- glunix/src/Makefile.orig 1997-11-05 23:30:39.000000000 +0100 -+++ glunix/src/Makefile -@@ -2,7 +2,7 @@ - # - # Basic path definitions - # --GLUNIX_BASE = /disks/barad-dur/now/glunix -+GLUNIX_BASE = $(GLUNIX_SOURCE)/glunix - - # - # This lists all of the modules in the system that should be compiled -@@ -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. - # -+GLUNIX_ARCH= $(ARCH) -+GLUNIX_OS= $(OPSYS) -+GLUNIX_NET:=tcp -+INSTALL := /usr/bin/install -+ - ifndef GLUNIX_ARCH - GLUNIX_ARCH = sun4 - endif -@@ -59,11 +64,8 @@ ifeq ($(GLUNIX_ARCH),sun4) - GLUNIX_NET := tcp - INSTALL := /usr/sww/bin/ginstall - endif --ifeq ($(GLUNIX_ARCH),i386) -- GLUNIX_OS := solaris2.6 -- GLUNIX_NET := tcp -- INSTALL := /usr/now/bin/install --endif -+#ifeq ($(GLUNIX_ARCH),i386) -+#endif - GLUNIX_PLATFORM = $(GLUNIX_ARCH)-$(GLUNIX_OS)-$(GLUNIX_NET) - - MKDIR = $(INSTALL) -d -m 0775 -g glunix -@@ -71,38 +73,48 @@ INSTALL_BIN = $(INSTALL) -m 0775 -g glu - INSTALL_MAN = $(INSTALL) -m 0664 -g glunix - - OBJROOT := ../obj --BINROOT := ../../bin --LIBROOT := ../../lib -+BINROOT := ../bin -+LIBROOT := ../lib - OBJDIR := $(OBJROOT)/$(GLUNIX_PLATFORM) - BINDIR := $(BINROOT)/$(GLUNIX_PLATFORM) - LIBDIR := $(LIBROOT)/$(GLUNIX_PLATFORM) - - CC := gcc --LD := gcc -+C++ := g++ -+LD := ld - - INCLUDE_DIRS := -I../include $(addprefix -I./,$(ALL_MODULES)) - #CFLAGS += -pipe -g -Wall -DDEBUG -DGLUNIX_PLATFORM=$(GLUNIX_PLATFORM) $(INCLUDE_DIRS) --CFLAGS += -Wall -g -O2 -DDEBUG -DGLUNIX_PLATFORM=$(GLUNIX_PLATFORM) $(INCLUDE_DIRS) -+CFLAGS += -Wall -g -O2 $(FLAGS) -DDEBUG -DGLUNIX_PLATFORM=$(GLUNIX_PLATFORM) $(INCLUDE_DIRS) - #CFLAGS += -pipe -Wall -O4 -DGLUNIX_PLATFORM=$(GLUNIX_PLATFORM) $(INCLUDE_DIRS) - --MLDLIBS += -lsocket -lnsl \ -- -L$(GLUNIX_BASE)/release/lib/$(GLUNIX_PLATFORM) --DLDLIBS += -R/usr/lib -lsocket -lnsl -lm -lelf -lkvm \ -- -L$(GLUNIX_BASE)/release/lib/$(GLUNIX_PLATFORM) -+MLDLIBS += -L$(GLUNIX_BASE)/release/lib/$(GLUNIX_PLATFORM) -+DLDLIBS += -R/usr/lib -lm -lkvm -L$(GLUNIX_BASE)/release/lib/$(GLUNIX_PLATFORM) -+ -+#MLDLIBS += -lsocket -lnsl \ -+# -L$(GLUNIX_BASE)/release/lib/$(GLUNIX_PLATFORM) -+#DLDLIBS += -R/usr/lib -lsocket -lnsl -lm -lelf -lkvm \ -+# -L$(GLUNIX_BASE)/release/lib/$(GLUNIX_PLATFORM) - - MOBJS := $(addprefix $(OBJDIR)/,$(patsubst %.c,%.o,$(MSRC:.cc=.o))) - DOBJS := $(addprefix $(OBJDIR)/,$(patsubst %.c,%.o,$(DSRC:.cc=.o))) - LOBJS := $(addprefix $(OBJDIR)/,$(patsubst %.c,%.o,$(LSRC:.cc=.o))) -+SOBJS := $(addprefix $(OBJDIR)/,$(patsubst %.c,%.so,$(LSRC:.cc=.so))) - - vpath %.cc $(ALL_BUILD_MODULES) - vpath %.c list - vpath %.o $(OBJDIR) - vpath %.a $(OBJDIR) - -+$(OBJDIR)/%.so : %.cc $(OBJDIR) -+ "rm" -f $@ ; \ -+ 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 $@ ; \ -- $(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.* -+ "rm" -f $(SOBJS) $(OBJDIR)/libglunix.* - - tags: - echo 'etags -C ../include/*.h ../include/glib/*.h */*.h */*.cc */*.c' -@@ -143,7 +156,7 @@ tags: - - master: $(OBJDIR)/master - daemon: $(OBJDIR)/daemon --library: $(OBJDIR)/libglunix.so -+library: $(OBJDIR)/libglunix.so.1.0 - - install: master daemon library - $(MKDIR) $(BINDIR); \ -@@ -155,9 +168,9 @@ install: master daemon library - $(INSTALL_BIN) $(OBJDIR)/daemon $(BINDIR)/daemon; \ - echo Installing library; \ - $(MKDIR) $(LIBDIR); \ -- $(INSTALL_BIN) $(LIBDIR)/libglunix.so $(LIBDIR)/libglunix.so.old; \ -+ $(INSTALL_BIN) $(LIBDIR)/libglunix.so.1.0 $(LIBDIR)/libglunix.so.old; \ - $(INSTALL_BIN) $(LIBDIR)/libglunix.a $(LIBDIR)/libglunix.a.old; \ -- $(INSTALL_BIN) $(OBJDIR)/libglunix.so $(LIBDIR)/libglunix.so; \ -+ $(INSTALL_BIN) $(OBJDIR)/libglunix.so.1.0 $(LIBDIR)/libglunix.so.1.0; \ - $(INSTALL_BIN) $(OBJDIR)/libglunix.a $(LIBDIR)/libglunix.a - endif - -@@ -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) $(C++) -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS) ; \ -+ $(PURIFY_COMMAND) $(C++) -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS); \ - echo Master done. - - $(OBJDIR)/daemon: $(DOBJS) - echo " " ; \ - echo Linking daemon; \ - $(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) $(C++) -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS) ; \ -+ $(PURIFY_COMMAND) $(C++) -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS); \ - echo Daemon done. - --$(OBJDIR)/libglunix.so: $(LOBJS) -+$(OBJDIR)/libglunix.so.1.0: $(LOBJS) $(SOBJS) - echo " " ; \ - echo "Building library" ; \ - rm -f $(OBJDIR)/libglunix.a ; \ - echo ar ruc $(OBJDIR)/libglunix.a $(LOBJS) ; \ - ar ruc $(OBJDIR)/libglunix.a $(LOBJS) ; \ -- echo $(LD) -g -o $(OBJDIR)/libglunix.so -G $(LOBJS) ; \ -- $(LD) -g -o $(OBJDIR)/libglunix.so -G $(LOBJS) ; \ -+ echo ranlib $(OBJDIR)/libglunix.a ; \ -+ ranlib $(OBJDIR)/libglunix.a ; \ -+ echo $(LD) -x -Bshareable -Bforcearchive -o $(OBJDIR)/libglunix.so.1.0 $(SOBJS) ; \ -+ $(LD) -x -Bshareable -Bforcearchive -o $(OBJDIR)/libglunix.so.1.0 $(SOBJS) ; \ - touch $(OBJDIR)/libglunix.a ; \ -- touch $(OBJDIR)/libglunix.so ; \ -- chgrp glunix $(OBJDIR)/libglunix.a $(OBJDIR)/libglunix.so; \ -- chmod g+w $(OBJDIR)/libglunix.a $(OBJDIR)/libglunix.so; \ -+ touch $(OBJDIR)/libglunix.so.1.0 ; \ -+ chgrp glunix $(OBJDIR)/libglunix.a $(OBJDIR)/libglunix.so.1.0; \ -+ chmod g+w $(OBJDIR)/libglunix.a $(OBJDIR)/libglunix.so.1.0; \ - echo Library done. - - #$(sort $(MOBJS) $(DOBJS) $(LOBJS)): $(OBJDIR) diff --git a/parallel/glunix/patches/patch-ab b/parallel/glunix/patches/patch-ab deleted file mode 100644 index af643630777..00000000000 --- a/parallel/glunix/patches/patch-ab +++ /dev/null @@ -1,171 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2005/05/29 14:38:33 wiz Exp $ - ---- 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> - #include <unistd.h> --#include <sys/systeminfo.h> -+/*#include <sys/systeminfo.h>*/ -+#include <sys/uio.h> - - #include "glib/types.h" - #include "cdebug.h" -@@ -258,7 +259,7 @@ Comm_GetIpByHostName(char *hostName) - - h = gethostbyname(hostName); - if (!h) { -- DE("Cannot resolve host name: %s\n", strerror(errno)); -+ DE("Cannot resolve host name: %s %s\n",hostName, strerror(errno)); - // BUGBUG set error code - return 0; - } -@@ -328,14 +329,15 @@ Comm_GetMyIpAddr(uint *ipPtr) - } - - // Get my IP address -- if (sysinfo(SI_HOSTNAME, hostName, sizeof(hostName)-1) < 0) { -- DE("sysinfo(SI_HOSTNAME): %s\n", strerror(errno)); -- *ipPtr = 0; -- return False; -- } -+// if (sysinfo(SI_HOSTNAME, hostName, sizeof(hostName)-1) < 0) { -+// DE("sysinfo(SI_HOSTNAME): %s\n", strerror(errno)); -+// *ipPtr = 0; -+// return False; -+// } -+ gethostname(hostName,sizeof(hostName)); - h = gethostbyname(hostName); - if (!h) { -- DE("Cannot resolve host name: %s\n", strerror(errno)); -+ DE("Cannot resolve host name: %s %s\n",hostName, strerror(errno)); - // BUGBUG error code - *ipPtr = 0; - return False; -@@ -365,7 +367,7 @@ Bool - Comm_SocketGetPort(int sock, int *port) - { - struct sockaddr_in s; -- int len; -+ socklen_t len; - - ASSERT(port != NULL); - -@@ -376,7 +378,11 @@ Comm_SocketGetPort(int sock, int *port) - return False; - } - // use ntohs to convert it back to host order for pc's -+#ifdef L_ENDIAN -+ *port = s.sin_port; -+#else - *port = ntohs(s.sin_port); -+#endif - return True; - } - -@@ -397,7 +403,7 @@ int - Comm_SocketGetPeerPort(int sock) - { - struct sockaddr_in s; -- int len; -+ socklen_t len; - - len = sizeof(struct sockaddr_in); - if (getpeername(sock, (struct sockaddr *)&s, &len) -@@ -425,7 +431,7 @@ Bool - Comm_SocketGetPeerIpAddr(int sock, uint *ipAddrPtr) - { - struct sockaddr_in s; -- int len; -+ socklen_t len; - - ASSERT(ipAddrPtr != NULL); - *ipAddrPtr = 0; -@@ -435,8 +441,11 @@ Comm_SocketGetPeerIpAddr(int sock, uint - DE("getpeername: %s\n", strerror(errno)); - return False; - } -- -+#ifdef L_ENDIAN -+ *ipAddrPtr = s.sin_addr.s_addr; -+#else - *ipAddrPtr = ntohl(s.sin_addr.s_addr); -+#endif - return True; - } - -@@ -528,8 +537,13 @@ Comm_CreateListenSock(int port, int *soc - - // Bind the socket to a well-known port - s.sin_family = AF_INET; -+#ifdef L_ENDIAN -+ s.sin_port = port; -+ s.sin_addr.s_addr = INADDR_ANY; -+#else - s.sin_port = htons(port); - s.sin_addr.s_addr = htonl(INADDR_ANY); -+#endif - - val = bind(sock, (struct sockaddr *) &s, sizeof(s)); - if (val < 0) { -@@ -637,9 +651,13 @@ Comm_Connect(int *sockPtr, uint ipAddr, - - // Now connect to the requested host - s.sin_family = AF_INET ; -+#ifdef L_ENDIAN -+ s.sin_port = port; -+ s.sin_addr.s_addr = ipAddr; -+#else - s.sin_port = htons(port); - s.sin_addr.s_addr = htonl(ipAddr); -- -+#endif - if (connect(sock, (struct sockaddr *) &s, sizeof(s)) < 0) { - if (errno == EINTR) { - while(1) { -@@ -700,7 +718,7 @@ Comm_Accept(int listenFd, int *newFd) - { - struct sockaddr_in s; - int fd; -- int addrLen; -+ socklen_t addrLen; - - ASSERT(newFd != NULL); - *newFd = -1; -@@ -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 -- for (; bufLen; bufLen -= val, bufPtr += val) { -+ for (; bufLen; bufLen -= val, (char *)bufPtr += val) { - val = write(sock, (const char *)bufPtr, bufLen); - - writeErrno = errno; -@@ -880,7 +898,7 @@ Comm_SureWriteV(int sock, struct iovec * - vecLen--; - } else { - vecPtr[0].iov_len -= val; -- vecPtr[0].iov_base += val; -+ (char *)vecPtr[0].iov_base += val; - break; - } - } -@@ -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 -- for (; bufLen; bufLen -= val, bufPtr += val) { -+ for (; bufLen; bufLen -= val, (char *)bufPtr += val) { - val = read(sock, (char *)bufPtr, bufLen); - readErrno = errno; - D9("Read from sock %d, bufPtr %08x, bufLen %d, bytes %d\n", -@@ -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; -- vecPtr[currVec].iov_base += val; -+ (char *)vecPtr[currVec].iov_base += val; - break; - } - } diff --git a/parallel/glunix/patches/patch-ac b/parallel/glunix/patches/patch-ac deleted file mode 100644 index 23160e8df27..00000000000 --- a/parallel/glunix/patches/patch-ac +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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, - // 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 deleted file mode 100644 index a364ea0de60..00000000000 --- a/parallel/glunix/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index 899f4be3cdf..00000000000 --- a/parallel/glunix/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2005/05/29 14:38:33 wiz Exp $ - ---- 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 -- 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 @@ Perf_CalibrateDaemon(Ndb_Node *node, int - 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-af b/parallel/glunix/patches/patch-af deleted file mode 100644 index 49d9e4dc16d..00000000000 --- a/parallel/glunix/patches/patch-af +++ /dev/null @@ -1,80 +0,0 @@ -$NetBSD: patch-af,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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__ -+#include <sys/time.h> -+#include <sys/resource.h> -+typedef short pri_t; -+#else - #include <sys/priocntl.h> - #include <sys/rtpriocntl.h> - #include <sys/tspriocntl.h> -+#endif - - #include "glib/types.h" - #include "cdebug.h" -@@ -102,6 +109,7 @@ - * - * Side effects: - *****************************************************************************/ -+#ifndef __NetBSD__ - static short - Sched_GetMaxPriority(void) - { -@@ -120,6 +128,7 @@ Sched_GetMaxPriority(void) - D9("%d\n", maxPriority); - return maxPriority; - } -+#endif - - /****************************************************************************** - * Sched_GetMyCid -- -@@ -131,6 +140,9 @@ Sched_GetMaxPriority(void) - * - * Side effects: - *****************************************************************************/ -+#ifdef __NetBSD__ -+ -+#else - static id_t - Sched_GetMyCid(void) - { -@@ -152,7 +164,7 @@ Sched_GetMyCid(void) - return myCid; - - } -- -+#endif - /****************************************************************************** - * 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) - { -+#ifdef __NetBSD__ -+ -+ setpriority(PRIO_PROCESS, targPid, PRIO_MIN+offset); -+ return; -+ -+#else - pcparms_t parms; - 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 deleted file mode 100644 index f23c7df4a6f..00000000000 --- a/parallel/glunix/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index 8ac94836c19..00000000000 --- a/parallel/glunix/patches/patch-ah +++ /dev/null @@ -1,101 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2005/05/29 14:38:33 wiz Exp $ - ---- 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 -+#ifdef __NetBSD__ -+#define MAX_SIGNAL NSIG -+#endif - - #define SIGNAL_MAX_HANDLERS 5 - -@@ -216,12 +219,18 @@ Signal_Initialize(void) - sigaddset(&allSignals, SIGTERM); - sigaddset(&allSignals, SIGUSR1); - sigaddset(&allSignals, SIGUSR2); -+#ifndef __NetBSD__ - sigaddset(&allSignals, SIGCLD); -+#endif - sigaddset(&allSignals, SIGCHLD); -+#ifndef __NetBSD__ - sigaddset(&allSignals, SIGPWR); -+#endif - sigaddset(&allSignals, SIGWINCH); - sigaddset(&allSignals, SIGURG); -+#ifndef __NetBSD__ - sigaddset(&allSignals, SIGPOLL); -+#endif - sigaddset(&allSignals, SIGIO); - sigaddset(&allSignals, SIGSTOP); - sigaddset(&allSignals, SIGTSTP); -@@ -232,8 +241,9 @@ Signal_Initialize(void) - sigaddset(&allSignals, SIGPROF); - sigaddset(&allSignals, SIGXCPU); - sigaddset(&allSignals, SIGXFSZ); -+#ifndef __NetBSD__ - sigaddset(&allSignals, SIGWAITING); -- -+#endif - initialized = True; - cleanedUp = False; - -@@ -243,7 +253,7 @@ Signal_Initialize(void) - 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 @@ Signal_CheckInterest(int sig) - } else { - if (found) { - // Otherwise, we're not catching it and we should be -+#ifdef __NetBSD__ -+ signal(sig, CatchSignal); -+#else - sigset(sig, CatchSignal); -+#endif - } - } - return; -@@ -863,11 +877,18 @@ Signal_DispatchMode(void) - Bool - Signal_Hold(int sig) - { -- if (sighold(sig) < 0) { -- return False; -- } else { -- return True; -- } -+#ifdef __NetBSD__ -+int i; -+ i = sigsetmask(0); -+ i &= ~sigmask(sig); -+ if (sigsetmask(i) < 0) { -+#else -+ if (sighold(sig) < 0) { -+#endif -+ return False; -+ } else { -+ return True; -+ } - } - - /****************************************************************************** -@@ -885,7 +906,11 @@ Signal_Hold(int sig) - Bool - Signal_Release(int sig) - { -+#ifdef __NetBSD__ -+ if (sigsetmask(sigmask(sig)) < 0 ) { -+#else - if (sigrelse(sig) < 0) { -+#endif - return False; - } else { - return True; diff --git a/parallel/glunix/patches/patch-ai b/parallel/glunix/patches/patch-ai deleted file mode 100644 index 1d04aa822b7..00000000000 --- a/parallel/glunix/patches/patch-ai +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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> -+#else -+#include <unistd.h> -+#endif - #include <string.h> - #include <errno.h> - -@@ -137,11 +141,17 @@ Util_GetMyHostName(void) - if (init) { - return hostname; - } -- -+#ifdef __NetBSD__ -+ if (gethostname(hostname,sizeof(hostname)-1) < 0) { -+ DE("Hostname: %s\n",strerror(errno)); -+ return NULL; -+ } -+#else - if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)-1) < 0) { - 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 deleted file mode 100644 index 3aab414ed67..00000000000 --- a/parallel/glunix/patches/patch-aj +++ /dev/null @@ -1,370 +0,0 @@ -$NetBSD: patch-aj,v 1.5 2005/05/29 14:38:33 wiz Exp $ - ---- 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> - #include <stdio.h> -+ -+#ifdef __NetBSD__ -+#include <stdlib.h> -+#include <string.h> -+#include <sys/time.h> -+#include <sys/param.h> -+#include <sys/proc.h> -+#include <miscfs/procfs/procfs.h> -+#if __NetBSD_Version__ < 104000200 -+#include <vm/vm_swap.h> -+#else /* moved to sys in 1.4.2 */ -+#include <sys/swap.h> -+#endif -+#include <sys/sysctl.h> -+#else - #include <sys/proc.h> - #include <sys/procfs.h> - #include <sys/sysinfo.h> - #include <sys/cpuvar.h> - #include <sys/time.h> -+#endif -+ - #include <unistd.h> - #include <bsd.h> -+ -+#ifndef __NetBSD__ - #include <vm/anon.h> // Contains defns for swap virtual memory info -+#endif - - #include "clist.h" - #include "cidle.h" -@@ -120,12 +140,51 @@ - - #define LOADDOUBLE(la) ((double)(la) / FSCALE) - #define HASH(x) ((x) >> 1) -+ -+#ifdef __NetBSD__ -+int getpsize() -+{ -+ FILE *file; -+ char *buf; -+ -+ file = fopen("/kern/pagesize","r"); -+ fscanf(file,"%s",buf); -+ fclose(file); -+ return atoi(buf); -+} -+#define PAGETOK(size) (size) * getpsize() -+ -+#else - #define PAGETOK(size) (size) << 3 // 8K pages -+#endif - -+#ifndef __NetBSD__ - #define MAX(a, b) (((a) > (b)) ? (a) : (b)) -- -+#endif - /*****************************************************************************/ - -+#ifdef __NetBSD__ -+static struct nlist nlst[] = { -+#define X_CCPU 0 -+ { "_ccpu" }, /* 0 */ -+#define X_CP_TIME 1 -+ { "_cp_time" }, /* 1 */ -+#define X_HZ 2 -+ { "_hz" }, /* 2 */ -+#define X_STATHZ 3 -+ { "_stathz" }, /* 3 */ -+#define X_AVENRUN 4 -+ { "_averunnable" }, /* 4 */ -+#define X_CNT 5 -+ { "_cnt" }, -+ -+ { 0 } -+}; -+ -+static ulong cp_time_offset,cnt_offset; -+ -+#else -+ - /* definitions for indices in the nlist array */ - #define X_AVENRUN 0 - #define X_MPID 1 -@@ -165,11 +224,11 @@ static struct nlist nlst[] = - - // These are offsets into kmem for the stats we need - static ulong avenrunOffset, availrmemOffset, anoninfoOffset, swapfsOffset; -- -+#endif - /*****************************************************************************/ - - /* 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 +296,45 @@ ReadKernelData(unsigned long addr, char - * - * Side effects: - *****************************************************************************/ -+#ifdef __NetBSD__ -+Bool -+Idle_InitializeSysinfo(void) -+{ -+ int notFound; -+ int i; -+ -+ if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) == NULL) { -+ kd = NULL; -+ perror("(dile)Idle_InitializeSysinfo: kvm_open"); -+ return -1; -+ } -+ /* get the list of symbols we want to access in the kernel */ -+ if ((notFound = kvm_nlist(kd, nlst)) < 0) { -+ fprintf(stderr, "res: nlist failed\n"); -+ return False; -+ } -+ numCpus=1; -+ cp_time_offset = nlst[X_CP_TIME].n_value; -+ cnt_offset = nlst[X_CNT].n_value; -+ -+ if (!(procdir = opendir(PROCFS))) { -+ (void) fprintf(stderr, "Unable to open %s\n", PROCFS); -+ return False; -+ } -+ /* handy for later on when we're reading it */ -+ if (chdir(PROCFS)) { -+ (void) fprintf(stderr, "Unable to chdir to %s\n", PROCFS); -+ return False; -+ } -+ -+ for (i = 0; i < USAGE_TABLE_SIZE; i++) { -+ procUsageTable[i].pid = -1; -+ procUsageTable[i].cpuUsage = 0.0; -+ } -+ -+ return True; -+} -+#else - Bool - Idle_InitializeSysinfo(void) - { -@@ -301,7 +399,7 @@ Idle_InitializeSysinfo(void) - - return True; - } -- -+#endif - /****************************************************************************** - * Idle_CleanupSysinfo -- - * Description of purpose and function of the procedure -@@ -333,18 +431,30 @@ Idle_CleanupSysinfo(void) - * - * Side effects: - *****************************************************************************/ -+#ifdef __NetBSD__ -+static ProcUsage * -+FindEntry(pid_t pid, double usage) -+#else - static ProcUsage * - FindEntry(struct prpsinfo *targProc, double usage) -+#endif - { - int index, start; - ProcUsage *candidate; -+#ifdef __NetBSD__ -+ index = HASH(pid); -+#else - ASSERT(targProc != NULL); -- - index = HASH(targProc->pr_pid); -+#endif - start = index; - while (1) { - candidate = &(procUsageTable[index]); -+#ifdef __NetBSD__ -+ if (candidate->pid == pid) { -+#else - if (candidate->pid == targProc->pr_pid) { -+#endif - /* 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 @@ FindEntry(struct prpsinfo *targProc, dou - return candidate; - } - if (candidate->pid == -1) { -+#ifdef __NetBSD__ -+ candidate->pid = pid; -+#else - candidate->pid = targProc->pr_pid; -+#endif - candidate->cpuUsage = 0; - return candidate; - } -@@ -379,10 +493,17 @@ FindEntry(struct prpsinfo *targProc, dou - * - * Side effects: - *****************************************************************************/ -+ -+#ifdef __NetBSD__ -+static void -+UpdateEntry(ProcUsage *entry, double usage) -+{ -+#else - static void - UpdateEntry(ProcUsage *entry, struct prpsinfo *proc, double usage) - { - UNUSED_PARAM(proc); -+#endif - ASSERT(entry != NULL); - entry->cpuUsage = usage; - } -@@ -408,12 +529,24 @@ UpdateEntry(ProcUsage *entry, struct prp - void - Idle_GetSysInfo(Idle_Load *total, Idle_Load *seq, List_List *glunixProcs) - { -+ -+#ifndef __NetBSD__ - struct prpsinfo currproc; /* pointer to current proc structure */ -+#else -+ struct kinfo_proc *procs; -+ int mib[3],i; -+ size_t size; -+#endif -+ -+#ifndef __NetBSD__ - int fd; -+#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 +592,33 @@ Idle_GetSysInfo(Idle_Load *total, Idle_L - vmInUse[TOTAL] = 0; vmInUse[SEQUENTIAL] = 0; - cpuUsage[TOTAL] = 0; cpuUsage[SEQUENTIAL] = 0; - numProcs = 0; -+ -+#ifdef __NetBSD__ -+ size = 0; -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC; -+ mib[2] = KERN_PROC_ALL; -+ -+ sysctl(mib, 3, NULL, &size, NULL, 0); -+ procs = (struct kinfo_proc *)malloc(size); -+ sysctl(mib, 3, procs, &size, NULL, 0); -+ numProcs = size / sizeof(struct kinfo_proc); -+ -+ for (i=0; i<numProcs; i++) { -+ activeMemory[TOTAL] += procs[i].kp_eproc.e_xrssize; -+ vmInUse[TOTAL] += procs[i].kp_eproc.e_xsize; -+ currUsage = procs[i].kp_proc.p_rtime.tv_sec * 1.0e9 + procs[i].kp_proc.p_rtime.tv_usec * 1000; -+ oldProc = FindEntry(procs[i].kp_proc.p_pid, currUsage); -+ percentCpu = (currUsage - oldProc->cpuUsage) / timeDiff; -+ UpdateEntry(oldProc, currUsage); -+ cpuUsage[TOTAL] += (int) (percentCpu * 10.0); -+ if (glunixProcs->KeySearch(procs[i].kp_proc.p_pid) == NULL) { -+ activeMemory[SEQUENTIAL] += procs[i].kp_eproc.e_xrssize; -+ vmInUse[SEQUENTIAL] += procs[i].kp_eproc.e_xsize; -+ cpuUsage[SEQUENTIAL] += (int) (percentCpu * 10.0); -+ } -+ } -+#else - rewinddir(procdir); - - while ((direntp = readdir(procdir)) != 0) { -@@ -493,6 +653,7 @@ Idle_GetSysInfo(Idle_Load *total, Idle_L - (void) close(fd); - numProcs++; - } -+#endif - total->mem = activeMemory[TOTAL]; - total->cpu = cpuUsage[TOTAL]; - seq->mem = activeMemory[SEQUENTIAL]; -@@ -503,10 +664,21 @@ Idle_GetSysInfo(Idle_Load *total, Idle_L - void - Idle_GetSystemInfo(Idle_SystemLoad *sysLoad) - { -- struct anoninfo anoninfo; -+#ifndef __NetBSD__ -+ int i; - long avenrun[3]; -+ struct anoninfo anoninfo; - int ani_max, ani_resv, availrmem, swapfs_minfree; -+#else - int i; -+ double avenrun[3]; -+ int mib[2]; -+ struct vmtotal total; -+ size_t sizeofvmtotal; -+ struct swapent *sep; -+ int totalsize, size, totalinuse, inuse, ncounted; -+ int rnswap, nswap; -+#endif - - if (kd == NULL) { - sysLoad->loadAvg[0] = 0; -@@ -515,7 +687,48 @@ Idle_GetSystemInfo(Idle_SystemLoad *sysL - sysLoad->memory = 0; - return; - } -+#ifdef __NetBSD__ - -+ getloadavg(avenrun,3); -+ for (i = 0; i < 3; i++) { -+ sysLoad->loadAvg[i] = avenrun[i]; -+ } -+ -+ sep = NULL; -+ do { -+ nswap = swapctl(SWAP_NSWAP, 0, 0); -+ if (nswap < 1) -+ break; -+ sep = (struct swapent *)malloc(nswap * sizeof(*sep)); -+ if (sep == NULL) -+ break; -+ rnswap = swapctl(SWAP_STATS, (void *)sep, nswap); -+ if (nswap != rnswap) -+ break; -+ -+ totalsize = totalinuse = ncounted = 0; -+ for (; rnswap-- > 0; sep++) { -+ ncounted++; -+ size = sep->se_nblks; -+ inuse = sep->se_inuse; -+ totalsize += size; -+ totalinuse += inuse; -+ } -+ -+ } while (0); -+ if (sep) -+ free(sep); -+ -+ 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 */ - ReadKernelData(avenrunOffset, (char *) avenrun, sizeof (avenrun)); - // -@@ -539,6 +752,7 @@ Idle_GetSystemInfo(Idle_SystemLoad *sysL - sysLoad->memory = PAGETOK(MAX(ani_max - ani_resv, 0) + - availrmem - swapfs_minfree); - -+#endif - return; - } - diff --git a/parallel/glunix/patches/patch-ak b/parallel/glunix/patches/patch-ak deleted file mode 100644 index a632a3d650e..00000000000 --- a/parallel/glunix/patches/patch-ak +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 - #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 - - #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) - - #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 deleted file mode 100644 index 448afdb19a6..00000000000 --- a/parallel/glunix/patches/patch-al +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-al,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 - - #include "glib/types.h" - #include "cdebug.h" -@@ -200,6 +204,27 @@ Nmgt_IncomingWelcome(int callbackValue, - Bool - Nmgt_GetMachineInfo(MsgNmgt_Hello *hello) - { -+#ifdef __NetBSD__ -+ -+ FILE *file; -+ int *psize, *phys; -+ int one,two; -+ -+ psize = &one; -+ phys = &two; -+ -+ hello->machDesc.numProcessors = 1; /* hardcoded cuz I know better */ -+ file = fopen("/kern/pagesize","r"); -+ fscanf(file,"%d",psize); -+ fclose(file); -+ file = fopen("/kern/physmem","r"); -+ fscanf(file,"%d",phys); -+ fclose(file); -+ hello->machDesc.totalMegs = one * two; -+ hello->machDesc.mhz = 100; /* this is a hack XXX */ -+ -+#else -+ - processor_info_t info; - - 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 deleted file mode 100644 index 8277a157977..00000000000 --- a/parallel/glunix/patches/patch-am +++ /dev/null @@ -1,271 +0,0 @@ -$NetBSD: patch-am,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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__ -+#include <sys/ptrace.h> -+#include <sys/ioctl.h> -+#else - #include <stropts.h> -+#endif -+ - #include <grp.h> - #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__ -+static int PtySlaveOpen(char *ptyName, int uid, int gid); -+#else - static int PtySlaveOpen(char *ptyName, int ptyMasterFd); -- -+#endif - /*****************************************************************************/ - - // 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) { -+#else - if((ptyErrorSlaveFd = PtySlaveOpen(ptyErrorName, ptyErrorMasterFd)) - == -1) { -+#endif - DE("PtySlaveOpen() failed\n"); - return False; - } - close(ptyErrorMasterFd); - --/* if(setsid() == -1) { -- Debug_Print(MODULE_REXEC, DEBUG_ERROR, "(rexec)ChildPtyPiping: " -- "setsid() failed\n"); -- return False; -- }*/ -+#ifdef __NetBSD__ -+ if(setsid() == -1) { -+ DE("(rexec)ChildPtyPiping: setsid() failed\n"); -+ return False; -+ } -+#endif - -- setpgrp(); -+ setpgrp(0,0); - - // Open the stdin/stdout pty -+#ifdef __NetBSD__ -+ if((ptySlaveFd = PtySlaveOpen(ptyName, msg->uid, msg->gid)) == -1) { -+#else - if((ptySlaveFd = PtySlaveOpen(ptyName, ptyMasterFd)) == -1) { --/* if((ptySlaveFd = PtySlaveOpen(ptyName, msg->uid, msg->gid)) == -1) {*/ -+#endif - DE("PtySlaveOpen() failed\n"); - return False; - } - close(ptyMasterFd); - --/* This should work on BSD, but doesn't on SysV --#if defined(TIOCSCTTY) && !defined(CIBAUD) -+#ifdef __NetBSD__ -+ /* This should work on BSD, but doesn't on SysV*/ - if(ioctl(ptySlaveFd, TIOCSCTTY, (char *) 0) == -1) { -- DE("cannot set controlling tty: %s\n", strerror(errno)); -- return False; -+ DE("cannot set controlling tty: %s\n", strerror(errno)); -+ return False; - } --#else --#error Nope --#endif */ -- -+#else - (void) ioctl(ptySlaveFd, TCSETSF, (char *)&startupTermios); - (void) ioctl(ptySlaveFd, TIOCSWINSZ, (char *)&windowSize); -+#endif - --/* while(tcsetattr(ptySlaveFd, TCSANOW, &startupTermios) == -1) { -- if(errno == EINTR) { -- continue; -- } else { -- * BUGBUG maybe should return failure here? * -- DE("ioctl: %s\n", strerror(errno)); -- } -+#ifdef __NetBSD__ -+ while(tcsetattr(ptySlaveFd, TCSANOW, &startupTermios) == -1) { -+ if(errno == EINTR) { -+ continue; -+ } else { -+ /* BUGBUG maybe should return failure here? */ -+ DE("ioctl: %s\n", strerror(errno)); -+ } - } - - if(ioctl(ptySlaveFd, TIOCSWINSZ, (char *) &windowSize) == -1) { -- * BUGBUG maybe should return failure here? * -- DE("ioctl: %s\n", strerror(errno)); -- } */ -- -+ /* BUGBUG maybe should return failure here? */ -+ DE("ioctl: %s\n", strerror(errno)); -+ } -+#else - (void) ioctl(ptyErrorSlaveFd, TCSETSF, (char *)&startupTermios); - (void) ioctl(ptyErrorSlaveFd, TIOCSWINSZ, (char *)&windowSize); -+#endif - --/* while(tcsetattr(ptyErrorSlaveFd, TCSANOW, &startupTermios) == -1) { -- if(errno == EINTR) { -- continue; -- } else { -- * BUGBUG maybe should return failure here? * -- DE("ioctl: %s\n", strerror(errno)); -- } -+#ifdef __NetBSD__ -+ while(tcsetattr(ptyErrorSlaveFd, TCSANOW, &startupTermios) == -1) { -+ if(errno == EINTR) { -+ continue; -+ } else { -+ /* BUGBUG maybe should return failure here? */ -+ DE("ioctl: %s\n", strerror(errno)); -+ } - } - - if(ioctl(ptyErrorSlaveFd, TIOCSWINSZ, (char *) &windowSize) == -1) { -- * BUGBUG maybe should return failure here? * -- DE("ioctl: %s\n", strerror(errno)); -- } */ -+ /* BUGBUG maybe should return failure here? */ -+ DE("ioctl: %s\n", strerror(errno)); -+ } -+#endif - - 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 - PtyMasterOpen(char *ptyName) - { -@@ -1271,7 +1291,7 @@ PtyMasterOpen(char *ptyName) - - return ptyMasterFd; - } -- -+#else - /****************************************************************************** - * PtyMasterOpen -- - * This is the actual procedure that opens up a master pty. (BSD STYLE) -@@ -1284,40 +1304,43 @@ PtyMasterOpen(char *ptyName) - * - * Side effects: - ****************************************************************************/ --/*int -+ -+int - PtyMasterOpen(char *ptyName) - { -- int ptyMasterFd; -- char *ptr1, *ptr2; -- -- strcpy(ptyName, "/dev/ptyXY"); -- -- ASSERT(strlen(ptyName) < PTY_PATH_LENGTH); -- -- // array index: 0123456789 (for references in following code) -- for(ptr1 = "pqrstuvwxyzPQRST"; *ptr1 != 0; ptr1++) { -- ptyName[8] = *ptr1; -- for(ptr2 = "0123456789abcdef"; *ptr2 != 0; ptr2++) { -- ptyName[9] = *ptr2; -- -- if((ptyMasterFd = open(ptyName, O_RDWR)) == -1) { -- if(errno == ENOENT) { -- return -1; -- } else { -- continue; -- } -- } -- -- ptyName[5] = 't'; // need to change string to "tty" so that this -- // string can be used later to open the slave -- // end of the pty by PtyChildOpen -- return ptyMasterFd; -+ int ptyMasterFd; -+ char *ptr1, *ptr2; -+ -+ strcpy(ptyName, "/dev/ptyXY"); -+ -+ ASSERT(strlen(ptyName) < PTY_PATH_LENGTH); -+ -+ // array index: 0123456789 (for references in following code) -+ for(ptr1 = "pqrstuvwxyzPQRST"; *ptr1 != 0; ptr1++) { -+ ptyName[8] = *ptr1; -+ for(ptr2 = "0123456789abcdef"; *ptr2 != 0; ptr2++) { -+ ptyName[9] = *ptr2; -+ -+ if((ptyMasterFd = open(ptyName, O_RDWR)) == -1) { -+ if(errno == ENOENT) { -+ return -1; -+ } else { -+ continue; - } -+ } -+ -+ ptyName[5] = 't'; // need to change string to "tty" so that this -+ // string can be used later to open the slave -+ // end of the pty by PtyChildOpen -+ return ptyMasterFd; - } -+ } - -- return -1; --}*/ -+ return -1; -+} -+#endif - -+#ifndef __NetBSD__ - int - PtySlaveOpen(char *ptyName, int ptyMasterFd) - { -@@ -1364,7 +1387,7 @@ PtySlaveOpen(char *ptyName, int ptyMaste - - return ptySlaveFd; - } -- -+#else - /****************************************************************************** - * 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 - /****************************************************************************** - * 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))) { -+#else - 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 deleted file mode 100644 index 0782ba18f1e..00000000000 --- a/parallel/glunix/patches/patch-an +++ /dev/null @@ -1,90 +0,0 @@ -$NetBSD: patch-an,v 1.3 2005/05/29 14:38:33 wiz Exp $ - ---- 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> - #include <limits.h> -+#ifdef __NetBSD__ -+#include <sys/ioctl.h> -+#endif - - #include "glib/types.h" - #include "glib.h" -@@ -375,39 +378,30 @@ SetupTerminal() - { - struct termios buf; - -- (void) ioctl(0, TCGETS, (char *)&saveTermios); -- -- /* while(tcgetattr(STDIN_FILENO, &saveTermios) == -1) { -+#ifdef __NetBSD__ -+ while(tcgetattr(STDIN_FILENO, &saveTermios) == -1) { - if(errno == EINTR) { - continue; - } else { - D1("tcgetattr() failed: %s\n", strerror(errno)); -- return False; -+ return; - } -- }*/ -- -+ } -+#else -+ (void) ioctl(0, TCGETS, (char *)&saveTermios); -+#endif - validTermios = True; - -- /* if(ioctl(STDIN_FILENO, TIOCGWINSZ, (char *) windowSize) == -1) { -+ /* -+ if(ioctl(STDIN_FILENO, TIOCGWINSZ, (char *) windowSize) == -1) { - return False; - }*/ - - buf = saveTermios; - -- /**/ -- -- buf.c_iflag &= ~(INLCR|IGNCR|ICRNL|IUCLC|IXON); -- // buf.c_oflag &= ~OPOST; -- buf.c_lflag &= ~(ICANON|ECHO|ISIG); -- buf.c_cc[VMIN] = 1; -- buf.c_cc[VTIME] = 0; -- (void) ioctl(0, TCSETSF, (char *)&buf); -- -- /**/ -- -- /* -+#ifdef __NetBSD__ - buf.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); --// buf.c_oflag &= ~(OPOST); on non-ultrasparcs, this loses CR's -+ buf.c_oflag &= ~(OPOST); /*on non-ultrasparcs, this loses CR's*/ - buf.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); - buf.c_cflag &= ~(CSIZE | PARENB); - buf.c_cflag |= CS8; -@@ -426,14 +420,20 @@ SetupTerminal() - continue; - } else { - D1("tcsetattr(): %s\n", strerror(errno)); -- return False; -+ return; - } - } - -- return False; -+ return; - } -- }*/ -- -+ } -+#else -+ buf.c_iflag &= ~(INLCR|IGNCR|ICRNL|IUCLC|IXON); -+ buf.c_lflag &= ~(ICANON|ECHO|ISIG); -+ buf.c_cc[VMIN] = 1; -+ buf.c_cc[VTIME] = 0; -+ (void) ioctl(0, TCSETSF, (char *)&buf); -+#endif - Comm_SetLineBuffering(False); - - return; diff --git a/parallel/glunix/patches/patch-ao b/parallel/glunix/patches/patch-ao deleted file mode 100644 index a2790b547b4..00000000000 --- a/parallel/glunix/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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-ap b/parallel/glunix/patches/patch-ap deleted file mode 100644 index 762e3d7c2fc..00000000000 --- a/parallel/glunix/patches/patch-ap +++ /dev/null @@ -1,133 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2000/10/10 19:09:26 dmcmahill Exp $ - ---- progs/Makefile.common.orig Wed Nov 5 15:43:41 1997 -+++ progs/Makefile.common Wed Jun 21 15:54:25 2000 -@@ -3,50 +3,30 @@ - # There are configuration values that are used in this Makefile and are - # used to do substitutions in the scripts. - # Use the environment variable GLUNIX_ARCH to manage multiple architectures --ifeq ($(GLUNIX_ARCH),) -- # This is the default architecture to build -- GLUNIX_ARCH = sun4 --endif -- --ifeq ($(GLUNIX_ARCH),sun4) -- GLUNIX_OS = solaris2.4 -- GLUNIX_NET = tcp -- GLUNIX_PLATFORM = $(GLUNIX_ARCH)-$(GLUNIX_OS)-$(GLUNIX_NET) -- PERL_PATH = /usr/sww/bin/perl -- MAIL_PATH = /usr/ucb/Mail -- RSH_PATH = /usr/sww/bin/ssh -- GLUNIX_DIR = /disks/barad-dur/now/glunix -- GLUNIX_DATA_DIR = $(GLUNIX_DIR)/data -- INSTALL_DIR = /usr/now -- HTTP_BASE = /usr/now/share/etc/httpd/docs -- MASTER_HOSTNAME = u.CS.Berkeley.EDU -- GLUNIX_ACCOUNT = 12345 -- GLUNIX_GROUP = 311 -- PERL_LIB_DIR = $(GLUNIX_DIR)/release/progs/tools/perl-lib -- -- INSTALL = /usr/sww/bin/ginstall --endif --ifeq ($(GLUNIX_ARCH),i386) -- GLUNIX_OS = solaris2.6 -- GLUNIX_NET = tcp -- GLUNIX_PLATFORM = $(GLUNIX_ARCH)-$(GLUNIX_OS)-$(GLUNIX_NET) -- PERL_PATH = /usr/sww/bin/perl -- MAIL_PATH = /usr/ucb/Mail -- RSH_PATH = /usr/sww/bin/ssh -- GLUNIX_DIR = /disks/barad-dur/now/glunix -- GLUNIX_DATA_DIR = $(GLUNIX_DIR)/data -- INSTALL_DIR = /usr/now -- HTTP_BASE = -- MASTER_HOSTNAME = pc0.CS.Berkeley.EDU -- GLUNIX_ACCOUNT = 12345 -- GLUNIX_GROUP = 311 -- PERL_LIB_DIR = $(GLUNIX_DIR)/release/progs/tools/perl-lib - -- INSTALL = /usr/now/bin/install -+ifeq ($(OPSYS),NetBSD) -+GLUNIX_BASE = $(WRKDIR) -+GLUNIX_SOURCE = $(WRKDIR)/glunix -+GLUNIX_ARCH = $(ARCH) -+GLUNIX_OS = $(OPSYS) -+GLUNIX_NET = tcp -+GLUNIX_PLATFORM = $(GLUNIX_ARCH)-$(GLUNIX_OS)-$(GLUNIX_NET) -+PERL_PATH = ${LOCALBASE}/bin/perl -+MAIL_PATH = /usr/bin/Mail -+RSH_PATH = ${SSH} -+GLUNIX_DIR = $(NOW_ROOT) -+GLUNIX_DATA_DIR = $(NOW_ROOT)/data -+INSTALL_DIR = $(NOW_ROOT) -+HTTP_BASE = $(NOW_ROOT)/man/http -+MASTER_HOSTNAME = $(shell /bin/hostname) -+GLUNIX_ACCOUNT = 12345 # These don't matter, they're calculated at run-time -+GLUNIX_GROUP = 12345 # These don't matter, they're calculated at run-time -+PERL_LIB_DIR = $(GLUNIX_DIR)/lib/perl-lib -+INSTALL = /usr/bin/install - endif - - # Paths to needed programs --MHTML2HTML = /usr/now/bin/mhtml2html -+MHTML2HTML = $(GLUNIX_SOURCE)/bin/$(GLUNIX_PLATFORM)/mhtml2html - - ########################################################################### - # Set up purify and quantify commands -@@ -58,7 +38,7 @@ - PURIFY_COMMAND = purify -cache-dir=/disks/barad-dur/now/glunix/data/purify/cache - endif - --CC = $(PURIFY_COMMAND) gcc -+CC = gcc - CFLAGS += -Wall -g $(RLIBPATH) $(LLIBPATH) $(INCPATH) $(LIBS) \ - -DGLUNIX_ARCH=$(GLUNIX_ARCH) -DGLUNIX_OS=$(GLUNIX_OS) \ - -DGLUNIX_NET=$(GLUNIX_NET) -DGLUNIX_PLATFORM=$(GLUNIX_PLATFORM) \ -@@ -69,7 +49,7 @@ - -DGLUNIX_ACCOUNT=$(GLUNIX_ACCOUNT) -DGLUNIX_GROUP=$(GLUNIX_GROUP) - MKDIR = $(INSTALL) -d -m 0775 -g glunix - INSTALL_BIN = $(INSTALL) -m 0775 -g glunix --INSTALL_MAN = $(INSTALL) -m 0664 -g glunix -+INSTALL_MAN = $(INSTALL) -c -m 0664 -g glunix - MHTML_TO_NROFF = $(MHTML2HTML) nroff - MHTML_TO_HTML = $(MHTML2HTML) html - -@@ -96,6 +76,7 @@ - # %%GLUNIX_GROUP%% - STANDARD_XLATE = sed -e 's,%%PERL_PATH%%,$(PERL_PATH),g' \ - -e 's,%%MAIL_PATH%%,$(MAIL_PATH),g' \ -+ -e 's,%%GLUNIX_BASE%%,$(GLUNIX_BASE),g' \ - -e 's,%%RSH_PATH%%,$(RSH_PATH),g' \ - -e 's,%%GLUNIX_ARCH%%,$(GLUNIX_ARCH),g' \ - -e 's,%%GLUNIX_OS%%,$(GLUNIX_OS),g' \ -@@ -111,10 +92,10 @@ - -e 's,%%GLUNIX_GROUP%%,$(GLUNIX_GROUP),g' \ - $^ > $@ ; chmod +x $@ - --MANHOME_MHTML = ../../man/mhtml --MANHOME_HTML = ../../man/html --MANHOME_NROFF = ../../man/man --BINHOME = ../../bin/$(GLUNIX_PLATFORM) -+MANHOME_MHTML = ../../glunix/man/mhtml -+MANHOME_HTML = ../../glunix/man/html -+MANHOME_NROFF = ../../glunix/man/man -+BINHOME = ../../glunix/bin/$(GLUNIX_PLATFORM) - - ifneq ($(origin GLUNIX_DEVEL),undefined) - -@@ -123,8 +104,8 @@ - - else - --GLUNIX_LIBPATH = $(INSTALL_DIR)/lib --GLUNIX_INCLUDEPATH = $(INSTALL_DIR)/include -+GLUNIX_LIBPATH = $(GLUNIX_SOURCE)/lib/$(GLUNIX_PLATFORM) -+GLUNIX_INCLUDEPATH = $(GLUNIX_SOURCE)/include - - endif - -@@ -166,4 +147,4 @@ - else - installman: - @echo No manpages to install. --endif -+endif diff --git a/parallel/glunix/patches/patch-aq b/parallel/glunix/patches/patch-aq deleted file mode 100644 index db2c0ae9a91..00000000000 --- a/parallel/glunix/patches/patch-aq +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 - --LIBS = -lnsl -+LIBS = - MANPAGES = MHTML.1 - - ########################################################################### diff --git a/parallel/glunix/patches/patch-ar b/parallel/glunix/patches/patch-ar deleted file mode 100644 index 22fe8bb5a24..00000000000 --- a/parallel/glunix/patches/patch-ar +++ /dev/null @@ -1,211 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 "; -+$install_bin = "/usr/bin/install -c -m 755 -o glunix -g glunix "; -+$imkdir = "/usr/bin/install -d -m 755 -o glunix -g glunix"; -+$glunix_base = "%%GLUNIX_BASE%%"; - $now_base = "%%INSTALL_DIR%%"; - $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"); --&my_mkdir("$now_base/include"); --&my_mkdir("$now_base/man"); --if ($http_base ne "") { -- &my_mkdir("$http_base/man/html"); --} -+#&my_mkdir("$now_base/bin"); -+#&my_mkdir("$now_base/lib"); -+#&my_mkdir("$now_base/include"); -+#&my_mkdir("$now_base/man"); -+#if ($http_base ne "") { -+# &my_mkdir("$http_base/man/html"); -+#} - - ####################################################################### - # -@@ -48,22 +51,43 @@ if ($http_base ne "") { - # Install include files/directories - # - --@files = <$glunix_base/glunix/include/*>; --@files = &strip_garbage(@files); -+#@files = <$glunix_base/glunix/include/*>; -+#@files = &strip_garbage(@files); - #print "Found include files: ", join(" ", @dirs), "\n"; - --foreach $val (@files) { -- $install_path = "$now_base/include/" . &path_tail($val); -- print "Installing $install_path\n"; -- if ($justTesting) { -- print "Unlinking $install_path\n"; -- print "Linking $install_path to $val\n"; -- } else { -- unlink($install_path); -- symlink($val, $install_path); -- } -+#foreach $val (@files) { -+# $install_path = "$now_base/include/" . &path_tail($val); -+# print "Installing $install_path\n"; -+# if ($justTesting) { -+# print "Unlinking $install_path\n"; -+# print "Linking $install_path to $val\n"; -+# } else { -+# unlink($install_path); -+# system("$install_man $val $install_path"); -+# } -+#} -+# create necc dirs. -+system("$imkdir $now_base/include"); -+system("$imkdir $now_base/lib/$glunix_arch"); -+system("$imkdir $now_base/bin/$glunix_arch"); -+system("$imkdir $now_base/include/glib"); -+system("$imkdir $now_base/lib/perl-lib/Time"); -+system("$imkdir $now_base/man"); -+ -+system("$install_bin $glunix_base/glunix/bin/$glunix_arch/master $now_base/bin/$glunix_arch"); -+system("$install_bin $glunix_base/glunix/bin/$glunix_arch/daemon $now_base/bin/$glunix_arch"); -+system("$install_man $glunix_base/glunix/include/glib/*.h $now_base/include/glib"); -+system("$install_man $glunix_base/glunix/include/*.h $now_base/include"); -+system("$install_man $glunix_base/progs/tools/perl-lib/Time/* $now_base/lib/perl-lib/Time"); -+system("$install_man $glunix_base/progs/tools/perl-lib/*.pl $now_base/lib/perl-lib"); -+system("cp -R -p $glunix_base/glunix/man/* $now_base/man"); -+system("rm $now_base/man/Makefile"); -+@chownme = `find $glunix_base/glunix/man -name \\*`; -+foreach (@chownme) { -+ chomp; -+ $_ =~ s+$glunix_base/glunix/man++; -+ system("chown glunix:glunix $now_base/man/$_"); - } -- - print "\n"; - - ####################################################################### -@@ -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?>); - - # print "Found man directories: ", join(" ", @dirs), "\n"; - --foreach $val (@dirs) { -- @f = <$val/*.*>; -+#foreach $val (@dirs) { -+# @f = <$val/*.*>; - # print "Found man pages: ", join(" ", &man_pagename(@f)), "\n"; -- push(@files, @f); --} -+# push(@files, @f); -+#} - --@files = <$glunix_base/man/man?/*.*>; --&install_manpages("$now_base/man/man", @files); -+#@files = <$glunix_base/man/man?/*.*>; -+#&install_manpages("$now_base/man/man", @files); - --if ($http_base ne "") { -- @files = <$glunix_base/man/html?/*.*>; -- &install_manpages("$http_base/man/html", @files); --} -- --print "Creating windex file (this may take a while)\n"; --if (!$justTesting) { -- system("/usr/bin/catman -M $now_base/man -w"); -- print "Done with catman!\n"; --} -+#if ($http_base ne "") { -+# @files = <$glunix_base/man/html?/*.*>; -+# &install_manpages("$http_base/man/html", @files); -+#} -+ -+# no windex file in bsd. -+#print "Creating windex file (this may take a while)\n"; -+#if (!$justTesting) { -+# system("/usr/bin/catman -M $now_base/man -w"); -+# print "Done with catman!\n"; -+#} - - ####################################################################### - # - # Install libraries - # - --@files = <$glunix_base/lib/$glunix_arch/*>; -+@files = <$glunix_base/glunix/lib/$glunix_arch/*>; - @files = &strip_garbage(@files); - #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"); - } - } - -@@ -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"; -+ if (-e "$glunix_base/glunix/bin/$glunix_arch/$val") { -+ print "Copying $glunix_base/glunix/bin/$glunix_arch/$val to $now_base/bin/$val\n"; - if (!$justTesting) { -- system("/bin/cp $glunix_base/bin/$glunix_arch/$val $now_base/bin/$val"); -+ system("$install_bin $glunix_base/glunix/bin/$glunix_arch/$val $now_base/bin/$val"); - } - } else { -- 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"; - } - } - - # Find all of the programs in the release directory --@dirs = <$glunix_base/bin/*>; -+@dirs = <$glunix_base/glunix/bin/*>; - - #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"); - } - } - - 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"); - } - } - -@@ -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 deleted file mode 100644 index c7b5da5b621..00000000000 --- a/parallel/glunix/patches/patch-as +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-as,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index 98d1ff48200..00000000000 --- a/parallel/glunix/patches/patch-at +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-at,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index 7ebb83b37c2..00000000000 --- a/parallel/glunix/patches/patch-au +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-au,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 - --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 deleted file mode 100644 index 88c014df3a4..00000000000 --- a/parallel/glunix/patches/patch-av +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-av,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index d50d3e89837..00000000000 --- a/parallel/glunix/patches/patch-aw +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aw,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index 850b56e09cf..00000000000 --- a/parallel/glunix/patches/patch-ax +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ax,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index c827ed56621..00000000000 --- a/parallel/glunix/patches/patch-ay +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ay,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index 9a412ef6825..00000000000 --- a/parallel/glunix/patches/patch-az +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-az,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index c533b3f5e67..00000000000 --- a/parallel/glunix/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index 26aa853edce..00000000000 --- a/parallel/glunix/patches/patch-bb +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-bb,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index 10810a27577..00000000000 --- a/parallel/glunix/patches/patch-bc +++ /dev/null @@ -1,107 +0,0 @@ -$NetBSD: patch-bc,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- progs/glumake/Makefile.orig 1997-11-05 21:43:50.000000000 +0100 -+++ progs/glumake/Makefile -@@ -27,26 +27,17 @@ - # - # Configure the GLUnix modifications here - # -+# for netbsd below. do *not* run configure in here.. it will make a mess -+ -+GLUNIX_ARCH= $(ARCH) -+GLUNIX_OS= $(OPSYS) -+GLUNIX_NET:=tcp -+INSTALL := /usr/bin/install - --ifeq ($(GLUNIX_ARCH),) --GLUNIX_ARCH = sun4 --endif --ifeq ($(GLUNIX_ARCH),sun4) -- GLUNIX_OS = solaris2.4 -- GLUNIX_NET = tcp -- # Generic install program. -- INSTALL = /usr/sww/bin/ginstall -c --endif --ifeq ($(GLUNIX_ARCH),i386) -- GLUNIX_OS = solaris2.6 -- GLUNIX_NET = tcp -- # Generic install program. -- INSTALL = /usr/now/bin/install -c --endif - GLUNIX_PLATFORM = $(GLUNIX_ARCH)-$(GLUNIX_OS)-$(GLUNIX_NET) - --GLUNIX_DEVEL_BASE = /disks/barad-dur/now/glunix/devel --GLUNIX_BASE = /usr/now -+GLUNIX_DEVEL_BASE = $(WRKDIR) -+#GLUNIX_BASE = $(NOW_ROOT) - - ############################################################################ - -@@ -56,7 +47,7 @@ srcdir = . - - CC = gcc - --CFLAGS = -g -O -I$(GLUNIX_BASE)/include -+CFLAGS = -g -O2 -I$(GLUNIX_DEVEL_BASE)/glunix/include - CPPFLAGS = - LDFLAGS = - -@@ -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)\" -+defines += -DHAVE_SYS_SIGLIST - - # Which flavor of remote job execution support to use. - # The code is found in `remote-$(REMOTE).c'. -@@ -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) --LOADLIBES = -lelf -lkvm -R$(GLUNIX_DEVEL_BASE)/$(USER)/lib/$(GLUNIX_PLATFORM) -lglunix -L$(GLUNIX_DEVEL_BASE)/$(USER)/lib/$(GLUNIX_PLATFORM) -lsocket -lnsl -+LOADLIBES = -lkvm -R$(GLUNIX_DEVEL_BASE)/$(USER)/lib/$(GLUNIX_PLATFORM) -lglunix -L$(GLUNIX_DEVEL_BASE)/$(USER)/lib/$(GLUNIX_PLATFORM) - else --LOADLIBES = -lelf -lkvm -R$(GLUNIX_BASE)/lib -lglunix -L$(GLUNIX_BASE)/lib -lsocket -lnsl -+LOADLIBES = -lkvm -R$(GLUNIX_DEVEL_BASE)/glunix/lib/$(GLUNIX_PLATFORM) -lglunix -L$(GLUNIX_DEVEL_BASE)/glunix/lib/$(GLUNIX_PLATFORM) - endif - - # Any extra object files your system needs. - extras = getloadavg.o - - # Common prefix for machine-independent installed files. --prefix = ../.. -+prefix = ../../glunix - # Common prefix for machine-dependent installed files. - exec_prefix = ${prefix} - -@@ -138,7 +130,7 @@ group = sys - # Program to install `glumake'. - INSTALL_PROGRAM = ${INSTALL} - # Program to install the man page. --INSTALL_DATA = ${INSTALL} -m 644 -+INSTALL_DATA = ${INSTALL} -c -m 644 - - # Program to format Texinfo source into Info files. - MAKEINFO = makeinfo -@@ -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 \ -- $(INSTALL) -m 0775 $(srcdir)/glumake.1 $(mandir)/$(manprefix)make.$(manext); \ -- $(GLUNIX_BASE)/bin/mhtml2html nroff <$(srcdir)/glumake.1 >../../man/man1/glumake.1; \ -- $(GLUNIX_BASE)/bin/mhtml2html html <$(srcdir)/glumake.1 >../../man/html1/glumake.html; \ -+ $(INSTALL_DATA) $(srcdir)/glumake.1 $(mandir)/$(manprefix)make.$(manext); \ -+ $(GLUNIX_BASE)/bin/mhtml2html nroff <$(srcdir)/glumake.1 >../../glunix/man/man1/glumake.1; \ -+ $(GLUNIX_BASE)/bin/mhtml2html html <$(srcdir)/glumake.1 >../../glunix/man/html1/glumake.html; \ - fi - - loadavg: loadavg.c config.h diff --git a/parallel/glunix/patches/patch-bd b/parallel/glunix/patches/patch-bd deleted file mode 100644 index 319bd678af0..00000000000 --- a/parallel/glunix/patches/patch-bd +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bd,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index 49317e3da8e..00000000000 --- a/parallel/glunix/patches/patch-be +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-be,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 --extern char *sys_siglist[]; --#endif --#else -+#ifndef HAVE_SYS_SIGLIST - #include "signame.h" - #endif - diff --git a/parallel/glunix/patches/patch-bf b/parallel/glunix/patches/patch-bf deleted file mode 100644 index 163180a4a99..00000000000 --- a/parallel/glunix/patches/patch-bf +++ /dev/null @@ -1,846 +0,0 @@ -$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 -@@ -1,8 +1,15 @@ - # Makefile generated by imake - do not edit! --# $XConsortium: imake.c,v 1.91 95/01/12 16:15:47 kaleb Exp $ -+# $TOG: imake.c /main/97 1997/06/20 20:23:51 kaleb $ - - # ---------------------------------------------------------------------- --# Makefile generated from "Imake.tmpl" and </tmp/IIf.a005Oj> --# $XConsortium: Imake.tmpl,v 1.224 94/12/27 03:57:50 gildea Exp $ -+# Makefile generated from "Imake.tmpl" and </tmp/IIf.07781a> -+# $TOG: Imake.tmpl /main/245 1997/05/20 10:05:47 kaleb $ - # -+# -+# -+# -+# $XFree86: xc/config/cf/Imake.tmpl,v 3.32.2.5 1997/07/06 07:27:59 dawes Exp $ -+# ---------------------------------------------------------------------- -+ -+all:: - -@@ -10,3 +17,4 @@ - --# $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $ -+# $TOG: Imake.cf /main/28 1997/06/25 08:31:36 barstow $ -+# $XFree86: xc/config/cf/Imake.cf,v 3.34.2.3 1997/07/27 02:41:02 dawes Exp $ - -@@ -16,16 +24,90 @@ - --# site: $XConsortium: site.sample,v 1.9 94/04/08 17:02:06 rws Exp $ -+# site: $XConsortium: site.def /main/revisionist/4 1996/12/31 08:02:07 kaleb $ -+# site: $XFree86: xc/config/cf/site.def,v 3.17.2.1 1997/06/22 10:32:21 dawes Exp $ - --# ----------------------------------------------------------------------- --# platform-specific configuration parameters - edit sun.cf to change -+# $XFree86: xc/config/cf/xf86site.def,v 3.101.2.11 1997/06/22 10:32:22 dawes Exp $ -+ -+# ---------------------------------------------------------------------- -+# platform-specific configuration parameters - edit NetBSD.cf to change - --# platform: $XConsortium: sun.cf,v 1.139 95/01/12 15:30:26 kaleb Exp $ -+# platform: $XConsortium: NetBSD.cf /main/16 1996/10/31 14:47:14 kaleb $ - --# operating system: SunOS 5.4 -+# platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.9 1997/07/26 06:30:39 dawes Exp $ - --# $XConsortium: svr4.cf,v 1.11 95/01/25 16:32:39 kaleb Exp $ -+# -+# This file currently contains support for: -+# -+# NetBSD/i386 client/server -+# NetBSD/sparc client/server -+# NetBSD/sun3 client/server -+# NetBSD/hp300 client -+# NetBSD/mac68k client/server -+# NetBSD/pmax client -+# NetBSD/amiga client/server -+# NetBSD/alpha client/server -+# NetBSD/arm32 client -+# - --# $XConsortium: sv4Lib.rules,v 1.14 94/04/09 12:00:10 rws Exp $ -+# operating system: NetBSD 1.3 (1.3.0) - --# ----------------------------------------------------------------------- -+# Man pages need to be formatted when installed, so override the default -+# imake rules. -+ -+# $XConsortium: bsdLib.rules /main/3 1996/09/28 16:09:18 rws $ -+ -+# $XFree86: xc/config/cf/bsdLib.rules,v 3.4.2.1 1997/05/11 05:04:04 dawes Exp $ -+ -+# $XFree86: xc/config/cf/xfree86.cf,v 3.129.2.14 1997/07/06 07:28:00 dawes Exp $ -+ -+# $XConsortium: xfree86.cf /main/34 1996/12/06 11:45:18 rws $ -+ -+LINKKITDIR = $(USRLIBDIR)/Server -+XF98LINKKITDIR = $(USRLIBDIR)/Server -+ -+ XF86SRC = $(SERVERSRC)/hw/xfree86 -+ XF86ACCELSRC = $(XF86SRC)/accel -+ XF86COMSRC = $(XF86SRC)/common -+ XF86CONFIGSRC = $(XF86COMSRC) -+ XF86HWSRC = $(XF86SRC)/common_hw -+ XF86OSSRC = $(XF86SRC)/os-support -+ VGADRIVERSRC = $(XF86SRC)/vga256/drivers -+VGA16DRIVERSRC = $(XF86SRC)/vga16/drivers -+ VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers -+ MONODRIVERSRC = $(XF86SRC)/mono/drivers -+ S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers -+ S3VDRIVERSRC = $(XF86SRC)/accel/s3_virge/drivers -+ -+ XF68SRC = $(SERVERSRC)/hw/xfree68 -+ XF68COMSRC = $(XF68SRC)/common -+ XF68CONFIGSRC = $(XF68COMSRC) -+ XF68OSSRC = $(XF68SRC)/os-support -+ -+ XF98SRC = $(SERVERSRC)/hw/xfree98 -+ XF98ACCELSRC = $(XF98SRC)/accel -+ XF98COMSRC = $(XF98SRC)/common -+ XF98CONFIGSRC = $(XF98COMSRC) -+ XF98HWSRC = $(XF98SRC)/common_hw/generic -+ XF98HWNECSRC = $(XF98SRC)/common_hw/nec -+ XF98HWPWSKBSRC = $(XF98SRC)/common_hw/pwskb -+ XF98HWPWLBSRC = $(XF98SRC)/common_hw/pwlb -+ XF98HWGA968SRC = $(XF98SRC)/common_hw/ga968 -+ XF98OSSRC = $(XF98SRC)/os-support -+ XF98VGADRIVERSRC = $(XF98SRC)/vga256/drivers -+XF98VGA16DRIVERSRC = $(XF98SRC)/vga16/drivers -+ XF98VGA2DRIVERSRC = $(XF98SRC)/vga2/drivers -+ XF98MONODRIVERSRC = $(XF98SRC)/mono/drivers -+XF98NECS3DRIVERSRC = $(XF98SRC)/accel/s3nec/drivers -+XF98PWSKBDRIVERSRC = $(XF98SRC)/accel/s3pwskb/drivers -+ XF98PWLBDRIVERSRC = $(XF98SRC)/accel/s3pwlb/drivers -+XF98GA968DRIVERSRC = $(XF98SRC)/accel/s3ga968/drivers -+ -+ XFREE86DOCDIR = $(LIBDIR)/doc -+ XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript -+ XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html -+XFREE86JAPANESEDOCDIR = $(XFREE86DOCDIR)/Japanese -+ -+# $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $ -+# $XFree86: xc/config/cf/xf86.rules,v 3.16.2.1 1997/05/18 12:00:01 dawes Exp $ -+ -+# ---------------------------------------------------------------------- - # site-specific configuration parameters that go after -@@ -33,7 +115,19 @@ - --# site: $XConsortium: site.sample,v 1.9 94/04/08 17:02:06 rws Exp $ -+# site: $XConsortium: site.def /main/revisionist/4 1996/12/31 08:02:07 kaleb $ -+# site: $XFree86: xc/config/cf/site.def,v 3.17.2.1 1997/06/22 10:32:21 dawes Exp $ - --# ----------------------------------------------------------------------- -+# --------------------------------------------------------------------- - # Imake rules for building libraries, programs, scripts, and data files --# rules: $XConsortium: Imake.rules,v 1.197 94/12/05 19:30:41 gildea Exp $ -+# rules: $TOG: Imake.rules /main/222 1997/07/17 20:04:40 kaleb $ -+# rules: $XFree86: xc/config/cf/Imake.rules,v 3.33.2.5 1997/07/19 04:59:07 dawes Exp $ -+ -+ _NULLCMD_ = @ echo -n -+ -+TKLIBNAME = -+ -+TKLIBDIR = -+ -+TCLLIBNAME = -+ -+TCLIBDIR = - -@@ -46,39 +140,38 @@ - IMAKE = imake -- DEPEND = makedepend -- MKDIRHIER = mkdirhier -+ DEPEND = gccmakedep -+ MKDIRHIER = mkdir -p -+ EXPORTLISTGEN = - CONFIGSRC = $(TOP)/config - IMAKESRC = $(CONFIGSRC)/imake -- DEPENDSRC = $(CONFIGSRC)/makedepend -- IXXSRC = $(UNSUPPORTEDSRC)/programs/ixx -- IXX = ixx -- IXXFLAGS = -s BaseObject -m TypeObj -r RequestObj -p Xf -- IXXINCLUDES = -i '<X11/Fresco/enter-scope.h>' -- -- INCROOT = /usr/sww/X11R6/include -- USRLIBDIR = /usr/sww/X11R6/lib -- SHLIBDIR = /usr/sww/X11R6/lib -+ DEPENDSRC = $(CONFIGSRC)/util -+ -+ INCROOT = /usr/X11R6/include -+ USRLIBDIR = /usr/X11R6/lib -+ VARLIBDIR = /var/lib -+ SHLIBDIR = /usr/X11R6/lib - LINTLIBDIR = $(USRLIBDIR)/lint -- MANPATH = /usr/sww/X11R6/man -- MANHOME = ../../man/mhtml1 -- MANSOURCEPATH = $(MANPATH)/man -- MANDIR = $(MANSOURCEPATH)1 -- LIBMANDIR = $(MANSOURCEPATH)3 -+ MANPATH = /usr/X11R6/man -+ MANSOURCEPATH = $(MANPATH)/cat -+ MANDIR = $(MANSOURCEPATH)$(MANSUFFIX) -+ LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSUFFIX) - FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSUFFIX) - -- AR = /usr/ccs/bin/ar cq -- BOOTSTRAPCFLAGS = -DSVR4 -+ AR = ar clq -+ BOOTSTRAPCFLAGS = - CC = gcc -- AS = /usr/ccs/bin/as -+ AS = as - --.SUFFIXES: .cxx -+.SUFFIXES: .cc - - CXX = g++ -- CXXDEBUGFLAGS = -g -+ CXXFILT = c++filt -+ CXXLIB = -+ CXXDEBUGFLAGS = -O2 -fno-strength-reduce -+CXXDEPENDINCLUDES = - CXXEXTRA_DEFINES = - CXXEXTRA_INCLUDES = -- CXXIDL_INCLUDES = -I$(TOP)/include -- CXXSTD_DEFINES = -Dsun -DSVR4 -D__sparc -+ CXXSTD_DEFINES = -DCSRG_BASED $(CXXPROJECT_DEFINES) - CXXOPTIONS = -- CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) $(CXXIDL_INCLUDES) -- CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) -+ CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) -+ CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES) - CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) -@@ -86,27 +179,35 @@ - COMPRESS = compress -- CPP = /usr/ccs/lib/cpp $(STD_CPP_DEFINES) -- PREPROCESSCMD = cc -E $(STD_CPP_DEFINES) -- INSTALL = bsdinst -+ GZIPCMD = gzip -+ CPP = /usr/libexec/cpp $(STD_CPP_DEFINES) -+ PREPROCESSCMD = /usr/libexec/cpp $(STD_CPP_DEFINES) -+ INSTALL = install - INSTALLFLAGS = -c -- LD = /usr/ccs/bin/ld -- LEX = /usr/ccs/bin/lex -+ LD = ld -+ LEX = lex -l - LEXLIB = -ll -- YACC = /usr/ccs/bin/yacc -- CCYACC = /usr/ccs/bin/yacc -+ YACC = yacc -+ CCYACC = yacc - LINT = lint -- LINTLIBFLAG = -o -- LINTOPTS = -bh -+ LINTLIBFLAG = -C -+ LINTOPTS = -axz - LN = ln -s -- MAKE = /usr/ccs/bin/make -- MV = mv -+ MAKE = make -+ MV = mv -f - CP = cp - -+ RANLIB = ranlib -+ RANLIBINSTFLAGS = -+ - RM = rm -f -- MANSUFFIX = 1x -- LIBMANSUFFIX = 3x -- FILEMANSUFFIX = 4 -- TROFF = psroff -+ MANSUFFIX = 1 -+ LIBMANSUFFIX = 3 -+ FILEMANSUFFIX = 5 -+ TROFF = groff -Tps -+ NROFF = nroff -Tlatin1 - MSMACROS = -ms -+ MANMACROS = -man - TBL = tbl -- EQN = eqn -+ EQN = eqn -Tps -+ NEQN = neqn -Tlatin1 -+ COL = col - -@@ -116,20 +217,17 @@ - STD_INCLUDES = -- STD_CPP_DEFINES = -Dsun -DSVR4 -D__sparc -- STD_DEFINES = -Dsun -DSVR4 -D__sparc -+ STD_CPP_DEFINES = -traditional $(PROJECT_DEFINES) -+ STD_DEFINES = -DCSRG_BASED $(PROJECT_DEFINES) - EXTRA_LOAD_FLAGS = --# If the GLUNIX_DEVEL is set --ifneq ($(origin GLUNIX_DEVEL),undefined) -- EXTRA_LDOPTIONS = -g -L/disks/barad-dur/now/glunix/devel/$(USER)/lib/sun4-solaris2.4-tcp -R/disks/barad-dur/now/glunix/devel/$(USER)/lib/sun4-solaris2.4-tcp --else -- EXTRA_LDOPTIONS = -g -L/usr/now/lib -R/usr/now/lib --endif -- EXTRA_LIBRARIES = -lsocket -lnsl -lgen -+ EXTRA_LDOPTIONS = -+ EXTRA_LIBRARIES = -lgnumalloc - TAGS = ctags - -+ PARALLELMFLAGS = -+ - SHAREDCODEDEF = -- SHLIBDEF = -+ SHLIBDEF = -DBSDSHLIB - -- SHLIBLDFLAGS = -G -z text -+ SHLIBLDFLAGS = -Bshareable - -- PICFLAGS = -Kpic -+ PICFLAGS = -fpic - -@@ -137,26 +235,18 @@ - -- PROTO_DEFINES = -+ PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO -+ -+ INSTPGMFLAGS = -s -m 0555 -o bin -g bin - -- INSTPGMFLAGS = -+ INSTBINFLAGS = -m 0555 -o bin -g bin -+ INSTUIDFLAGS = -m 4511 -o root -g bin -+ INSTLIBFLAGS = -m 0444 -o bin -g bin -+ INSTINCFLAGS = -m 0444 -o bin -g bin -+ INSTMANFLAGS = -m 0444 -o bin -g bin -+ INSTDATFLAGS = -m 0444 -o bin -g bin -+ INSTKMEMFLAGS = -m 2555 -o bin -g kmem - -- INSTBINFLAGS = -m 0755 -- INSTUIDFLAGS = -m 4755 -- INSTLIBFLAGS = -m 0644 -- INSTINCFLAGS = -m 0444 -- INSTMANFLAGS = -m 0444 -- INSTDATFLAGS = -m 0444 -- INSTKMEMFLAGS = -g sys -m 2755 -- -- PROJECTROOT = /usr/sww/X11R6 -- -- TOP_INCLUDES = -i$(INCROOT) --# If the GLUNIX_DEVEL is set --ifneq ($(origin GLUNIX_DEVEL),undefined) -- TOP_INCLUDES += -I/disks/barad-dur/now/glunix/devel/$(USER)/glunix/include --else -- TOP_INCLUDES += -I/usr/now/include --endif -+ PROJECTROOT = /usr/X11R6 - -- CDEBUGFLAGS = -O -- CCOPTIONS = -L$(USRLIBDIR) -R$(USRLIBDIR)/sww.r6:$(PROJECTROOT)/motif/lib:$(USRLIBDIR):/usr/lib -+ CDEBUGFLAGS = -O2 -fno-strength-reduce -+ CCOPTIONS = - -@@ -164,3 +254,3 @@ - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) -- CFLAGS = -g $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) -@@ -168,18 +258,26 @@ - LDPOSTLIB = -- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB) -- CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB) -+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) -+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - -- LDLIBS = $(LDPOSTLIB) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) -+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) - -- CCENVSETUP = LD_RUN_PATH=$(USRLIBDIR) -- CCLINK = $(CCENVSETUP) $(CC) -+ CCLINK = $(CC) - -- CXXENVSETUP = LD_RUN_PATH=$(USRLIBDIR) -- CXXLINK = $(CXXENVSETUP) $(CXX) -+ CXXLINK = $(CXX) - - LDSTRIPFLAGS = -x -- LDCOMBINEFLAGS = -r -+ LDCOMBINEFLAGS = -X -r - DEPENDFLAGS = - -- MACROFILE = sun.cf -+# Not sure this belongs here -+ TKLIBDIR = -+ TKINCDIR = -+ TKLIBNAME = -+ TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) -+ TCLLIBDIR = -+ TCLINCDIR = -+ TCLLIBNAME = -+ TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) -+ -+ MACROFILE = NetBSD.cf - RM_CMD = $(RM) -@@ -191,5 +289,5 @@ - -- ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl \ -- $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) \ -- $(EXTRA_ICONFIGFILES) -+ ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES) -+ -+# $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $ - -@@ -197,3 +295,8 @@ - # X Window System Build Parameters and Rules --# $XConsortium: Project.tmpl,v 1.248 95/01/06 19:12:51 gildea Exp $ -+# $TOG: X11.tmpl /main/292 1997/05/20 10:05:59 kaleb $ -+# -+# -+# -+# -+# $XFree86: xc/config/cf/X11.tmpl,v 1.8.2.3 1997/05/21 15:02:13 dawes Exp $ - -@@ -202,11 +305,19 @@ - -- BINDIR = /usr/sww/X11R6/bin -- BUILDINCROOT = $(TOP) -- BUILDINCDIR = $(BUILDINCROOT)/X11 -- BUILDINCTOP = .. -- BUILDLIBDIR = $(TOP)/usrlib -- BUILDLIBTOP = .. -- INCDIR = $(INCROOT)/X11 -- ADMDIR = /usr/adm -+ XTOP = $(TOP) -+ BINDIR = /usr/X11R6/bin -+ BUILDINCROOT = $(TOP)/exports -+ BUILDINCDIR = $(BUILDINCROOT)/include -+ BUILDINCTOP = ../.. -+ BUILDLIBDIR = $(TOP)/exports/lib -+ BUILDLIBTOP = ../.. -+ BUILDBINDIR = $(TOP)/exports/bin -+ BUILDBINTOP = ../.. -+ XBUILDINCROOT = $(XTOP)/exports -+ XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 -+ XBUILDINCTOP = ../../.. -+ XBUILDBINDIR = $(XBUILDINCROOT)/bin -+ INCDIR = $(INCROOT) -+ ADMDIR = /var/log - LIBDIR = $(USRLIBDIR)/X11 -+ TOP_X_INCLUDES = -I. -I../../glunix/include - -@@ -215,2 +326,3 @@ - XDMDIR = $(LIBDIR)/xdm -+ XDMVARDIR = $(VARLIBDIR)/xdm - TWMDIR = $(LIBDIR)/twm -@@ -220,2 +332,5 @@ - PEXAPIDIR = $(LIBDIR)/PEX -+ LBXPROXYDIR = $(LIBDIR)/lbxproxy -+ PROXYMANAGERDIR = $(LIBDIR)/proxymngr -+ XPRINTDIR = $(LIBDIR) - XAPPLOADDIR = $(LIBDIR)/app-defaults -@@ -229,3 +344,5 @@ - -- DOCUTILSRC = $(TOP)/doc/util -+ DOCUTILSRC = $(XTOP)/doc/util -+ CLIENTSRC = $(TOP)/clients -+ DEMOSRC = $(TOP)/demos - XDOCMACROS = $(DOCUTILSRC)/macros.t -@@ -233,10 +350,11 @@ - PROGRAMSRC = $(TOP)/programs -- LIBSRC = $(TOP)/lib -- FONTSRC = $(TOP)/fonts -- INCLUDESRC = $(TOP)/X11 -- SERVERSRC = $(TOP)/programs/Xserver -- CONTRIBSRC = $(TOP)/../contrib -- UNSUPPORTEDSRC = $(TOP)/unsupported -- DOCSRC = $(TOP)/doc -- RGBSRC = $(TOP)/programs/rgb -+ LIBSRC = $(XTOP)/lib -+ FONTSRC = $(XTOP)/fonts -+ INCLUDESRC = $(BUILDINCROOT)/include -+ XINCLUDESRC = $(INCLUDESRC)/X11 -+ SERVERSRC = $(XTOP)/programs/Xserver -+ CONTRIBSRC = $(XTOP)/../contrib -+ UNSUPPORTEDSRC = $(XTOP)/unsupported -+ DOCSRC = $(XTOP)/doc -+ RGBSRC = $(XTOP)/programs/rgb - BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf -@@ -244,4 +362,4 @@ - FONTSERVERSRC = $(PROGRAMSRC)/xfs -- FONTINCSRC = $(TOP)/include/fonts -- EXTINCSRC = $(TOP)/include/extensions -+ FONTINCSRC = $(XTOP)/include/fonts -+ EXTINCSRC = $(XTOP)/include/extensions - TRANSCOMMSRC = $(LIBSRC)/xtrans -@@ -249,7 +367,7 @@ - --# $XConsortium: sunLib.tmpl,v 1.36 94/04/08 19:13:50 rws Exp $ -- --# $XConsortium: sv4Lib.tmpl,v 1.19 93/12/03 10:48:36 kaleb Exp $ -+ XENVLIBDIR = $(USRLIBDIR) -+ CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) - --XMULIBONLY = -lXmu -+# $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $ -+# $XFree86: xc/config/cf/bsdLib.tmpl,v 3.3.2.1 1997/07/27 02:41:03 dawes Exp $ - -@@ -257,3 +375,3 @@ - --SOXLIBREV = 6.0 -+SOXLIBREV = 6.1 - DEPXONLYLIB = -@@ -267,3 +385,3 @@ - --SOXEXTREV = 6.0 -+SOXEXTREV = 6.3 - DEPEXTENSIONLIB = -@@ -278,2 +396,37 @@ - -+ XSSLIBSRC = $(LIBSRC)/Xss -+ -+DEPXSSLIB = $(USRLIBDIR)/libXss.a -+XSSLIB = -lXss -+ -+LINTXSS = $(LINTLIBDIR)/llib-lXss.ln -+ -+ XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -+ -+DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a -+XXF86MISCLIB = -lXxf86misc -+ -+LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln -+ -+ XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -+ -+DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a -+XXF86VMLIB = -lXxf86vm -+ -+LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln -+ -+ XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -+ -+DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a -+XXF86DGALIB = -lXxf86dga -+ -+LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln -+ -+ XDPMSLIBSRC = $(LIBSRC)/Xdpms -+ -+DEPXDPMSLIB = $(USRLIBDIR)/libXdpms.a -+XDPMSLIB = -lXdpms -+ -+LINTXDPMS = $(LINTLIBDIR)/llib-lXdpms.ln -+ - XAUTHSRC = $(LIBSRC)/Xau -@@ -296,3 +449,3 @@ - DEPXMULIB = --XMULIB = -lXmu -+XMULIB = -lXmu $(LDPRELIBS) $(XTOOLONLYLIB) $(XONLYLIB) - -@@ -308,2 +461,10 @@ - -+ XPLIBSRC = $(LIBSRC)/Xp -+ -+SOXPREV = 6.2 -+DEPXPLIB = -+XPLIB = -lXp -+ -+LINTXP = $(LINTLIBDIR)/llib-lXp.ln -+ - TOOLKITSRC = $(LIBSRC)/Xt -@@ -320,5 +481,13 @@ - -+ XALIBSRC = $(LIBSRC)/Xa -+ -+SOXAREV = 1.0 -+DEPXALIB = -+XALIB = -lXa -+ -+LINTXA = $(LINTLIBDIR)/llib-lXa.ln -+ - AWIDGETSRC = $(LIBSRC)/Xaw - --SOXAWREV = 6.0 -+SOXAWREV = 6.1 - DEPXAWLIB = -@@ -328,16 +497,2 @@ - -- XTFSRC = $(TOP)/workInProgress/Xtf -- --DEPXTFLIB = $(USRLIBDIR)/libXtf.a --XTFLIB = -lXtf -- --LINTXTF = $(LINTLIBDIR)/llib-lXtf.ln -- -- FRESCOSRC = $(TOP)/workInProgress/Fresco -- --DEPFRESCOLIB = $(USRLIBDIR)/libFresco.a --FRESCOLIB = -lFresco -- --LINTFRESCO = $(LINTLIBDIR)/llib-lFresco.ln -- - XILIBSRC = $(LIBSRC)/Xi -@@ -352,3 +507,3 @@ - --SOXTESTREV = 6.0 -+SOXTESTREV = 6.1 - DEPXTESTLIB = -@@ -388,3 +543,3 @@ - --SOICEREV = 6.0 -+SOICEREV = 6.3 - DEPICELIB = -@@ -402,2 +557,10 @@ - -+ XKEYSRC = $(LIBSRC)/Xkey -+ -+SOXKEYREV = 6.0 -+DEPXKEYLIB = -+XKEYLIB = -lXkey -+ -+LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln -+ - FSLIBSRC = $(LIBSRC)/FS -@@ -416,2 +579,25 @@ - -+ XPMLIBSRC = $(LIBSRC)/Xpm -+ -+DEPXPMLIB = $(USRLIBDIR)/libXpm.a -+XPMLIB = -lXpm -+ -+LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln -+ -+ XKBFILELIBSRC = $(LIBSRC)/xkbfile -+ -+DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a -+XKBFILELIB = -lxkbfile -+ -+LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln -+ -+ XKBCOMPCMD = xkbcomp -+ -+ XKBUILIBSRC = $(LIBSRC)/xkbui -+ -+DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a -+XKBUILIB = -lxkbui -+ -+LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln -+ - DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) -@@ -421,2 +607,12 @@ - DEPLIBS3 = $(DEPLIBS) -+ DEPLIBS4 = $(DEPLIBS) -+ DEPLIBS5 = $(DEPLIBS) -+ DEPLIBS6 = $(DEPLIBS) -+ DEPLIBS7 = $(DEPLIBS) -+ DEPLIBS8 = $(DEPLIBS) -+ DEPLIBS9 = $(DEPLIBS) -+ DEPLIBS10 = $(DEPLIBS) -+ -+XMULIBONLY = -lXmu -+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - -@@ -424,3 +620,11 @@ - --# ----------------------------------------------------------------------- -+ USRLIBDIRPATH = $(USRLIBDIR) -+ LDPRELIBS = -L../../glunix/lib/%%%PLAT%%% -+ LDPOSTLIBS = -+ TOP_INCLUDES = $(TOP_X_INCLUDES) -+ PROJECT_DEFINES = -+ -+CXXPROJECT_DEFINES = -+ -+# ---------------------------------------------------------------------- - # start of Imakefile -@@ -445,3 +649,3 @@ - --# CONFIGH = -DCONFIGH=\"config/sol23\" -+# CONFIGH = -DCONFIGH=\"config/bsd4.4\" - -@@ -473,3 +677,3 @@ - --LIBCRYPT = -+LIBCRYPT = -lcrypt - -@@ -482,5 +686,3 @@ - --SYSLIBS = $(LIBPOSIX) $(LIBDIRECTENT) $(LIBTERMCAP) $(LIBCURSES) \ -- $(LIBNET) $(LIBINTL) $(LIBSOCKET) $(LIBSUN) $(LIBBSD) $(LIBCPOSIX) \ -- $(LIBINET) $(LIBDIRECT) $(LIBX) $(LIBC_S) $(LIBSQNT) $(LIBCRYPT) -+SYSLIBS = $(LIBPOSIX) $(LIBDIRECTENT) $(LIBTERMCAP) $(LIBCURSES) $(LIBNET) $(LIBINTL) $(LIBSOCKET) $(LIBSUN) $(LIBBSD) $(LIBCPOSIX) $(LIBINET) $(LIBDIRECT) $(LIBX) $(LIBC_S) $(LIBSQNT) $(LIBCRYPT) -lglunix - -@@ -503,3 +705,3 @@ - --CDEBUGFLAGS = -O -+CDEBUGFLAGS = -O2 - -@@ -509,4 +711,3 @@ - INCLUDES = -I. --LDLIBS = -lnsl -lsocket --GLUNIX_LIBS = -lglunix -+LDLIBS = - -@@ -515,37 +716,20 @@ - --SHSRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ -- sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ -- sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ -- sh.set.c sh.time.c sh.char.h sh.dir.h sh.proc.h sh.h \ -- sh.decls.h glob.c glob.h ${SYSSRCS} --SHOBJS= sh.${SUF} sh.dir.${SUF} sh.dol.${SUF} sh.err.${SUF} sh.exec.${SUF} \ -- sh.char.${SUF} sh.exp.${SUF} sh.func.${SUF} sh.glob.${SUF} \ -- sh.hist.${SUF} sh.init.${SUF} sh.lex.${SUF} sh.misc.${SUF} \ -- sh.parse.${SUF} sh.print.${SUF} sh.proc.${SUF} sh.sem.${SUF} \ -- sh.set.${SUF} sh.time.${SUF} glob.${SUF} ${SYSOBJS} -- --TWSRCS= tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \ -- tw.comp.c --TWOBJS= tw.help.${SUF} tw.init.${SUF} tw.parse.${SUF} tw.spell.${SUF} \ -- tw.comp.${SUF} -- --EDSRCS= ed.chared.c ed.decls.h ed.defns.c ed.h ed.init.c ed.inputl.c \ -- ed.refresh.c ed.screen.c ed.xmap.c ed.term.c ed.term.h --EDOBJS= ed.chared.${SUF} ed.refresh.${SUF} ed.screen.${SUF} ed.init.${SUF} \ -- ed.inputl.${SUF} ed.defns.${SUF} ed.xmap.${SUF} ed.term.${SUF} -- --TCSRCS= tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.disc.c \ -- tc.func.c tc.os.c tc.os.h tc.printf.c tc.prompt.c \ -- tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h tc.vers.c tc.wait.h \ -- tc.who.c tc.h --TCOBJS= tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF} tc.defs.${SUF} \ -- tc.disc.${SUF} tc.func.${SUF} tc.os.${SUF} tc.printf.${SUF} \ -- tc.prompt.${SUF} tc.sched.${SUF} tc.sig.${SUF} tc.str.${SUF} \ -- tc.vers.${SUF} tc.who.${SUF} -- --MISCF = Makefile.std Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \ -- WishList config_f.h eight-bit.me glob.3 patchlevel.h \ -- pathnames.h tcsh.man Ported src.desc Imakefile imake.config \ -- README.imake complete.tcsh vmsreadme.txt Makefile.vms termcap.vms \ -- snames.h host.defs gethost.c tcsh.man2html -+SHSRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c sh.set.c sh.time.c sh.char.h sh.dir.h sh.proc.h sh.h sh.decls.h glob.c glob.h ${SYSSRCS} -+ -+SHOBJS= sh.${SUF} sh.dir.${SUF} sh.dol.${SUF} sh.err.${SUF} sh.exec.${SUF} sh.char.${SUF} sh.exp.${SUF} sh.func.${SUF} sh.glob.${SUF} sh.hist.${SUF} sh.init.${SUF} sh.lex.${SUF} sh.misc.${SUF} sh.parse.${SUF} sh.print.${SUF} sh.proc.${SUF} sh.sem.${SUF} sh.set.${SUF} sh.time.${SUF} glob.${SUF} ${SYSOBJS} -+ -+TWSRCS= tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c tw.comp.c -+ -+TWOBJS= tw.help.${SUF} tw.init.${SUF} tw.parse.${SUF} tw.spell.${SUF} tw.comp.${SUF} -+ -+EDSRCS= ed.chared.c ed.decls.h ed.defns.c ed.h ed.init.c ed.inputl.c ed.refresh.c ed.screen.c ed.xmap.c ed.term.c ed.term.h -+ -+EDOBJS= ed.chared.${SUF} ed.refresh.${SUF} ed.screen.${SUF} ed.init.${SUF} ed.inputl.${SUF} ed.defns.${SUF} ed.xmap.${SUF} ed.term.${SUF} -+ -+TCSRCS= tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.disc.c tc.func.c tc.os.c tc.os.h tc.printf.c tc.prompt.c tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h tc.vers.c tc.wait.h tc.who.c tc.h -+ -+TCOBJS= tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF} tc.defs.${SUF} tc.disc.${SUF} tc.func.${SUF} tc.os.${SUF} tc.printf.${SUF} tc.prompt.${SUF} tc.sched.${SUF} tc.sig.${SUF} tc.str.${SUF} tc.vers.${SUF} tc.who.${SUF} -+ -+MISCF = Makefile.std Fixes MAKEDIFFS MAKESHAR NewThings README FAQ WishList config_f.h eight-bit.me glob.3 patchlevel.h pathnames.h tcsh.man Ported src.desc Imakefile imake.config README.imake complete.tcsh vmsreadme.txt Makefile.vms termcap.vms snames.h host.defs gethost.c tcsh.man2html -+ - CONFSRCS=config/[a-z]* -@@ -580,6 +764,4 @@ - @echo '#define _h_tc_const' >> $@ -- ${CC} -E $(INCLUDES) ${DFLAGS} -D_h_tc_const tc.const.c | \ -- grep 'Char STR' | \ -- sed -e 's/Char \([a-zA-Z0-9_]*\)\[\].*/extern Char \1[];/' | \ -- sort >> $@ -+ ${CC} -E $(INCLUDES) ${DFLAGS} -D_h_tc_const tc.const.c | grep 'Char STR' | sed -e 's/Char \([a-zA-Z0-9_]*\)\[\].*/extern Char \1[];/' | sort >> $@ -+ - @echo '#endif /* _h_tc_const */' >> $@ -@@ -587,3 +769,3 @@ - config.h: -- @cp config/sol23 config.h -+ @cp config/bsd4.4 config.h - -@@ -615,4 +797,4 @@ - cp ${CONFSRCS} tcsh-${VERSION}/config -- MAKESHAR -v -n tcsh-${VERSION} tcsh-${VERSION} \ -- tcsh-${VERSION}/?* tcsh-${VERSION}/config/?* -+ MAKESHAR -v -n tcsh-${VERSION} tcsh-${VERSION} tcsh-${VERSION}/?* tcsh-${VERSION}/config/?* -+ - rm -rf tcsh-${VERSION} -@@ -620,3 +802,3 @@ - world: -- make clean ; make depend ; make tcsh ; make install -+ make clean ; make depend ; make glush ; make install - -@@ -639,3 +821,3 @@ - $(RM) $@ -- $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LDLIBS) $(GLUNIX_LIBS) $(ALIB) $(EXTRA_LOAD_FLAGS) -+ $(CXXLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LDLIBS) $(ALIB) $(EXTRA_LOAD_FLAGS) - -@@ -646,3 +828,3 @@ - $(RM) $@ -- $(CCLINK) -o $@ $(LDOPTIONS) gethost.${SUF} $(LDLIBS) $(ALIB) $(EXTRA_LOAD_FLAGS) -+ $(CCLINK) -static -o $@ $(LDOPTIONS) gethost.${SUF} $(LDLIBS) $(ALIB) $(EXTRA_LOAD_FLAGS) - -@@ -651,3 +833,2 @@ - -- - install:: glush -@@ -655,6 +836,3 @@ - # else (set -x; $(MKDIRHIER) $(DESTDIR)$(TCSH_BINDIR)); fi --# -if [ -f $(DESTDIR)$(TCSH_BINDIR)/tcsh ]; then cmp $(DESTDIR)$(TCSH_BINDIR)/tcsh tcsh >/dev/null 2>&1; if [ $$? -ne 0 ]; then $(MV) $(DESTDIR)$(TCSH_BINDIR)/tcsh $(DESTDIR)$(TCSH_BINDIR)/tcsh.bak; fi; fi - # $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) tcsh $(DESTDIR)$(TCSH_BINDIR)/tcsh; --# mv glush ../../bin/sun4-solaris2.4-tcp/ --# cp glush.1 $(MANHOME) - gmake -f Makefile.install install -@@ -664,12 +842,31 @@ - --install.man:: tcsh.man -- @if [ -d $(DESTDIR)$(TCSH_MANDIR) ]; then set +x; \ -- else (set -x; $(MKDIRHIER) $(DESTDIR)$(TCSH_MANDIR)); fi -- -if [ -f $(DESTDIR)$(TCSH_MANDIR)/tcsh.$(MANSUFFIX) ]; then cmp $(DESTDIR)$(TCSH_MANDIR)/tcsh.$(MANSUFFIX) tcsh.man >/dev/null 2>&1; if [ $$? -ne 0 ]; then $(MV) $(DESTDIR)$(TCSH_MANDIR)/tcsh.$(MANSUFFIX) $(DESTDIR)$(TCSH_MANDIR)/tcsh.$(MANSUFFIX).bak; fi; fi -- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) tcsh.man $(DESTDIR)$(TCSH_MANDIR)/tcsh.$(MANSUFFIX); -+all:: tcsh.0 - --depend:: -- $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) -+tcsh.0:: tcsh.man -+ @if [ -f tcsh.man ]; \ -+ then \ -+ cat tcsh.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ -+ cp /tmp/$$$$.man tcsh.0; \ -+ $(RM) /tmp/$$$$.man; \ -+ fi - --# ----------------------------------------------------------------------- -+install.man:: -+# @if [ -d $(DESTDIR)$(TCSH_MANDIR) ]; then set +x; \ -+# else (set -x; $(MKDIRHIER) $(DESTDIR)$(TCSH_MANDIR)); fi -+# -@if [ -f tcsh.0 ]; \ -+# then \ -+# $(INSTALL) -c $(INSTMANFLAGS) tcsh.0 $(DESTDIR)$(TCSH_MANDIR)/tcsh.0; \ -+# fi -+ gmake -f Makefile.install installman -+ -+clean:: -+ $(RM) tcsh.o; -+ -+depend:: .depend -+ -+.depend:: -+ $(RM) $@ -+ $(DEPEND) -f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) > $@ -+ -+# ---------------------------------------------------------------------- - # common rules for all Makefiles - do not edit -@@ -678,3 +875,3 @@ - $(RM) $@ -- $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ -+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ - -@@ -683,3 +880,3 @@ - clean:: -- $(RM_CMD) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* -+ $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut *.core "#"* - -@@ -695,3 +892,5 @@ - --# ----------------------------------------------------------------------- -+man_keywords:: -+ -+# ---------------------------------------------------------------------- - # empty rules for directories that do not have SUBDIRS - do not edit -@@ -713,4 +912,6 @@ - --# ----------------------------------------------------------------------- -+# ---------------------------------------------------------------------- - # dependencies generated by makedepend -+ -+# dependencies are in .depend - diff --git a/parallel/glunix/patches/patch-bg b/parallel/glunix/patches/patch-bg deleted file mode 100644 index f12f088da5f..00000000000 --- a/parallel/glunix/patches/patch-bg +++ /dev/null @@ -1,72 +0,0 @@ -$NetBSD: patch-bg,v 1.4 2005/05/29 14:38:33 wiz Exp $ - ---- 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"; - 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"); - 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"); - } - } - } -@@ -1499,12 +1500,13 @@ sub my_touch { - my(@files) = @_; - my($f); - -- umask 0755; -+ umask 0022; - foreach $f (@files) { - if (!(-e $f)) { - open(TOUCHFD,">$f"); - close(TOUCHFD); - print "Created file $f\n"; -+ system("/usr/sbin/chown glunix:glunix $f"); - } - } - } -@@ -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"; - exit(-2); - } -+ if ($< == 0 && $> != 0) { -+ $> = $<; -+ } - &my_mkdir($gl_dataDir); - &my_touch($gl_machineFile, $gl_groupFile, $gl_aliasFile, - $gl_reservationFile, $gl_lockFile, $gl_logFile); -+ -+ if ($> != $tid) { -+ $> = $tid; -+ } -+ - exit(0); - } - diff --git a/parallel/glunix/patches/patch-bh b/parallel/glunix/patches/patch-bh deleted file mode 100644 index eaa7d07ae90..00000000000 --- a/parallel/glunix/patches/patch-bh +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-bh,v 1.2 2000/07/10 23:54:24 wiz Exp $ - ---- progs/tools/run_glunix_script.pl.orig Wed Nov 5 15:44:28 1997 -+++ progs/tools/run_glunix_script.pl Thu Jun 22 00:31:41 2000 -@@ -6,20 +6,21 @@ - # These machines have to be able to do a root rsh to all other machines in - # the cluster. - @ok_hostnames = ("%%MASTER_HOSTNAME%%"); --@ok_people = ("ghorm", "glunix", "root"); # These people are allowed to -- # modify the production cluster --@dont_notify_people = ("ghorm", "jcoates"); # Don't send mail if these people -- # do things. -+@ok_people = ("glunix", "root"); # These people are allowed to -+ # modify the production cluster -+@dont_notify_people = (); # Don't send mail if these people -+ # do things. - - $root_dir = "%%GLUNIX_DIR%%"; - $data_dir = "%%GLUNIX_DATA_DIR%%"; --$release_dir = "$root_dir/release"; -+$release_dir = "$root_dir"; - $devel_dir = "$root_dir/devel"; - $perl_lib = "%%PERL_LIB_DIR%%"; - $run_glunix_agent = "%%INSTALL_DIR%%/bin/run_glunix_agent"; --$command_master = "u"; # The preferred location of the master -+# The preferred location of the master -+$command_master = "%%MASTER_HOSTNAME%%"; - $mail_cmd = "%%MAIL_PATH%%"; --$admin_email = "glunix-admin\@now.cs"; -+$admin_email = "root"; - $questions_email = "glunix\@now.cs.berkeley.edu"; - $glunix_platform = "%%GLUNIX_PLATFORM%%"; - $rsh_command = "%%RSH_PATH%%"; -@@ -548,8 +549,8 @@ - next; - } - $full_hostname = &expand_hostname($host); -- $ping_str = `/usr/sbin/ping -v $full_hostname 2`; -- if ($ping_str =~ m/$full_hostname.* is alive/) { -+ $ping_str = `/sbin/ping -o $full_hostname`; -+ if ($ping_str =~ m/1 packets transmitted, 1 packets received/) { - push(@alive, $host); - print "$host "; - } else { -@@ -1097,7 +1098,7 @@ - - foreach $pid (keys %children) { - kill(2, $pid); -- print STDERR &expand_hostname(${children{$pid}}), ".CS.Berkeley.EDU: timed out\n"; -+ print STDERR &expand_hostname(${children{$pid}}), ": timed out\n"; - } - } - diff --git a/parallel/glunix/patches/patch-bi b/parallel/glunix/patches/patch-bi deleted file mode 100644 index 6ff34c8b795..00000000000 --- a/parallel/glunix/patches/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-bi,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $ - ---- glunix/src/init/glunix.h.orig Thu Oct 2 12:33:52 1997 -+++ glunix/src/init/glunix.h Thu Apr 9 11:33:20 1998 -@@ -98,4 +98,4 @@ - */ --#define GLUNIX_BIN_DIR "/usr/now/bin" --#define GLUNIX_DATA_DIR "/disks/barad-dur/now/glunix/data" -+#define GLUNIX_BIN_DIR "%%%NOW_ROOT%%%/bin" -+#define GLUNIX_DATA_DIR "%%%NOW_ROOT%%%/data" - diff --git a/parallel/glunix/patches/patch-bj b/parallel/glunix/patches/patch-bj deleted file mode 100644 index 8a2efc99118..00000000000 --- a/parallel/glunix/patches/patch-bj +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-bj,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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) { - DE("dup2(STDIN) failed: %s\n", strerror(errno)); - exit(-1); - } -- -+#ifdef __NetBSD__ -+ if (dup2(pipeFds[1], STDOUT_FILENO) < 0) { -+#else - if (dup2(pipeFds[0], STDOUT_FILENO) < 0) { -+#endif - DE("dup2(STDOUT) failed: %s\n", strerror(errno)); - 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]); -- -+#endif - *pidPtr = pid; -+#ifdef __NetBSD__ -+ *fdPtr = pipeFds[0]; -+#else - *fdPtr = pipeFds[1]; -+#endif - - return True; - } diff --git a/parallel/glunix/patches/patch-bk b/parallel/glunix/patches/patch-bk deleted file mode 100644 index 3d4397b9a06..00000000000 --- a/parallel/glunix/patches/patch-bk +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-bk,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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>) { - 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*//; - @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 deleted file mode 100644 index c068ce1f7c2..00000000000 --- a/parallel/glunix/patches/patch-bl +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bl,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index e1e7a7fd467..00000000000 --- a/parallel/glunix/patches/patch-bm +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-bm,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 deleted file mode 100644 index bc4977675e2..00000000000 --- a/parallel/glunix/patches/patch-bn +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bn,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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-bo b/parallel/glunix/patches/patch-bo deleted file mode 100644 index d3c284e5082..00000000000 --- a/parallel/glunix/patches/patch-bo +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-bo,v 1.2 2000/06/16 23:40:18 wiz Exp $ - ---- progs/glupart/glupart.c.orig Thu Sep 18 17:01:35 1997 -+++ progs/glupart/glupart.c Tue Jun 13 14:44:12 2000 -@@ -1,18 +1,40 @@ - #include <stdio.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <sys/param.h> - #include <netdb.h> - #include <netinet/in.h> - #include <unistd.h> - #include <stdlib.h> - -+#if (defined(BSD) && BSD >= 199306) -+#include <pwd.h> -+#include <grp.h> -+ -+#define userId pwp->pw_uid -+#define groupId grp->gr_gid -+#else - #define userId GLUNIX_ACCOUNT /* This is the glunix account */ - #define groupId GLUNIX_GROUP /* The glunix group */ -+#endif - --#define progPath "/usr/now/bin/glupart_script" -+#define progPath "%%%NOW_ROOT%%%/bin/glupart_script" - - int - main(int argc, char **argv) { -+#if (defined(BSD) && BSD >= 199306) -+ struct passwd *pwp; -+ struct group *grp; -+ -+ if ((pwp = getpwnam("glunix")) == (struct passwd *) NULL) { -+ (void) fprintf(stderr, "Error: can't get uid for `%s'\n", "glunix"); -+ exit(1); -+ } -+ if ((grp = getgrnam("glunix")) == (struct group *) NULL) { -+ (void) fprintf(stderr, "Error: can't get gid for `%s'\n", "glunix"); -+ exit(1); -+ } -+#endif - setegid(groupId); - /* setgid(groupId); */ - seteuid(userId); diff --git a/parallel/glunix/patches/patch-bp b/parallel/glunix/patches/patch-bp deleted file mode 100644 index 9c15dbfafb9..00000000000 --- a/parallel/glunix/patches/patch-bp +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-bp,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $ - ---- progs/glunix/glunix.1~ Thu Mar 27 12:11:28 1997 -+++ progs/glunix/glunix.1 Thu Apr 9 11:40:46 1998 -@@ -10,4 +10,4 @@ - All programs discussed in this overview page are located in the --directory <EM>/usr/now/bin</EM>. They all link with the <EM>libglunix.so</EM> --dynamic library in <EM>/usr/now/lib</EM>. -+directory <EM>%%%NOW_ROOT%%%/bin</EM>. They all link with the <EM>libglunix.so</EM> -+dynamic library in <EM>%%%NOW_ROOT%%%/lib</EM>. - diff --git a/parallel/glunix/patches/patch-bq b/parallel/glunix/patches/patch-bq deleted file mode 100644 index 8db75c26fc2..00000000000 --- a/parallel/glunix/patches/patch-bq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bq,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $ - ---- progs/glurun/glurun-wrapper.pl~ Tue Jul 8 16:04:16 1997 -+++ progs/glurun/glurun-wrapper.pl Thu Apr 9 11:42:57 1998 -@@ -54,5 +54,5 @@ - # helper scripts --$glustat = '/usr/now/bin/glustat'; --$glupart = '/usr/now/bin/glupart_new'; --$glurun = '/usr/now/bin/glurun_orig'; -+$glustat = '%%%NOW_ROOT%%%/bin/glustat'; -+$glupart = '%%%NOW_ROOT%%%/bin/glupart_new'; -+$glurun = '%%%NOW_ROOT%%%/bin/glurun_orig'; - diff --git a/parallel/glunix/patches/patch-br b/parallel/glunix/patches/patch-br deleted file mode 100644 index f6fd243cfee..00000000000 --- a/parallel/glunix/patches/patch-br +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-br,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $ - ---- progs/tools/run_glunix.c~ Wed Sep 17 14:36:56 1997 -+++ progs/tools/run_glunix.c Thu Apr 9 11:48:05 1998 -@@ -7,3 +7,3 @@ - --#define BIN_PATH "/usr/now/bin" -+#define BIN_PATH "%%%NOW_ROOT%%%/bin" - char *newArgv[2] = { "run_glunix_script", NULL }; diff --git a/parallel/glunix/patches/patch-bs b/parallel/glunix/patches/patch-bs deleted file mode 100644 index 58380a999c8..00000000000 --- a/parallel/glunix/patches/patch-bs +++ /dev/null @@ -1,101 +0,0 @@ -$NetBSD: patch-bs,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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 - - /* - * 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 - - /* - * 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 - - /* - * 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 - - /* - * 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 - * you are running. Or set it to 0 if you are not SYSV based - */ --#define SYSVREL 4 -+#define SYSVREL 0 - - /* - * 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) -- */ --#define HAVEUTMPX -- --/* - * UTHOST Does the utmp file have a host field? - */ --#ifdef HAVEUTMPX --# define UTHOST --#else --# undef UTHOST --#endif /* HAVEUTMPX */ -+#define UTHOST - - /* - * DIRENT Your system has <dirent.h> instead of <sys/dir.h> - */ - #define DIRENT -- --/* -- * ECHO_STYLE Optionally change the behavior of the builtin echo -- * BOTH_ECHO: Support both bsd options (-n) and sysv escapes (\nnn) -- * BSD_ECHO: Support only -n -- * SYSV_ECHO: Support only sysv escapes (\nnn) -- * NONE_ECHO: Pure echo. -- */ --#define ECHO_STYLE BSD_ECHO /* BSD options only */ -- - /****************** local defines *********************/ --#ifndef BSDTIMES --# define NEEDgethostname --#endif --/* -- * Shadow passwd file -- */ --#define PW_SHADOW -- --#define SOLARIS2 23 -- - /****************** configurable hacks ****************/ - /* 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 deleted file mode 100644 index 02f97fb5479..00000000000 --- a/parallel/glunix/patches/patch-bt +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bt,v 1.3 2005/05/29 14:38:33 wiz Exp $ - ---- 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 - - /* - * 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 deleted file mode 100644 index 64265115d12..00000000000 --- a/parallel/glunix/patches/patch-bu +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-bu,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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"*/ - - #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 deleted file mode 100644 index 81a7fe01e5b..00000000000 --- a/parallel/glunix/patches/patch-bv +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bv,v 1.4 2005/12/05 20:50:51 rillig Exp $ - ---- progs/glush/sh.sem.c.orig 1995-07-20 20:09:24.000000000 +0200 -+++ progs/glush/sh.sem.c -@@ -50,7 +50,7 @@ - #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 deleted file mode 100644 index abbc7894030..00000000000 --- a/parallel/glunix/patches/patch-bw +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bw,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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) - 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-bx b/parallel/glunix/patches/patch-bx deleted file mode 100644 index 203befabd80..00000000000 --- a/parallel/glunix/patches/patch-bx +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-bx,v 1.1.1.1 1998/10/21 19:59:29 garbled Exp $ - -Use getcwd(3) in preference to getwd(3). - ---- progs/glush/sh.dir.c 1998/10/16 09:42:40 1.1 -+++ progs/glush/sh.dir.c 1998/10/16 09:44:01 -@@ -71,7 +71,7 @@ - static char *emsg = "tcsh: Trying to start from \"%s\"\n"; - - /* Don't believe the login shell home, because it may be a symlink */ -- tcp = (char *) getwd(path); -+ tcp = (char *) getcwd(path, sizeof(path)); - if (tcp == NULL || *tcp == '\0') { - xprintf("tcsh: %s\n", path); - if (hp && *hp) { -@@ -524,7 +524,7 @@ - char *dptr, *ptr; - if (chdir(dptr = short2str(cp)) < 0) - stderror(ERR_SYSTEM, dptr, strerror(errno)); -- else if ((ptr = getwd(ebuf)) && *ptr != '\0') { -+ else if ((ptr = getcwd(ebuf, sizeof(ebuf))) && *ptr != '\0') { - xfree((ptr_t) cp); - cp = Strsave(str2short(ptr)); - return dgoto(cp); diff --git a/parallel/glunix/patches/patch-by b/parallel/glunix/patches/patch-by deleted file mode 100644 index 3387bc8f3c1..00000000000 --- a/parallel/glunix/patches/patch-by +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index e2e72e4519b..00000000000 --- a/parallel/glunix/patches/patch-bz +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 2ca371dc901..00000000000 --- a/parallel/glunix/patches/patch-ca +++ /dev/null @@ -1,25 +0,0 @@ -$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 deleted file mode 100644 index d9337c673ac..00000000000 --- a/parallel/glunix/patches/patch-cb +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-cb,v 1.2 2005/05/29 14:38:33 wiz Exp $ - ---- 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); -- 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 deleted file mode 100644 index b60c542e74a..00000000000 --- a/parallel/glunix/patches/patch-cc +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 7dd63d47bf0..00000000000 --- a/parallel/glunix/patches/patch-cd +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 44eb8e81a5d..00000000000 --- a/parallel/glunix/patches/patch-ce +++ /dev/null @@ -1,13 +0,0 @@ -$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/patches/patch-cf b/parallel/glunix/patches/patch-cf deleted file mode 100644 index a770597f35c..00000000000 --- a/parallel/glunix/patches/patch-cf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2000/06/16 23:40:18 wiz Exp $ - ---- glunix/src/perf/cperf_collector.h.orig Fri Sep 5 21:30:06 1997 -+++ glunix/src/perf/cperf_collector.h Sat Jun 17 01:13:40 2000 -@@ -87,7 +87,7 @@ - int numExpected); - ~Perf_Collector(void); - -- CollectTicket(timeval *endTime); -+ int CollectTicket(timeval *endTime); - - private: - Bool enabled; diff --git a/parallel/glunix/patches/patch-cg b/parallel/glunix/patches/patch-cg deleted file mode 100644 index 9a175ecf53b..00000000000 --- a/parallel/glunix/patches/patch-cg +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cg,v 1.1 2003/03/31 03:46:30 jmc Exp $ - ---- progs/tools/mhtml2html.pl.orig Sun Mar 30 22:00:17 2003 -+++ progs/tools/mhtml2html.pl Sun Mar 30 22:00:21 2003 -@@ -68,7 +68,7 @@ - # print "Line cache is: \"$line_cache\"\n"; - - # $line_cache =~ s/^\s+//; -- undef $1; -+# undef $1; - # First yank the next token out of the line_cache - $char = substr($line_cache, 0, 1); - if ($char eq "<") { diff --git a/parallel/glunix/patches/patch-ch b/parallel/glunix/patches/patch-ch deleted file mode 100644 index aabde402e0d..00000000000 --- a/parallel/glunix/patches/patch-ch +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 8550d636a71..00000000000 --- a/parallel/glunix/patches/patch-ci +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 9549ca5b86f..00000000000 --- a/parallel/glunix/patches/patch-cj +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 89b3d72cf79..00000000000 --- a/parallel/glunix/patches/patch-ck +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 2d9fc3a9650..00000000000 --- a/parallel/glunix/patches/patch-cl +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 6bf7e44f8ba..00000000000 --- a/parallel/glunix/patches/patch-cm +++ /dev/null @@ -1,21 +0,0 @@ -$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 deleted file mode 100644 index 2962feb6ed9..00000000000 --- a/parallel/glunix/patches/patch-cn +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index fc318f5ea84..00000000000 --- a/parallel/glunix/patches/patch-co +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index a17559b2b92..00000000000 --- a/parallel/glunix/patches/patch-cp +++ /dev/null @@ -1,21 +0,0 @@ -$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 deleted file mode 100644 index 3b148e4347c..00000000000 --- a/parallel/glunix/patches/patch-cq +++ /dev/null @@ -1,21 +0,0 @@ -$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 deleted file mode 100644 index 202a43d6366..00000000000 --- a/parallel/glunix/patches/patch-cr +++ /dev/null @@ -1,16 +0,0 @@ -$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 deleted file mode 100644 index 87f70aa4161..00000000000 --- a/parallel/glunix/patches/patch-cs +++ /dev/null @@ -1,31 +0,0 @@ -$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 deleted file mode 100644 index 31929f8fcee..00000000000 --- a/parallel/glunix/patches/patch-cu +++ /dev/null @@ -1,10 +0,0 @@ -$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> |