summaryrefslogtreecommitdiff
path: root/sysutils/gmc
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2000-03-04 10:00:14 +0000
committertron <tron@pkgsrc.org>2000-03-04 10:00:14 +0000
commit04e287ce52c938b756b6f878524d5cf4e23babd3 (patch)
tree872ec3aaaebe31bb67712737172a7e37024aad50 /sysutils/gmc
parentca4efb0e7942bd4845206feabe59515af25f0fee (diff)
downloadpkgsrc-04e287ce52c938b756b6f878524d5cf4e23babd3.tar.gz
Rework patches derived from "mc" so that they search "unzip" etc. in
"${LOCALBASE}/bin" and not in "${X11BASE}/bin".
Diffstat (limited to 'sysutils/gmc')
-rw-r--r--sysutils/gmc/files/patch-sum8
-rw-r--r--sysutils/gmc/patches/patch-aa16
-rw-r--r--sysutils/gmc/patches/patch-af4
-rw-r--r--sysutils/gmc/patches/patch-ag4
4 files changed, 20 insertions, 12 deletions
diff --git a/sysutils/gmc/files/patch-sum b/sysutils/gmc/files/patch-sum
index 7787af49e1e..96fe3b18101 100644
--- a/sysutils/gmc/files/patch-sum
+++ b/sysutils/gmc/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.3 2000/03/04 00:01:54 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/03/04 10:00:14 tron Exp $
-MD5 (patch-aa) = 2892d6861d5fb067447401db2a0f594e
+MD5 (patch-aa) = 2412e7b60e0fda6213b8c50b6315dce6
MD5 (patch-ab) = 38eb63b2947645ec67c9010ffd7f9cf8
MD5 (patch-ac) = 990a7730d8115426662d2d678a99860e
MD5 (patch-ad) = 375fabc8300e8a7626dc3d23628fcd6d
MD5 (patch-ae) = 64c125193b94340f449cdcdff23170d5
-MD5 (patch-af) = c4f09410d5b2bc581feec64762f30c39
-MD5 (patch-ag) = fd65533286dd3c9468b668d11b0ddebc
+MD5 (patch-af) = b229afc7c143b0bb758b165fce44f38f
+MD5 (patch-ag) = ed4186ad9684dcc3439ee9808e3bc902
diff --git a/sysutils/gmc/patches/patch-aa b/sysutils/gmc/patches/patch-aa
index 9bffbe83de5..37eaf25b47c 100644
--- a/sysutils/gmc/patches/patch-aa
+++ b/sysutils/gmc/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/03/15 00:10:30 tron Exp $
+$NetBSD: patch-aa,v 1.2 2000/03/04 10:00:15 tron Exp $
---- configure.orig Mon May 25 06:16:04 1998
-+++ configure Sun Oct 4 13:10:51 1998
-@@ -3073,7 +3073,7 @@
+--- configure.orig Tue Dec 7 00:49:54 1999
++++ configure Sat Mar 4 10:51:44 2000
+@@ -3257,7 +3257,7 @@
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.cat
INSTOBJEXT=.cat
@@ -11,3 +11,11 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/03/15 00:10:30 tron Exp $
INTLDEPS='$(top_builddir)/intl/libintl.a'
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+@@ -11710,6 +11710,7 @@
+ s%@LIBS@%$LIBS%g
+ s%@exec_prefix@%$exec_prefix%g
+ s%@prefix@%$prefix%g
++s%@localbase@%$LOCALBASE%g
+ s%@program_transform_name@%$program_transform_name%g
+ s%@bindir@%$bindir%g
+ s%@sbindir@%$sbindir%g
diff --git a/sysutils/gmc/patches/patch-af b/sysutils/gmc/patches/patch-af
index 27c63504e92..84206d8ea0d 100644
--- a/sysutils/gmc/patches/patch-af
+++ b/sysutils/gmc/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2000/03/04 00:01:56 tron Exp $
+$NetBSD: patch-af,v 1.2 2000/03/04 10:00:15 tron Exp $
--- vfs/extfs/uzip.in.orig Tue Dec 7 00:49:56 1999
+++ vfs/extfs/uzip.in Thu Mar 2 22:25:30 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1 2000/03/04 00:01:56 tron Exp $
#
-DZIP=/usr/bin
-+DZIP=@prefix@/bin
++DZIP=@localbase@/bin
XZIP="$DZIP/zip -g"
XDZIP="$DZIP/zip -d"
XUNZIP="$DZIP/unzip"
diff --git a/sysutils/gmc/patches/patch-ag b/sysutils/gmc/patches/patch-ag
index 3bdbf33898c..a8a85f5c803 100644
--- a/sysutils/gmc/patches/patch-ag
+++ b/sysutils/gmc/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2000/03/04 00:01:57 tron Exp $
+$NetBSD: patch-ag,v 1.2 2000/03/04 10:00:15 tron Exp $
--- vfs/extfs/urar.in.orig Tue Dec 7 00:49:56 1999
+++ vfs/extfs/urar.in Thu Mar 2 22:29:44 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.1 2000/03/04 00:01:57 tron Exp $
# beta version 2.0
#
-DRAR=/usr/bin
-+DRAR=@prefix@/bin
++DRAR=@localbase@/bin
RAR=$DRAR/rar
UNRAR=$DRAR/unrar # Prefer unrar (freeware)
#