- Remove mail/sylpheed-gtk2 and point users to mail/sylpheed2

PR:		ports/78908
Submitted by:	Jean-Yves Lefort <jylefort@brutele.be> (maintainer)

7 files changed, 0 insertions, 245 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 6b69a92d49e7..4599f5938bb7 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -463,7 +463,6 @@
     SUBDIR += sylpheed
     SUBDIR += sylpheed2
     SUBDIR += sylpheed-claws
-    SUBDIR += sylpheed-gtk2
     SUBDIR += sympa
     SUBDIR += sympa-elixus
     SUBDIR += t-prot
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
deleted file mode 100644
index b9581cb69d5e..000000000000
--- a/mail/sylpheed-gtk2/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# New ports collection makefile for:	sylpheed-gtk2
-# Date created:                 25 September 2003
-# Whom:                         Jean-Yves Lefort <jylefort@brutele.be>
-#
-# $FreeBSD$
-#
-
-PORTNAME=		sylpheed-gtk2
-PORTVERSION=		1.0.0.20041224
-PORTREVISION=	1
-CATEGORIES=		mail ipv6
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=		sylpheed-${PORTVERSION:R}-gtk2-${PORTVERSION:E}
-
-MAINTAINER=		jylefort@brutele.be
-COMMENT=		The GTK+ 2.0 port of a lightweight, featureful and fast e-mail client
-
-USE_GETTEXT=		yes
-USE_GMAKE=		yes
-USE_ICONV=		yes
-USE_X_PREFIX=		yes
-USE_GNOME=		gtk20
-USE_LIBTOOL_VER=	15
-USE_REINPLACE=		yes
-
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib"
-
-OPTIONS=		SSL "SSL support" off \
-			GPGME "GnuPG support (using GPGME)" off \
-			COMPFACE "X-Face support (using compface)" off \
-			JPILOT "JPilot support" off \
-			LDAP "LDAP support" off
-
-CONFLICTS=		sylpheed-[0-9]*
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-CONFIGURE_ARGS+=	--enable-ssl
-.endif
-
-.if defined(WITH_GPGME)
-LIB_DEPENDS+=		gpgme03.9:${PORTSDIR}/security/gpgme03
-RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=	--enable-gpgme
-.endif
-
-.if defined(WITH_COMPFACE)
-LIB_DEPENDS+=		compface.1:${PORTSDIR}/mail/faces
-.else
-CONFIGURE_ARGS+=	--disable-compface
-.endif
-
-.if defined(WITH_JPILOT)
-LIB_DEPENDS+=		pisock.8:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS+=		jpilot:${PORTSDIR}/palm/jpilot
-CONFIGURE_ARGS+=	--enable-jpilot
-.endif
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--enable-ldap
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		 s|-lresolv||g; s|-lpisock\"|-liconv &|g; \
-		 s|^manualdir=.*|manualdir="${DOCSDIR}/manual"|g; \
-		 s|^faqdir=.*|faqdir="${DOCSDIR}/faq"|g ;\
-		 s|gpgme-config|gpgme03-config|g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po src manual faq$$|SUBDIRS = ac po src|g' \
-		${WRKSRC}/Makefile.in
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/sylpheed-gtk2/distinfo b/mail/sylpheed-gtk2/distinfo
deleted file mode 100644
index 458b5f0893b3..000000000000
--- a/mail/sylpheed-gtk2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (sylpheed-1.0.0-gtk2-20041224.tar.gz) = fa07eb9f2499f3aad6ed947a387e98cb
-SIZE(sylpheed-1.0.0-gtk2-20041224.tar.gz) = 3451862
diff --git a/mail/sylpheed-gtk2/files/patch-src::defs.h b/mail/sylpheed-gtk2/files/patch-src::defs.h
deleted file mode 100644
index 95df340577c1..000000000000
--- a/mail/sylpheed-gtk2/files/patch-src::defs.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/defs.h.orig	Sat Jul  3 01:49:41 2004
-+++ src/defs.h	Sat Jul  3 01:50:15 2004
-@@ -64,7 +64,7 @@
- #define MARK_VERSION		2
- 
- #define DEFAULT_SIGNATURE	".signature"
--#define DEFAULT_INC_PATH	"/usr/bin/mh/inc"
-+#define DEFAULT_INC_PATH	""
- #define DEFAULT_INC_PROGRAM	"inc"
- /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
- /* #define DEFAULT_INC_PROGRAM	"imget" */
-@@ -74,7 +74,7 @@
- #ifdef _PATH_MAILDIR
- #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
- #else
--#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
-+#  define DEFAULT_SPOOL_PATH	"/var/mail"
- #endif
- 
- #define BUFFSIZE			8192
diff --git a/mail/sylpheed-gtk2/files/patch-src::main.c b/mail/sylpheed-gtk2/files/patch-src::main.c
deleted file mode 100644
index 71c8b9e8dcea..000000000000
--- a/mail/sylpheed-gtk2/files/patch-src::main.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/main.c.orig	Tue Nov  2 15:29:14 2004
-+++ src/main.c	Tue Nov  2 15:30:16 2004
-@@ -194,20 +194,6 @@
- 
- 	srandom((gint)time(NULL));
- 
--	/* parse gtkrc files */
--	userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
--			     NULL);
--	gtk_rc_parse(userrc);
--	g_free(userrc);
--	userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtk",
--			     G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
--	gtk_rc_parse(userrc);
--	g_free(userrc);
--	userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc-2.0",
--			     NULL);
--	gtk_rc_parse(userrc);
--	g_free(userrc);
--
- 	userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
- 	gtk_accel_map_load (userrc);
- 	g_free(userrc);
diff --git a/mail/sylpheed-gtk2/pkg-descr b/mail/sylpheed-gtk2/pkg-descr
deleted file mode 100644
index 8bb9fd10d794..000000000000
--- a/mail/sylpheed-gtk2/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
-X Window System, and aiming for:
-  * Quick response
-  * Graceful, and sophisticated interface
-  * Easy configuration, intuitive operation
-  * Abundant features
-
-Currently, many features are supported including POP3, IMAP, NNTP,
-multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
-AUTH, SSL, IPv6, GnuPG, internalization, and more.
-
-This is the GTK+ 2.0 branch of Sylpheed, authored by Takuro Ashie and
-Botond Botyanszki.
-
-WWW: http://sylpheed.good-day.net/
-WWW: http://www.homa.ne.jp/~ashie/linux/sylpheed-gtk2.html
diff --git a/mail/sylpheed-gtk2/pkg-plist b/mail/sylpheed-gtk2/pkg-plist
deleted file mode 100644
index 6a457eeafcaf..000000000000
--- a/mail/sylpheed-gtk2/pkg-plist
+++ /dev/null
@@ -1,101 +0,0 @@
-bin/sylpheed
-share/locale/bg/LC_MESSAGES/sylpheed.mo
-share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/nl/LC_MESSAGES/sylpheed.mo
-share/locale/pl/LC_MESSAGES/sylpheed.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-share/locale/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/LC_MESSAGES/sylpheed.mo
-share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/uk/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.sgml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/ja
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/it
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/es
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
-%%PORTDOCS%%@dirrm %%DOCSDIR%%