diff options
author | tron <tron> | 1998-06-25 23:27:51 +0000 |
---|---|---|
committer | tron <tron> | 1998-06-25 23:27:51 +0000 |
commit | 50ecb26e86eda20fd71cbe6c73c7290a6375fffb (patch) | |
tree | a9e8f45a3a58fdd03aab98d2239f94504c8c2f57 /x11 | |
parent | 56295b1ffda1ccd2c89a6d09357be56be732a625 (diff) | |
download | pkgsrc-50ecb26e86eda20fd71cbe6c73c7290a6375fffb.tar.gz |
Get "kdm" to work properly.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kdebase/patches/patch-ac | 51 | ||||
-rw-r--r-- | x11/kdebase/patches/patch-ad | 11 |
2 files changed, 62 insertions, 0 deletions
diff --git a/x11/kdebase/patches/patch-ac b/x11/kdebase/patches/patch-ac new file mode 100644 index 00000000000..a5922e2ca65 --- /dev/null +++ b/x11/kdebase/patches/patch-ac @@ -0,0 +1,51 @@ +--- kdm/resource.c.orig Fri Mar 27 01:10:33 1998 ++++ kdm/resource.c Fri Jun 26 00:26:15 1998 +@@ -72,31 +72,31 @@ + */ + #ifndef __EMX__ + #ifndef DEF_SERVER_LINE +-#define DEF_SERVER_LINE ":0 local /usr/bin/X11/X :0" ++#define DEF_SERVER_LINE ":0 local " PREFIX "/bin/X :0" + #endif + #ifndef XRDB_PROGRAM +-#define XRDB_PROGRAM "/usr/bin/X11/xrdb" ++#define XRDB_PROGRAM PREFIX "/bin/xrdb" + #endif + #ifndef DEF_SESSION +-#define DEF_SESSION "/usr/bin/X11/xterm -ls" ++#define DEF_SESSION PREFIX "/bin/xterm -ls" + #endif + #ifndef DEF_USER_PATH +-#define DEF_USER_PATH ":/bin:/usr/bin:/usr/bin/X11:/usr/ucb" ++#define DEF_USER_PATH "/bin:/usr/bin:" PREFIX "/bin" + #endif + #ifndef DEF_SYSTEM_PATH +-#define DEF_SYSTEM_PATH "/etc:/bin:/usr/bin:/usr/bin/X11:/usr/ucb" ++#define DEF_SYSTEM_PATH "/bin:/sbin:/usr/bin:/usr/sbin:" PREFIX "/bin" + #endif + #ifndef DEF_SYSTEM_SHELL + #define DEF_SYSTEM_SHELL "/bin/sh" + #endif + #ifndef DEF_FAILSAFE_CLIENT +-#define DEF_FAILSAFE_CLIENT "/usr/bin/X11/xterm" ++#define DEF_FAILSAFE_CLIENT PREFIX "/bin/xterm" + #endif + #ifndef DEF_XDM_CONFIG +-#define DEF_XDM_CONFIG "/usr/lib/X11/xdm/xdm-config" ++#define DEF_XDM_CONFIG PREFIX "/lib/X11/xdm/xdm-config" + #endif + #ifndef DEF_CHOOSER +-#define DEF_CHOOSER "/usr/lib/X11/xdm/chooser" ++#define DEF_CHOOSER PREFIX "/lib/X11/xdm/chooser" + #endif + #ifndef DEF_AUTH_NAME + #ifdef HASXDMAUTH +@@ -106,7 +106,7 @@ + #endif + #endif + #ifndef DEF_AUTH_DIR +-#define DEF_AUTH_DIR "/usr/lib/X11/xdm" ++#define DEF_AUTH_DIR PREFIX "/lib/X11/xdm" + #endif + #ifndef DEF_USER_AUTH_DIR + #define DEF_USER_AUTH_DIR "/tmp" diff --git a/x11/kdebase/patches/patch-ad b/x11/kdebase/patches/patch-ad new file mode 100644 index 00000000000..617c3c397df --- /dev/null +++ b/x11/kdebase/patches/patch-ad @@ -0,0 +1,11 @@ +--- kdm/Makefile.in.orig Sun Apr 19 01:22:07 1998 ++++ kdm/Makefile.in Fri Jun 26 00:27:10 1998 +@@ -217,7 +217,7 @@ + CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) + LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) + CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ -DPREFIX=\"${prefix}\" + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ |