head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.54 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.52 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.50 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.48 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.46 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.44 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.42 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.40 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.38 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.36 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.34 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.32 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.30 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.28 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.26 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.24 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.22 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.20 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.18 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.16 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.14 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.12 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.10 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.8 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.6 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 buildlink2-base:1.5 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2000.12.12.02.11.35; author wiz; state dead; branches; next 1.4; 1.4 date 2000.10.02.08.05.11; author jlam; state Exp; branches; next 1.3; 1.3 date 2000.10.02.08.01.13; author jlam; state Exp; branches; next 1.2; 1.2 date 99.07.21.04.17.50; author mrg; state Exp; branches; next 1.1; 1.1 date 99.06.19.14.36.58; author mrg; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.06.19.14.36.58; author mrg; state Exp; branches; next ; desc @@ 1.5 log @Added wm category to main Makefile; remove packages that have been moved from x11 to wm; fix paths in packages that depend on the moved ones. @ text @$NetBSD: patch-aa,v 1.4 2000/10/02 08:05:11 jlam Exp $ --- Imakefile.orig Thu Feb 2 19:25:44 1995 +++ Imakefile @@@@ -51,12 +51,12 @@@@ XCOMM XCOMM XCOMM Also note, if you install your libXpm.a in a strange place, you'll -XCOMM have to adjust $(XPMLIB) below. You may also have to change the +XCOMM have to adjust $(XPM_LIB) below. You may also have to change the XCOMM include path of the compile, so that the code can include from XCOMM . XCOMM - XPMLIB = -lXpm + XPM_LIB = -lXpm XPM_DEF = -DXPM XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\" @@@@ -71,7 +71,7 @@@@ XCOMM Various defines to pass into twm.c -#if DefaultToM4 +#ifdef DefaultToM4 M4_DEF = -DM4_DEFAULT #endif #ifdef No_waitpid @@@@ -79,7 +79,7 @@@@ #endif TWM_DEFS = $(XLOADIM_DEF) $(M4_DEF) $(WAITPID_DEF) -LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XPMLIB) $(XLIB) +LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XPM_LIB) $(XLIB) LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB) DEFINES = -DSHAPE $(RELEASE_DEFINES) $(LOCAL_DEFINES) $(SIGNAL_DEFINES) @@@@ -93,14 +93,15 @@@@ iconmgr.o cursor.o icons.o vdt.o move.o LocPixmap.o \ regexp.o -AllTarget(tvtwm ssetroot) +AllTarget(tvtwm ssetroot system.tvtwmrc) -SpecialObjectRule(parse.o,NullParameter,'-DSYSTEM_INIT_FILE="'$(TWMDIR)'/system.twmrc"') +SpecialObjectRule(parse.o,NullParameter,'-DSYSTEM_INIT_FILE="'$(TWMDIR)'/system.tvtwmrc"') SpecialObjectRule(vdt.o,NullParameter,$(XLOADIM_DEF)) -SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/bitmaps"') +SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/X11/bitmaps"') SpecialObjectRule(twm.o,NullParameter,$(TWM_DEFS)) -#if defined(UltrixArchitecture) || defined(AlphaArchitecture) +/* The following rule is only applicable to a specific compiler on Ultrix. */ +#if defined(UltrixArchitecture) SpecialObjectRule(menus.o,NullParameter,-Olimit 700) #endif @@@@ -120,11 +121,12 @@@@ XCOMM ln $(BINDIR)/tvtwm $(BINDIR)/twm #if (ProjectX < 5) -InstallNonExec(system.twmrc,$(TWMDIR)) +InstallNonExec(system.tvtwmrc,$(TWMDIR)) /* InstallProgram(ssetroot,$(BINDIR)/xsetroot) */ #else -InstallNonExecFile(system.twmrc,$(TWMDIR)) -/* InstallNamedProg(ssetroot,xsetroot,$(BINDIR)) */ +InstallNonExecFile(system.tvtwmrc,$(TWMDIR)) +/* Install ssetroot as ssetroot so we don't overwrite the real xsetroot */ +InstallNamedProg(ssetroot,ssetroot,$(BINDIR)) #endif gram.h gram.c: gram.y @@@@ -135,7 +137,10 @@@@ clean:: $(RM) y.tab.h y.tab.c lex.yy.c gram.h gram.c lex.c deftwmrc.c -deftwmrc.c: system.twmrc +system.tvtwmrc: system.twmrc + cp system.twmrc system.tvtwmrc + +deftwmrc.c: system.tvtwmrc $(RM) $@@ @@echo '/* ' >>$@@ @@echo ' * This file is generated automatically from the default' >>$@@ @ 1.4 log @Don't pass Ultrix C compiler flags to gcc on NetBSD/alpha. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Consolidate patches of same file into one patch @ text @d38 1 a38 1 @@@@ -93,11 +93,11 @@@@ d52 7 a58 2 #if defined(UltrixArchitecture) || defined(AlphaArchitecture) @@@@ -120,11 +120,12 @@@@ d74 1 a74 1 @@@@ -135,7 +136,10 @@@@ @ 1.2 log @install ssetroot as ssetroot so we do not overwrite the real xsetroot @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 1999/06/19 14:36:58 mrg Exp $ d3 36 a38 3 --- Imakefile.orig Fri Feb 3 11:25:44 1995 +++ Imakefile Sun Jun 20 00:19:00 1999 @@@@ -93,9 +93,9 @@@@ d48 2 a49 1 SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/bitmaps"') d51 3 a53 1 @@@@ -120,11 +120,11 @@@@ d64 1 d69 1 a69 1 @@@@ -135,7 +135,10 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d28 1 a28 1 +InstallNamedProg(ssetroot,xsetroot,$(BINDIR)) @ 1.1.1.1 log @tvtwm patch11, another virtual window hack upon twm. @ text @@