From 336dee06c9f346d1d5bb34a0d6fec0aae69191fd Mon Sep 17 00:00:00 2001
From: wg <wg@FreeBSD.org>
Date: Tue, 24 Jun 2014 20:08:33 +0000
Subject: mail/cone: support stage [1]

- Add LICENSE [1]
- Fix for clang [1]
- Use shebangfix
- Remove unneeded pre/post include

PR:		191323
Submitted by:	maintainer
---
 mail/cone/Makefile                                 | 43 ++++++++++------------
 .../cone/files/patch-curses-cursescontainer-C.diff | 11 ++++++
 mail/cone/files/patch-libmail-envelope-h.diff      | 10 +++++
 mail/cone/pkg-plist                                |  3 ++
 4 files changed, 43 insertions(+), 24 deletions(-)
 create mode 100644 mail/cone/files/patch-curses-cursescontainer-C.diff
 create mode 100644 mail/cone/files/patch-libmail-envelope-h.diff

(limited to 'mail')

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 6a67868baf52..0928161ea41a 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -3,9 +3,8 @@
 
 PORTNAME=	cone
 PORTVERSION=	0.90
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
-NO_STAGE=	yes
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
 #		http://www.lerctr.org/~ler/
@@ -15,39 +14,35 @@ MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Console based mail client with POP3/IMAP/SMAP support
 
-LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
 BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		fam gettext gmake iconv ncurses perl5
+USES=		fam gettext gmake iconv ncurses perl5 shebangfix tar:bzip2
 USE_GNOME=	libxml2
 
-USE_BZIP2=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	-C --without-db --with-certdb=${PREFIX}/share/cone/rootcerts --prefix=${PREFIX} --exec-prefix=${PREFIX}
+SHEBANG_FILES=	sysconftool
 
+CPPFLAGS+=	-I${LOCALBASE}/include \
+		-D_XOPEN_SOURCE_EXTENDED \
+		-I${WRKDIR} -D_XOPEN_SOURCE_EXTENDED
 LDFLAGS+=	-L${LOCALBASE}/lib
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	-C --without-db --with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
 CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash"
-MAN1=		cone.1 leaf.1 mailtool.1
-INSTALL_TARGET=	install-strip
 
-.include <bsd.port.pre.mk>
-
-CPPFLAGS+=	-D_XOPEN_SOURCE_EXTENDED
-CPPFLAGS+=	-I${WRKDIR} -D_XOPEN_SOURCE_EXTENDED
+INSTALL_TARGET=	install-strip
 
 post-extract:
-		${MKDIR} ${WRKDIR}/ncursesw
+		@${MKDIR} ${WRKDIR}/ncursesw
 		${LN} -s ${LOCALBASE}/include/ncurses/ncurses.h ${WRKDIR}/ncursesw/curses.h
 
 post-install:
-		${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin/cone-sysconftool
-		PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PORTNAME} POST-INSTALL
-		${RM} -f ${PREFIX}/share/cone/rootcerts/.0
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}
-		${INSTALL_MAN} ${WRKSRC}/ChangeLog ${DOCSDIR}
-.endif
-
-.include <bsd.port.post.mk>
+		${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool
+		${RM} -f ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0
+		@${MKDIR} ${STAGEDIR}${DOCSDIR}
+		${INSTALL_MAN} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/mail/cone/files/patch-curses-cursescontainer-C.diff b/mail/cone/files/patch-curses-cursescontainer-C.diff
new file mode 100644
index 000000000000..edf4665fd59e
--- /dev/null
+++ b/mail/cone/files/patch-curses-cursescontainer-C.diff
@@ -0,0 +1,11 @@
+--- curses/cursescontainer.C.orig	2014-06-24 00:25:29.000000000 +0200
++++ curses/cursescontainer.C	2014-06-24 00:25:42.000000000 +0200
+@@ -10,7 +10,7 @@
+ using namespace std;
+ 
+ CursesContainer::CursesContainer(CursesContainer *parent)
+-	: Curses(parent), drawIndex(0)
++	: Curses(parent), drawIndex()
+ {
+ }
+ 
diff --git a/mail/cone/files/patch-libmail-envelope-h.diff b/mail/cone/files/patch-libmail-envelope-h.diff
new file mode 100644
index 000000000000..08086a7f38ef
--- /dev/null
+++ b/mail/cone/files/patch-libmail-envelope-h.diff
@@ -0,0 +1,10 @@
+--- libmail/envelope.H.orig	2014-06-24 00:28:56.000000000 +0200
++++ libmail/envelope.H	2014-06-24 00:29:36.000000000 +0200
+@@ -8,6 +8,7 @@
+ 
+ #include <vector>
+ #include <string>
++#include <ctime>
+ 
+ #include "namespace.H"
+ 
diff --git a/mail/cone/pkg-plist b/mail/cone/pkg-plist
index bed36ff85dd5..046943ebd253 100644
--- a/mail/cone/pkg-plist
+++ b/mail/cone/pkg-plist
@@ -4,6 +4,9 @@ bin/mailtool
 sbin/cone-sysconftool
 etc/cone.dist
 libexec/cone
+man/man1/cone.1.gz
+man/man1/mailtool.1.gz
+man/man1/leaf.1.gz
 %%DATADIR%%/APPLICATION.PDF.filter
 %%DATADIR%%/IMAGE.GIF.filter
 %%DATADIR%%/IMAGE.JPEG.filter
-- 
cgit