diff options
| author | wiz <wiz> | 2002-03-20 01:49:23 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-03-20 01:49:23 +0000 |
| commit | 9dee5b7aae419495c2d0709213012eb7682e6886 (patch) | |
| tree | d8b6cf106f8e0182d90ac77bb99500f8a912c3e6 /x11 | |
| parent | 9148a63e8b1959d42f2ad5f34567cbcffe96328b (diff) | |
| download | pkgsrc-9dee5b7aae419495c2d0709213012eb7682e6886.tar.gz | |
xpkgwedge fixes from Robert Elz, pkg/15041.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xdm3d/distinfo | 4 | ||||
| -rw-r--r-- | x11/xdm3d/patches/patch-ab | 34 | ||||
| -rw-r--r-- | x11/xdm3d/patches/patch-ac | 11 |
3 files changed, 48 insertions, 1 deletions
diff --git a/x11/xdm3d/distinfo b/x11/xdm3d/distinfo index 40d3391cab9..c1b8ad85f8c 100644 --- a/x11/xdm3d/distinfo +++ b/x11/xdm3d/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:07:52 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/03/20 01:49:23 wiz Exp $ SHA1 (xdm3d-1.0.tar.gz) = 494a33aefee0c1545331b657bf47b90634b69648 Size (xdm3d-1.0.tar.gz) = 157858 bytes SHA1 (patch-aa) = 4a86a37ad238e502352346fa86090b7578d862ee +SHA1 (patch-ab) = 4e61db30ef609a194629482355e91858803698ca +SHA1 (patch-ac) = a9a2ea520168d18e8178ef12010be72a2b8d3727 diff --git a/x11/xdm3d/patches/patch-ab b/x11/xdm3d/patches/patch-ab new file mode 100644 index 00000000000..0517455987e --- /dev/null +++ b/x11/xdm3d/patches/patch-ab @@ -0,0 +1,34 @@ +--- Imakefile.orig Tue Aug 18 16:51:04 1998 ++++ Imakefile Sun Dec 23 11:46:41 2001 +@@ -4,7 +4,7 @@ + #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' + + #undef XDMDIR +-XDMDIR=$(X11BASE)/share/xdm3d ++XDMDIR=$(PREFIX)/share/xdm3d + + #ifndef BuildChooser + #define BuildChooser !SystemV +@@ -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)"' \ diff --git a/x11/xdm3d/patches/patch-ac b/x11/xdm3d/patches/patch-ac new file mode 100644 index 00000000000..73194f65c67 --- /dev/null +++ b/x11/xdm3d/patches/patch-ac @@ -0,0 +1,11 @@ +--- xdmshell.c.orig Fri Aug 22 16:42:11 1997 ++++ xdmshell.c Sun Dec 23 16:42:32 2001 +@@ -186,7 +186,7 @@ + * exec /usr/bin/X11/xdm -nodaemon -udpPort 0 + */ + strcpy (cmdbuf, BINDIR); +- strcat (cmdbuf, "/xdm"); ++ strcat (cmdbuf, "/xdm3d"); + args[0] = cmdbuf; + args[1] = "-nodaemon"; + args[2] = "-udpPort"; |