head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.10 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.8 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.6 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.4 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.2 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.2.0.40 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.38 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.36 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.34 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.32 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.30 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.28 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.26 pkgsrc-2008Q1:1.2.0.24 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.22 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.20 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.18 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.16 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.14 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.1.1.0.20 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.18 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.16 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 comdex-fall-1999:1.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 netbsd-1-4-RELEASE:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2009.11.26.17.04.18; author joerg; state dead; branches; next 1.2; 1.2 date 2005.05.29.14.38.33; author wiz; state Exp; branches; next 1.1; 1.1 date 98.10.21.19.59.30; author garbled; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.10.21.19.59.30; author garbled; state Exp; branches; next ; desc @@ 1.3 log @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. @ text @$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) @ 1.2 log @Make build, install and deinstall on NetBSD-2.0/i386. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- glunix/src/Makefile.orig Wed Nov 5 15:30:39 1997 +++ glunix/src/Makefile Mon Oct 12 21:31:58 1998 d14 1 a14 1 @@@@ -50,6 +50,11 @@@@ d26 1 a26 1 @@@@ -59,11 +64,8 @@@@ d40 1 a40 1 @@@@ -71,34 +73,43 @@@@ d54 1 d87 2 a88 2 + echo $(CC) -fpic -DPIC -c $(CFLAGS) $(CPPFLAGS) $< -o $@@ ; \ + $(CC) -fpic -DPIC -c $(CFLAGS) $(CPPFLAGS) $< -o $@@ ; \ d92 8 a99 2 echo $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@@ ; \ @@@@ -136,6 +147,7 @@@@ d107 1 a107 1 @@@@ -143,7 +155,7 @@@@ d116 1 a116 1 @@@@ -155,9 +167,9 @@@@ d128 1 a128 1 @@@@ -165,30 +177,32 @@@@ d134 2 a135 2 + echo $(PURIFY_COMMAND) $(CC) -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS) ; \ + $(PURIFY_COMMAND) $(CC) -o $(OBJDIR)/master $(MOBJS) $(MLDLIBS); \ d144 2 a145 2 + echo $(PURIFY_COMMAND) $(CC) -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS) ; \ + $(PURIFY_COMMAND) $(CC) -o $(OBJDIR)/daemon $(DOBJS) $(DLDLIBS); \ a170 9 @@@@ -202,7 +216,7 @@@@ echo Rebuilding dependencies.; \ touch $@@.new; \ echo makedepend -f$@@ -p$(OBJDIR)/ -- $(CFLAGS) -- ... ; \ - makedepend -f$@@.new -w256 -p$(OBJDIR)/ -- $(CFLAGS) -- $(DEPEND_SRC) ;\ + ../../makedepend/makedepend -f$@@.new -w256 -p$(OBJDIR)/ -- $(CFLAGS) -- $(DEPEND_SRC) ;\ cat $@@.new | sed -e 's,/usr/include[^ ]*,,g' | sed -e 's,[^:]*: *$$,,' | sed -e 's,$(OBJDIR)/[^/]*,$(OBJDIR),' | uniq >$@@ ; \ rm -f $@@.new.bak $@@.new ; \ echo " " ; \ @ 1.1.1.1 log @Initial import of glunix-1.0a Thanks to Ross for all the help, and Alistair for fixing some brain damage. A Global Layer Unix for NOW. (Network Of Workstations) @ text @@