From a610dc6e19a353ff6503b8a09b06c0c7b0a633c4 Mon Sep 17 00:00:00 2001 From: sakamoto Date: Mon, 1 Nov 1999 04:03:09 +0000 Subject: Fix version of shlib for a.out and ELF, suggested by Hubert Feyrer. --- japanese/mh/Makefile | 8 +--- japanese/mh/files/patch-sum | 6 +-- japanese/mh/patches/patch-aa | 5 +- japanese/mh/patches/patch-ab | 5 +- japanese/mh/pkg/PLIST | 107 +++++++++++++++++++++---------------------- 5 files changed, 61 insertions(+), 70 deletions(-) (limited to 'japanese/mh') diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile index 1c9b8da2639..c437324ce06 100644 --- a/japanese/mh/Makefile +++ b/japanese/mh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/10/30 17:06:32 sakamoto Exp $ +# $NetBSD: Makefile,v 1.6 1999/11/01 04:03:09 sakamoto Exp $ # FreeBSD Id: Makefile,v 1.13 1999/02/10 18:13:21 motoyuki Exp $ DISTNAME= mh-6.8.4-JP-3.03 @@ -15,12 +15,6 @@ DEPENDS= ja-less-332:../../japanese/less CONFLICTS= nmh-* .include "../../mk/bsd.prefs.mk" -.if ${OBJECT_FMT} == ELF -LIBMH_VERSION= 3 -.else -LIBMH_VERSION= 3.2 -.endif -PLIST_SUBST= LIBMH_VERSION=${LIBMH_VERSION} MANCOMPRESSED= yes GNU_CONFIGURE= yes diff --git a/japanese/mh/files/patch-sum b/japanese/mh/files/patch-sum index 363ebb73d0f..c7d565d151f 100644 --- a/japanese/mh/files/patch-sum +++ b/japanese/mh/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.2 1999/10/29 08:50:01 sakamoto Exp $ +$NetBSD: patch-sum,v 1.3 1999/11/01 04:03:10 sakamoto Exp $ -MD5 (patch-aa) = 3014664c98409aa504e6a478039746f8 -MD5 (patch-ab) = cdde8f45ee53392e3787e6dc3a636428 +MD5 (patch-aa) = 6fb5eb998332429846ef8dc4b338ec9d +MD5 (patch-ab) = 60c71e50e18108f4a992c769c2c97259 diff --git a/japanese/mh/patches/patch-aa b/japanese/mh/patches/patch-aa index c4a355c71b6..bf859c2a037 100644 --- a/japanese/mh/patches/patch-aa +++ b/japanese/mh/patches/patch-aa @@ -1,14 +1,13 @@ -$NetBSD: patch-aa,v 1.2 1999/10/29 08:50:01 sakamoto Exp $ +$NetBSD: patch-aa,v 1.3 1999/11/01 04:03:10 sakamoto Exp $ --- ./configure.in.orig Fri Oct 1 23:01:15 1999 +++ ./configure.in Fri Oct 29 17:02:23 1999 -@@ -354,4 +354,9 @@ +@@ -354,4 +354,8 @@ fi fi + if test "$OBJECT_FMT" = ELF + then + sharedlib=gnuelf -+ make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"' + fi slflags="-fpic" slibdir=$libdir diff --git a/japanese/mh/patches/patch-ab b/japanese/mh/patches/patch-ab index 0b1281eabf9..85da0be9615 100644 --- a/japanese/mh/patches/patch-ab +++ b/japanese/mh/patches/patch-ab @@ -1,14 +1,13 @@ -$NetBSD: patch-ab,v 1.2 1999/10/29 08:50:02 sakamoto Exp $ +$NetBSD: patch-ab,v 1.3 1999/11/01 04:03:10 sakamoto Exp $ --- ./configure.orig Fri Oct 1 23:01:45 1999 +++ ./configure Fri Oct 29 17:02:29 1999 -@@ -1386,4 +1386,9 @@ +@@ -1386,4 +1386,8 @@ fi fi + if test "$OBJECT_FMT" = ELF + then + sharedlib=gnuelf -+ make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"' + fi slflags="-fpic" slibdir=$libdir diff --git a/japanese/mh/pkg/PLIST b/japanese/mh/pkg/PLIST index 5646f731c85..906ae3012ce 100644 --- a/japanese/mh/pkg/PLIST +++ b/japanese/mh/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 1999/10/29 08:50:02 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.4 1999/11/01 04:03:11 sakamoto Exp $ bin/ali bin/anno bin/bbc @@ -33,8 +33,7 @@ bin/show bin/sortm bin/whatnow bin/whom -lib/libmh.so -lib/libmh.so.${LIBMH_VERSION} +lib/libmh.so.3.2 libexec/mh/MailAliases libexec/mh/ap libexec/mh/components @@ -121,55 +120,55 @@ man/ja_JP.EUC/man8/dp.8 man/ja_JP.EUC/man8/fmtdump.8 man/ja_JP.EUC/man8/install-mh.8 man/ja_JP.EUC/man8/post.8 -man/man1/ali.1.gz -man/man1/anno.1.gz -man/man1/bbc.1.gz -man/man1/burst.1.gz -man/man1/comp.1.gz -man/man1/dist.1.gz -man/man1/folder.1.gz -man/man1/forw.1.gz -man/man1/inc.1.gz -man/man1/mark.1.gz -man/man1/mh-chart.1.gz -man/man1/mh.1.gz -man/man1/mhl.1.gz -man/man1/mhmail.1.gz -man/man1/mhn.1.gz -man/man1/mhook.1.gz -man/man1/mhparam.1.gz -man/man1/mhpath.1.gz -man/man1/msgchk.1.gz -man/man1/msh.1.gz -man/man1/next.1.gz -man/man1/packf.1.gz -man/man1/pgped.1.gz -man/man1/pick.1.gz -man/man1/prev.1.gz -man/man1/prompter.1.gz -man/man1/rcvstore.1.gz -man/man1/refile.1.gz -man/man1/repl.1.gz -man/man1/rmf.1.gz -man/man1/rmm.1.gz -man/man1/scan.1.gz -man/man1/send.1.gz -man/man1/show.1.gz -man/man1/slocal.1.gz -man/man1/sortm.1.gz -man/man1/vmh.1.gz -man/man1/whatnow.1.gz -man/man1/whom.1.gz -man/man5/mh-alias.5.gz -man/man5/mh-format.5.gz -man/man5/mh-mail.5.gz -man/man5/mh-profile.5.gz -man/man5/mh-sequence.5.gz -man/man5/mh-tailor.5.gz -man/man8/ap.8.gz -man/man8/conflict.8.gz -man/man8/dp.8.gz -man/man8/fmtdump.8.gz -man/man8/install-mh.8.gz -man/man8/post.8.gz +man/man1/ali.1 +man/man1/anno.1 +man/man1/bbc.1 +man/man1/burst.1 +man/man1/comp.1 +man/man1/dist.1 +man/man1/folder.1 +man/man1/forw.1 +man/man1/inc.1 +man/man1/mark.1 +man/man1/mh-chart.1 +man/man1/mh.1 +man/man1/mhl.1 +man/man1/mhmail.1 +man/man1/mhn.1 +man/man1/mhook.1 +man/man1/mhparam.1 +man/man1/mhpath.1 +man/man1/msgchk.1 +man/man1/msh.1 +man/man1/next.1 +man/man1/packf.1 +man/man1/pgped.1 +man/man1/pick.1 +man/man1/prev.1 +man/man1/prompter.1 +man/man1/rcvstore.1 +man/man1/refile.1 +man/man1/repl.1 +man/man1/rmf.1 +man/man1/rmm.1 +man/man1/scan.1 +man/man1/send.1 +man/man1/show.1 +man/man1/slocal.1 +man/man1/sortm.1 +man/man1/vmh.1 +man/man1/whatnow.1 +man/man1/whom.1 +man/man5/mh-alias.5 +man/man5/mh-format.5 +man/man5/mh-mail.5 +man/man5/mh-profile.5 +man/man5/mh-sequence.5 +man/man5/mh-tailor.5 +man/man8/ap.8 +man/man8/conflict.8 +man/man8/dp.8 +man/man8/fmtdump.8 +man/man8/install-mh.8 +man/man8/post.8 @dirrm libexec/mh -- cgit v1.2.3