diff options
| author | tron <tron@pkgsrc.org> | 1998-08-18 22:30:07 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1998-08-18 22:30:07 +0000 |
| commit | b7d036770cfb5a7edddc76b662fea34a474ecd9e (patch) | |
| tree | f2d1f817c358b634472ee592ccec1877a2466327 /x11 | |
| parent | 85172439984e3f7c26df86503717e834ca324fea (diff) | |
| download | pkgsrc-b7d036770cfb5a7edddc76b662fea34a474ecd9e.tar.gz | |
Correct locations of "xdm" and resource file directory.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xbanner/patches/patch-aa | 30 | ||||
| -rw-r--r-- | x11/xbanner/patches/patch-ac | 11 |
2 files changed, 33 insertions, 8 deletions
diff --git a/x11/xbanner/patches/patch-aa b/x11/xbanner/patches/patch-aa index 81d762e7398..f0d7922f316 100644 --- a/x11/xbanner/patches/patch-aa +++ b/x11/xbanner/patches/patch-aa @@ -1,13 +1,27 @@ -$NetBSD: patch-aa,v 1.1 1998/08/18 21:54:39 tron Exp $ - ---- Imakefile.orig Thu May 15 13:38:25 1997 -+++ Imakefile Tue Aug 18 01:44:23 1998 -@@ -8,3 +8,3 @@ +--- Imakefile.orig Thu May 15 22:38:25 1997 ++++ Imakefile Wed Aug 19 00:21:21 1998 +@@ -6,15 +6,15 @@ + + XCOMM Install directory: -LOCALBINDIR=/usr/X11/bin -+LOCALBINDIR=$(X11BASE)/bin - ETCDIR=/etc/X11/xdm -@@ -25,4 +25,4 @@ +-ETCDIR=/etc/X11/xdm ++LOCALBINDIR=${X11BASE}/bin ++ETCDIR=${X11BASE}/lib/X11/xdm + + XCOMM ***** No need to touch anything below this! ***** + + XCOMM Compile directives + + XCOMM *** Remove following line if you don't have XPM! +-DEFINES=-DHAS_XPM ++DEFINES=-DHAS_XPM -DX11BASE=\"${X11BASE}\" + + AllTarget($(PROGRAMS)) + SingleProgramTarget(xbanner, backg.o colors.o effect.o linger.o pix.o plasma.o ripples.o util.o xbanner.o xres.o , /**/ , -lXpm -lX11 -lm ) +@@ -23,6 +23,6 @@ + SingleProgramTarget(random_effect, random_effect.o , /**/ , /**/ ) + XCOMM Install directives -InstallTarget(install,xbanner, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR)) -InstallTarget(install,freetemp, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR)) diff --git a/x11/xbanner/patches/patch-ac b/x11/xbanner/patches/patch-ac new file mode 100644 index 00000000000..d05bd83e8c6 --- /dev/null +++ b/x11/xbanner/patches/patch-ac @@ -0,0 +1,11 @@ +--- xres.c.orig Thu May 15 22:38:25 1997 ++++ xres.c Wed Aug 19 00:18:07 1998 +@@ -1196,7 +1196,7 @@ + /* get the app-defaults */ + + #ifndef vms +- strcpy(line,"/usr/lib/X11/app-defaults/"); ++ strcpy(line,X11BASE "/lib/X11/app-defaults/"); + strcat(line,PRGCLASS); + appdefDB = XrmGetFileDatabase(line); + if(appdefDB==NULL && getenv("XAPPLRESDIR")!=NULL) |