Merge pull request #1 from Treer/bootstrap

Switch config screens to pfSense's new UI
Treer · Aug 14, 2016 · 6281a4b · 6281a4b
2 parents d778107 + 14c24f2
commit 6281a4b
Show file tree

Hide file tree

Showing 9 changed files with 677 additions and 815 deletions.
diff --git a/sysutils/pfSense-pkg-LCDproc/Makefile b/sysutils/pfSense-pkg-LCDproc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-pkg-LCDproc
-PORTVERSION=	0.9.15
+PORTVERSION=	0.10.0
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -44,15 +44,20 @@ do-extract:
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/pkg
 	${MKDIR} ${STAGEDIR}/etc/inc/priv
+	${MKDIR} ${STAGEDIR}${PREFIX}/www/packages/lcdproc
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} -m 0644 ${FILESDIR}${PREFIX}/pkg/lcdproc.xml \
 		${STAGEDIR}${PREFIX}/pkg
-	${INSTALL_DATA} -m 0644 ${FILESDIR}${PREFIX}/pkg/lcdproc_screens.xml \
-		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} -m 0644 ${FILESDIR}${PREFIX}/pkg/lcdproc_client.php \
 		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/lcdproc.inc \
 		${STAGEDIR}${PREFIX}/pkg
+	${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/packages/lcdproc/lcdproc.php \
+		${STAGEDIR}${PREFIX}/www/packages/lcdproc
+	${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/packages/lcdproc/lcdproc_screens.php \
+		${STAGEDIR}${PREFIX}/www/packages/lcdproc
+	${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/packages/lcdproc/index.php \
+		${STAGEDIR}${PREFIX}/www/packages/lcdproc
 	${INSTALL_DATA} ${FILESDIR}/etc/inc/priv/lcdproc.priv.inc \
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \

diff --git a/sysutils/pfSense-pkg-LCDproc/files/etc/inc/priv/lcdproc.priv.inc b/sysutils/pfSense-pkg-LCDproc/files/etc/inc/priv/lcdproc.priv.inc
@@ -32,9 +32,8 @@ $priv_list['page-services-lcdproc'] = array();
 $priv_list['page-services-lcdproc']['name'] = "WebCfg - Services: LCDproc package";
 $priv_list['page-services-lcdproc']['descr'] = "Allow access to LCDproc package GUI";
 $priv_list['page-services-lcdproc']['match'] = array();
-$priv_list['page-services-lcdproc']['match'][] = "pkg.php?xml=lcdproc.xml*";
-$priv_list['page-services-lcdproc']['match'][] = "pkg.php?xml=lcdproc_screens.xml*";
-$priv_list['page-services-lcdproc']['match'][] = "pkg_edit.php?xml=lcdproc.xml*";
-$priv_list['page-services-lcdproc']['match'][] = "pkg_edit.php?xml=lcdproc_screens.xml*";
+$priv_list['page-services-lcdproc']['match'][] = "packages/lcdproc/lcdproc.php*";
+$priv_list['page-services-lcdproc']['match'][] = "packages/lcdproc/lcdproc_screens.php*";
+$priv_list['page-services-lcdproc']['match'][] = "packages/lcdproc/index.php*";
 
 ?>