8 files changed, 36 insertions, 52 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 74eb7504cda8..7fe16530b122 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	0.9.11
+PORTVERSION=	0.9.12
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
-DISTNAME=	sylpheed-${PORTVERSION}claws
+#DISTNAME=	sylpheed-${PORTVERSION}claws
 DISTFILES=	${EXTRACT_ONLY} \
 		${THEMEFILE}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -30,6 +30,7 @@ USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=13
 USE_GNOME=	gnomehack pkgconfig gtk12
 USE_REINPLACE=	yes
+WANT_GNOME=	yes
 
 MAN1=		sylpheed-claws.1
 
@@ -45,6 +46,12 @@ CONFIGURE_ARGS=		--enable-openssl --with-openssl-includes=${OPENSSLINC} \
 
 .include <bsd.port.pre.mk>
 
+.if ${HAVE_GNOME:Mgnomehier} != ""
+PLIST_SUB+=	GNOME=""
+.else
+PLIST_SUB+=	GNOME="@comment "
+.endif
+
 CONFIGURE_ARGS+=	--program-suffix="-claws" --enable-ipv6
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 711ef5773ed2..2069115fbf4f 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed-0.9.11claws.tar.bz2) = d64647fdbcb49bfa4447989bffb9d0b8
-SIZE (sylpheed-0.9.11claws.tar.bz2) = 3012539
+MD5 (sylpheed-claws-0.9.12.tar.bz2) = 798f25bb5dae7fd4959fbcb38868bef0
+SIZE (sylpheed-claws-0.9.12.tar.bz2) = 3031344
 MD5 (sylpheed-iconset-20040525.tar.gz) = a2aa029cdee6cc22a0305774b70a5a70
 SIZE (sylpheed-iconset-20040525.tar.gz) = 856996
diff --git a/mail/claws-mail/files/patch-configure b/mail/claws-mail/files/patch-configure
index d0ba8d95c09d..f5fee614d635 100644
--- a/mail/claws-mail/files/patch-configure
+++ b/mail/claws-mail/files/patch-configure
@@ -1,24 +1,6 @@
---- configure.orig	Sat Jul 12 15:59:49 2003
-+++ configure	Sun Jul 27 13:26:36 2003
-@@ -1509,7 +1509,7 @@
- ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- 
- 
--PACKAGE=sylpheed
-+PACKAGE=sylpheed-claws
- 
- MAJOR_VERSION=0
- MINOR_VERSION=9
-@@ -2022,7 +2022,7 @@
- fi
- 
- 
--if test -n "$gnomedatadir"; then
-+if false; then
-   SYLPHEED_GNOME_TRUE=
-   SYLPHEED_GNOME_FALSE='#'
- else
-@@ -8506,6 +8506,7 @@
+--- configure.bak	Mon Jun 28 19:14:16 2004
++++ configure	Tue Jun 29 17:16:24 2004
+@@ -19691,6 +19691,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -26,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12501,9 +12502,9 @@
+@@ -23957,9 +23958,9 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 1155f4a46e87..fd6c990ef6bb 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -95,6 +95,7 @@ include/sylpheed-claws/gtk/menu.h
 include/sylpheed-claws/gtk/pluginwindow.h
 include/sylpheed-claws/gtk/prefswindow.h
 include/sylpheed-claws/gtk/progressdialog.h
+include/sylpheed-claws/gtk/quicksearch.h
 include/sylpheed-claws/gtk/sslcertwindow.h
 include/sylpheed-claws/headerview.h
 include/sylpheed-claws/html.h
@@ -346,6 +347,8 @@ share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed-claws.mo
 share/pixmaps/sylpheed-claws.png
+%%GNOME%%share/gnome/pixmaps/sylpheed.png
+%%GNOME%%share/gnome/apps/Internet/sylpheed.desktop
 %%DATADIR%%/OOo2sylpheed.pl
 %%DATADIR%%/calypso_convert.pl
 %%DATADIR%%/convert_mbox.pl
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 74eb7504cda8..7fe16530b122 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	0.9.11
+PORTVERSION=	0.9.12
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
-DISTNAME=	sylpheed-${PORTVERSION}claws
+#DISTNAME=	sylpheed-${PORTVERSION}claws
 DISTFILES=	${EXTRACT_ONLY} \
 		${THEMEFILE}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -30,6 +30,7 @@ USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=13
 USE_GNOME=	gnomehack pkgconfig gtk12
 USE_REINPLACE=	yes
