aboutsummaryrefslogtreecommitdiffstats
path: root/japanese/mutt
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2007-07-05 18:47:11 +0800
committerpav <pav@FreeBSD.org>2007-07-05 18:47:11 +0800
commit8d044c9b6572f32ee4e22125bf1231dcfaccb7ee (patch)
treec33bd374105936442d2ed3d284e215a8c12c9c08 /japanese/mutt
parent99aa7ffbef66b11be9e7561a5a308ec396a17d76 (diff)
downloadfreebsd-ports-gnome-8d044c9b6572f32ee4e22125bf1231dcfaccb7ee.tar.gz
freebsd-ports-gnome-8d044c9b6572f32ee4e22125bf1231dcfaccb7ee.tar.zst
freebsd-ports-gnome-8d044c9b6572f32ee4e22125bf1231dcfaccb7ee.zip
- Fix build with GCC 4.2
Submitted by: SHIOZAKI Takehiko <st@be.to> (maintainer)
Diffstat (limited to 'japanese/mutt')
-rw-r--r--japanese/mutt/Makefile6
-rw-r--r--japanese/mutt/files/patch-keymap.h11
-rw-r--r--japanese/mutt/files/patch-m4-gssapi.m433
3 files changed, 47 insertions, 3 deletions
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index a8664cbae305..784d7d7bb0ea 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -6,12 +6,12 @@
PORTNAME= mutt
PORTVERSION= ${VERSION}.j${JP_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese mail
MASTER_SITES= http://www.emaillab.org/mutt/1.4/ \
http://my.reset.jp/~iwashita/mutt/distfiles/ \
http://ha4.seikyou.ne.jp/home/Kohtaro.Hitomi/mutt/ \
- ftp://ftp.mutt.org/pub/mutt/devel/
+ ftp://ftp.mutt.org/pub/mutt/
DISTNAME= ${PORTNAME}-${VERSION}i
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${DISTNAME}-ja.${JP_VERSION}${EXTRACT_SUFX} \
@@ -34,7 +34,7 @@ FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
USE_GMAKE= yes
USE_ICONV= yes
-USE_AUTOTOOLS= automake:14 autoconf:253
+USE_AUTOTOOLS= automake:19 autoconf:259
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/mutt/files/patch-keymap.h b/japanese/mutt/files/patch-keymap.h
new file mode 100644
index 000000000000..3e359d94f357
--- /dev/null
+++ b/japanese/mutt/files/patch-keymap.h
@@ -0,0 +1,11 @@
+--- keymap.h.orig Tue Sep 11 20:20:34 2001
++++ keymap.h Wed Jul 4 18:17:25 2007
+@@ -19,6 +19,8 @@
+ #ifndef KEYMAP_H
+ #define KEYMAP_H
+
++#include "mapping.h"
++
+ /* maximal length of a key binding sequence used for buffer in km_bindkey */
+ #define MAX_SEQ 8
+
diff --git a/japanese/mutt/files/patch-m4-gssapi.m4 b/japanese/mutt/files/patch-m4-gssapi.m4
new file mode 100644
index 000000000000..2425cde4f2b8
--- /dev/null
+++ b/japanese/mutt/files/patch-m4-gssapi.m4
@@ -0,0 +1,33 @@
+--- m4/gssapi.m4.orig Wed Apr 17 19:05:04 2002
++++ m4/gssapi.m4 Mon Oct 16 10:59:34 2006
+@@ -6,10 +6,13 @@
+ dnl if it is set and not "yes".
+ dnl Defines GSSAPI_CFLAGS and GSSAPI_LIBS if found.
+ dnl Defines GSSAPI_IMPL to "Heimdal", "MIT", or "OldMIT", or "none" if not found
+-AC_DEFUN(MUTT_AM_PATH_GSSAPI,
++AC_DEFUN([MUTT_AM_PATH_GSSAPI],
+ [
+ GSSAPI_PREFIX=[$]$1
+ GSSAPI_IMPL="none"
++ saved_CPPFLAGS="$CPPFLAGS"
++ saved_LDFLAGS="$LDFLAGS"
++ saved_LIBS="$LIBS"
+ dnl First try krb5-config
+ if test "$GSSAPI_PREFIX" != "yes"
+ then
+@@ -24,14 +27,11 @@
+ GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`"
+ case "`$KRB5CFGPATH --version`" in
+ "Kerberos 5 "*) GSSAPI_IMPL="MIT";;
+- [hH]eimdal*) GSSAPI_IMPL="Heimdal";;
++ ?eimdal*) GSSAPI_IMPL="Heimdal";;
+ *) GSSAPI_IMPL="Unknown";;
+ esac
+ else
+ dnl No krb5-config, run the old code
+- saved_CPPFLAGS="$CPPFLAGS"
+- saved_LDFLAGS="$LDFLAGS"
+- saved_LIBS="$LIBS"
+ if test "$GSSAPI_PREFIX" != "yes"
+ then
+ GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include"