- Fix build

- Add License

PR:		185335
Submitted by:	ports fury

5 files changed, 53 insertions, 8 deletions

diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index ad5fe7d91ebb..630135225eb2 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -7,7 +7,9 @@ CATEGORIES=	mail
 MASTER_SITES=	SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A tool intended for Blackbox that checks for new mail
+COMMENT=	Tool intended for Blackbox that checks for new mail
+
+LICENSE=	GPLv2 # (or later)
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libbt.pc:${PORTSDIR}/x11-wm/blackbox
 
@@ -15,12 +17,7 @@ USES=		pkgconfig
 USE_XORG=	xext
 GNU_CONFIGURE=	yes
 
-MAN1=		bbmail.1
-PLIST_FILES=	bin/bbmail share/bbtools/bbmail.rc
-
-NO_STAGE=	yes
-post-install:
-	@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
-		>> ${TMPPLIST}
+PLIST_FILES=	bin/bbmail man/man1/bbmail.1.gz share/bbtools/bbmail.rc
+PLIST_DIRSTRY=	share/bbtools
 
 .include <bsd.port.mk>
diff --git a/mail/bbmail/files/patch-src__bbmail.cpp b/mail/bbmail/files/patch-src__bbmail.cpp
new file mode 100644
index 000000000000..e3037a975b10
--- /dev/null
+++ b/mail/bbmail/files/patch-src__bbmail.cpp
@@ -0,0 +1,18 @@
+--- src/bbmail.cpp.orig
++++ src/bbmail.cpp
+@@ -22,13 +22,14 @@
+ #include "bbmail.h"
+ #include "config.h"
+ #include <string>
++#include <cstdlib>
++#include <cmath>
+ 
+ extern "C" {
+ #include <utime.h>
+ #include <dirent.h>
+ #include <X11/cursorfont.h>
+ #include <sys/stat.h>
+-#include <math.h>
+ }
+ 
+ #include "EWMH.hh"
diff --git a/mail/bbmail/files/patch-src__mailboxmenu.cpp b/mail/bbmail/files/patch-src__mailboxmenu.cpp
new file mode 100644
index 000000000000..997df68a4144
--- /dev/null
+++ b/mail/bbmail/files/patch-src__mailboxmenu.cpp
@@ -0,0 +1,10 @@
+--- src/mailboxmenu.cpp.orig
++++ src/mailboxmenu.cpp
+@@ -20,6 +20,7 @@
+ //
+ //
+ #include "mailboxmenu.h"
++#include <cstdlib>
+ 
+ MailboxMenu::MailboxMenu(ToolWindow *toolwindow) :
+         Menu(*toolwindow, toolwindow->getCurrentScreen()), bbtool(toolwindow)
diff --git a/mail/bbmail/files/patch-src__main.cpp b/mail/bbmail/files/patch-src__main.cpp
new file mode 100644
index 000000000000..67bf90cee453
--- /dev/null
+++ b/mail/bbmail/files/patch-src__main.cpp
@@ -0,0 +1,10 @@
+--- src/main.cpp.orig
++++ src/main.cpp
+@@ -22,6 +22,7 @@
+ #include "bbmail.h"
+ #include "main.h"
+ #include "config.h"
++#include <cstdlib>
+ 
+ Configuration::Configuration(int iargc, char **iargv)
+ {
diff --git a/mail/bbmail/files/patch-src__resource.cpp b/mail/bbmail/files/patch-src__resource.cpp
new file mode 100644
index 000000000000..34aab214a5cc
--- /dev/null
+++ b/mail/bbmail/files/patch-src__resource.cpp
@@ -0,0 +1,10 @@
+--- src/resource.cpp.orig
++++ src/resource.cpp
+@@ -22,6 +22,7 @@
+ #include "bbmail.h"
+ #include "resource.h"
+ #include "blackboxstyle.h"
++#include <cstdlib>
+ 
+ Resource::Resource(ToolWindow *toolwindow, const std::string &rc_file):
+ 		BaseResource(*toolwindow, toolwindow->getCurrentScreen(), rc_file),