head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.184
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.182
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.180
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.178
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.176
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.174
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.172
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.170
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.168
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.166
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.164
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.162
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.160
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.158
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.156
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.154
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.152
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.150
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.148
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.146
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.144
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.142
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.140
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.136
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.116
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.138
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.134
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.132
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.130
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.128
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.126
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.124
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.122
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.120
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.118
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.114
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.112
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.110
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.108
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.106
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.104
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.102
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.100
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.3.0.98
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.96
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.3.0.94
	pkgsrc-2014Q4-base:1.3
	pkgsrc-2014Q3:1.3.0.92
	pkgsrc-2014Q3-base:1.3
	pkgsrc-2014Q2:1.3.0.90
	pkgsrc-2014Q2-base:1.3
	pkgsrc-2014Q1:1.3.0.88
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.86
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.3.0.84
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.82
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.80
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.78
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.76
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.74
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.72
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.70
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.68
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.66
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.64
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.62
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.60
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.58
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.56
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.54
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.52
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.50
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.48
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.46
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.44
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.42
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.40
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.38
	pkgsrc-2008Q1:1.3.0.36
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.34
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.32
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.30
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.28
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.26
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.24
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.22
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.20
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.18
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.16
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.14
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.12
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.10
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.8
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.6
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.4
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3
	netbsd-1-6-1:1.2.0.6
	netbsd-1-6-1-base:1.2
	netbsd-1-6:1.2.0.8
	netbsd-1-6-RELEASE-base:1.2
	pkgviews:1.2.0.4
	pkgviews-base:1.2
	buildlink2:1.2.0.2
	buildlink2-base:1.2
	netbsd-1-5-PATCH003:1.2;
locks; strict;
comment	@# @;


1.3
date	2003.11.06.16.22.28;	author agc;	state Exp;
branches;
next	1.2;

1.2
date	2002.03.20.01.52.31;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	2002.03.20.01.49.24;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Let this package build and install in the presence of xpkgwedge.
@
text
@$NetBSD: patch-ab,v 1.2 2002/03/20 01:52:31 wiz Exp $

--- Imakefile.orig	1998-08-18 10:51:04.000000000 +0100
+++ Imakefile	2003-11-06 16:14:00.000000000 +0000
@@@@ -4,7 +4,7 @@@@
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 
 #undef XDMDIR
-XDMDIR=$(X11BASE)/share/xdm3d
+XDMDIR=$(PREFIX)/share/xdm3d
 
 #ifndef BuildChooser
 #define BuildChooser !SystemV
@@@@ -135,7 +135,7 @@@@
         SUBDIRS = $(GREET_DIR) $(XDMCONFIGDIR)
 
 INCLUDES = $(KRB5_INCLUDE)
-DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) $(DEPXAUTHLIB) $(DEPXDMCPLIB)
+DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
 LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB) $(XAUTHLIB) $(XDMCPLIB) $(RPCLIB) $(DLLIBRARY) $(CRYPT_LIBRARIES)
 
           SRCS1 = auth.c daemon.c server.c dpylist.c dm.c error.c file.c \
@@@@ -155,7 +155,7 @@@@
 #if BuildChooser
           SRCS3 = chooser.c
           OBJS3 = chooser.o
-       DEPLIBS3 = XawClientDepLibs XkbClientDepLibs $(DEPXDMCPLIB)
+       DEPLIBS3 = XawClientDepLibs XkbClientDepLibs
           LIBS3 = XawClientLibs XkbClientLibs $(XDMCPLIB)
 #endif
        
@@@@ -202,18 +202,18 @@@@
 XCOMM
 XCOMM Do NOT change these lines!
 XCOMM
-DEF_SERVER = $(BINDIR)/X
+DEF_SERVER = $(X11BASE)/bin/X
 DEF_USER_PATH = DefaultUserPath		/* no leading spaces or imake will */
 DEF_SYSTEM_PATH = DefaultSystemPath	/* indent as rule */
 BOURNE_SHELL = DefaultSystemShell
 #ifndef OS2Architecture
 RES_DEFINES = '-DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0"' \
-		  '-DXRDB_PROGRAM="$(BINDIR)/xrdb"' \
-		  '-DDEF_SESSION="$(BINDIR)/xterm -ls"' \
+		  '-DXRDB_PROGRAM="$(X11BASE)/bin/xrdb"' \
+		  '-DDEF_SESSION="$(X11BASE)/bin/xterm -ls"' \
 		  '-DDEF_USER_PATH="$(DEF_USER_PATH)"' \
 		  '-DDEF_SYSTEM_PATH="$(DEF_SYSTEM_PATH)"' \
 		  '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
-		  '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
+		  '-DDEF_FAILSAFE_CLIENT="$(X11BASE)/bin/xterm"' \
 		  '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
 		  '-DDEF_CHOOSER="$(XDMDIR)/chooser"' \
 		  '-DDEF_AUTH_DIR="$(XDMDIR)"' \
@


1.2
log
@Add RCS ids to patch-ac and patch-ab.
New patch-ad fixes problem with unset loginmoveInterval resource,
reported (including patch) by Robert Elz in pkg/15040.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- Imakefile.orig	Tue Aug 18 16:51:04 1998
+++ Imakefile	Sun Dec 23 11:46:41 2001
d14 18
@


1.1
log
@xpkgwedge fixes from Robert Elz, pkg/15041.
@
text
@d1 2
@