From 39c66df0236952ccacd2cb77f9b4b8ccaa0236a5 Mon Sep 17 00:00:00 2001 From: kuriyama Date: Wed, 12 Dec 2001 13:56:00 +0000 Subject: Upgrade to 2.1. Submitted by: TAKEMURA Masahiro , NINOMIYA Hideyuki Approved by: maintainer --- mail/mew2-emacs20/Makefile | 2 +- mail/mew2-emacs20/distinfo | 2 +- mail/mew2-emacs20/files/patch-ab | 16 ++++++------ mail/mew2-emacs20/files/patch-ac | 6 ++--- mail/mew2-emacs20/files/patch-af | 55 ++++++++++++++++++++++++++++++++++++++++ mail/mew2-emacs20/pkg-plist | 2 +- mail/mew2/Makefile | 2 +- mail/mew2/distinfo | 2 +- mail/mew2/files/patch-ab | 16 ++++++------ mail/mew2/files/patch-ac | 6 ++--- mail/mew2/files/patch-af | 55 ++++++++++++++++++++++++++++++++++++++++ mail/mew2/pkg-plist | 2 +- mail/mew3-emacs20/Makefile | 2 +- mail/mew3-emacs20/distinfo | 2 +- mail/mew3-emacs20/files/patch-ab | 16 ++++++------ mail/mew3-emacs20/files/patch-ac | 6 ++--- mail/mew3-emacs20/files/patch-af | 55 ++++++++++++++++++++++++++++++++++++++++ mail/mew3-emacs20/pkg-plist | 2 +- mail/mew3/Makefile | 2 +- mail/mew3/distinfo | 2 +- mail/mew3/files/patch-ab | 16 ++++++------ mail/mew3/files/patch-ac | 6 ++--- mail/mew3/files/patch-af | 55 ++++++++++++++++++++++++++++++++++++++++ mail/mew3/pkg-plist | 2 +- 24 files changed, 276 insertions(+), 56 deletions(-) create mode 100644 mail/mew2-emacs20/files/patch-af create mode 100644 mail/mew2/files/patch-af create mode 100644 mail/mew3-emacs20/files/patch-af create mode 100644 mail/mew3/files/patch-af (limited to 'mail') diff --git a/mail/mew2-emacs20/Makefile b/mail/mew2-emacs20/Makefile index c0665e9b5596..b4a133c20a63 100644 --- a/mail/mew2-emacs20/Makefile +++ b/mail/mew2-emacs20/Makefile @@ -19,7 +19,7 @@ MAINTAINER?= kiri@FreeBSD.org MEW_MAJOR_VER?= 2 # distfile version -MEW_VER= ${MEW_MAJOR_VER}.0 +MEW_VER= ${MEW_MAJOR_VER}.1 # document install directory by install-doc target MEW_DOCDIR?= share/doc/${PORTNAME}${MEW_MAJOR_VER} diff --git a/mail/mew2-emacs20/distinfo b/mail/mew2-emacs20/distinfo index a22192b70647..232144109fa2 100644 --- a/mail/mew2-emacs20/distinfo +++ b/mail/mew2-emacs20/distinfo @@ -1 +1 @@ -MD5 (mew-2.0.tar.gz) = be2973fff4f5b2c51f0d0e43c8547ee7 +MD5 (mew-2.1.tar.gz) = db70bd87397f31ad10d97d62ecc5f427 diff --git a/mail/mew2-emacs20/files/patch-ab b/mail/mew2-emacs20/files/patch-ab index 2fb11a359a49..cde8b6340a44 100644 --- a/mail/mew2-emacs20/files/patch-ab +++ b/mail/mew2-emacs20/files/patch-ab @@ -1,5 +1,5 @@ ---- bin/Makefile.in~ Fri May 25 12:58:39 2001 -+++ bin/Makefile.in Thu Aug 2 19:11:38 2001 +--- bin/Makefile.in.orig Mon Sep 24 21:40:37 2001 ++++ bin/Makefile.in Tue Nov 20 10:10:42 2001 @@ -65,7 +65,7 @@ $(CC) $(COFLAG) $(OBJ1) $(LIBS) $(RM) $(ALT) @@ -11,18 +11,18 @@ $(CC) $(COFLAG) $(CFLAGS) $(OBJ2) @@ -88,14 +88,14 @@ fi - $(INSTALL) $(PRG1) $(bindir) + $(INSTALL) -m 555 $(PRG1) $(bindir) for f in $(ALT); do \ - $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done -+ $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done - $(INSTALL) $(PRG2) $(bindir) ++ $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done + $(INSTALL) -m 555 $(PRG2) $(bindir) -@if [ ! -d $(mandir) ]; then \ $(MKDIR) $(mandir); \ fi - $(INSTALL) $(MAN1) $(mandir) + $(INSTALL) -m 444 $(MAN1) $(mandir) for f in $(MALT); do \ - $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done -+ $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done - $(INSTALL) $(MAN2) $(mandir) ++ $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done + $(INSTALL) -m 444 $(MAN2) $(mandir) ## diff --git a/mail/mew2-emacs20/files/patch-ac b/mail/mew2-emacs20/files/patch-ac index b30fd65baa8d..1b3351685988 100644 --- a/mail/mew2-emacs20/files/patch-ac +++ b/mail/mew2-emacs20/files/patch-ac @@ -1,5 +1,5 @@ ---- info/Makefile.orig Wed Jul 18 08:20:40 2001 -+++ info/Makefile Fri Aug 3 22:19:55 2001 +--- info/Makefile.orig Fri Aug 17 21:26:00 2001 ++++ info/Makefile Tue Nov 20 10:18:58 2001 @@ -28,9 +28,9 @@ #INSTALLINFO_OPTIONS = --section Emacs Emacs #INSTALLINFO_JOPTIONS = @@ -17,7 +17,7 @@ ## -INFO = mew.info mew.info-1 mew.info-2 mew.info-3 --JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 +-JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3 +INFO = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3 +JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2 +MANUALS= 00readme mew.texi diff --git a/mail/mew2-emacs20/files/patch-af b/mail/mew2-emacs20/files/patch-af new file mode 100644 index 000000000000..7bb77f4ae56e --- /dev/null +++ b/mail/mew2-emacs20/files/patch-af @@ -0,0 +1,55 @@ +--- bin/mewls.c.orig Sat Sep 8 11:07:12 2001 ++++ bin/mewls.c Tue Nov 20 10:26:04 2001 +@@ -124,8 +124,8 @@ + private void init_fields(char *); + private void print_field(char *, int, char *, char *); + private void init_search(char *, int); +-private char *strcasechr(char *, int); +-private char *strcasestr(char *, char *); ++private char *mystrcasechr(char *, int); ++private char *mystrcasestr(char *, char *); + private int print_for_scan(FILE *, char *, char *); + private int print_for_sort(FILE *, char *, char *); + private int print_for_pick(FILE *, char *, char *); +@@ -473,7 +473,7 @@ + } + + private char * +-strcasechr(char *s, int c) ++mystrcasechr(char *s, int c) + { + int lc = tolower(c); + int uc = toupper(c); +@@ -486,12 +486,12 @@ + } + + private char * +-strcasestr(char *s1, char *s2) ++mystrcasestr(char *s1, char *s2) + { + char *p; + unsigned int len = strlen(s2); + +- for (p = s1; (p = strcasechr(p, *s2)) != NULL; p++) ++ for (p = s1; (p = mystrcasechr(p, *s2)) != NULL; p++) + if (strncasecmp(p, s2, len) == 0) + return p; + return NULL; +@@ -513,7 +513,7 @@ + return TRUE; + } + } else { +- if (strcasestr(p, value) != NULL) { ++ if (mystrcasestr(p, value) != NULL) { + *end = tmp; + return TRUE; + } +@@ -540,7 +540,7 @@ + return TRUE; + } + } else { +- if (strcasestr(beg, value) != NULL) { ++ if (mystrcasestr(beg, value) != NULL) { + *end = tmp; + return TRUE; + } diff --git a/mail/mew2-emacs20/pkg-plist b/mail/mew2-emacs20/pkg-plist index 74f5489ce5ce..a8e416582261 100644 --- a/mail/mew2-emacs20/pkg-plist +++ b/mail/mew2-emacs20/pkg-plist @@ -47,7 +47,7 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Image.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Octet-Stream.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Postscript.xpm -%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc82%%MEW_MAJOR_VER%%.xpm +%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc822.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Text.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Unknown.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Video.xpm diff --git a/mail/mew2/Makefile b/mail/mew2/Makefile index c0665e9b5596..b4a133c20a63 100644 --- a/mail/mew2/Makefile +++ b/mail/mew2/Makefile @@ -19,7 +19,7 @@ MAINTAINER?= kiri@FreeBSD.org MEW_MAJOR_VER?= 2 # distfile version -MEW_VER= ${MEW_MAJOR_VER}.0 +MEW_VER= ${MEW_MAJOR_VER}.1 # document install directory by install-doc target MEW_DOCDIR?= share/doc/${PORTNAME}${MEW_MAJOR_VER} diff --git a/mail/mew2/distinfo b/mail/mew2/distinfo index a22192b70647..232144109fa2 100644 --- a/mail/mew2/distinfo +++ b/mail/mew2/distinfo @@ -1 +1 @@ -MD5 (mew-2.0.tar.gz) = be2973fff4f5b2c51f0d0e43c8547ee7 +MD5 (mew-2.1.tar.gz) = db70bd87397f31ad10d97d62ecc5f427 diff --git a/mail/mew2/files/patch-ab b/mail/mew2/files/patch-ab index 2fb11a359a49..cde8b6340a44 100644 --- a/mail/mew2/files/patch-ab +++ b/mail/mew2/files/patch-ab @@ -1,5 +1,5 @@ ---- bin/Makefile.in~ Fri May 25 12:58:39 2001 -+++ bin/Makefile.in Thu Aug 2 19:11:38 2001 +--- bin/Makefile.in.orig Mon Sep 24 21:40:37 2001 ++++ bin/Makefile.in Tue Nov 20 10:10:42 2001 @@ -65,7 +65,7 @@ $(CC) $(COFLAG) $(OBJ1) $(LIBS) $(RM) $(ALT) @@ -11,18 +11,18 @@ $(CC) $(COFLAG) $(CFLAGS) $(OBJ2) @@ -88,14 +88,14 @@ fi - $(INSTALL) $(PRG1) $(bindir) + $(INSTALL) -m 555 $(PRG1) $(bindir) for f in $(ALT); do \ - $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done -+ $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done - $(INSTALL) $(PRG2) $(bindir) ++ $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done + $(INSTALL) -m 555 $(PRG2) $(bindir) -@if [ ! -d $(mandir) ]; then \ $(MKDIR) $(mandir); \ fi - $(INSTALL) $(MAN1) $(mandir) + $(INSTALL) -m 444 $(MAN1) $(mandir) for f in $(MALT); do \ - $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done -+ $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done - $(INSTALL) $(MAN2) $(mandir) ++ $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done + $(INSTALL) -m 444 $(MAN2) $(mandir) ## diff --git a/mail/mew2/files/patch-ac b/mail/mew2/files/patch-ac index b30fd65baa8d..1b3351685988 100644 --- a/mail/mew2/files/patch-ac +++ b/mail/mew2/files/patch-ac @@ -1,5 +1,5 @@ ---- info/Makefile.orig Wed Jul 18 08:20:40 2001 -+++ info/Makefile Fri Aug 3 22:19:55 2001 +--- info/Makefile.orig Fri Aug 17 21:26:00 2001 ++++ info/Makefile Tue Nov 20 10:18:58 2001 @@ -28,9 +28,9 @@ #INSTALLINFO_OPTIONS = --section Emacs Emacs #INSTALLINFO_JOPTIONS = @@ -17,7 +17,7 @@ ## -INFO = mew.info mew.info-1 mew.info-2 mew.info-3 --JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 +-JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3 +INFO = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3 +JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2 +MANUALS= 00readme mew.texi diff --git a/mail/mew2/files/patch-af b/mail/mew2/files/patch-af new file mode 100644 index 000000000000..7bb77f4ae56e --- /dev/null +++ b/mail/mew2/files/patch-af @@ -0,0 +1,55 @@ +--- bin/mewls.c.orig Sat Sep 8 11:07:12 2001 ++++ bin/mewls.c Tue Nov 20 10:26:04 2001 +@@ -124,8 +124,8 @@ + private void init_fields(char *); + private void print_field(char *, int, char *, char *); + private void init_search(char *, int); +-private char *strcasechr(char *, int); +-private char *strcasestr(char *, char *); ++private char *mystrcasechr(char *, int); ++private char *mystrcasestr(char *, char *); + private int print_for_scan(FILE *, char *, char *); + private int print_for_sort(FILE *, char *, char *); + private int print_for_pick(FILE *, char *, char *); +@@ -473,7 +473,7 @@ + } + + private char * +-strcasechr(char *s, int c) ++mystrcasechr(char *s, int c) + { + int lc = tolower(c); + int uc = toupper(c); +@@ -486,12 +486,12 @@ + } + + private char * +-strcasestr(char *s1, char *s2) ++mystrcasestr(char *s1, char *s2) + { + char *p; + unsigned int len = strlen(s2); + +- for (p = s1; (p = strcasechr(p, *s2)) != NULL; p++) ++ for (p = s1; (p = mystrcasechr(p, *s2)) != NULL; p++) + if (strncasecmp(p, s2, len) == 0) + return p; + return NULL; +@@ -513,7 +513,7 @@ + return TRUE; + } + } else { +- if (strcasestr(p, value) != NULL) { ++ if (mystrcasestr(p, value) != NULL) { + *end = tmp; + return TRUE; + } +@@ -540,7 +540,7 @@ + return TRUE; + } + } else { +- if (strcasestr(beg, value) != NULL) { ++ if (mystrcasestr(beg, value) != NULL) { + *end = tmp; + return TRUE; + } diff --git a/mail/mew2/pkg-plist b/mail/mew2/pkg-plist index 74f5489ce5ce..a8e416582261 100644 --- a/mail/mew2/pkg-plist +++ b/mail/mew2/pkg-plist @@ -47,7 +47,7 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Image.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Octet-Stream.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Postscript.xpm -%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc82%%MEW_MAJOR_VER%%.xpm +%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc822.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Text.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Unknown.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Video.xpm diff --git a/mail/mew3-emacs20/Makefile b/mail/mew3-emacs20/Makefile index c0665e9b5596..b4a133c20a63 100644 --- a/mail/mew3-emacs20/Makefile +++ b/mail/mew3-emacs20/Makefile @@ -19,7 +19,7 @@ MAINTAINER?= kiri@FreeBSD.org MEW_MAJOR_VER?= 2 # distfile version -MEW_VER= ${MEW_MAJOR_VER}.0 +MEW_VER= ${MEW_MAJOR_VER}.1 # document install directory by install-doc target MEW_DOCDIR?= share/doc/${PORTNAME}${MEW_MAJOR_VER} diff --git a/mail/mew3-emacs20/distinfo b/mail/mew3-emacs20/distinfo index a22192b70647..232144109fa2 100644 --- a/mail/mew3-emacs20/distinfo +++ b/mail/mew3-emacs20/distinfo @@ -1 +1 @@ -MD5 (mew-2.0.tar.gz) = be2973fff4f5b2c51f0d0e43c8547ee7 +MD5 (mew-2.1.tar.gz) = db70bd87397f31ad10d97d62ecc5f427 diff --git a/mail/mew3-emacs20/files/patch-ab b/mail/mew3-emacs20/files/patch-ab index 2fb11a359a49..cde8b6340a44 100644 --- a/mail/mew3-emacs20/files/patch-ab +++ b/mail/mew3-emacs20/files/patch-ab @@ -1,5 +1,5 @@ ---- bin/Makefile.in~ Fri May 25 12:58:39 2001 -+++ bin/Makefile.in Thu Aug 2 19:11:38 2001 +--- bin/Makefile.in.orig Mon Sep 24 21:40:37 2001 ++++ bin/Makefile.in Tue Nov 20 10:10:42 2001 @@ -65,7 +65,7 @@ $(CC) $(COFLAG) $(OBJ1) $(LIBS) $(RM) $(ALT) @@ -11,18 +11,18 @@ $(CC) $(COFLAG) $(CFLAGS) $(OBJ2) @@ -88,14 +88,14 @@ fi - $(INSTALL) $(PRG1) $(bindir) + $(INSTALL) -m 555 $(PRG1) $(bindir) for f in $(ALT); do \ - $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done -+ $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done - $(INSTALL) $(PRG2) $(bindir) ++ $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done + $(INSTALL) -m 555 $(PRG2) $(bindir) -@if [ ! -d $(mandir) ]; then \ $(MKDIR) $(mandir); \ fi - $(INSTALL) $(MAN1) $(mandir) + $(INSTALL) -m 444 $(MAN1) $(mandir) for f in $(MALT); do \ - $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done -+ $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done - $(INSTALL) $(MAN2) $(mandir) ++ $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done + $(INSTALL) -m 444 $(MAN2) $(mandir) ## diff --git a/mail/mew3-emacs20/files/patch-ac b/mail/mew3-emacs20/files/patch-ac index b30fd65baa8d..1b3351685988 100644 --- a/mail/mew3-emacs20/files/patch-ac +++ b/mail/mew3-emacs20/files/patch-ac @@ -1,5 +1,5 @@ ---- info/Makefile.orig Wed Jul 18 08:20:40 2001 -+++ info/Makefile Fri Aug 3 22:19:55 2001 +--- info/Makefile.orig Fri Aug 17 21:26:00 2001 ++++ info/Makefile Tue Nov 20 10:18:58 2001 @@ -28,9 +28,9 @@ #INSTALLINFO_OPTIONS = --section Emacs Emacs #INSTALLINFO_JOPTIONS = @@ -17,7 +17,7 @@ ## -INFO = mew.info mew.info-1 mew.info-2 mew.info-3 --JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 +-JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3 +INFO = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3 +JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2 +MANUALS= 00readme mew.texi diff --git a/mail/mew3-emacs20/files/patch-af b/mail/mew3-emacs20/files/patch-af new file mode 100644 index 000000000000..7bb77f4ae56e --- /dev/null +++ b/mail/mew3-emacs20/files/patch-af @@ -0,0 +1,55 @@ +--- bin/mewls.c.orig Sat Sep 8 11:07:12 2001 ++++ bin/mewls.c Tue Nov 20 10:26:04 2001 +@@ -124,8 +124,8 @@ + private void init_fields(char *); + private void print_field(char *, int, char *, char *); + private void init_search(char *, int); +-private char *strcasechr(char *, int); +-private char *strcasestr(char *, char *); ++private char *mystrcasechr(char *, int); ++private char *mystrcasestr(char *, char *); + private int print_for_scan(FILE *, char *, char *); + private int print_for_sort(FILE *, char *, char *); + private int print_for_pick(FILE *, char *, char *); +@@ -473,7 +473,7 @@ + } + + private char * +-strcasechr(char *s, int c) ++mystrcasechr(char *s, int c) + { + int lc = tolower(c); + int uc = toupper(c); +@@ -486,12 +486,12 @@ + } + + private char * +-strcasestr(char *s1, char *s2) ++mystrcasestr(char *s1, char *s2) + { + char *p; + unsigned int len = strlen(s2); + +- for (p = s1; (p = strcasechr(p, *s2)) != NULL; p++) ++ for (p = s1; (p = mystrcasechr(p, *s2)) != NULL; p++) + if (strncasecmp(p, s2, len) == 0) + return p; + return NULL; +@@ -513,7 +513,7 @@ + return TRUE; + } + } else { +- if (strcasestr(p, value) != NULL) { ++ if (mystrcasestr(p, value) != NULL) { + *end = tmp; + return TRUE; + } +@@ -540,7 +540,7 @@ + return TRUE; + } + } else { +- if (strcasestr(beg, value) != NULL) { ++ if (mystrcasestr(beg, value) != NULL) { + *end = tmp; + return TRUE; + } diff --git a/mail/mew3-emacs20/pkg-plist b/mail/mew3-emacs20/pkg-plist index 74f5489ce5ce..a8e416582261 100644 --- a/mail/mew3-emacs20/pkg-plist +++ b/mail/mew3-emacs20/pkg-plist @@ -47,7 +47,7 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Image.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Octet-Stream.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Postscript.xpm -%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc82%%MEW_MAJOR_VER%%.xpm +%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc822.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Text.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Unknown.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Video.xpm diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile index c0665e9b5596..b4a133c20a63 100644 --- a/mail/mew3/Makefile +++ b/mail/mew3/Makefile @@ -19,7 +19,7 @@ MAINTAINER?= kiri@FreeBSD.org MEW_MAJOR_VER?= 2 # distfile version -MEW_VER= ${MEW_MAJOR_VER}.0 +MEW_VER= ${MEW_MAJOR_VER}.1 # document install directory by install-doc target MEW_DOCDIR?= share/doc/${PORTNAME}${MEW_MAJOR_VER} diff --git a/mail/mew3/distinfo b/mail/mew3/distinfo index a22192b70647..232144109fa2 100644 --- a/mail/mew3/distinfo +++ b/mail/mew3/distinfo @@ -1 +1 @@ -MD5 (mew-2.0.tar.gz) = be2973fff4f5b2c51f0d0e43c8547ee7 +MD5 (mew-2.1.tar.gz) = db70bd87397f31ad10d97d62ecc5f427 diff --git a/mail/mew3/files/patch-ab b/mail/mew3/files/patch-ab index 2fb11a359a49..cde8b6340a44 100644 --- a/mail/mew3/files/patch-ab +++ b/mail/mew3/files/patch-ab @@ -1,5 +1,5 @@ ---- bin/Makefile.in~ Fri May 25 12:58:39 2001 -+++ bin/Makefile.in Thu Aug 2 19:11:38 2001 +--- bin/Makefile.in.orig Mon Sep 24 21:40:37 2001 ++++ bin/Makefile.in Tue Nov 20 10:10:42 2001 @@ -65,7 +65,7 @@ $(CC) $(COFLAG) $(OBJ1) $(LIBS) $(RM) $(ALT) @@ -11,18 +11,18 @@ $(CC) $(COFLAG) $(CFLAGS) $(OBJ2) @@ -88,14 +88,14 @@ fi - $(INSTALL) $(PRG1) $(bindir) + $(INSTALL) -m 555 $(PRG1) $(bindir) for f in $(ALT); do \ - $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done -+ $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done - $(INSTALL) $(PRG2) $(bindir) ++ $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done + $(INSTALL) -m 555 $(PRG2) $(bindir) -@if [ ! -d $(mandir) ]; then \ $(MKDIR) $(mandir); \ fi - $(INSTALL) $(MAN1) $(mandir) + $(INSTALL) -m 444 $(MAN1) $(mandir) for f in $(MALT); do \ - $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done -+ $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done - $(INSTALL) $(MAN2) $(mandir) ++ $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done + $(INSTALL) -m 444 $(MAN2) $(mandir) ## diff --git a/mail/mew3/files/patch-ac b/mail/mew3/files/patch-ac index b30fd65baa8d..1b3351685988 100644 --- a/mail/mew3/files/patch-ac +++ b/mail/mew3/files/patch-ac @@ -1,5 +1,5 @@ ---- info/Makefile.orig Wed Jul 18 08:20:40 2001 -+++ info/Makefile Fri Aug 3 22:19:55 2001 +--- info/Makefile.orig Fri Aug 17 21:26:00 2001 ++++ info/Makefile Tue Nov 20 10:18:58 2001 @@ -28,9 +28,9 @@ #INSTALLINFO_OPTIONS = --section Emacs Emacs #INSTALLINFO_JOPTIONS = @@ -17,7 +17,7 @@ ## -INFO = mew.info mew.info-1 mew.info-2 mew.info-3 --JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 +-JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3 +INFO = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3 +JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2 +MANUALS= 00readme mew.texi diff --git a/mail/mew3/files/patch-af b/mail/mew3/files/patch-af new file mode 100644 index 000000000000..7bb77f4ae56e --- /dev/null +++ b/mail/mew3/files/patch-af @@ -0,0 +1,55 @@ +--- bin/mewls.c.orig Sat Sep 8 11:07:12 2001 ++++ bin/mewls.c Tue Nov 20 10:26:04 2001 +@@ -124,8 +124,8 @@ + private void init_fields(char *); + private void print_field(char *, int, char *, char *); + private void init_search(char *, int); +-private char *strcasechr(char *, int); +-private char *strcasestr(char *, char *); ++private char *mystrcasechr(char *, int); ++private char *mystrcasestr(char *, char *); + private int print_for_scan(FILE *, char *, char *); + private int print_for_sort(FILE *, char *, char *); + private int print_for_pick(FILE *, char *, char *); +@@ -473,7 +473,7 @@ + } + + private char * +-strcasechr(char *s, int c) ++mystrcasechr(char *s, int c) + { + int lc = tolower(c); + int uc = toupper(c); +@@ -486,12 +486,12 @@ + } + + private char * +-strcasestr(char *s1, char *s2) ++mystrcasestr(char *s1, char *s2) + { + char *p; + unsigned int len = strlen(s2); + +- for (p = s1; (p = strcasechr(p, *s2)) != NULL; p++) ++ for (p = s1; (p = mystrcasechr(p, *s2)) != NULL; p++) + if (strncasecmp(p, s2, len) == 0) + return p; + return NULL; +@@ -513,7 +513,7 @@ + return TRUE; + } + } else { +- if (strcasestr(p, value) != NULL) { ++ if (mystrcasestr(p, value) != NULL) { + *end = tmp; + return TRUE; + } +@@ -540,7 +540,7 @@ + return TRUE; + } + } else { +- if (strcasestr(beg, value) != NULL) { ++ if (mystrcasestr(beg, value) != NULL) { + *end = tmp; + return TRUE; + } diff --git a/mail/mew3/pkg-plist b/mail/mew3/pkg-plist index 74f5489ce5ce..a8e416582261 100644 --- a/mail/mew3/pkg-plist +++ b/mail/mew3/pkg-plist @@ -47,7 +47,7 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Image.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Octet-Stream.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Postscript.xpm -%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc82%%MEW_MAJOR_VER%%.xpm +%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc822.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Text.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Unknown.xpm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Video.xpm -- cgit