www/otrs: update 3.3.11 -> 4.0.8

- Set NO_ARCH
- Switch to OPTION helpers
- Regen patches with makepatch

PR:                  200761
Submitted by:        m.tsatsenko@gmail.com (maintainer)

www/otrs/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	otrs
-PORTVERSION=	3.3.11
+PORTVERSION=	4.0.8
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.otrs.org/pub/otrs/ \
 		ftp://ftp.samurai.com/pub/otrs/ \
@@ -14,7 +14,9 @@ COMMENT=	Open Ticket Request System
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-Crypt-Eksblowfish>=0:${PORTSDIR}/security/p5-Crypt-Eksblowfish \
 		p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
 		p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA \
 		p5-MIME-Tools>=5.427:${PORTSDIR}/mail/p5-MIME-Tools \
@@ -27,19 +29,22 @@ BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
 		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
 		p5-IO-Interactive>=0:${PORTSDIR}/devel/p5-IO-Interactive \
 		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
 		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
 		p5-Date-Pcalc>=0:${PORTSDIR}/devel/p5-Date-Pcalc \
 		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
+		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
 		p5-XML-FeedPP>=0:${PORTSDIR}/textproc/p5-XML-FeedPP \
 		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML \
 		p5-JavaScript-Minifier>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier \
 		p5-CSS-Minifier>=0:${PORTSDIR}/textproc/p5-CSS-Minifier \
 		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
 		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Mozilla-CA>=0:${PORTSDIR}/www/p5-Mozilla-CA
