diff options
Diffstat (limited to 'x11/afterstep/patches')
| -rw-r--r-- | x11/afterstep/patches/patch-aa | 24 | ||||
| -rw-r--r-- | x11/afterstep/patches/patch-ab | 31 | ||||
| -rw-r--r-- | x11/afterstep/patches/patch-ac | 12 | ||||
| -rw-r--r-- | x11/afterstep/patches/patch-ad | 20 | ||||
| -rw-r--r-- | x11/afterstep/patches/patch-ae | 12 | ||||
| -rw-r--r-- | x11/afterstep/patches/patch-af | 12 | ||||
| -rw-r--r-- | x11/afterstep/patches/patch-ag | 22 | ||||
| -rw-r--r-- | x11/afterstep/patches/patch-ah | 36 |
8 files changed, 169 insertions, 0 deletions
diff --git a/x11/afterstep/patches/patch-aa b/x11/afterstep/patches/patch-aa new file mode 100644 index 00000000000..9f8fde684af --- /dev/null +++ b/x11/afterstep/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.1 1998/08/23 07:28:45 garbled Exp $ +--- Imakefile.orig Tue Apr 7 09:20:58 1998 ++++ Imakefile Tue Aug 18 16:40:59 1998 +@@ -18,3 +18,2 @@ + apps/ascd \ +- apps/asclock \ + apps/asfsm \ +@@ -22,4 +21,2 @@ + apps/asmail \ +- apps/asmix \ +- apps/asmixer \ + apps/asprint \ +@@ -41,2 +38,5 @@ + modules/Zharf ++# the following are broken WRT NetBSD ++# apps/asmix \ ++# apps/asmixer \ + +@@ -45,4 +45,3 @@ + install:: +- mv /usr/share/afterstep/ /usr/share/oldafterstep +- cp -R afterstep /usr/share/afterstep ++ cp -R afterstep $(PREFIX)/share/afterstep + diff --git a/x11/afterstep/patches/patch-ab b/x11/afterstep/patches/patch-ab new file mode 100644 index 00000000000..87028239cdb --- /dev/null +++ b/x11/afterstep/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.1 1998/08/23 07:28:45 garbled Exp $ +--- configure.h.orig Tue Aug 18 13:58:00 1998 ++++ configure.h Tue Aug 18 14:02:00 1998 +@@ -10,5 +10,5 @@ + +-#define AFTER_BIN_DIR BINDIR=/usr/X11R6/bin +-#define AFTER_MOD_DIR "/usr/X11R6/bin/" +-#define AFTER_MAN_DIR MANDIR=/usr/X11R6/man/man1 ++#define AFTER_BIN_DIR BINDIR=###x11###/bin ++#define AFTER_MOD_DIR "###x11###/bin/" ++#define AFTER_MAN_DIR MANDIR=###x11###/man/man1 + +@@ -16,5 +16,5 @@ + +-#define AFTER_BPMDIR "/usr/X11R6/include/X11/bitmaps" +-#define AFTER_XPMDIR "/usr/X11R6/include/X11/pixmaps" +-#define AFTER_SHAREDIR "/usr/share/afterstep" ++#define AFTER_BPMDIR "###x11###/share/bitmaps" ++#define AFTER_XPMDIR "###x11###/share/pixmaps" ++#define AFTER_SHAREDIR "###x11###/share/afterstep" + +@@ -54,3 +54,3 @@ + +-#define XIMAGELOADER "xli -onroot -quiet -colors 20" ++#define XIMAGELOADER "xv -rmode 5 -root -quit" + +@@ -176,3 +176,3 @@ + #define XPM +-#define XPMLIBRARY -L/usr/X11R6/lib -lXpm ++#define XPMLIBRARY -L###x11###/lib -lXpm + diff --git a/x11/afterstep/patches/patch-ac b/x11/afterstep/patches/patch-ac new file mode 100644 index 00000000000..6f8b82f47a3 --- /dev/null +++ b/x11/afterstep/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 1998/08/23 07:28:45 garbled Exp $ +--- configure.orig Tue Aug 18 16:06:31 1998 ++++ configure Tue Aug 18 16:06:51 1998 +@@ -1850,5 +1850,5 @@ + +-cd apps/asclock +-./configure +-cd ../.. ++#cd apps/asclock ++#./configure ++#cd ../.. + echo "" diff --git a/x11/afterstep/patches/patch-ad b/x11/afterstep/patches/patch-ad new file mode 100644 index 00000000000..db293e57fdf --- /dev/null +++ b/x11/afterstep/patches/patch-ad @@ -0,0 +1,20 @@ +$NetBSD: patch-ad,v 1.1 1998/08/23 07:28:45 garbled Exp $ +--- apps/ascd/plat_freebsd.c.orig Tue Aug 18 16:15:06 1998 ++++ apps/ascd/plat_freebsd.c Tue Aug 18 16:18:41 1998 +@@ -32,4 +32,4 @@ + #define MSF_FRAMES 3 +-#include "/sys/scsi/scsi_all.h" +-#include "/sys/scsi/scsi_cd.h" ++/*#include "/sys/scsi/scsi_all.h"*/ ++/*#include "/sys/scsi/scsi_cd.h"*/ + #else +@@ -108,3 +108,3 @@ + +-#ifdef __NetBSD__ ++#ifdef __NetBSDBROKE__ + *startframe = toc_buffer.addr[MSF_MINUTES]*60*75 + +@@ -186,3 +186,3 @@ + dopos: +-#ifdef __NetBSD__ ++#ifdef __NetBSDBROKE__ + *pos = scd.what.position.absaddr[MSF_MINUTES] * 60 * 75 + diff --git a/x11/afterstep/patches/patch-ae b/x11/afterstep/patches/patch-ae new file mode 100644 index 00000000000..e0e4301b235 --- /dev/null +++ b/x11/afterstep/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.1 1998/08/23 07:28:45 garbled Exp $ +--- apps/asmix/asmix.c.orig Tue Aug 18 16:21:04 1998 ++++ apps/asmix/asmix.c Tue Aug 18 16:31:24 1998 +@@ -12,3 +12,7 @@ + #else +-# include <linux/soundcard.h> ++ #ifdef __NetBSD__ ++ # include <soundcard.h> ++ #else ++ # include <linux/soundcard.h> ++ #endif + #endif diff --git a/x11/afterstep/patches/patch-af b/x11/afterstep/patches/patch-af new file mode 100644 index 00000000000..8749665bc7d --- /dev/null +++ b/x11/afterstep/patches/patch-af @@ -0,0 +1,12 @@ +$NetBSD: patch-af,v 1.1 1998/08/23 07:28:45 garbled Exp $ +--- apps/asmixer/asmixer.c.orig Tue Aug 18 16:39:38 1998 ++++ apps/asmixer/asmixer.c Tue Aug 18 16:40:17 1998 +@@ -28,4 +28,7 @@ + #include <sys/mount.h> ++#if defined(__NetBSD__) ++#include <soundcard.h> ++#else + #include <linux/soundcard.h> +- ++#endif + diff --git a/x11/afterstep/patches/patch-ag b/x11/afterstep/patches/patch-ag new file mode 100644 index 00000000000..c921c76ed37 --- /dev/null +++ b/x11/afterstep/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1 1998/08/23 07:28:45 garbled Exp $ +--- afterdoc/Imakefile.orig Tue Aug 18 16:53:52 1998 ++++ afterdoc/Imakefile Tue Aug 18 16:54:58 1998 +@@ -7,10 +7,10 @@ + +-InstallNonExecFile(afterstep.html,/usr/share/afterstep/doc) +-InstallNonExecFile(afterstep-1.html,/usr/share/afterstep/doc) +-InstallNonExecFile(afterstep-2.html,/usr/share/afterstep/doc) +-InstallNonExecFile(afterstep-3.html,/usr/share/afterstep/doc) +-InstallNonExecFile(afterstep-4.html,/usr/share/afterstep/doc) +-InstallNonExecFile(afterstep-5.html,/usr/share/afterstep/doc) +-InstallNonExecFile(afterstep-6.html,/usr/share/afterstep/doc) +-InstallNonExecFile(afterstep-7.html,/usr/share/afterstep/doc) ++InstallNonExecFile(afterstep.html,$(PREFIX)/share/afterstep/doc) ++InstallNonExecFile(afterstep-1.html,$(PREFIX)/share/afterstep/doc) ++InstallNonExecFile(afterstep-2.html,$(PREFIX)/share/afterstep/doc) ++InstallNonExecFile(afterstep-3.html,$(PREFIX)/share/afterstep/doc) ++InstallNonExecFile(afterstep-4.html,$(PREFIX)/share/afterstep/doc) ++InstallNonExecFile(afterstep-5.html,$(PREFIX)/share/afterstep/doc) ++InstallNonExecFile(afterstep-6.html,$(PREFIX)/share/afterstep/doc) ++InstallNonExecFile(afterstep-7.html,$(PREFIX)/share/afterstep/doc) + InstallTarget(install,afterstepdoc,-m 0755,$(BINDIR)) diff --git a/x11/afterstep/patches/patch-ah b/x11/afterstep/patches/patch-ah new file mode 100644 index 00000000000..47406a86db0 --- /dev/null +++ b/x11/afterstep/patches/patch-ah @@ -0,0 +1,36 @@ +$NetBSD: patch-ah,v 1.1 1998/08/23 07:28:45 garbled Exp $ +--- afterdoc/afterstepdoc.orig Tue Aug 18 16:55:29 1998 ++++ afterdoc/afterstepdoc Tue Aug 18 16:57:48 1998 +@@ -6,23 +6,23 @@ + +-if [ -x /usr/X11R6/bin/netscape ] ++if [ -x ###x11###/bin/netscape ] + then +- /usr/X11R6/bin/netscape /usr/share/afterstep/doc/afterstep.html ++ ###x11###/bin/netscape ###x11###/share/afterstep/doc/afterstep.html + elif [ -x /usr/local/bin/netscape ] + then +- /usr/local/bin/netscape /usr/share/afterstep/doc/afterstep.html ++ /usr/local/bin/netscape ###x11###/share/afterstep/doc/afterstep.html + elif [ -x /usr/local/netscape/netscape ] + then +- /usr/local/netscape/netscape /usr/share/afterstep/doc/afterstep.html ++ /usr/local/netscape/netscape ###x11###/share/afterstep/doc/afterstep.html + elif [ -x /opt/netscape/netscape ] + then +- /opt/netscape/netscape /usr/share/afterstep/doc/afterstep.html ++ /opt/netscape/netscape ###x11###/share/afterstep/doc/afterstep.html + elif [ -x /usr/bin/lynx ] + then +- xiterm -bg black -fg peachpuff -sl 500 -vb -e "/usr/bin/lynx /usr/share/afterstep/doc/afterstep.html" ++ xiterm -bg black -fg peachpuff -sl 500 -vb -e "/usr/bin/lynx ###x11###/share/afterstep/doc/afterstep.html" + elif [ -x /usr/local/bin/lynx ] + then +- xiterm -bg black -fg peachpuff -sl 500 -vb -e "/usr/local/bin/lynx /usr/share/afterstep/doc/afterstep.html" +-elif [ -x /bin/lynx ] ++ xiterm -bg black -fg peachpuff -sl 500 -vb -e "/usr/local/bin/lynx ###x11###/share/afterstep/doc/afterstep.html" ++elif [ -x /usr/pkg/bin/lynx ] + then +- xiterm -bg black -fg peachpuff -sl 500 -vb -e "/bin/lynx /usr/share/afterstep/doc/afterstep.html" ++ xiterm -bg black -fg peachpuff -sl 500 -vb -e "/usr/pkg/bin/lynx ###x11###/share/afterstep/doc/afterstep.html" + fi |