Retire mail/msmtp-devel: mail/msmtp is the new stable version and no new

development version exists.

PR:		ports/69244
Submitted by:	Roman Bogorodskiy (msmtp-devel maintainer)
Approved by:	R.I.Pienaar (msmtp maintainer)

8 files changed, 9 insertions, 66 deletions

diff --git a/MOVED b/MOVED
index d3c8ad02996b..bc3dde82dfcf 100644
--- a/MOVED
+++ b/MOVED
@@ -1192,3 +1192,4 @@ misc/cfe||2004-07-06|no longer exists
 devel/p5-WWW-Mechanize-FormFiller|www/p5-WWW-Mechanize-FormFiller|2004-07-09|moved to correct category (www)
 editors/moleskine||2004-07-09|project officially dead for last 1.5 years
 mail/sendmail-old|mail/sendmail811|2004-07-17|renamed
+mail/msmtp-devel|mail/msmtp|2004-07-19|mail/msmtp is now stable again
diff --git a/mail/Makefile b/mail/Makefile
index 7b50042d878f..951ea7b629ac 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -203,7 +203,6 @@
     SUBDIR += mreport
     SUBDIR += msgconvert
     SUBDIR += msmtp
-    SUBDIR += msmtp-devel
     SUBDIR += msmtpqueue
     SUBDIR += mulberry
     SUBDIR += mutt
diff --git a/mail/msmtp-devel/Makefile b/mail/msmtp-devel/Makefile
deleted file mode 100644
index c83b66b2b81b..000000000000
--- a/mail/msmtp-devel/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# Ports collection makefile for:  msmtp-devel
-# Date created:                   2 June 2004
-# Whom:                           Roman Bogorodskiy
-#
-# $FreeBSD$
-#
-
-PORTNAME=	msmtp
-PORTVERSION=	1.2.0
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	msmtp
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	bogorodskiy@inbox.ru
-COMMENT=	The development version of SMTP plugin for MUAs
-
-GNU_CONFIGURE=	yes
-USE_GETOPT_LONG=yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAN1=		msmtp.1
-PLIST_FILES=	bin/msmtp
-
-CONFLICTS=	msmtp-0.* \
-		msmtp-1.0.*
-
-.if !defined(WITH_OPENSSL)
-WITH_GNUTLS=	yes
-.endif
-
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
-.endif
-
-.if defined(WITH_OPENSSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--with-ssl=openssl
-.endif
-
-.if defined(WITH_GNU_SASL)
-LIB_DEPENDS+=	gsasl:${PORTSDIR}/security/gsasl
-.else
-CONFIGURE_ARGS+=	--disable-gsasl
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/msmtp-devel/distinfo b/mail/msmtp-devel/distinfo
deleted file mode 100644
index 4f1fe376d029..000000000000
--- a/mail/msmtp-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (msmtp-1.2.0.tar.gz) = ad23bc7217a6d78fdf1f9312adcd350b
-SIZE (msmtp-1.2.0.tar.gz) = 154348
diff --git a/mail/msmtp-devel/pkg-descr b/mail/msmtp-devel/pkg-descr
deleted file mode 100644
index b759f5842287..000000000000
--- a/mail/msmtp-devel/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This is a development version of msmtp. Most of the code was rewritten or 
-restructured, so it needs some testing. Some new features were also added: 
-SMTP pipelining, the --serverinfo option, and the --from option.
-
-Note: you may want to install mail/msmtpqueue - queuing support for msmtp.
-
-WWW: http://msmtp.sourceforge.net/
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index ed9c6539d546..0a4c508dee36 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	msmtp
-PORTVERSION=	1.0.0
+PORTVERSION=	1.2.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	msmtp
 
-MAINTAINER=	rip@devco.net
+MAINTAINER=	bogorodskiy@inbox.ru
 COMMENT=	SMTP plugin for MUAs
 
 GNU_CONFIGURE=	yes
+USE_GETOPT_LONG=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 260779e2f54d..4f1fe376d029 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,2 +1,2 @@
-MD5 (msmtp-1.0.0.tar.gz) = c0cbda33411850bec811b0090d28536d
-SIZE (msmtp-1.0.0.tar.gz) = 144444
+MD5 (msmtp-1.2.0.tar.gz) = ad23bc7217a6d78fdf1f9312adcd350b
+SIZE (msmtp-1.2.0.tar.gz) = 154348
diff --git a/mail/msmtp/pkg-descr b/mail/msmtp/pkg-descr
index 53808badff4c..ec14dc3ef0cd 100644
--- a/mail/msmtp/pkg-descr
+++ b/mail/msmtp/pkg-descr
@@ -1,8 +1,8 @@
 msmtp -- An SMTP client 
 
-Is an SMTP client that can be used as an "SMTP plugin" for Mutt and probably 
-other MUAs (mail user agents). It forwards mails to an SMTP server (for 
-example at a free mail provider) which does the delivery.
+msmtp is an SMTP client that can be used as an "SMTP plugin" for Mutt and
+probably other MUAs (mail user agents). It forwards mails to an SMTP server
+(for example at a free mail provider) which does the delivery.
 To use this program, create a configuration file with your mail account(s) and 
 tell your MUA to call msmtp instead of /usr/sbin/sendmail.