astguiclient-vicidial: Fix pkglint errors & warnings | Include options framework > Added optional dependencies with the options framework; > Apache is no longer forced to be installed (included as an option); > Updated text in TODO, MESSAGE files; > Deleted PLIST.

[Angel M. Adames <angelmadames%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Angel M. Adames <angelmadames%gmail.com@localhost>
Pushed By:	angelmadames
Date:		Mon Jul 3 11:32:02 2017 -0400
Changeset:	49937d119831cddb702d6130141011496229cf11

Modified Files:
	astguiclient-vicidial/MESSAGE
	astguiclient-vicidial/Makefile
	astguiclient-vicidial/TODO
Added Files:
	astguiclient-vicidial/options.mk
Removed Files:
	astguiclient-vicidial/PLIST

Log Message:
astguiclient-vicidial: Fix pkglint errors & warnings | Include options framework
	> Added optional dependencies with the options framework;
	> Apache is no longer forced to be installed (included as an option);
	> Updated text in TODO, MESSAGE files;
	> Deleted PLIST.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=49937d119831cddb702d6130141011496229cf11

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 astguiclient-vicidial/MESSAGE    | 12 +++++-----
 astguiclient-vicidial/Makefile   | 29 +++++++++++++------------
 astguiclient-vicidial/PLIST      |  1 -
 astguiclient-vicidial/TODO       |  6 ++---
 astguiclient-vicidial/options.mk | 47 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 69 insertions(+), 26 deletions(-)

diffs:
diff --git a/astguiclient-vicidial/MESSAGE b/astguiclient-vicidial/MESSAGE
index 1748443467..7c8b7e3503 100644
--- a/astguiclient-vicidial/MESSAGE
+++ b/astguiclient-vicidial/MESSAGE
@@ -8,13 +8,11 @@ Please check the steps needed to properly configure astGUIclient in:
 ${WRKSRC}/docs/SCRATCH_INSTALL.txt or
 ${WRKSRC}/docs/BASE_INSTALL.txt (summarized).
 
-It also contains optional dependencies you might want to check.
-
-Also, you should install the asterisk and asterisk-perl versions supported 
-by this package, imported as: 
+You should install the Asterisk version supported for this vicidial
+package to work properly:
+	> wip/asterisk-vicidial
 
-* wip/asterisk11-vicidial
-
-This was tested using Apache v2.4 using www/ap-php. 
+It also contains optional dependencies you might want to check.
+Most of them are included in the options of this package.
 
 ===========================================================================
diff --git a/astguiclient-vicidial/Makefile b/astguiclient-vicidial/Makefile
index 3799561c85..33e4cec89b 100644
--- a/astguiclient-vicidial/Makefile
+++ b/astguiclient-vicidial/Makefile
@@ -12,16 +12,17 @@ HOMEPAGE=	https://sourceforge.net/projects/astguiclient/
 COMMENT=	Asterisk GUI client, VICIdial
 
 NO_BUILD=	yes
-USE_TOOLS+=	perl
+USE_TOOLS+=	perl pax
 
 REPLACE_PERL+=	install.pl
 REPLACE_PERL+=	bin/*.pl
 REPLACE_PERL+=	extras/*.pl
+REPLACE_PERL+=	agi/*.agi
 
 WRKSRC=		${WRKDIR}
 BUILD_DEFS+=	VARBASE
 
-INTERACTIVE_STAGE= configure install
+INTERACTIVE_STAGE=	configure install
 
 	# Perl dependencies :
 DEPENDS+=	p5-DBI>=1.6:../../databases/p5-DBI
@@ -65,13 +66,12 @@ DEPENDS+=	p5-Spreadsheet-WriteExcel>=2.4:../../math/p5-Spreadsheet-WriteExcel
 DEPENDS+=	p5-Spreadsheet-ReadSXC>=0.2:../../math/p5-Spreadsheet-ReadSXC
 DEPENDS+=	p5-Spreadsheet-ParseExcel>=0.6:../../math/p5-Spreadsheet-ParseExcel
 DEPENDS+=	p5-Spreadsheet-Read>=0.7:../../math/p5-Spreadsheet-Read
-DEPENDS+=	p5-Spreadsheet-XLSX>=0.1:../../math/p5-Spreadsheet-XLSX	
+DEPENDS+=	p5-Spreadsheet-XLSX>=0.1:../../math/p5-Spreadsheet-XLSX
 	# PHP dependencies :
 DEPENDS+=	php56-mysql>=5.6:../../databases/php-mysql
 DEPENDS+=	php56-mysqli>=5.6:../../databases/php-mysqli
 	# Networking dependencies :
 DEPENDS+=	wget>=1.19:../../net/wget
-DEPENDS+=	ap24-php56>=5.6:../../www/ap-php
 
 SUBST_CLASSES+=			fix-conf-path
 SUBST_STAGE.fix-conf-path=	post-extract
@@ -82,12 +82,12 @@ SUBST_FILES.fix-conf-path+=	*/*/*.pl
 SUBST_FILES.fix-conf-path+=	agi/*.agi
 SUBST_FILES.fix-conf-path+=	*/*/*.php
 SUBST_FILES.fix-conf-path+=	*/*/*/*.php
-SUBST_SED.fix-conf-path=	-e 's,/etc/astguiclient.conf,${PREFIX}/etc/astguiclient.conf,g'	
-SUBST_SED.fix-conf-path+=	-e 's,/etc/asterisk,${PREFIX}/etc/asterisk,g'	
-SUBST_SED.fix-conf-path+=	-e 's,/usr/local/apache2,${PREFIX}/share/httpd,g'	
-SUBST_SED.fix-conf-path+=	-e 's,/usr/local/bin/sox,${PREFIX}/bin/sox,g'	
-SUBST_SED.fix-conf-path+=	-e 's,/usr/local/bin/lame,${PREFIX}/bin/lame,g'	
-SUBST_SED.fix-conf-path+=	-e 's,/usr/local/mysql/bin,${PREFIX}/bin/mysql,g'	
+SUBST_SED.fix-conf-path=	-e 's,/etc/astguiclient.conf,${PREFIX}/etc/astguiclient.conf,g'
+SUBST_SED.fix-conf-path+=	-e 's,/etc/asterisk,${PREFIX}/etc/asterisk,g'
+SUBST_SED.fix-conf-path+=	-e 's,/usr/local/apache2,${PREFIX}/share/httpd,g'
+SUBST_SED.fix-conf-path+=	-e 's,/usr/local/bin/sox,${PREFIX}/bin/sox,g'
+SUBST_SED.fix-conf-path+=	-e 's,/usr/local/bin/lame,${PREFIX}/bin/lame,g'
+SUBST_SED.fix-conf-path+=	-e 's,/usr/local/mysql/bin,${PREFIX}/bin/mysql,g'
 
 do-install:
 	cd ${WRKSRC}; \
@@ -103,12 +103,13 @@ do-install:
 		--monitor=${VARBASE}/spool/asterisk/monitor \
 		--DONEmonitor=${VARBASE}/spool/asterisk/monitorDONE \
 		--copy_sample_conf_files \
-		--asterisk_version=11.X
-	${CP} -R ${WRKSRC}/extras  ${PREFIX}/share/vicidial/extras
+		--asterisk_version=11.
+	cd ${WRKSRC}/extras && ${PAX} -wr * ${PREFIX}/share/vicidial/extras
+	#${CP} -R ${WRKSRC}/extras  ${PREFIX}/share/vicidial/extras
 
+.include "options.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../databases/mysql55-server/buildlink3.mk"
-.include "../../audio/sox/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
 .include "../../wip/p5-Asterisk-vicidial/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/astguiclient-vicidial/PLIST b/astguiclient-vicidial/PLIST
deleted file mode 100644
index 48d96a5493..0000000000
--- a/astguiclient-vicidial/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD$
diff --git a/astguiclient-vicidial/TODO b/astguiclient-vicidial/TODO
index cbd77a1954..8f0181199d 100644
--- a/astguiclient-vicidial/TODO
+++ b/astguiclient-vicidial/TODO
@@ -1,8 +1,6 @@
-* The install script is better used in interactive mode. If you want
-  to avoid this, please review the install script help by executing:
-   << perl install.pl --help  >>
 * This software is installed by the PERL script provided by upstream.
   Meaning, after running this script, ${MAKE} deinstall will not work
   if you have the need to deinstall the files. Thus, you'll have to
   manually delete the files.
-* The PLIST is empty for the same reason previously stated.
+* Only tested on FreeBSD 11 x86_64.
+* Document options in mk/defaults/options.description. 
diff --git a/astguiclient-vicidial/options.mk b/astguiclient-vicidial/options.mk
new file mode 100644
index 0000000000..217d94a3ad
--- /dev/null
+++ b/astguiclient-vicidial/options.mk
@@ -0,0 +1,47 @@
+# $NetBSD$
+# Options for astGUIclient VICIdial
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.vicidial
+PKG_SUPPORTED_OPTIONS=	lame sox apache sipsak screen iftop openntpd ploticus ttyload
+PKG_SUGGESTED_OPTIONS=	lame sox
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlame)
+.include "../../audio/lame/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msox)
+.include "../../audio/sox/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mapache)
+.include "../../www/apache24/buildlink3.mk"
+DEPENDS+=	ap24-php56>=5.6:../../www/ap-php
+.endif
+
+.if !empty(PKG_OPTIONS:Msipsak)
+DEPENDS+=	sipsak>=0.9:../../net/sipsak
+.endif
+
+.if !empty(PKG_OPTIONS:Mscreen)
+DEPENDS+=	screen>=4.0:../../misc/screen
+.endif
+
+.if !empty(PKG_OPTIONS:Miftop)
+DEPENDS+=	iftop>=0.17:../../net/iftop
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenntpd)
+DEPENDS+=	openntpd>=6.0:../../net/openntpd
+.endif
+
+.if !empty(PKG_OPTIONS:Mploticus)
+DEPENDS+=	ploticus>=2.42:../../graphics/ploticus
+.endif
+
+# Please note this is a WIP package, if you choose this
+# option, there's no guarantee it will work efficiently.
+.if !empty(PKG_OPTIONS:Mttyload)
+DEPENDS+=	ttyloadp>=0.5:../../wip/ttyload
+.endif