From 0a097c3d8b07e432db9c6861a33fa97928d7c3eb Mon Sep 17 00:00:00 2001 From: sakamoto Date: Fri, 29 Oct 1999 08:50:00 +0000 Subject: Update to mh-6.8.4-JP-3.03. some bugfix. Fix ELF problems. --- japanese/mh/Makefile | 19 +++++--- japanese/mh/files/md5 | 4 +- japanese/mh/files/patch-sum | 6 +-- japanese/mh/patches/patch-aa | 24 +++++----- japanese/mh/patches/patch-ab | 105 ++++++------------------------------------- japanese/mh/pkg/PLIST | 58 ++++++++++++++++++++++-- 6 files changed, 100 insertions(+), 116 deletions(-) (limited to 'japanese/mh') diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile index d7ffae6dd66..af8459ad3a7 100644 --- a/japanese/mh/Makefile +++ b/japanese/mh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 1999/08/02 04:30:57 sakamoto Exp $ +# $NetBSD: Makefile,v 1.4 1999/10/29 08:50:00 sakamoto Exp $ # FreeBSD Id: Makefile,v 1.13 1999/02/10 18:13:21 motoyuki Exp $ -DISTNAME= mh-6.8.4-JP-3.02 -PKGNAME= ja-mh-6.8.4 +DISTNAME= mh-6.8.4-JP-3.03 +PKGNAME= ja-mh-6.8.4-JP-3.03 CATEGORIES= japanese mail MASTER_SITES= ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \ ftp://komadori.planet.sci.kobe-u.ac.jp/pub/MH/ \ @@ -14,9 +14,18 @@ DEPENDS= ja-less-332:../../japanese/less CONFLICTS= nmh-* -MANCOMPRESSED= YES +.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 -CONFIGURE_ARGS= --enable-batchmode \ +CONFIGURE_ENV+= OBJECT_FMT=${OBJECT_FMT} +CONFIGURE_ARGS= --enable-batchmode \ --libexecdir=${PREFIX}/libexec/mh \ --enable-jmandir=${PREFIX}/man/ja_JP.EUC \ --enable-apop=${PREFIX}/etc/pop.auth --enable-rpop diff --git a/japanese/mh/files/md5 b/japanese/mh/files/md5 index 558ff143e01..3a801834159 100644 --- a/japanese/mh/files/md5 +++ b/japanese/mh/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1999/08/02 04:26:49 sakamoto Exp $ +$NetBSD: md5,v 1.3 1999/10/29 08:50:01 sakamoto Exp $ -MD5 (mh-6.8.4-JP-3.02.tar.gz) = 59f3d742f465fd070f43b2e638219e1c +MD5 (mh-6.8.4-JP-3.03.tar.gz) = 82e7bebde8d6697a03f35021991bff2b diff --git a/japanese/mh/files/patch-sum b/japanese/mh/files/patch-sum index a07f7485c89..363ebb73d0f 100644 --- a/japanese/mh/files/patch-sum +++ b/japanese/mh/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.1 1999/08/02 04:26:49 sakamoto Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/29 08:50:01 sakamoto Exp $ -MD5 (patch-aa) = 47ef5d83a108be0b82f4af9d9dfba57c -MD5 (patch-ab) = 14baa2add5590eaa6eec13105451e55b +MD5 (patch-aa) = 3014664c98409aa504e6a478039746f8 +MD5 (patch-ab) = cdde8f45ee53392e3787e6dc3a636428 diff --git a/japanese/mh/patches/patch-aa b/japanese/mh/patches/patch-aa index 5513514bbb2..c4a355c71b6 100644 --- a/japanese/mh/patches/patch-aa +++ b/japanese/mh/patches/patch-aa @@ -1,12 +1,14 @@ -$NetBSD: patch-aa,v 1.1 1999/08/02 04:26:50 sakamoto Exp $ +$NetBSD: patch-aa,v 1.2 1999/10/29 08:50:01 sakamoto Exp $ ---- sbr/advertise.c- Tue May 18 03:29:44 1999 -+++ sbr/advertise.c Tue May 18 03:30:08 1999 -@@ -5,6 +5,7 @@ - - #include "../h/mh.h" - #include -+#include - #if defined(BSD42) || defined(SVR4) - #include - #include +--- ./configure.in.orig Fri Oct 1 23:01:15 1999 ++++ ./configure.in Fri Oct 29 17:02:23 1999 +@@ -354,4 +354,9 @@ + 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 d95011b845a..0b1281eabf9 100644 --- a/japanese/mh/patches/patch-ab +++ b/japanese/mh/patches/patch-ab @@ -1,93 +1,14 @@ -$NetBSD: patch-ab,v 1.1 1999/08/02 04:26:50 sakamoto Exp $ +$NetBSD: patch-ab,v 1.2 1999/10/29 08:50:02 sakamoto Exp $ ---- sbr/advertise.c- Thu May 20 01:53:16 1999 -+++ sbr/advertise.c Thu May 20 01:53:43 1999 -@@ -22,7 +22,7 @@ - extern char *sys_errlist[]; - #endif - #ifdef __NetBSD__ /* XXX */ --#include -+#include - #endif - - /* */ ---- uip/ftpsbr.c- Thu May 20 01:53:16 1999 -+++ uip/ftpsbr.c Thu May 20 01:53:49 1999 -@@ -72,7 +72,7 @@ - extern char *sys_errlist[]; - #endif - #ifdef __NetBSD__ /* XXX */ --#include -+#include - #endif - - ---- uip/mhn.c- Thu May 20 01:53:16 1999 -+++ uip/mhn.c Thu May 20 01:54:00 1999 -@@ -221,6 +221,9 @@ - extern int sys_nerr; - extern char *sys_errlist[]; - #endif -+#ifdef __NetBSD__ -+#include -+#endif - - off_t lseek (); - time_t time (); ---- uip/popsbr.c- Thu May 20 01:53:16 1999 -+++ uip/popsbr.c Thu May 20 01:54:04 1999 -@@ -33,7 +33,7 @@ - extern char *sys_errlist[]; - #endif - #ifdef __NetBSD__ /* XXX */ --#include -+#include - #endif - - static int poprint = 0; ---- uip/pshsbr.c- Thu May 20 01:53:16 1999 -+++ uip/pshsbr.c Thu May 20 01:54:04 1999 -@@ -33,7 +33,7 @@ - extern char *sys_errlist[]; - #endif - #ifdef __NetBSD__ /* XXX */ --#include -+#include - #endif - - static int poprint = 0; ---- uip/vmh.c- Thu May 20 01:53:16 1999 -+++ uip/vmh.c Thu May 20 01:54:23 1999 -@@ -221,6 +221,9 @@ - extern int sys_nerr; - extern char *sys_errlist[]; - #endif -+#ifdef __NetBSD__ -+#include -+#endif - - static void adorn (); - ---- uip/vmhsbr.c- Thu May 20 01:53:16 1999 -+++ uip/vmhsbr.c Thu May 20 01:54:28 1999 -@@ -31,7 +31,7 @@ - extern char *sys_errlist[]; - #endif - #ifdef __NetBSD__ /* XXX */ --#include -+#include - #endif - - static int rclose(); ---- uip/wmh.c- Thu May 20 01:53:16 1999 -+++ uip/wmh.c Thu May 20 01:54:40 1999 -@@ -148,6 +148,9 @@ - extern int sys_nerr; - extern char *sys_errlist[]; - #endif -+#ifdef __NetBSD__ -+#include -+#endif - - void adorn (); - +--- ./configure.orig Fri Oct 1 23:01:45 1999 ++++ ./configure Fri Oct 29 17:02:29 1999 +@@ -1386,4 +1386,9 @@ + 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 ba08f8e895c..5646f731c85 100644 --- a/japanese/mh/pkg/PLIST +++ b/japanese/mh/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1999/08/02 04:26:50 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.3 1999/10/29 08:50:02 sakamoto Exp $ bin/ali bin/anno bin/bbc @@ -31,9 +31,10 @@ bin/scan bin/send bin/show bin/sortm -bin/vmh bin/whatnow bin/whom +lib/libmh.so +lib/libmh.so.${LIBMH_VERSION} libexec/mh/MailAliases libexec/mh/ap libexec/mh/components @@ -69,7 +70,6 @@ libexec/mh/slocal libexec/mh/spost libexec/mh/tmac.h libexec/mh/viamail -lib/libmh.so.3.2 man/ja_JP.EUC/man1/ali.1 man/ja_JP.EUC/man1/anno.1 man/ja_JP.EUC/man1/bbc.1 @@ -121,3 +121,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 +@dirrm libexec/mh -- cgit v1.2.3