summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorBrian Somers <brian@FreeBSD.org>1998-09-24 06:42:15 +0000
committerBrian Somers <brian@FreeBSD.org>1998-09-24 06:42:15 +0000
commit2ab3132856fc1a6f99d17e88110fe85a7dfa790b (patch)
tree6a0374d3200c29ec2054a98575f13ad6cf204893 /mail
parentChange CATEGORIES to lang. (diff)
Elfify
Ok'd (but not tested by): pst
Notes
Notes: svn path=/head/; revision=13377
Diffstat (limited to 'mail')
-rw-r--r--mail/mh/files/patch-ad33
-rw-r--r--mail/mh/pkg-plist5
2 files changed, 35 insertions, 3 deletions
diff --git a/mail/mh/files/patch-ad b/mail/mh/files/patch-ad
index 5b54b488dee0..f806e2f15993 100644
--- a/mail/mh/files/patch-ad
+++ b/mail/mh/files/patch-ad
@@ -106,11 +106,13 @@ The following patch adds shared library support for FreeBSD to MH
#define NOTOK (-1)
---- 32,38 ----
+--- 32,40 ----
#define MHRELEASE "6.8.3" /* for version: "Maj.min.pat" */
#define MHCENTERFOOT "MH.6.8" /* for nroff page footers */
#define MHLEFTFOOT "[mh.6]" /* [mh.6] MH.6.6 page# */
+! #ifndef MHSLIBVER
! #define MHSLIBVER "3.2" /* Shared library version */
+! #endif
#define NOTOK (-1)
@@ -194,3 +196,32 @@ diff -cdr ../mh-6.8.3.orig/zotnet/mts/lock.c ./zotnet/mts/lock.c
#ifdef SYS5
#define u_short ushort
#define u_long ulong
+--- conf/makefiles/sbr.orig Tue Sep 22 16:38:28 1998
++++ conf/makefiles/sbr Tue Sep 22 16:51:48 1998
+@@ -157,6 +157,7 @@
+ inst-lib: libmh.so $(LIBSA)
+ -rm -f $(SLIBDIR)/libmh.so.$(SLIBVER)
+ cp libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so.$(SLIBVER)
++ ln -s libmh.so.$(SLIBVER) $(SLIBDIR)/libmh.so
+ -@chmod $(PGMPROT) $(SLIBDIR)/libmh.so.$(SLIBVER)
+ -@ls -l $(SLIBDIR)/libmh.so.*
+ -@echo "Shared library installed normally"
+--- conf/Makefile.orig Wed Sep 23 10:27:39 1998
++++ conf/Makefile Wed Sep 23 10:27:25 1998
+@@ -6,10 +6,15 @@
+ SHELL = /bin/sh
+
+ CC = cc
+-CFLAGS = -O
+ LFLAGS = -bhu
+ LDFLAGS =
+ LIBES =
++
++.if ${PORTOBJFORMAT} == "elf"
++CFLAGS = -O -DMHSLIBVER=\"3\"
++.else
++CFLAGS = -O -DMHSLIBVER=\"3.2\"
++.endif
+
+
+ ######################################################################
diff --git a/mail/mh/pkg-plist b/mail/mh/pkg-plist
index c6e3018833c0..c3380a49f520 100644
--- a/mail/mh/pkg-plist
+++ b/mail/mh/pkg-plist
@@ -71,7 +71,8 @@ lib/mh/spop
lib/mh/spost
lib/mh/tmac.h
lib/mh/viamail
+lib/libmh.so
lib/libmh.so.3.2
-@exec ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
libexec/popd