head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.94 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.92 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.90 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.88 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.86 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.84 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.82 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.80 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.78 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.76 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.74 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.72 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.70 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.68 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.66 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.64 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.62 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.60 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.58 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.56 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.54 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.52 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.50 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.46 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.26 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.48 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.44 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.42 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.40 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.38 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.36 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.34 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.32 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.30 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.28 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.24 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.22 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.20 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.18 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.16 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.14 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.12 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.10 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.8 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.6 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.4 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.2 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.5.0.26 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.24 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.22 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.20 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.18 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.16 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.14 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.12 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.10 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.8 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.6 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.4 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.2 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.4.0.44 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.42 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.40 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.38 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.36 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.34 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.32 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.30 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.28 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.26 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.24 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.22 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.20 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.18 pkgsrc-2008Q1:1.4.0.16 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.14 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.12 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.10 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.8 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.6 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.4 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.2 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.3.0.18 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.16 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.14 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.12 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.10 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.8 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.6 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.8 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.4 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.6 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.2 pkgviews-base:1.2 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.6 date 2014.09.25.12.25.07; author jperkin; state Exp; branches; next 1.5; commitid SqXEbtMKQ6SsXIRx; 1.5 date 2011.05.25.06.11.46; author obache; state Exp; branches; next 1.4; 1.4 date 2006.04.21.09.00.23; author joerg; state Exp; branches; next 1.3; 1.3 date 2004.02.18.23.09.03; author kristerw; state Exp; branches; next 1.2; 1.2 date 2002.07.17.18.22.24; author wiz; state Exp; branches; next 1.1; 1.1 date 98.11.05.08.24.12; author garbled; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.11.05.08.24.12; author garbled; state Exp; branches; next ; desc @@ 1.6 log @Fix build on SunOS. Make it more likely that other OPSYS can build this package too. @ text @$NetBSD: patch-aa,v 1.5 2011/05/25 06:11:46 obache Exp $ --- Makefile.orig 1998-07-14 13:41:40.000000000 +0000 +++ Makefile @@@@ -3,8 +3,8 @@@@ #BinInstallPath=$(ARCH)/ #LibInstallPath=images/ -BinInstallPath=/usr/X11R6/bin/ -LibInstallPath=/usr/lib/Wormz/ +BinInstallPath=$(PREFIX)/bin/ +LibInstallPath=$(PREFIX)/share/Wormz/ #AllDepths=16 AllDepths=8 16 24 @@@@ -18,9 +18,9 @@@@ ifndef TYPEOS TYPEOS=$(shell uname) endif -ifeq ($(TYPEOS),Solaris) -ARCH=Solaris -EXTRALIBS=-lsocket -lnsl -lm -lstdc++ -lucb -lposix4 +ifeq ($(TYPEOS),SunOS) +ARCH=SunOS +EXTRALIBS=-lsocket -lnsl -lm else ifeq ($(TYPEOS),IRIX) ARCH=Irix @@@@ -29,13 +29,23 @@@@ else ifeq ($(TYPEOS),Linux) ARCH=Linux EXTRALIBS=-lm +else +ifeq ($(TYPEOS),NetBSD) +ARCH=NetBSD +EXTRALIBS=-lm +else +ifeq ($(TYPEOS),DragonFly) +ARCH=DragonFly +EXTRALIBS=-lm +else #!!! #EXTRALIBS=-lefence -else endif endif endif +endif +endif ifdef USE_GGI EXTRAGGILIBS=-lggi -lt1 @@@@ -43,11 +53,11 @@@@ endif ifdef ARCH -INSTALL=install -INSTALLBIN=install -s +INSTALL=install -c +INSTALLBIN=install -c -s INSTALLDIR=install -d -CC=gcc +#CC=gcc CDEFS=-D$(ARCH) -DARCHDIR=\"$(ARCHDIR)\" -DColorDepth=$(Depth) OPTFLAGS=-O2 @@@@ -60,8 +70,8 @@@@ WARNFLAGS=-Wall -Wcast-qual -Wcast-align #-lefence CFLAGS=-pipe $(INCLUDE) $(OPTFLAGS) $(DEBUGFLAGS) $(WARNFLAGS) $(CDEFS) #-Wshadow -X11INCLUDE=-I/usr/openwin/share/include/ -STDINCLUDE=-I/usr/local/lib/g++-include/ -I/usr/include/g++/ +X11INCLUDE=-I${X11BASE}/include +STDINCLUDE= INCLUDE=-I./include -I. $(X11INCLUDE) $(STDINCLUDE) @@@@ -108,7 +118,7 @@@@ ObjsClientND=$(addprefix $(OBJDIR),$(Obj SrcsClient=$(SrcsClientND) $(SrcsClientDD) ObjsClient=$(ObjsClientND) $(ObjsClientDD) -LibsClient=-L/usr/X11R6/lib/ -L/usr/local/lib/ -lX11 -lXext $(EXTRALIBS) $(EXTRAGGILIBS) +LibsClient=${LDFLAGS} -L${X11BASE}/lib -lX11 -lXext $(EXTRALIBS) $(EXTRAGGILIBS) SrcsServer=$(foreach dir,$(DirsServer),$(wildcard $(dir)/*.cc)) SrcsServerNotDir=$(notdir $(SrcsServer)) @@@@ -120,7 +130,7 @@@@ SrcsRunner=$(foreach dir,$(DirsRunner),$ SrcsRunnerNotDir=$(notdir $(SrcsRunner)) ObjsRunnerNotDir=$(SrcsRunnerNotDir:.cc=.o) ObjsRunner=$(addprefix $(OBJDIR),$(ObjsRunnerNotDir)) -LibsRunner=-L/usr/X11R6/lib/ -L/usr/local/lib/ -lX11 +LibsRunner=${LDFLAGS} -L${LOCALBASE}/lib -L${PREFIX}/lib/ -lX11 AllDSrcs=$(foreach dir,$(DepthDepenceDirs),$(wildcard $(dir)/*.cc)) AllNSrcs=$(foreach dir,$(NotDepthDepenceDirs),$(wildcard $(dir)/*.cc)) @@@@ -130,10 +140,10 @@@@ vpath %.o $(OBJDIR) $(OBJDIR)%$(Depth).o: %.cc - $(CC) $(CFLAGS) -c $< -o $@@ + $(CXX) $(CFLAGS) -c $< -o $@@ $(OBJDIR)%.o: %.cc - $(CC) $(CFLAGS) -c $< -o $@@ + $(CXX) $(CFLAGS) -c $< -o $@@ DEPEND=$(OBJDIR).depend @@@@ -147,9 +157,9 @@@@ depend: Create-PathConfig Depth=xxx $(MAKE) real-depend real-depend: - $(CC) $(CFLAGS) -MM $(AllNSrcs) | \ + $(CXX) $(CFLAGS) -MM $(AllNSrcs) | \ awk '/^[^ ]/ { print "$(OBJDIR)" $$0 } /^ / { print $$0 }' > $(DEPEND) - $(CC) $(CFLAGS) -MM $(AllDSrcs) | \ + $(CXX) $(CFLAGS) -MM $(AllDSrcs) | \ awk '/^[^ ]/ { print "$(OBJDIR)" $$0 } /^ / { print $$0 }' > .deptmp for i in $(AllDepths); do \ sed s/\\\.o/$$i\\\.o/g < .deptmp >> $(DEPEND) ; done @@@@ -160,13 +170,13 @@@@ clean: rm -f `find . -name \*~` $(TargetClient): $(ObjsClient) - $(CC) $(CFLAGS) -o $(TargetClient) $(LibsClient) $(ObjsClient) + $(CXX) $(CFLAGS) -o $(TargetClient) $(LibsClient) $(ObjsClient) $(TargetRunner): $(ObjsRunner) - $(CC) $(CFLAGS) -o $(TargetRunner) $(LibsRunner) $(ObjsRunner) + $(CXX) $(CFLAGS) -o $(TargetRunner) $(LibsRunner) $(ObjsRunner) $(TargetServer): $(ObjsServer) - $(CC) $(CFLAGS) -o $(TargetServer) $(LibsServer) $(ObjsServer) + $(CXX) $(CFLAGS) -o $(TargetServer) $(LibsServer) $(ObjsServer) Client-target: $(TargetClient) @@@@ -178,22 +188,22 @@@@ PathConfig=include/PathConfig.hh Create-PathConfig: echo '#ifndef _PathConfig_hh_' > $(PathConfig) echo '#define _PathConfig_hh_' >> $(PathConfig) - echo '#define ClientBinInstallPath "$(LibInstallPath)$(TargetNameClient)"' >> $(PathConfig) + echo '#define ClientBinInstallPath "$(BinInstallPath)$(TargetNameClient)"' >> $(PathConfig) echo '#define ServerBinInstallPath "$(BinInstallPath)$(TargetNameServer)"' >> $(PathConfig) echo '#define LibInstallPath "$(LibInstallPath)"' >> $(PathConfig) echo '#define '$(DEF_USE_GGI) >> $(PathConfig) echo '#endif' >> $(PathConfig) install-client2: - $(INSTALLBIN) $(TargetClient) $(LibInstallPath)$(TargetNameClient) + $(INSTALLBIN) $(TargetClient) $(DESTDIR)$(BinInstallPath)$(TargetNameClient) install: all - $(INSTALLDIR) $(BinInstallPath) - $(INSTALLDIR) $(LibInstallPath) - $(INSTALLBIN) $(TargetRunner) $(BinInstallPath)$(TargetNameRunner) - $(INSTALLBIN) $(TargetServer) $(BinInstallPath)$(TargetNameServer) + $(INSTALLDIR) $(DESTDIR)$(BinInstallPath) + $(INSTALLDIR) $(DESTDIR)$(LibInstallPath) + $(INSTALLBIN) $(TargetRunner) $(DESTDIR)$(BinInstallPath)$(TargetNameRunner) + $(INSTALLBIN) $(TargetServer) $(DESTDIR)$(BinInstallPath)$(TargetNameServer) for i in $(AllDepths); do Depth=$$i $(MAKE) install-client2 ; done - $(INSTALL) images/* $(LibInstallPath) + $(INSTALL) images/* $(DESTDIR)$(LibInstallPath) include $(DEPEND) @ 1.5 log @* set LICENSE=gnu-gpl-v2. * add user-destdir installation support. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2006/04/21 09:00:23 joerg Exp $ d16 13 @ 1.4 log @Add DragonFly. Fix GCC 3.4+ issues in C++. @ text @d1 1 a1 1 $NetBSD$ d127 1 a127 1 @@@@ -178,14 +188,14 @@@@ PathConfig=include/PathConfig.hh d140 1 a140 1 + $(INSTALLBIN) $(TargetClient) $(BinInstallPath)$(TargetNameClient) d143 14 a156 1 $(INSTALLDIR) $(BinInstallPath) @ 1.3 log @Make this package compile when using gcc 3.3. @ text @d3 2 a4 2 --- Makefile.orig Tue Jul 14 15:41:40 1998 +++ Makefile Wed Feb 18 22:53:19 2004 d16 1 a16 1 @@@@ -29,13 +29,18 @@@@ d25 4 d37 1 d41 1 a41 1 @@@@ -43,11 +48,11 @@@@ d56 1 a56 1 @@@@ -60,8 +65,8 @@@@ d67 1 a67 1 @@@@ -108,7 +113,7 @@@@ d76 1 a76 1 @@@@ -120,7 +125,7 @@@@ d85 1 a85 1 @@@@ -130,10 +135,10 @@@@ d98 1 a98 1 @@@@ -147,9 +152,9 @@@@ d110 1 a110 1 @@@@ -160,13 +165,13 @@@@ d127 1 a127 1 @@@@ -178,14 +183,14 @@@@ @ 1.2 log @Give this a chance of working on xpkgwedged systems. Not on 1.6 or -current, though, since it has C++ bugs that need fixing. @ text @d1 4 a4 3 $NetBSD: patch-aa,v 1.1.1.1 1998/11/05 08:24:12 garbled Exp $ --- Makefile.orig Tue Jul 14 06:41:40 1998 +++ Makefile Wed Nov 4 21:36:13 1998 d36 1 a36 1 @@@@ -43,8 +48,8 @@@@ d46 5 a50 1 CC=gcc d80 42 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d52 2 a53 2 +X11INCLUDE=-I${PREFIX}/include +STDINCLUDE=-I${LOCALBASE}/include d62 1 a62 1 +LibsClient=${LDFLAGS} -L${LOCALBASE}/lib -L${PREFIX}/lib -lX11 -lXext $(EXTRALIBS) $(EXTRAGGILIBS) @ 1.1.1.1 log @Initial import of wormz-1.0b5: a networked game for X11 @ text @@