3 files changed, 14 insertions, 16 deletions

diff --git a/www/otrs/Makefile b/www/otrs/Makefile
index 2e9714919d9b..5e075c89f08d 100644
--- a/www/otrs/Makefile
+++ b/www/otrs/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	otrs
-PORTVERSION=	5.0.18
-PORTREVISION=	1
+PORTVERSION=	5.0.23
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.otrs.org/pub/otrs/ \
 		ftp://ftp.samurai.com/pub/otrs/ \
@@ -44,6 +43,9 @@ BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
 		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
 		p5-Mozilla-CA>=0:www/p5-Mozilla-CA \
+		p5-CGI>=0:www/p5-CGI \
+		p5-Lingua-Translit>=0:devel/p5-Lingua-Translit \
+		p5-Pod-Strip>=0:textproc/p5-Pod-Strip \
 		p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -98,6 +100,7 @@ SSL_RUN_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 
 APACHE_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2 \
 			p5-Apache-DBI>0:www/p5-Apache-DBI
+APACHE_USE=		apache_run=22+
 
 REPORTS_RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD \
 			p5-GD-Graph>=0:graphics/p5-GD-Graph \
@@ -124,10 +127,6 @@ GNUPG_RUN_DEPENDS=	gpg:security/gnupg1
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	22+
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.pm" | \
 		${XARGS} ${REINPLACE_CMD} -i '' \
@@ -141,18 +140,16 @@ do-build:
 	@${FIND} ${WRKSRC}/Kernel -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/opt/=${PREFIX}/=g;s=wwwrun=${WWWOWN}=g;"
-.if ${PORT_OPTIONS:MISPELL}
+
+do-build-ISPELL-on:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/ispell=${PREFIX}/bin/ispell=g"
-.endif
-.if ${PORT_OPTIONS:MASPELL}
+do-build-ASPELL-on:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/ispell=${PREFIX}/bin/aspell=g"
-.endif
-.if ${PORT_OPTIONS:MGNUPG}
+do-build-GNUPG-on:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/gpg=${PREFIX}/bin/gpg=g"
-.endif
 
 do-install:
 .for D in ${ROOT_DIRS_LIST:S!^!${OTRSDIR}/!} ${BIN_DIRS_LIST:S!^!${OTRSDIR}/bin/!} ${SCRIPTS_DIRS_LIST:S!^!${OTRSDIR}/scripts/!}
diff --git a/www/otrs/distinfo b/www/otrs/distinfo
index 190cf4671254..68b8245bfa84 100644
--- a/www/otrs/distinfo
+++ b/www/otrs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491412917
-SHA256 (otrs-5.0.18.tar.bz2) = 32d2a17996a882fb8965e52d92589be1a9a8fb1a15cd47689919e6d1302fe1b4
-SIZE (otrs-5.0.18.tar.bz2) = 20401943
+TIMESTAMP = 1506472975
+SHA256 (otrs-5.0.23.tar.bz2) = 5e12affbccde0cae5738de1d0c7334e655b4c373ea668913ec54f31564b128c4
+SIZE (otrs-5.0.23.tar.bz2) = 20617459
diff --git a/www/otrs/pkg-plist b/www/otrs/pkg-plist
index e3fbe7d36160..d6e08f2567aa 100644
--- a/www/otrs/pkg-plist
+++ b/www/otrs/pkg-plist
@@ -5,7 +5,7 @@ otrs/.mailfilter.dist
 otrs/.procmailrc.dist
 otrs/ARCHIVE
 @sample otrs/Kernel/Config.pm.dist otrs/Kernel/Config.pm
-otrs/Kernel/Config.pod.dist
+@sample otrs/Kernel/Config.pod.dist otrs/Kernel/Config.pod
 otrs/Kernel/Config/Defaults.pm
 otrs/Kernel/Config/Files/CloudServices.xml
 otrs/Kernel/Config/Files/Daemon.xml
@@ -518,6 +518,7 @@ otrs/Kernel/Output/HTML/Templates/Standard/InstallerLicenseText.tt
 otrs/Kernel/Output/HTML/Templates/Standard/InstallerSystem.tt
 otrs/Kernel/Output/HTML/Templates/Standard/LinkObject.tt
 otrs/Kernel/Output/HTML/Templates/Standard/Login.tt
+otrs/Kernel/Output/HTML/Templates/Standard/MetaFloater.tt
 otrs/Kernel/Output/HTML/Templates/Standard/MobileNotAvailableWidget.tt
 otrs/Kernel/Output/HTML/Templates/Standard/Motd.tt
 otrs/Kernel/Output/HTML/Templates/Standard/NoPermission.tt