4 files changed, 60 insertions, 23 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 80331a010ec9..b7c4c27b7bf1 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	0.7.6
+PORTVERSION=	0.7.8
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -17,6 +17,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	corecode@corecode.ath.cx
 
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
+
 THEMEVERSION=	2
 THEMEFILE=	sylpheed-theme-pak${THEMEVERSION}${EXTRACT_SUFX}
 
@@ -26,8 +28,7 @@ USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 USE_GTK=	yes
 
-CONFIGURE_ARGS=	--program-suffix="-claws" --with-included-gettext \
-		--enable-ipv6
+CONFIGURE_ARGS=	--program-suffix="-claws" --enable-ipv6
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
@@ -40,7 +41,7 @@ USE_IMLIB=		yes
 CONFIGURE_ARGS+=	--disable-gdk-pixbuf
 .endif
 .if defined(WITH_GPGME) || defined(WITH_ALL)
-LIB_DEPENDS+=		gpgme.5:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+=		gpgme.8:${PORTSDIR}/security/gpgme
 RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
 CONFIGURE_ARGS+=	--enable-gpgme
 .endif
@@ -103,10 +104,11 @@ post-extract:
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" \
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
+	@${REINPLACE_CMD} -e "s|po intl libkcc|po libkcc|" ${WRKSRC}/Makefile.in
 .if defined(NOPORTDOCS)
-	@${PERL} -pi -e 's|^(SUBDIRS = .*)manual faq (.*)|\1\2|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|src manual faq tools|src tools|' ${WRKSRC}/Makefile.in
 .endif
 
 pre-build:
@@ -115,9 +117,9 @@ pre-build:
 post-install:
 .if !defined(NOPORTDOCS)
 .for i in NEWS README README.jp README.claws ReleaseNotes.claws TODO TODO.jp tools/README.sylprint
-	@${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-	@${INSTALL_MAN} ${WRKSRC}/tools/README ${DOCSDIR}/README.tools
+	@${INSTALL_DATA} ${WRKSRC}/tools/README ${DOCSDIR}/README.tools
 .endif
 	@${MKDIR} ${DATADIR}
 .for i in eud2gc.py filter_conv.pl gif2xface.pl ldif-to-xml.py newscache_clean.pl
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 34cbd85f3fb1..7eac9153807f 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,2 +1,2 @@
-MD5 (sylpheed-0.7.6claws.tar.bz2) = e80a700478b01a00170864c7b59d910e
+MD5 (sylpheed-0.7.8claws.tar.bz2) = 94724f28b92a20297783aa29625b558c
 MD5 (sylpheed-theme-pak2.tar.bz2) = e62d7a6188d1212e0ceac8ed7aaecd62
diff --git a/mail/claws-mail/files/patch-configure b/mail/claws-mail/files/patch-configure
index 47a8b864dc16..7fc71eab9637 100644
--- a/mail/claws-mail/files/patch-configure
+++ b/mail/claws-mail/files/patch-configure
@@ -1,26 +1,46 @@
---- configure.orig	Sun Apr 28 09:44:55 2002
-+++ configure	Tue Apr 30 14:53:48 2002
-@@ -758,7 +758,7 @@
- fi
- 
+--- configure.orig	Sat Jun 15 10:50:09 2002
++++ configure	Sun Jun 16 18:02:59 2002
+@@ -1172,7 +1172,7 @@
+ PATH_SEPARATOR="$ac_path_separator"
+ rm -f conftest.sh
  
 -PACKAGE=sylpheed
 +PACKAGE=sylpheed-claws
  
  MAJOR_VERSION=0
  MINOR_VERSION=7
-@@ -1148,7 +1148,7 @@
- fi
+@@ -1612,7 +1612,7 @@
  
+ fi
  
 -if test -d "$gnomedir"; then
 +if false; then
    SYLPHEED_GNOME_TRUE=
    SYLPHEED_GNOME_FALSE='#'
  else
-@@ -7479,9 +7479,9 @@
- localedir='${prefix}/${DATADIRNAME}/locale'
+@@ -7019,7 +7019,7 @@
+ fi
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh"
  
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -9932,8 +9932,8 @@
+                 INTLOBJS="\$(GETTOBJS)"
+         BUILD_INCLUDED_LIBINTL=yes
+         USE_INCLUDED_LIBINTL=yes
+-        LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
+-        LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
++        LIBINTL="$LIBICONV"
++        LTLIBINTL="$LTLIBICONV"
+         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+       fi
+ 
+@@ -10019,9 +10019,9 @@
+ 
+ localedir='${prefix}/${DATADIRNAME}/locale'
  
 -manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
 +manualdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/manual'
@@ -28,9 +48,9 @@
 -faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq'
 +faqdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/faq'
  
- 
  if test "x${datadir}" = 'x${prefix}/share'; then
-@@ -8948,7 +8948,7 @@
+   if test "x${prefix}" = "xNONE"; then
+@@ -11633,7 +11633,7 @@
  
  	if test "$ac_cv_enable_ldap" = yes; then
  		CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
@@ -38,4 +58,21 @@
 +		LIBS="$LIBS -lldap -llber ${PTHREAD_LIBS} `$GLIB_CONFIG --libs gthread`"
  	fi
  else
- 	echo "$ac_t""no" 1>&6
+ 	echo "$as_me:11639: result: no" >&5
+@@ -14194,7 +14194,7 @@
+ fi
+ done
+ 
+-ac_config_files="$ac_config_files Makefile sylpheed.spec ac/Makefile libkcc/Makefile src/version.h src/Makefile faq/Makefile faq/de/Makefile faq/en/Makefile faq/es/Makefile faq/fr/Makefile faq/it/Makefile manual/Makefile manual/de/Makefile manual/en/Makefile manual/es/Makefile manual/fr/Makefile manual/ja/Makefile tools/Makefile intl/Makefile po/Makefile.in"
++ac_config_files="$ac_config_files Makefile sylpheed.spec ac/Makefile libkcc/Makefile src/version.h src/Makefile faq/Makefile faq/de/Makefile faq/en/Makefile faq/es/Makefile faq/fr/Makefile faq/it/Makefile manual/Makefile manual/de/Makefile manual/en/Makefile manual/es/Makefile manual/fr/Makefile manual/ja/Makefile tools/Makefile po/Makefile.in"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -14539,7 +14539,6 @@
+   "manual/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual/fr/Makefile" ;;
+   "manual/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual/ja/Makefile" ;;
+   "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+-  "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+   "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 1a78c2593449..0272d9975490 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -2,7 +2,6 @@ bin/sylpheed-claws
 bin/sylpheed-switcher
 bin/sylprint.pl
 etc/sylprint.rc.example
-lib/charset.alias
 %%PORTDOCS%%share/doc/sylpheed-claws/NEWS
 %%PORTDOCS%%share/doc/sylpheed-claws/README
 %%PORTDOCS%%share/doc/sylpheed-claws/README.claws
@@ -145,7 +144,6 @@ share/locale/hr/LC_MESSAGES/sylpheed-claws.mo
 share/locale/it/LC_MESSAGES/sylpheed-claws.mo
 share/locale/ja/LC_MESSAGES/sylpheed-claws.mo
 share/locale/ko/LC_MESSAGES/sylpheed-claws.mo
-share/locale/locale.alias
 share/locale/nl/LC_MESSAGES/sylpheed-claws.mo
 share/locale/pl/LC_MESSAGES/sylpheed-claws.mo
 share/locale/pt_BR/LC_MESSAGES/sylpheed-claws.mo