summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>1998-07-16 22:54:34 +0000
committertv <tv@pkgsrc.org>1998-07-16 22:54:34 +0000
commitc243bc71c8586801cd7798a79e91ee87295a1dd4 (patch)
treef140968f2e3d9c09745223f9c4192e579909ed1d
parentfdf7955d09c78bace763220371e1461c8c43e3c0 (diff)
downloadpkgsrc-c243bc71c8586801cd7798a79e91ee87295a1dd4.tar.gz
Fix rununpack script so that it searches ${PREFIX}/bin for unpackers.
-rw-r--r--comms/fidogate/patches/patch-ad11
-rw-r--r--comms/fidogate/patches/patch-al64
2 files changed, 69 insertions, 6 deletions
diff --git a/comms/fidogate/patches/patch-ad b/comms/fidogate/patches/patch-ad
index c5bc660e9a0..e0dd10c6b3f 100644
--- a/comms/fidogate/patches/patch-ad
+++ b/comms/fidogate/patches/patch-ad
@@ -1,10 +1,9 @@
---- subst.pl.orig Thu Jul 16 10:20:52 1998
-+++ subst.pl Thu Jul 16 10:22:04 1998
-@@ -39,6 +39,7 @@
- for $s (keys %macros) {
- $r = $macros{$s};
+--- subst.pl.orig Sat Sep 28 04:13:51 1996
++++ subst.pl Thu Jul 16 18:35:06 1998
+@@ -41,5 +41,6 @@
s/<$s>/$r/g;
-+ s/\$\{PREFIX\}/$ENV{'PREFIX'}/g;
}
++ s/\$\{PREFIX\}/$ENV{'PREFIX'}/g;
print;
+ }
diff --git a/comms/fidogate/patches/patch-al b/comms/fidogate/patches/patch-al
new file mode 100644
index 00000000000..cbc84a5a850
--- /dev/null
+++ b/comms/fidogate/patches/patch-al
@@ -0,0 +1,64 @@
+--- src/toss/rununpack.sh.orig Thu Jul 16 18:36:08 1998
++++ src/toss/rununpack.sh Thu Jul 16 18:38:09 1998
+@@ -17,7 +17,7 @@
+ # 0 short 0x60ea ARJ Archive
+ #
+
+-# Programs are searched in: /bin, /usr/bin, /usr/local/bin
++# Programs are searched in: /bin, /usr/bin, ${PREFIX}/bin
+
+ PRG=<LIBDIR>
+ SPOOL=`$PRG/ftnconfig =spooldir`
+@@ -109,45 +109,45 @@
+ ARJ | Arj | arj)
+ [ -x /bin/unarj ] && cmd=/bin/unarj
+ [ -x /usr/bin/unarj ] && cmd=/usr/bin/unarj
+- [ -x /usr/local/bin/unarj ] && cmd=/usr/local/bin/unarj
++ [ -x ${PREFIX}/bin/unarj ] && cmd=${PREFIX}/bin/unarj
+ xcmd="$cmd e $arc"
+ lcmd="$cmd l $arc"
+ ;;
+ ARC | Arc | arc)
+ [ -x /bin/arc ] && cmd=/bin/arc
+ [ -x /usr/bin/arc ] && cmd=/usr/bin/arc
+- [ -x /usr/local/bin/arc ] && cmd=/usr/local/bin/arc
++ [ -x ${PREFIX}/bin/arc ] && cmd=${PREFIX}/bin/arc
+ xcmd="$cmd e $arc"
+ lcmd="$cmd l $arc"
+ ;;
+ ZIP | Zip | zip)
+ [ -x /bin/unzip ] && cmd=/bin/unzip
+ [ -x /usr/bin/unzip ] && cmd=/usr/bin/unzip
+- [ -x /usr/local/bin/unzip ] && cmd=/usr/local/bin/unzip
++ [ -x ${PREFIX}/bin/unzip ] && cmd=${PREFIX}/bin/unzip
+ xcmd="$cmd -ojL $arc"
+ lcmd="$cmd -l $arc"
+ ;;
+ RAR | Rar | rar)
+ [ -x /bin/rar ] && cmd=/bin/rar
+ [ -x /usr/bin/rar ] && cmd=/usr/bin/rar
+- [ -x /usr/local/bin/rar ] && cmd=/usr/local/bin/rar
++ [ -x ${PREFIX}/bin/rar ] && cmd=${PREFIX}/bin/rar
+ xcmd="$cmd e $arc"
+ lcmd="$cmd l $arc"
+ ;;
+ LHA | LHa | Lha | lha)
+ [ -x /bin/lharc ] && cmd=/bin/lharc
+ [ -x /usr/bin/lharc ] && cmd=/usr/bin/lharc
+- [ -x /usr/local/bin/lharc ] && cmd=/usr/local/bin/lharc
++ [ -x ${PREFIX}/bin/lharc ] && cmd=${PREFIX}/bin/lharc
+ [ -x /bin/lha ] && cmd=/bin/lha
+ [ -x /usr/bin/lha ] && cmd=/usr/bin/lha
+- [ -x /usr/local/bin/lha ] && cmd=/usr/local/bin/lha
++ [ -x ${PREFIX}/bin/lha ] && cmd=${PREFIX}/bin/lha
+ xcmd="$cmd ei $arc"
+ lcmd="$cmd l $arc"
+ ;;
+ ZOO | Zoo | zoo)
+ [ -x /bin/zoo ] && cmd=/bin/zoo
+ [ -x /usr/bin/zoo ] && cmd=/usr/bin/zoo
+- [ -x /usr/local/bin/zoo ] && cmd=/usr/local/bin/zoo
++ [ -x ${PREFIX}/bin/zoo ] && cmd=${PREFIX}/bin/zoo
+ xcmd="$cmd e: $arc"
+ lcmd="$cmd l $arc"
+ ;;