From 0302664d5dd0856e210eaa99883ffdaf614c6d61 Mon Sep 17 00:00:00 2001 From: taca Date: Mon, 29 Nov 2004 05:09:42 +0000 Subject: Overhaul ja-mh package, update to ja-mh6-3.05. - Based on mh-6.8.4-JP-3.05 + four official patches. - Update MASTER_SITES and HOMEPAGE. - make vmh(1) build again. - specify proper link option; build again after introduce of "toolchain wrappers." - improve patch to concat.c. Great thanks to Masanori Mikawa on tech-pkg-ja. --- mail/ja-mh/Makefile | 18 +++-- mail/ja-mh/PLIST | 3 +- mail/ja-mh/distinfo | 38 ++++------ mail/ja-mh/patches/patch-aa | 12 --- mail/ja-mh/patches/patch-ab | 12 --- mail/ja-mh/patches/patch-ac | 12 --- mail/ja-mh/patches/patch-ad | 12 --- mail/ja-mh/patches/patch-ae | 12 --- mail/ja-mh/patches/patch-af | 12 --- mail/ja-mh/patches/patch-ag | 12 --- mail/ja-mh/patches/patch-ah | 12 --- mail/ja-mh/patches/patch-ai | 12 --- mail/ja-mh/patches/patch-aj | 12 --- mail/ja-mh/patches/patch-ak | 12 --- mail/ja-mh/patches/patch-al | 174 ++++++++++++++++++++++++++++++++++++-------- mail/ja-mh/patches/patch-am | 12 --- mail/ja-mh/patches/patch-an | 12 --- mail/ja-mh/patches/patch-ao | 12 --- mail/ja-mh/patches/patch-ap | 13 ---- mail/ja-mh/patches/patch-aq | 13 ---- mail/ja-mh/patches/patch-ar | 14 ---- mail/ja-mh/patches/patch-as | 10 ++- mail/ja-mh/patches/patch-au | 24 ++++++ mail/ja-mh/patches/patch-av | 14 ++++ mail/ja-mh/patches/patch-aw | 24 ++++++ 25 files changed, 241 insertions(+), 272 deletions(-) delete mode 100644 mail/ja-mh/patches/patch-aa delete mode 100644 mail/ja-mh/patches/patch-ab delete mode 100644 mail/ja-mh/patches/patch-ac delete mode 100644 mail/ja-mh/patches/patch-ad delete mode 100644 mail/ja-mh/patches/patch-ae delete mode 100644 mail/ja-mh/patches/patch-af delete mode 100644 mail/ja-mh/patches/patch-ag delete mode 100644 mail/ja-mh/patches/patch-ah delete mode 100644 mail/ja-mh/patches/patch-ai delete mode 100644 mail/ja-mh/patches/patch-aj delete mode 100644 mail/ja-mh/patches/patch-ak delete mode 100644 mail/ja-mh/patches/patch-am delete mode 100644 mail/ja-mh/patches/patch-an delete mode 100644 mail/ja-mh/patches/patch-ao delete mode 100644 mail/ja-mh/patches/patch-ap delete mode 100644 mail/ja-mh/patches/patch-aq delete mode 100644 mail/ja-mh/patches/patch-ar create mode 100644 mail/ja-mh/patches/patch-au create mode 100644 mail/ja-mh/patches/patch-av create mode 100644 mail/ja-mh/patches/patch-aw (limited to 'mail/ja-mh') diff --git a/mail/ja-mh/Makefile b/mail/ja-mh/Makefile index 2d14a41378e..22a0cb4c4b1 100644 --- a/mail/ja-mh/Makefile +++ b/mail/ja-mh/Makefile @@ -1,14 +1,19 @@ -# $NetBSD: Makefile,v 1.4 2004/09/18 04:52:22 taca Exp $ +# $NetBSD: Makefile,v 1.5 2004/11/29 05:09:42 taca Exp $ # FreeBSD Id: Makefile,v 1.13 1999/02/10 18:13:21 motoyuki Exp $ -DISTNAME= mh-6.8.4-JP-3.03 -PKGNAME= ja-mh6-3.03 +DISTNAME= mh-6.8.4-JP-3.05 +PKGNAME= ja-mh6-3.05 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/ \ - ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/net/mh/ +MASTER_SITES= ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/net/mh/ + +PATCH_SITES= ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/net/mh/mh-6.8.4-JP-3.05-patch/ +PATCHFILES= mh-6.8.4-JP-3.05-20030114.patch.gz \ + mh-6.8.4-JP-3.05-20030326.patch.gz \ + mh-6.8.4-JP-3.05-20031023.patch.gz \ + mh-6.8.4-JP-3.05-20031106.patch.gz MAINTAINER= tech-pkg-ja@jp.NetBSD.org +HOMEPAGE= http://www.chem.eng.himeji-tech.ac.jp/mh-plus/ COMMENT= Rand MH mail handling system + Japanese patches DEPENDS= ja-less>=332:../../misc/ja-less @@ -19,7 +24,6 @@ CONFLICTS= nmh-[0-9]* ja-mh-*_JP_* MANCOMPRESSED= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= OBJECT_FMT=${OBJECT_FMT} CONFIGURE_ARGS= --enable-batchmode \ --libexecdir=${PREFIX}/libexec/mh \ --enable-jmandir=${PREFIX}/man/ja_JP.EUC \ diff --git a/mail/ja-mh/PLIST b/mail/ja-mh/PLIST index 244d6c46771..7e329de28e3 100644 --- a/mail/ja-mh/PLIST +++ b/mail/ja-mh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/11/29 05:09:42 taca Exp $ bin/ali bin/anno bin/bbc @@ -31,6 +31,7 @@ bin/scan bin/send bin/show bin/sortm +bin/vmh bin/whatnow bin/whom lib/libmh.so diff --git a/mail/ja-mh/distinfo b/mail/ja-mh/distinfo index 4bd4f637e36..60c4b44c67b 100644 --- a/mail/ja-mh/distinfo +++ b/mail/ja-mh/distinfo @@ -1,24 +1,18 @@ -$NetBSD: distinfo,v 1.3 2004/11/21 18:52:36 kristerw Exp $ +$NetBSD: distinfo,v 1.4 2004/11/29 05:09:42 taca Exp $ -SHA1 (mh-6.8.4-JP-3.03.tar.gz) = e533b22c23e79e8cba50ed2fe391f0f3b3ca332a -Size (mh-6.8.4-JP-3.03.tar.gz) = 1567712 bytes -SHA1 (patch-aa) = d38c2340f53ddfafb63857a7c6cbf95f8ba91cbf -SHA1 (patch-ab) = 6ba17b9bb6844bbf5fc3d4edf268b7d671427438 -SHA1 (patch-ac) = aea3d9bdfb5faa42ec55af92c5b1d5cd74f3d42d -SHA1 (patch-ad) = 5d1e3f54abbb114bf5d3c367de1b186b8dd39317 -SHA1 (patch-ae) = 183afc6c35c04912986bb3826d9d443b0aaacb7f -SHA1 (patch-af) = 0f9dd68449f56039555253a8e1ba9a2923c5ef4e -SHA1 (patch-ag) = 5e68e06be4ff523335900b2dd01defbe84cd725c -SHA1 (patch-ah) = 3cabf8ae640fbce889dda69521453dc0a9e621f5 -SHA1 (patch-ai) = c9da909f7783f6600a21ac6f035b8df732275539 -SHA1 (patch-aj) = 418b6e60541558f2702393b89df76ad9edf1774f -SHA1 (patch-ak) = 7f8442f265111a4b87393b3a64fd8692c23b379d -SHA1 (patch-al) = 6f37a26a389689ca3b82900cf15ceea5b0f291ce -SHA1 (patch-am) = 3cea349883c6e73d95844a44586d32c0046eb94c -SHA1 (patch-an) = c879444e422531fc2c3d2a6bd4c52c9680239a5f -SHA1 (patch-ao) = 4ad1798a6d4cdc2c977dd5186e9a111a4585df94 -SHA1 (patch-ap) = bde44e5f75ee1e124b5fff9679823e1ee2c313f0 -SHA1 (patch-aq) = e9399fe4a26005be428960666ac7ac437789aaa5 -SHA1 (patch-ar) = 3f9a0e510c9649ac07f07ef86f4a139bba1a5055 -SHA1 (patch-as) = 287118b416c42d4ec340c4548242d4e15afa6748 +SHA1 (mh-6.8.4-JP-3.05.tar.gz) = cb531f80be4326cd56d33d6fa9efba4d2d63d0ce +Size (mh-6.8.4-JP-3.05.tar.gz) = 1574689 bytes +SHA1 (mh-6.8.4-JP-3.05-20030114.patch.gz) = 6d4e6535465e5ffd5b9b5eef8d96cfcb1f947470 +Size (mh-6.8.4-JP-3.05-20030114.patch.gz) = 313 bytes +SHA1 (mh-6.8.4-JP-3.05-20030326.patch.gz) = b360d5baf5831c21bb1748395df04fa88fc25523 +Size (mh-6.8.4-JP-3.05-20030326.patch.gz) = 273 bytes +SHA1 (mh-6.8.4-JP-3.05-20031023.patch.gz) = ae59493092d33ae294994017b913aa064dcb66f2 +Size (mh-6.8.4-JP-3.05-20031023.patch.gz) = 307 bytes +SHA1 (mh-6.8.4-JP-3.05-20031106.patch.gz) = daaf41afb5e83143dceb5ae6444e26f1f9ca5bf8 +Size (mh-6.8.4-JP-3.05-20031106.patch.gz) = 311 bytes +SHA1 (patch-al) = 59bd51d6b67beb0492b3a3d3acc05242474bac7b +SHA1 (patch-as) = 786c7bf7988806023d9fd5a2ced5a9d31550ff54 SHA1 (patch-at) = 5594d3beac4e911cfa3ff277d4ae034a6dccdccb +SHA1 (patch-au) = 3788f6ca9362a97323cc6bf0f942f2ba949e1c46 +SHA1 (patch-av) = e3e33d7e2ab065028244d60734e3dba4fd950b12 +SHA1 (patch-aw) = 8cfee271b0549e6886e29ae74e4e547dccc20230 diff --git a/mail/ja-mh/patches/patch-aa b/mail/ja-mh/patches/patch-aa deleted file mode 100644 index fcc67791c86..00000000000 --- a/mail/ja-mh/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./sbr/m_getdefs.c.orig Wed Dec 2 02:05:00 1998 -+++ ./sbr/m_getdefs.c Mon Nov 1 19:13:29 1999 -@@ -7,4 +7,7 @@ - #include - #include -+#ifdef UNISTD -+#include -+#endif - #include - #include diff --git a/mail/ja-mh/patches/patch-ab b/mail/ja-mh/patches/patch-ab deleted file mode 100644 index a4dad34d93e..00000000000 --- a/mail/ja-mh/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./sbr/refile.c.orig Wed Dec 1 13:01:26 1993 -+++ ./sbr/refile.c Mon Nov 1 19:13:30 1999 -@@ -6,4 +6,7 @@ - #include "../h/mh.h" - #include -+#ifdef UNISTD -+#include -+#endif - - int refile (arg, file) diff --git a/mail/ja-mh/patches/patch-ac b/mail/ja-mh/patches/patch-ac deleted file mode 100644 index 9682d73f37e..00000000000 --- a/mail/ja-mh/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./sbr/remdir.c.orig Fri Apr 24 06:02:00 1998 -+++ ./sbr/remdir.c Mon Nov 1 19:13:30 1999 -@@ -6,4 +6,7 @@ - #include "../h/mh.h" - #include -+#ifdef UNISTD -+#include -+#endif - - diff --git a/mail/ja-mh/patches/patch-ad b/mail/ja-mh/patches/patch-ad deleted file mode 100644 index 34bf5fc0c49..00000000000 --- a/mail/ja-mh/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./sbr/showfile.c.orig Wed Dec 1 13:01:26 1993 -+++ ./sbr/showfile.c Mon Nov 1 19:13:30 1999 -@@ -3,4 +3,7 @@ - #include "../h/mh.h" - #include -+#ifdef UNISTD -+#include -+#endif - - diff --git a/mail/ja-mh/patches/patch-ae b/mail/ja-mh/patches/patch-ae deleted file mode 100644 index 4365519584f..00000000000 --- a/mail/ja-mh/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/inc.c.orig Fri Sep 10 02:10:53 1999 -+++ ./uip/inc.c Mon Nov 1 19:13:30 1999 -@@ -38,4 +38,7 @@ - #include - #endif -+#ifdef UNISTD -+#include -+#endif - - /* */ diff --git a/mail/ja-mh/patches/patch-af b/mail/ja-mh/patches/patch-af deleted file mode 100644 index 064389143ae..00000000000 --- a/mail/ja-mh/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/mhlsbr.c.orig Tue Feb 9 20:30:00 1999 -+++ ./uip/mhlsbr.c Mon Nov 1 19:13:30 1999 -@@ -21,4 +21,7 @@ - #include - #include -+#ifdef UNISTD -+#include -+#endif - - diff --git a/mail/ja-mh/patches/patch-ag b/mail/ja-mh/patches/patch-ag deleted file mode 100644 index ebb40851b6d..00000000000 --- a/mail/ja-mh/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/mhn.c.orig Tue Feb 9 20:30:00 1999 -+++ ./uip/mhn.c Mon Nov 1 19:13:30 1999 -@@ -19,4 +19,7 @@ - #include - #endif -+#ifdef UNISTD -+#include -+#endif - - /* */ diff --git a/mail/ja-mh/patches/patch-ah b/mail/ja-mh/patches/patch-ah deleted file mode 100644 index ff57795215f..00000000000 --- a/mail/ja-mh/patches/patch-ah +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/rcvtty.c.orig Tue Feb 9 20:30:00 1999 -+++ ./uip/rcvtty.c Mon Nov 1 19:13:30 1999 -@@ -30,4 +30,7 @@ - #include - #endif -+#ifdef UNISTD -+#include -+#endif - - /* */ diff --git a/mail/ja-mh/patches/patch-ai b/mail/ja-mh/patches/patch-ai deleted file mode 100644 index dd952e16bcf..00000000000 --- a/mail/ja-mh/patches/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/replsbr.c.orig Fri Sep 10 13:51:41 1999 -+++ ./uip/replsbr.c Mon Nov 1 19:13:30 1999 -@@ -11,4 +11,7 @@ - #include /* off_t */ - #include /* L_SET */ -+#ifdef UNISTD -+#include -+#endif - - diff --git a/mail/ja-mh/patches/patch-aj b/mail/ja-mh/patches/patch-aj deleted file mode 100644 index 38f8d8b008b..00000000000 --- a/mail/ja-mh/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/sendsbr.c.orig Tue Feb 9 20:30:00 1999 -+++ ./uip/sendsbr.c Mon Nov 1 19:13:30 1999 -@@ -10,4 +10,7 @@ - #include - #include -+#ifdef UNISTD -+#include -+#endif - - static alert(), anno(), annoaux(); diff --git a/mail/ja-mh/patches/patch-ak b/mail/ja-mh/patches/patch-ak deleted file mode 100644 index 22b7b2c4113..00000000000 --- a/mail/ja-mh/patches/patch-ak +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/spost.c.orig Wed Dec 2 02:05:00 1998 -+++ ./uip/spost.c Mon Nov 1 19:13:30 1999 -@@ -23,4 +23,7 @@ - #include - #endif -+#ifdef UNISTD -+#include -+#endif - - extern char *getfullname (), *getusr (); diff --git a/mail/ja-mh/patches/patch-al b/mail/ja-mh/patches/patch-al index 18ca3cc9ee6..2d19a971ba3 100644 --- a/mail/ja-mh/patches/patch-al +++ b/mail/ja-mh/patches/patch-al @@ -1,39 +1,153 @@ -$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ +$NetBSD: patch-al,v 1.2 2004/11/29 05:09:43 taca Exp $ ---- ./uip/vmh.c.orig Tue Feb 9 20:30:00 1999 -+++ ./uip/vmh.c Tue Feb 29 23:19:05 2000 -@@ -23,6 +23,9 @@ - If curses ever gets fixed, then XYZ code can be removed - */ - -+#ifdef UNISTD -+#include +--- uip/vmh.c.orig 2004-10-12 16:02:00.000000000 +0900 ++++ uip/vmh.c +@@ -113,6 +113,9 @@ void __cputchar __P((int)); + #define SMALLMOVE 1 + #define LARGEMOVE 10 + ++#ifndef A_CHARTEXT ++#define A_CHARTEXT 0xff +#endif - #ifdef __osf__ - #define _BSD + + #define XYZ /* XXX */ + +@@ -222,6 +225,15 @@ static struct ltchars ltc; #endif -@@ -85,9 +88,15 @@ - #define _maxy maxy - #define _curx curx /* curses.h */ - #define _cury cury -+#ifndef __NetBSD__ - void __cputchar __P((int)); + #endif /* TIOCGLTC */ + ++#ifdef __NetBSD__ ++static char *tc_CE, *tc_CM, *tc_SO, *tc_SE, *tc_US, *tc_UE; ++#define CE tc_CE ++#define CM tc_CM ++#define SO tc_SO ++#define SE tc_SE ++#define US tc_US ++#define UE tc_UE +#endif - #undef _putchar -+#ifdef BSD44 -+#define _putchar __cputchar + + #if !defined(SYS5) && !defined(BSD44) && !defined(TERMINFO) + int _putchar (); +@@ -348,7 +360,11 @@ static vmh () { + wclrtoeol (Command); + wrefresh (Command); + +- switch (WINgetstr (Command, buffer)) { ++#ifndef JAPAN ++ switch (WINgetstr (Command, buffer, sizeof(buffer))) { +#else - #define _putchar (int (*)()) __cputchar ++ switch (WINgetstr (Command, (unsigned char *)buffer, sizeof(buffer))) { ++#endif + case NOTOK: + break; + +@@ -808,6 +824,9 @@ static int WINinit (nprog) { + sideground (); + + #ifndef TERMINFO ++#ifdef __NetBSD__ ++ CM = getcap("cm"); +#endif - #include /* sgttyb */ - #endif /* !__NCURSES_H && (BSD44 || linux) */ + if (CM == NULL) + #else /* TERMINFO */ + if (cursor_address == NULL) /* assume mtr wanted "cm", not "CM" */ +@@ -822,6 +841,15 @@ static int WINinit (nprog) { + #ifndef TERMINFO + if (tgetflag ("xt") || tgetnum ("sg") > 0) + SO = SE = US = UE = NULL; ++#ifdef __NetBSD__ ++ else { ++ SO = getcap("so"); ++ SE = getcap("se"); ++ US = getcap("us"); ++ UE = getcap("ue"); ++ } ++ CE = getcap("ce"); ++#endif + #else /* TERMINFO */ + /* + * If termcap mapped directly to terminfo, we'd use the following: +@@ -862,21 +890,36 @@ static int WINinit (nprog) { + + /* */ + +-static int WINgetstr (w, buffer) ++static int WINgetstr (w, buffer, size) + register WINDOW *w; ++#ifndef JAPAN + char *buffer; ++#else /* JAPAN */ ++unsigned char *buffer; ++#endif /* JAPAN */ ++size_t size; + { + register int c; ++#ifndef JAPAN + register char *bp; ++#else /* JAPAN */ ++ register unsigned char *bp; ++#endif /* JAPAN */ -@@ -1509,7 +1518,7 @@ - tpgrp; - TYPESIG (*tstat) (); + bp = buffer; + *bp = 0; ++ --size; -- if ((pgrp = getpgrp (0)) == NOTOK) -+ if ((pgrp = getpgrp (/*0*/)) == NOTOK) - adios ("process group", "unable to determine"); for (;;) { - if (ioctl (fileno (stdin), TIOCGPGRP, (char *) &tpgrp) == NOTOK) +- switch (c = wgetch (w) & 0xff) { +- case ERR: +- adios (NULLCP, "wgetch lost"); ++ c = wgetch(w); ++ if (c == ERR) ++ adios (NULLCP, "wgetch lost"); ++ if (bp - buffer >= size && ++ !(c == intrc || c == EOFC || c == ERASE || c == KILL || ++ c == WERASC || c == '\r' || c == '\n')) ++ continue; + ++ switch (c &= A_CHARTEXT) { + case '\f': + wrefresh (curscr); + break; +@@ -1382,7 +1425,7 @@ WINDOW *w; + lp -> l_buf[i] = w -> lines[getcury(w)] -> line[i].ch; + #else + wmove(w, getcury(w), i); +- lp -> l_buf[i] = winch(w); /* 8bit ?? */ ++ lp -> l_buf[i] = winch(w) & A_CHARTEXT; + #endif + } + lp -> l_buf[getmaxx(w)] = '\0'; +@@ -1413,8 +1456,12 @@ WINDOW *w; + } + #endif /* __NCURSES_H */ + for (cp = lp -> l_buf + strlen (lp -> l_buf) - 1; cp >= lp -> l_buf; cp--) ++#ifndef JAPAN + if (isspace (*cp)) +- *cp = 0; ++#else /* JAPAN */ ++ if (isspace ((unsigned char)(*cp))) ++#endif /* JAPAN */ ++ *cp = '\0'; + else + break; + +@@ -1579,7 +1626,9 @@ static TTYoff () { + + INTR = intrc; + #ifndef SYS5 ++#ifndef __NetBSD__ + (void) ioctl (fileno (stdin), TIOCSETC, (char *) &tc); ++#endif + #else /* SYS5 */ + #if defined(TCGETATTR) && !defined(TCSETA) && defined(TCSANOW) + (void) tcsetattr (fileno (stdin), TCSANOW, &sg); +@@ -1591,6 +1640,9 @@ static TTYoff () { + leaveok (curscr, TRUE); + mvcur (0, COLS - 1, LINES - 1, 0); + endwin (); ++#ifdef __NetBSD__ ++ (void) ioctl (fileno (stdin), TIOCSETC, (char *) &tc); ++#endif + if (tty_ready == DONE) { + #ifndef TERMINFO + if (CE) diff --git a/mail/ja-mh/patches/patch-am b/mail/ja-mh/patches/patch-am deleted file mode 100644 index c1ace978e75..00000000000 --- a/mail/ja-mh/patches/patch-am +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/vmhtest.c.orig Fri Apr 24 06:02:00 1998 -+++ ./uip/vmhtest.c Mon Nov 1 19:13:30 1999 -@@ -11,4 +11,7 @@ - #include - #endif -+#ifdef UNISTD -+#include -+#endif - - /* */ diff --git a/mail/ja-mh/patches/patch-an b/mail/ja-mh/patches/patch-an deleted file mode 100644 index bcf767b2ce3..00000000000 --- a/mail/ja-mh/patches/patch-an +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/whatnowsbr.c.orig Tue Feb 9 20:30:00 1999 -+++ ./uip/whatnowsbr.c Mon Nov 1 19:13:30 1999 -@@ -9,4 +9,7 @@ - #include - #include -+#ifdef UNISTD -+#include -+#endif - - #ifndef MIME diff --git a/mail/ja-mh/patches/patch-ao b/mail/ja-mh/patches/patch-ao deleted file mode 100644 index b4dbc8c0a2d..00000000000 --- a/mail/ja-mh/patches/patch-ao +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./uip/wmh.c.orig Fri Apr 24 06:02:00 1998 -+++ ./uip/wmh.c Mon Nov 1 19:13:30 1999 -@@ -29,4 +29,7 @@ - #include - #endif -+#ifdef UNISTD -+#include -+#endif - - diff --git a/mail/ja-mh/patches/patch-ap b/mail/ja-mh/patches/patch-ap deleted file mode 100644 index 33b3361a45c..00000000000 --- a/mail/ja-mh/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./configure.in.orig Fri Oct 1 23:01:15 1999 -+++ ./configure.in Mon Nov 1 19:08:09 1999 -@@ -354,4 +354,8 @@ - fi - fi -+ if test "$OBJECT_FMT" = ELF -+ then -+ sharedlib=gnuelf -+ fi - slflags="-fpic" - slibdir=$libdir diff --git a/mail/ja-mh/patches/patch-aq b/mail/ja-mh/patches/patch-aq deleted file mode 100644 index 626c0362023..00000000000 --- a/mail/ja-mh/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./configure.orig Fri Oct 1 23:01:45 1999 -+++ ./configure Mon Nov 1 19:08:09 1999 -@@ -1386,4 +1386,8 @@ - fi - fi -+ if test "$OBJECT_FMT" = ELF -+ then -+ sharedlib=gnuelf -+ fi - slflags="-fpic" - slibdir=$libdir diff --git a/mail/ja-mh/patches/patch-ar b/mail/ja-mh/patches/patch-ar deleted file mode 100644 index ff1a6a48ebf..00000000000 --- a/mail/ja-mh/patches/patch-ar +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ar,v 1.1.1.1 2002/05/31 13:01:20 seb Exp $ - ---- ./zotnet/mts/client.c.orig Fri Sep 10 14:47:56 1999 -+++ ./zotnet/mts/client.c Tue Feb 29 22:38:35 2000 -@@ -360,7 +360,8 @@ - /* taken from ISODE's compat/internet.c */ - - #if !defined(SOLARIS) && !defined(linux) && !defined(__bsdi__) && \ -- !defined(OSF1) && !defined(__osf__) && !defined(__FreeBSD__) -+ !defined(OSF1) && !defined(__osf__) && !defined(__FreeBSD__) && \ -+ !defined(__NetBSD__) - #ifndef DG - #ifndef __alpha - u_long inet_addr (); diff --git a/mail/ja-mh/patches/patch-as b/mail/ja-mh/patches/patch-as index 016ff2bfd13..79a8f5ad893 100644 --- a/mail/ja-mh/patches/patch-as +++ b/mail/ja-mh/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.1 2004/09/18 04:43:39 taca Exp $ +$NetBSD: patch-as,v 1.2 2004/11/29 05:09:43 taca Exp $ --- sbr/concat.c.orig 1993-12-01 13:01:21.000000000 +0900 +++ sbr/concat.c -@@ -2,13 +2,12 @@ +@@ -2,34 +2,40 @@ #include "../h/mh.h" #include @@ -18,8 +18,10 @@ $NetBSD: patch-as,v 1.1 2004/09/18 04:43:39 taca Exp $ { register char *cp, *dp, -@@ -17,19 +16,26 @@ va_dcl - register va_list list; + *sp; + register unsigned len; +- register va_list list; ++ va_list list; len = 1; - va_start (list); diff --git a/mail/ja-mh/patches/patch-au b/mail/ja-mh/patches/patch-au new file mode 100644 index 00000000000..0a9d44fa361 --- /dev/null +++ b/mail/ja-mh/patches/patch-au @@ -0,0 +1,24 @@ +$NetBSD: patch-au,v 1.1 2004/11/29 05:09:43 taca Exp $ + +--- conf/makefiles/uip.orig 2001-05-30 23:57:47.000000000 +0900 ++++ conf/makefiles/uip +@@ -140,7 +140,7 @@ LD = LD_LIBRARY_PATH=../sbr @(MHCOMPILER + LD = LD_LIBRARY_PATH=../sbr @(MHCOMPILER) + @END: FBSDSHLIB + @BEGIN: GELFSHLIB +-LD = @(MHCOMPILER) -L../sbr ++LD = @(MHCOMPILER) -L../sbr -L../mts -L../zotnet + @END: GELFSHLIB + @END: SHAREDLIB + @BEGIN: OPTIM +@@ -166,6 +166,10 @@ LDLIBES = ../config/config.o \ + @BEGIN: SUN4SHLIB + -Bdynamic \ + @END: SUN4SHLIB ++@BEGIN: GELFSHLIB ++ @(SLDFLAG) -lmh$(SLIBVER) -lmts -lzot ++IGNORED_LDLIBES = \ ++@END: GELFSHLIB + @(SLDFLAG) -lmh$(SLIBVER) ../mts/libmts.a ../zotnet/libzot.a + LDLIBS = $(LDLIBES) ../config/version.o $(LDOPTLIB) + LDLIBS_POST = $(LDLIBES) ../config/version.o $(LDOPTLIB_POST) diff --git a/mail/ja-mh/patches/patch-av b/mail/ja-mh/patches/patch-av new file mode 100644 index 00000000000..c8a47ca060a --- /dev/null +++ b/mail/ja-mh/patches/patch-av @@ -0,0 +1,14 @@ +$NetBSD: patch-av,v 1.1 2004/11/29 05:09:43 taca Exp $ + +--- uip/dropsbr.c.orig 1998-04-24 06:02:00.000000000 +0900 ++++ uip/dropsbr.c +@@ -20,6 +20,9 @@ static char ident[] = "@(#)$Id: dropsbr. + #undef NULLVP + #include + #else ++#ifdef ntohl ++#undef ntohl ++#endif + #define ntohl(n) (n) + #endif + diff --git a/mail/ja-mh/patches/patch-aw b/mail/ja-mh/patches/patch-aw new file mode 100644 index 00000000000..3aaadb4e556 --- /dev/null +++ b/mail/ja-mh/patches/patch-aw @@ -0,0 +1,24 @@ +$NetBSD: patch-aw,v 1.1 2004/11/29 05:09:43 taca Exp $ + +--- conf/makefiles/MH-Makefile.orig 1999-02-09 20:30:00.000000000 +0900 ++++ conf/makefiles/MH-Makefile +@@ -6,5 +6,5 @@ + ############################################################################## + +-MAKE = make DESTDIR=$(DESTDIR) $(MFLAGS) -k ++MAKE = make DESTDIR=$(DESTDIR) $(MFLAGS) + SHELL = /bin/sh + +@@ -50,9 +50,9 @@ SHELL = /bin/sh + ALL = config sbr mts zotnet uip support doc + +-all:; for d in $(ALL); do (cd $$d; $(MAKE) all); done ++all:; for d in $(ALL); do (set -e; cd $$d; $(MAKE) all); done + +-depend:; for d in $(ALL); do (cd $$d; $(MAKE) depend); done ++depend:; for d in $(ALL); do (set -e; cd $$d; $(MAKE) depend); done + +-lint:; for d in $(ALL); do (cd $$d; $(MAKE) lint); done ++lint:; for d in $(ALL); do (set -e; cd $$d; $(MAKE) lint); done + + compat-v7: all -- cgit v1.2.3