+WANT_GNOME=	yes
 
 MAN1=		sylpheed-claws.1
 
@@ -45,6 +46,12 @@ CONFIGURE_ARGS=		--enable-openssl --with-openssl-includes=${OPENSSLINC} \
 
 .include <bsd.port.pre.mk>
 
+.if ${HAVE_GNOME:Mgnomehier} != ""
+PLIST_SUB+=	GNOME=""
+.else
+PLIST_SUB+=	GNOME="@comment "
+.endif
+
 CONFIGURE_ARGS+=	--program-suffix="-claws" --enable-ipv6
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
index 711ef5773ed2..2069115fbf4f 100644
--- a/mail/sylpheed-claws/distinfo
+++ b/mail/sylpheed-claws/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed-0.9.11claws.tar.bz2) = d64647fdbcb49bfa4447989bffb9d0b8
-SIZE (sylpheed-0.9.11claws.tar.bz2) = 3012539
+MD5 (sylpheed-claws-0.9.12.tar.bz2) = 798f25bb5dae7fd4959fbcb38868bef0
+SIZE (sylpheed-claws-0.9.12.tar.bz2) = 3031344
 MD5 (sylpheed-iconset-20040525.tar.gz) = a2aa029cdee6cc22a0305774b70a5a70
 SIZE (sylpheed-iconset-20040525.tar.gz) = 856996
diff --git a/mail/sylpheed-claws/files/patch-configure b/mail/sylpheed-claws/files/patch-configure
index d0ba8d95c09d..f5fee614d635 100644
--- a/mail/sylpheed-claws/files/patch-configure
+++ b/mail/sylpheed-claws/files/patch-configure
@@ -1,24 +1,6 @@
---- configure.orig	Sat Jul 12 15:59:49 2003
-+++ configure	Sun Jul 27 13:26:36 2003
-@@ -1509,7 +1509,7 @@
- ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- 
- 
--PACKAGE=sylpheed
-+PACKAGE=sylpheed-claws
- 
- MAJOR_VERSION=0
- MINOR_VERSION=9
-@@ -2022,7 +2022,7 @@
- fi
- 
- 
--if test -n "$gnomedatadir"; then
-+if false; then
-   SYLPHEED_GNOME_TRUE=
-   SYLPHEED_GNOME_FALSE='#'
- else
-@@ -8506,6 +8506,7 @@
+--- configure.bak	Mon Jun 28 19:14:16 2004
++++ configure	Tue Jun 29 17:16:24 2004
+@@ -19691,6 +19691,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -26,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12501,9 +12502,9 @@
+@@ -23957,9 +23958,9 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  
diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist
index 1155f4a46e87..fd6c990ef6bb 100644
--- a/mail/sylpheed-claws/pkg-plist
+++ b/mail/sylpheed-claws/pkg-plist
@@ -95,6 +95,7 @@ include/sylpheed-claws/gtk/menu.h
 include/sylpheed-claws/gtk/pluginwindow.h
 include/sylpheed-claws/gtk/prefswindow.h
 include/sylpheed-claws/gtk/progressdialog.h
+include/sylpheed-claws/gtk/quicksearch.h
 include/sylpheed-claws/gtk/sslcertwindow.h
 include/sylpheed-claws/headerview.h
 include/sylpheed-claws/html.h
@@ -346,6 +347,8 @@ share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed-claws.mo
 share/pixmaps/sylpheed-claws.png
+%%GNOME%%share/gnome/pixmaps/sylpheed.png
+%%GNOME%%share/gnome/apps/Internet/sylpheed.desktop
 %%DATADIR%%/OOo2sylpheed.pl
 %%DATADIR%%/calypso_convert.pl
 %%DATADIR%%/convert_mbox.pl