1: Update to 0.21.1.

2: set NO_ARCH.
3: use options-helper.

3 files changed, 16 insertions, 40 deletions

diff --git a/sysutils/racktables/Makefile b/sysutils/racktables/Makefile
index fd5cc7369779..cf4dda210f43 100644
--- a/sysutils/racktables/Makefile
+++ b/sysutils/racktables/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	racktables
-DISTVERSION=	0.20.14
+DISTVERSION=	0.21.1
 CATEGORIES?=	sysutils www
 MASTER_SITES=	SF/${PORTNAME}/
 DISTNAME=	RackTables-${DISTVERSION}
@@ -18,6 +18,7 @@ RACKHOME?=	www/racktables
 PORTEXAMPLES=	cleanup_ldap_cache.php init-sample-racks.sql syncdomain.php
 
 USES=		shebangfix php:web perl5 python:run
+NO_ARCH=	yes
 USE_PERL5=	run
 SHEBANG_FILES=	gateways/*
 
@@ -27,36 +28,14 @@ PLIST_SUB=	WWWDIR_REL=${WWWDIR_REL} WWWDIR=${WWWDIR}
 WWWUSER?=	www
 WWWGRP?=	www
 
-OPTIONS_DEFINE=	LDAP SNMP CURL LANG PCNTL PCRE
+OPTIONS_DEFINE=	LDAP SNMP CURL PCNTL PCRE
 PCRE_DESC=	Regular Expression Support
 PCNTL_DESC=	pcntl Support
-LANG_DESC=	Additional Language Support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_PHP+=	ldap
-.endif
-
-.if ${PORT_OPTIONS:MSNMP}
-USE_PHP+=	snmp
-.endif
-
-.if ${PORT_OPTIONS:MCURL}
-USE_PHP+=	curl
-.endif
-
-.if ${PORT_OPTIONS:MLANG}
-USE_PHP+=	lang
-.endif
-
-.if ${PORT_OPTIONS:MPCNTL}
-USE_PHP+=	pcntl
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-USE_PHP+=	pcre
-.endif
+LDAP_USE=	PHP=ldap
+SNMP_USE=	PHP=snmp
+CURL_USE=	PHP=curl
+PCNTL_USE=	PHP=pcntl
+PCRE_USE=	PHP=pcre
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
diff --git a/sysutils/racktables/distinfo b/sysutils/racktables/distinfo
index f48b8676bce8..73f2de5eb898 100644
--- a/sysutils/racktables/distinfo
+++ b/sysutils/racktables/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502574752
-SHA256 (RackTables-0.20.14.tar.gz) = 5b0c3fdd1ff91412b10c8ae37c6cb69903f43970fd2c6b49d3d91adba4e69dec
-SIZE (RackTables-0.20.14.tar.gz) = 956477
+TIMESTAMP = 1517836147
+SHA256 (RackTables-0.21.1.tar.gz) = b006d6e9254d1bea120722f412b24d7d5fce64c6d946442416b1a43ea50a2e7f
+SIZE (RackTables-0.21.1.tar.gz) = 978171
diff --git a/sysutils/racktables/pkg-plist b/sysutils/racktables/pkg-plist
index b0928cd9deb0..354b0e0691fc 100644
--- a/sysutils/racktables/pkg-plist
+++ b/sysutils/racktables/pkg-plist
@@ -4,6 +4,8 @@
 %%WWWDIR_REL%%/gateways/sshnokey
 %%WWWDIR_REL%%/gateways/telnet
 %%WWWDIR_REL%%/gateways/ucssdk
+%%WWWDIR_REL%%/wwwroot/css/codemirror/codemirror.css
+%%WWWDIR_REL%%/wwwroot/css/codemirror/rackcode.css
 %%WWWDIR_REL%%/wwwroot/css/jquery-ui-1.8.22.redmond.css
 %%WWWDIR_REL%%/wwwroot/css/jquery.contextmenu.css
 %%WWWDIR_REL%%/wwwroot/css/pi.css
@@ -40,15 +42,9 @@
 %%WWWDIR_REL%%/wwwroot/inc/triggers.php
 %%WWWDIR_REL%%/wwwroot/inc/upgrade.php
 %%WWWDIR_REL%%/wwwroot/index.php
-%%WWWDIR_REL%%/wwwroot/js/codemirror/codemirror.css
+%%WWWDIR_REL%%/wwwroot/js/bulkselector.js
 %%WWWDIR_REL%%/wwwroot/js/codemirror/codemirror.js
-%%WWWDIR_REL%%/wwwroot/js/codemirror/css.js
-%%WWWDIR_REL%%/wwwroot/js/codemirror/htmlmixed.js
-%%WWWDIR_REL%%/wwwroot/js/codemirror/javascript.js
-%%WWWDIR_REL%%/wwwroot/js/codemirror/php.js
 %%WWWDIR_REL%%/wwwroot/js/codemirror/rackcode.js
-%%WWWDIR_REL%%/wwwroot/js/codemirror/sql.js
-%%WWWDIR_REL%%/wwwroot/js/bulkselector.js
 %%WWWDIR_REL%%/wwwroot/js/inplace-edit.js
 %%WWWDIR_REL%%/wwwroot/js/jquery-1.4.4.min.js
 %%WWWDIR_REL%%/wwwroot/js/jquery-ui-1.8.21.min.js
@@ -156,6 +152,7 @@
 %%WWWDIR_REL%%/wwwroot/pix/tango-go-prev-next-32x32.png
 %%WWWDIR_REL%%/wwwroot/pix/tango-go-prev-next-gray-32x32.png
 %%WWWDIR_REL%%/wwwroot/pix/tango-go-previous.png
+%%WWWDIR_REL%%/wwwroot/pix/tango-go-up.png
 %%WWWDIR_REL%%/wwwroot/pix/tango-internet-32x32.png
 %%WWWDIR_REL%%/wwwroot/pix/tango-list-add-big.png
 %%WWWDIR_REL%%/wwwroot/pix/tango-list-add.png
@@ -179,4 +176,4 @@
 %%WWWDIR_REL%%/wwwroot/pix/tango-view-refresh-32x32.png
 %%WWWDIR_REL%%/wwwroot/pix/unchecked.png
 %%WWWDIR_REL%%/wwwroot/pix/virtualresources.png
-@unexec if [ -d %D/%%WWWDIR_REL%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%WWWDIR%%/`` to remove any configuration files left."; fi
+@postunexec if [ -d %D/%%WWWDIR_REL%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%WWWDIR%%/`` to remove any configuration files left."; fi