+		p5-Mozilla-CA>=0:${PORTSDIR}/www/p5-Mozilla-CA \
+		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -47,16 +52,17 @@ USES=		cpe shebangfix perl5 tar:bzip2
 SHEBANG_FILES=	bin/cgi-bin/*.pl bin/fcgi-bin/*.pl bin/*.pl \
 		scripts/auto_build/*.pl scripts/tools/*.pl scripts/*.pl
 
-OPTIONS_DEFINE=		MYSQL PGSQL REPORTS_MODULES SMTP POP3 IMAP LDAP PDF \
-			GNUPG DOCS APACHE
-OPTIONS_DEFAULT=	MYSQL REPORTS_MODULES SMTP POP3 IMAP PDF ASPELL APACHE
+OPTIONS_DEFINE=		MYSQL PGSQL REPORTS SMTP POP3 IMAP LDAP PDF \
+			GNUPG APACHE SSL
+OPTIONS_DEFAULT=	MYSQL REPORTS SMTP POP3 IMAP PDF ASPELL APACHE \
+			SSL
 OPTIONS_RADIO=		SPELL
 OPTIONS_RADIO_SPELL=	ASPELL ISPELL
 
 IMAP_DESC=		Fetch email via IMAP
 POP3_DESC=		Fetch email via POP3
 SMTP_DESC=		Send email via SMTP
-REPORTS_MODULES_DESC=	Reports support
+REPORTS_DESC=		Reports support
 APACHE_DESC=		Apache and www/mod_perl2 support
 
 OTRSDIR=	${PREFIX}/otrs
@@ -67,15 +73,13 @@ SUB_FILES=	pkg-message
 SUB_LIST=	OTRS_USER=${USERS} OTRS_GROUP=${USERS} WWWOWN=${WWWOWN}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-ROOT_DIRS_LIST=	Kernel bin scripts doc
+ROOT_DIRS_LIST=	Kernel bin scripts
 BIN_DIRS_LIST=	"" cgi-bin fcgi-bin
 PM_DIRS_LIST=	Kernel Kernel/Config Kernel/Config/Files Kernel/Language \
 		Modules Kernel/Output/HTML Kernel/Output/HTML/Lite \
 		Kernel/Output/HTML/Standard System System/Auth System/AuthSession \
 		System/Crypt System/CustomerAuth System/CustomerUser \
 		System/CustomerUser/ System/
-DOCS_DIRS_LIST=	"" manual/en
-DOCS_FILES_LIST=	C[A-Z]* INSTALL.md RE* UPGRADING.md
 
 SCRIPTS_DIRS_LIST=	"" database/update test tools
 CRON_SCRIPTS=	${STAGEDIR}${OTRSDIR}/var/cron/
@@ -88,57 +92,40 @@ PLIST_SUB+=	VER_CKEDITOR="4.4.5" OTRS_USER=${USERS} WWWOWN=${WWWOWN}
 PGSQL_RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 PGSQL_USES=		pgsql
 
-.include <bsd.port.pre.mk>
+MYSQL_RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 
-.if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-USE_MYSQL=	yes
-.endif
+SSL_RUN_DEPENDS+=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
+
+APACHE_RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:${PORTSDIR}/www/mod_perl2 \
+			p5-Apache-DBI>0:${PORTSDIR}/www/p5-Apache-DBI
+
+REPORTS_RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
+			p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
+			p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
+
+SMTP_RUN_DEPENDS+=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
+			p5-Net-SSLGlue>=0:${PORTSDIR}/security/p5-Net-SSLGlue
+
+POP3_RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
+			p5-Net-SSLGlue>=0:${PORTSDIR}/security/p5-Net-SSLGlue
+
+IMAP_RUN_DEPENDS+=	p5-Mail-IMAPClient>=0:${PORTSDIR}/mail/p5-Mail-IMAPClient \
+			p5-Net-IMAP-Simple>=0:${PORTSDIR}/mail/p5-Net-IMAP-Simple
+
+LDAP_RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+
+PDF_RUN_DEPENDS+=	p5-PDF-API2>=0.57:${PORTSDIR}/textproc/p5-PDF-API2
+
+ISPELL_RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
+
+ASPELL_RUN_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
+
+GNUPG_RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg1
+
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
-RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:${PORTSDIR}/www/mod_perl2 \
-		p5-Apache-DBI>0:${PORTSDIR}/www/p5-Apache-DBI
-.endif
-
-.if ${PORT_OPTIONS:MREPORTS_MODULES}
-RUN_DEPENDS+=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
-.endif
-
-.if ${PORT_OPTIONS:MSMTP}
-RUN_DEPENDS+=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
-		p5-Net-SSLGlue>=0:${PORTSDIR}/security/p5-Net-SSLGlue
-.endif
-
-.if ${PORT_OPTIONS:MPOP3}
-RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-SSLGlue>=0:${PORTSDIR}/security/p5-Net-SSLGlue
-.endif
-
-.if ${PORT_OPTIONS:MIMAP}
-RUN_DEPENDS+=	p5-Mail-IMAPClient>=0:${PORTSDIR}/mail/p5-Mail-IMAPClient
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
-.endif
-
-.if ${PORT_OPTIONS:MPDF}
-RUN_DEPENDS+=	p5-PDF-API2>=0.57:${PORTSDIR}/textproc/p5-PDF-API2
-.endif
-
-.if ${PORT_OPTIONS:MISPELL}
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
-.endif
-
-.if ${PORT_OPTIONS:MASPELL}
-RUN_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
-.endif
-
-.if ${PORT_OPTIONS:MGNUPG}
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg1
 .endif
 
 post-patch:
@@ -189,16 +176,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/scripts/database/*.* ${STAGEDIR}${OTRSDIR}/scripts/database/
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/test/*.t ${STAGEDIR}${OTRSDIR}/scripts/test/
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/tools/*.pl ${STAGEDIR}${OTRSDIR}/scripts/tools/
-.if ${PORT_OPTIONS:MDOCS}
-	${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-.for D in ${DOCS_DIRS_LIST:S!^!${DOCSDIR}/!}
-	${MKDIR} ${STAGEDIR}${D}
-.endfor
-	${INSTALL_DATA} ${DOCS_FILES_LIST:S!^!${WRKSRC}/!} ${STAGEDIR}${DOCSDIR}/
-.for D in ${DOCS_DIRS_LIST}
-	${INSTALL_DATA} ${WRKSRC}/doc/${D}/*.* ${STAGEDIR}${DOCSDIR}/${D}/
-.endfor
-.endif
 	${FIND} ${CRON_SCRIPTS} -type f -name *.dist | ${SED} -e "p;s/\.dist//" | ${XARGS} -n2 ${MV}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/var/article
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/var/httpd/htdocs/js/js-cache/

www/otrs/distinfo

@@ -1,2 +1,2 @@
-SHA256 (otrs-3.3.11.tar.bz2) = 1209f7ff7d9525419db5075b82ce4014bc0b52e0a943bc5ae36fac9db5fb9649
-SIZE (otrs-3.3.11.tar.bz2) = 20381138
+SHA256 (otrs-4.0.8.tar.bz2) = 9af1afb882ab1509a394b5b4c4674d0c01472bf08b7769ff43e1625734b5c16a
+SIZE (otrs-4.0.8.tar.bz2) = 14101877

www/otrs/files/patch-Kernel-System-Loader.pm

@@ -1,17 +1,17 @@
---- Kernel/System/Loader.pm.orig	2010-12-02 18:20:40.000000000 +0000
-+++ Kernel/System/Loader.pm	2010-12-02 18:21:30.000000000 +0000
-@@ -19,8 +19,8 @@
- 
- use Kernel::System::CacheInternal;
+--- Kernel/System/Loader.pm.orig	2015-05-11 14:29:06 UTC
++++ Kernel/System/Loader.pm
+@@ -12,8 +12,8 @@ package Kernel::System::Loader;
+ use strict;
+ use warnings;
  
 -use CSS::Minifier qw();
 -use JavaScript::Minifier qw();
 +use CSS::Minifier::XS qw();
 +use JavaScript::Minifier::XS qw();
  
- =head1 NAME
- 
-@@ -361,7 +361,7 @@
+ our @ObjectDependencies = (
+     'Kernel::Config',
+@@ -336,7 +336,7 @@ sub MinifyCSS {
          return;
      }
  
@@ -20,7 +20,7 @@
  
      # a few optimizations can be made for the minified CSS that CSS::Minifier doesn't yet do
  
-@@ -408,7 +408,7 @@
+@@ -383,7 +383,7 @@ sub MinifyJavaScript {
          return;
      }
  
@@ -28,4 +28,4 @@
 +    return JavaScript::Minifier::XS::minify( $Param{Code} );
  }
  
- =item CacheDelete()
+ =item CacheGenerate()

www/otrs/files/patch-bin-otrs.CheckModules.pl

@@ -0,0 +1,19 @@
+--- bin/otrs.CheckModules.pl.orig	2015-05-11 14:29:06 UTC
++++ bin/otrs.CheckModules.pl
+@@ -42,7 +42,6 @@ BEGIN {
+     }
+ }
+ 
+-use Linux::Distribution;
+ use ExtUtils::MakeMaker;
+ use File::Path;
+ use Getopt::Long;
+@@ -103,7 +102,7 @@ our %DistToInstType = (
+     win32as => 'ppm',
+ );
+ 
+-our $OSDist = Linux::Distribution::distribution_name() || '';
++our $OSDist = '';
+ 
+ # set win32as if active state perl is installed on windows.
+ # for windows installations without active state perl we use the default.

www/otrs/files/patch-scripts-apache2-httpd.include.conf

@@ -1,6 +1,6 @@
---- scripts/apache2-httpd.include.conf.orig	2013-12-05 01:24:02.000000000 +0400
-+++ scripts/apache2-httpd.include.conf	2013-12-12 19:48:14.757188756 +0400
-@@ -55,6 +55,7 @@
+--- scripts/apache2-httpd.include.conf.orig	2015-05-11 14:29:08 UTC
++++ scripts/apache2-httpd.include.conf
+@@ -49,6 +49,7 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht
  <Directory "/opt/otrs/bin/cgi-bin/">
      AllowOverride None
      Options +ExecCGI -Includes