4 files changed, 35 insertions, 9 deletions

diff --git a/security/base/Makefile b/security/base/Makefile
index 884916293328..e37b5871506e 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	base
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	secureideas
@@ -18,13 +18,34 @@ RUN_DEPENDS=	${LOCALBASE}/bin/snort:${PORTSDIR}/security/snort \
 		${ADODB_DIR}/adodb.inc.php:${PORTSDIR}/databases/adodb \
 		${LOCALBASE}/share/pear/Image/Graph.php:${PORTSDIR}/graphics/pear-Image_Graph
 
-USE_PHP=	yes
+USE_PHP=	gd gettext pcre session zlib
 
 ADODB_DIR=	${LOCALBASE}/share/adodb
 
 SUB_FILES=	pkg-message
 DOCS=		docs/CHANGELOG docs/CREDITS docs/README docs/TODO docs/UPGRADE
 
+OPTIONS=	MYSQL "Enable MySQL support" off \
+		PGSQL "Enable PostgreSQL support" off \
+		PDF "Enable PDF support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+USE_PHP+=	mysql
+.endif
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+USE_PHP+=	pgsql
+.endif
+.if defined(WITH_PDF)
+RUN_DEPENDS+=	${LOCALBASE}/share/fpdf/fpdf.php:${PORTSDIR}/print/fpdf
+.endif
+
+# we need this because we USE_PHP after bsd.port.pre.mk is included
+.include "${PORTSDIR}/Mk/bsd.php.mk"
+
 do-build:
 	@${REINPLACE_CMD} -e 's,DBlib_path = "",DBlib_path = "${ADODB_DIR}",' \
 		${WRKSRC}/base_conf.php.dist
@@ -48,4 +69,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/base/distinfo b/security/base/distinfo
index 7663dd6ac36c..db9f24d08ef2 100644
--- a/security/base/distinfo
+++ b/security/base/distinfo
@@ -1,3 +1,3 @@
-MD5 (base-1.2.2.tar.gz) = b257240c6e554f0e3a78913ecd01baa3
-SHA256 (base-1.2.2.tar.gz) = 63054beb2d615934ad492b239a89536e97c7fd89c4faeb67107d2b3929d80e53
-SIZE (base-1.2.2.tar.gz) = 346518
+MD5 (base-1.2.4.tar.gz) = 7f67a39b4213bdc6bce71a90444a9c58
+SHA256 (base-1.2.4.tar.gz) = a9f578a421d687d66f150e1e32f37e6641fe1ad36b2837e8d2476481143f28c1
+SIZE (base-1.2.4.tar.gz) = 327770
diff --git a/security/base/files/pkg-message.in b/security/base/files/pkg-message.in
index f15c1d0d9e4b..c729bf48a5bd 100644
--- a/security/base/files/pkg-message.in
+++ b/security/base/files/pkg-message.in
@@ -16,6 +16,11 @@ the following to your Apache configuration file:
 In order for the graphing functions to work in BASE, make sure you
 include PEAR in your %%LOCALBASE%%/etc/php.ini configuration file, like:
 
-    include_path = ".:%%PREFIX%%/share/pear"
+    include_path = ".:%%LOCALBASE%%/share/pear"
+
+If you built BASE with PDF support, make sure you include the FPDF
+path in your %%LOCALBASE%%/etc/php.ini configuration file, like:
+
+    include_path = ".:%%LOCALBASE%%/share/pear:%%LOCALBASE%%/share/fpdf"
 
 ========================================================================
diff --git a/security/base/pkg-plist b/security/base/pkg-plist
index 05247dadd53a..8ac634e75c76 100644
--- a/security/base/pkg-plist
+++ b/security/base/pkg-plist
@@ -69,8 +69,8 @@ www/base/includes/base_state_criteria.inc.php
 www/base/includes/base_state_query.inc.php
 www/base/includes/base_template.php
 www/base/includes/base_user.inc.php
-www/base/includes/class.ezpdf.php
-www/base/includes/class.pdf.php
+www/base/includes/fpdf_class.php
+www/base/includes/fpdf_fonts.php
 www/base/index.php
 www/base/languages/czech.lang.php
 www/base/languages/chinese.lang.php