summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2000-09-07 00:35:48 +0000
committerdmcmahill <dmcmahill>2000-09-07 00:35:48 +0000
commitcb50fc9619c22f7130d1669b6203391693bbe70f (patch)
tree1ef2e65717a567bbd9a49cb3d9d895e9d4e385c3 /mail
parentd778332f43dee2829563f5cbc1fbae5f8dd293dd (diff)
downloadpkgsrc-cb50fc9619c22f7130d1669b6203391693bbe70f.tar.gz
add missing rpath for X11BASE. Fixes recently noted ELF problems. Also
nuke bogus hard coded -L/usr/local/lib
Diffstat (limited to 'mail')
-rw-r--r--mail/xfmail/files/patch-sum4
-rw-r--r--mail/xfmail/patches/patch-ad28
2 files changed, 16 insertions, 16 deletions
diff --git a/mail/xfmail/files/patch-sum b/mail/xfmail/files/patch-sum
index 244e2bf9e94..482c44662a6 100644
--- a/mail/xfmail/files/patch-sum
+++ b/mail/xfmail/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:07 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/07 00:35:49 dmcmahill Exp $
MD5 (patch-aa) = a261d251cd80755282696e02ccc391e5
MD5 (patch-ab) = 6313b4a64105e4d3fe3a8279b8daadec
MD5 (patch-ac) = dca995c2c39df358248a4f981d2172f8
-MD5 (patch-ad) = dcb746a5128cd64e144310d3eae5af49
+MD5 (patch-ad) = 54c3c2564db85581a8e9d273ef8e33c3
diff --git a/mail/xfmail/patches/patch-ad b/mail/xfmail/patches/patch-ad
index 2fa37612bd7..4ca76d55368 100644
--- a/mail/xfmail/patches/patch-ad
+++ b/mail/xfmail/patches/patch-ad
@@ -1,10 +1,16 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:09:55 agc Exp $
+$NetBSD: patch-ad,v 1.3 2000/09/07 00:35:48 dmcmahill Exp $
---- configure.orig Wed Apr 15 09:57:51 1998
-+++ configure Sat Jun 27 00:50:25 1998
-@@ -2909,16 +2909,16 @@
+--- configure.orig Wed Apr 15 03:57:51 1998
++++ configure Wed Sep 6 20:17:41 2000
+@@ -1809,5 +1809,5 @@
fi
+-LIBS="$extra_libraries -L/usr/local/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
++LIBS="$extra_libraries -L${X11BASE}/lib -Wl,-R${X11BASE}/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
+ CPPFLAGS="$extra_includes $CPPFLAGS $X_CFLAGS"
+
+@@ -2910,7 +2910,7 @@
+
-ac_safe=`echo "forms.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for forms.h""... $ac_c" 1>&6
@@ -14,37 +20,31 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 11:09:55 agc Exp $
+echo "configure:2915: checking for X11/forms.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
+@@ -2919,5 +2919,5 @@
#line 2920 "configure"
#include "confdefs.h"
-#include <forms.h>
+#include <X11/forms.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:2925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -2942,13 +2942,13 @@
- echo "$ac_t""no" 1>&6
+@@ -2943,5 +2943,5 @@
xfmail_error_txt="$xfmail_error_txt
-** Can't find forms.h. Please check that
+** Can't find X11/forms.h. Please check that
the libforms library is installed correctly on your system.
"
- xfmail_error=yes
+@@ -2949,5 +2949,5 @@
fi
-if test $ac_cv_header_forms_h = yes; then
+if test $ac_cv_header_X11_forms_h = yes; then
echo $ac_n "checking xforms library version""... $ac_c" 1>&6
echo "configure:2954: checking xforms library version" >&5
- if eval "test \"`echo '$''{'xfmail_cv_xfversion'+set}'`\" = set"; then
-@@ -2958,7 +2958,7 @@
- #line 2959 "configure"
+@@ -2959,5 +2959,5 @@
#include "confdefs.h"
-#include <forms.h>
+#include <X11/forms.h>
#if ! defined(FL_INCLUDE_VERSION)
%%%old!%%%
- #else