diff options
32 files changed, 139 insertions, 236 deletions
diff --git a/sysutils/life-preserver/Makefile b/sysutils/life-preserver/Makefile index ad8f54315dd8..e33d8beb1c8a 100644 --- a/sysutils/life-preserver/Makefile +++ b/sysutils/life-preserver/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= life-preserver -PORTVERSION= 1422974289 +PORTVERSION= 1431457302 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ @@ -10,9 +10,10 @@ MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ MAINTAINER= kmoore@FreeBSD.org COMMENT= PC-BSD Life Preserver Utility -LICENSE= BSD +LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${LOCALBASE}/share/pcbsd/scripts/functions.sh:${PORTSDIR}/sysutils/pcbsd-libsh +RUN_DEPENDS= ${LOCALBASE}/share/pcbsd/scripts/functions.sh:${PORTSDIR}/sysutils/pcbsd-libsh \ + stunnel:${PORTSDIR}/security/stunnel WRKSRC= ${WRKDIR}/lpreserver USES= pkgconfig tar:xz diff --git a/sysutils/life-preserver/distinfo b/sysutils/life-preserver/distinfo index ef74e9568d30..fcb5f8161a67 100644 --- a/sysutils/life-preserver/distinfo +++ b/sysutils/life-preserver/distinfo @@ -1,2 +1,2 @@ -SHA256 (life-preserver-1422974289.tar.xz) = 512d656e816f30e10389c9096c339fff4b26abea3a7b7f5ff52824bfcd529a69 -SIZE (life-preserver-1422974289.tar.xz) = 16124 +SHA256 (life-preserver-1431457302.tar.xz) = eac284b3f82089f7fddb416ac55d2ddafff7a238ed0514d6eab7d03c76589f7b +SIZE (life-preserver-1431457302.tar.xz) = 22728 diff --git a/sysutils/life-preserver/pkg-install b/sysutils/life-preserver/pkg-install deleted file mode 100644 index 769ac9fe31d0..000000000000 --- a/sysutils/life-preserver/pkg-install +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Script for any install setup - -PREFIX=${PKG_PREFIX-/usr/local} - -if [ "$2" != "POST-INSTALL" ] ; then - exit 0 -fi - -# If this is during staging, we can skip for now -echo $PREFIX | grep -q '/stage/' -if [ $? -eq 0 ] ; then - exit 0 -fi - -exit 0 diff --git a/sysutils/life-preserver/pkg-plist b/sysutils/life-preserver/pkg-plist index 5dad6224f17d..5faf2db251af 100644 --- a/sysutils/life-preserver/pkg-plist +++ b/sysutils/life-preserver/pkg-plist @@ -1,4 +1,5 @@ bin/lpreserver +bin/lpreserver-host-iscsi share/lpreserver/backend/zfsmon.sh share/lpreserver/backend/zfsrmsnap.sh share/lpreserver/backend/runrep.sh diff --git a/sysutils/pbi-manager/Makefile b/sysutils/pbi-manager/Makefile index 5cc75adf0f61..495286f73991 100644 --- a/sysutils/pbi-manager/Makefile +++ b/sysutils/pbi-manager/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pbi-manager -PORTVERSION= 1422042374 +PORTVERSION= 1431457960 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ @@ -10,7 +10,7 @@ MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ MAINTAINER= kmoore@FreeBSD.org COMMENT= PBI management utilities -LICENSE= BSD +LICENSE= BSD3CLAUSE RUN_DEPENDS= ${LOCALBASE}/share/pcbsd/scripts/functions.sh:${PORTSDIR}/sysutils/pcbsd-libsh diff --git a/sysutils/pbi-manager/distinfo b/sysutils/pbi-manager/distinfo index 0a7e80619094..be0384863583 100644 --- a/sysutils/pbi-manager/distinfo +++ b/sysutils/pbi-manager/distinfo @@ -1,2 +1,2 @@ -SHA256 (pbi-manager-1422042374.tar.xz) = 951baba36d68706ee21198e205ce87b473ed87e69ced8156d48f4833598df1d1 -SIZE (pbi-manager-1422042374.tar.xz) = 24260 +SHA256 (pbi-manager-1431457960.tar.xz) = 440aea7177be0fdb8cb890f511160909363d0491cd2d81ff16a04c38b332a434 +SIZE (pbi-manager-1431457960.tar.xz) = 24620 diff --git a/sysutils/pbi-manager/pkg-descr b/sysutils/pbi-manager/pkg-descr index 1f2cac9bce0b..8aae62ab5f28 100644 --- a/sysutils/pbi-manager/pkg-descr +++ b/sysutils/pbi-manager/pkg-descr @@ -1,3 +1 @@ The PBI meta framework on top of PKGNG - -WWW: https://github.com/pcbsd/pcbsd diff --git a/sysutils/pbi-manager/pkg-install b/sysutils/pbi-manager/pkg-install deleted file mode 100644 index 769ac9fe31d0..000000000000 --- a/sysutils/pbi-manager/pkg-install +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Script for any install setup - -PREFIX=${PKG_PREFIX-/usr/local} - -if [ "$2" != "POST-INSTALL" ] ; then - exit 0 -fi - -# If this is during staging, we can skip for now -echo $PREFIX | grep -q '/stage/' -if [ $? -eq 0 ] ; then - exit 0 -fi - -exit 0 diff --git a/sysutils/pbi-manager/pkg-plist b/sysutils/pbi-manager/pkg-plist index fd071514ebb2..1f9ba9f1ee14 100644 --- a/sysutils/pbi-manager/pkg-plist +++ b/sysutils/pbi-manager/pkg-plist @@ -7,14 +7,14 @@ sbin/pbi_info sbin/pbi_makeindex sbin/pbi_updateindex etc/pbi.conf -share/pbi-manager/icons/default.png -share/pbi-manager/icons/patch.png -share/pbi-manager/pkgng-repo -share/pbi-manager/repokey.ssl +%%DATADIR%%/icons/default.png +%%DATADIR%%/icons/patch.png +%%DATADIR%%/pkgng-repo +%%DATADIR%%/repokey.ssl man/man1/pbi_add.1.gz man/man1/pbi_delete.1.gz man/man1/pbi_icon.1.gz man/man1/pbi_info.1.gz +man/man1/pbi_makeindex.1.gz +man/man1/pbi_updateindex.1.gz man/man5/pbi.conf.5.gz -@dirrm share/pbi-manager/icons -@dirrm share/pbi-manager diff --git a/sysutils/pcbsd-appweb/Makefile b/sysutils/pcbsd-appweb/Makefile index b2790cd2cd32..461da8bb98a0 100644 --- a/sysutils/pcbsd-appweb/Makefile +++ b/sysutils/pcbsd-appweb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pcbsd-appweb -PORTVERSION= 1422974666 +PORTVERSION= 1431522786 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ @@ -10,7 +10,7 @@ MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ MAINTAINER= kmoore@FreeBSD.org COMMENT= PC-BSD Web Interface -LICENSE= BSD +LICENSE= BSD3CLAUSE RUN_DEPENDS= syscache:${PORTSDIR}/sysutils/pcbsd-syscache \ pbi:${PORTSDIR}/sysutils/pbi-manager \ diff --git a/sysutils/pcbsd-appweb/distinfo b/sysutils/pcbsd-appweb/distinfo index 876a7cf764b9..03fe64117baf 100644 --- a/sysutils/pcbsd-appweb/distinfo +++ b/sysutils/pcbsd-appweb/distinfo @@ -1,2 +1,2 @@ -SHA256 (pcbsd-appweb-1422974666.tar.xz) = 40054a908f7f071d88a1b42cfd9d8e67b60d012f6275bde8c7a13a7d92d88355 -SIZE (pcbsd-appweb-1422974666.tar.xz) = 244208 +SHA256 (pcbsd-appweb-1431522786.tar.xz) = a241b39fe42b765794dd337a120d5430b0d013294953911fab73c4c23f026434 +SIZE (pcbsd-appweb-1431522786.tar.xz) = 272364 diff --git a/sysutils/pcbsd-appweb/pkg-install b/sysutils/pcbsd-appweb/pkg-install deleted file mode 100644 index 99e8d6539859..000000000000 --- a/sysutils/pcbsd-appweb/pkg-install +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Script for any install setup - -PREFIX=${PKG_PREFIX-/usr/local} - -if [ "$2" != "POST-INSTALL" ] ; then - exit 0 -fi - -# If this is during staging, we can skip for now -echo $PREFIX | grep -q '/stage/' -if [ $? -eq 0 ] ; then - exit 0 -fi - -# Check if we have our warden.conf file -#if [ ! -e "${PREFIX}/etc/warden.conf" ] ; then -# cp ${PREFIX}/etc/warden.conf.dist ${PREFIX}/etc/warden.conf -# chmod 644 ${PREFIX}/etc/warden.conf -#fi - -exit 0 diff --git a/sysutils/pcbsd-appweb/pkg-plist b/sysutils/pcbsd-appweb/pkg-plist index 6cd361901d45..bca22f33cd00 100644 --- a/sysutils/pcbsd-appweb/pkg-plist +++ b/sysutils/pcbsd-appweb/pkg-plist @@ -9,6 +9,8 @@ share/appcafe/mime.types share/appcafe/nginx.conf share/appcafe/nginx.conf.ssl share/appcafe/nginx.conf.temp +share/appcafe/php-fpm.conf +share/appcafe/php.ini share/appcafe/html/index.php share/appcafe/html/css/_reset.css share/appcafe/html/css/cssmenu.css @@ -16,6 +18,7 @@ share/appcafe/html/css/main.css share/appcafe/html/css/popbox.css share/appcafe/html/css/tabs.css share/appcafe/html/css/lightbox.css +share/appcafe/html/images/.directory share/appcafe/html/images/add.png share/appcafe/html/images/appcafe.png share/appcafe/html/images/application-exit.png @@ -65,6 +68,7 @@ share/appcafe/html/pages/appcafe-search.php share/appcafe/html/pages/appinfo.php share/appcafe/html/pages/dispatcher.php share/appcafe/html/pages/error.php +share/appcafe/html/pages/exportpbis.php share/appcafe/html/pages/jails.php share/appcafe/html/pages/jailcreate.php share/appcafe/html/pages/jailinfo.php @@ -76,9 +80,10 @@ share/appcafe/html/js/cssmenu.js share/appcafe/html/js/doubletaptogo.js share/appcafe/html/js/jquery.ba-hashchange.min.js share/appcafe/html/js/jquery.easytabs.min.js +share/appcafe/html/js/jquery.min.js share/appcafe/html/js/jquery.jscroll.min.js +share/appcafe/html/js/jquery.simplemodal.1.4.4.min.js share/appcafe/html/js/jquery.timer.js -share/appcafe/html/js/jquery.min.js share/appcafe/html/js/lightbox.min.js share/appcafe/html/js/main.js share/appcafe/html/js/popbox.min.js diff --git a/sysutils/pcbsd-libsh/Makefile b/sysutils/pcbsd-libsh/Makefile index 43926ed2ded4..32b340b1b79f 100644 --- a/sysutils/pcbsd-libsh/Makefile +++ b/sysutils/pcbsd-libsh/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pcbsd-libsh -PORTVERSION= 1420064498 +PORTVERSION= 1431457302 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ @@ -10,13 +10,15 @@ MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ MAINTAINER= kmoore@FreeBSD.org COMMENT= PC-BSD Shell Library -LICENSE= BSD +LICENSE= BSD3CLAUSE WRKSRC= ${WRKDIR}/libsh USES= pkgconfig tar:xz NO_BUILD= yes MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} +PLIST_FILES= share/pcbsd/scripts/functions.sh + .include <bsd.port.pre.mk> .if ${OSVERSION} < 1000000 diff --git a/sysutils/pcbsd-libsh/distinfo b/sysutils/pcbsd-libsh/distinfo index d9981f42bb62..82debd6f6920 100644 --- a/sysutils/pcbsd-libsh/distinfo +++ b/sysutils/pcbsd-libsh/distinfo @@ -1,2 +1,2 @@ -SHA256 (pcbsd-libsh-1420064498.tar.xz) = 189d7a84d150270ba9f4ada6321c0690833b35561263a13cfa91d5c8930eeaf9 -SIZE (pcbsd-libsh-1420064498.tar.xz) = 6996 +SHA256 (pcbsd-libsh-1431457302.tar.xz) = a9c27f3b130ac03ed484eeb6f7d32961c32b4a0cd93f846997fe32a2d7488f91 +SIZE (pcbsd-libsh-1431457302.tar.xz) = 6808 diff --git a/sysutils/pcbsd-libsh/pkg-install b/sysutils/pcbsd-libsh/pkg-install deleted file mode 100644 index 769ac9fe31d0..000000000000 --- a/sysutils/pcbsd-libsh/pkg-install +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Script for any install setup - -PREFIX=${PKG_PREFIX-/usr/local} - -if [ "$2" != "POST-INSTALL" ] ; then - exit 0 -fi - -# If this is during staging, we can skip for now -echo $PREFIX | grep -q '/stage/' -if [ $? -eq 0 ] ; then - exit 0 -fi - -exit 0 diff --git a/sysutils/pcbsd-libsh/pkg-plist b/sysutils/pcbsd-libsh/pkg-plist deleted file mode 100644 index 3de632c97ac3..000000000000 --- a/sysutils/pcbsd-libsh/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -share/pcbsd/scripts/functions.sh diff --git a/sysutils/pcbsd-syscache/Makefile b/sysutils/pcbsd-syscache/Makefile index 4b5febb28aea..7579c6622fb6 100644 --- a/sysutils/pcbsd-syscache/Makefile +++ b/sysutils/pcbsd-syscache/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pcbsd-syscache -PORTVERSION= 1421343297 +PORTVERSION= 1431457302 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ @@ -10,7 +10,7 @@ MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ MAINTAINER= kmoore@FreeBSD.org COMMENT= PC-BSD SysCache Utility -LICENSE= BSD +LICENSE= BSD3CLAUSE WRKSRC= ${WRKDIR}/syscache USE_QT5= core network buildtools qmake @@ -18,6 +18,10 @@ USES= pkgconfig tar:xz NO_BUILD= yes MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} +PLIST_FILES= bin/syscache \ + bin/syscache-daemon \ + etc/rc.d/syscache + .include <bsd.port.pre.mk> .if ${OSVERSION} < 1000000 diff --git a/sysutils/pcbsd-syscache/distinfo b/sysutils/pcbsd-syscache/distinfo index 2b3ae8e9018d..4866df690d0a 100644 --- a/sysutils/pcbsd-syscache/distinfo +++ b/sysutils/pcbsd-syscache/distinfo @@ -1,2 +1,2 @@ -SHA256 (pcbsd-syscache-1421343297.tar.xz) = a99d914b5d09ab9d5f3a2be5b9388b7505e3f474ba7c767a5fd91d20cb59ff28 -SIZE (pcbsd-syscache-1421343297.tar.xz) = 130044 +SHA256 (pcbsd-syscache-1431457302.tar.xz) = a38e0d76ce641c9d2bed3139ed2cc432cd38b0bbc1ebb11757a6d3e0014be508 +SIZE (pcbsd-syscache-1431457302.tar.xz) = 40576 diff --git a/sysutils/pcbsd-syscache/pkg-install b/sysutils/pcbsd-syscache/pkg-install deleted file mode 100644 index 769ac9fe31d0..000000000000 --- a/sysutils/pcbsd-syscache/pkg-install +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Script for any install setup - -PREFIX=${PKG_PREFIX-/usr/local} - -if [ "$2" != "POST-INSTALL" ] ; then - exit 0 -fi - -# If this is during staging, we can skip for now -echo $PREFIX | grep -q '/stage/' -if [ $? -eq 0 ] ; then - exit 0 -fi - -exit 0 diff --git a/sysutils/pcbsd-syscache/pkg-plist b/sysutils/pcbsd-syscache/pkg-plist deleted file mode 100644 index c77a56224d9c..000000000000 --- a/sysutils/pcbsd-syscache/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/syscache -bin/syscache-daemon -etc/rc.d/syscache diff --git a/sysutils/pcbsd-utils-qt5/Makefile b/sysutils/pcbsd-utils-qt5/Makefile index 437f7c203ac8..50250f507d33 100644 --- a/sysutils/pcbsd-utils-qt5/Makefile +++ b/sysutils/pcbsd-utils-qt5/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pcbsd-utils-qt5 -PORTVERSION= 1422974666 +PORTVERSION= 1431700504 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ @@ -10,12 +10,18 @@ MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ MAINTAINER= kmoore@FreeBSD.org COMMENT= PC-BSD Qt5 Utilities -LICENSE= BSD +LICENSE= BSD3CLAUSE +BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx \ + py27-sphinx-intl>=0:${PORTSDIR}/textproc/py-sphinx-intl \ + py27-sphinxcontrib-httpdomain>=0:${PORTSDIR}/textproc/py-sphinxcontrib-httpdomain \ + tex-formats>=0:${PORTSDIR}/print/tex-formats \ + tex-dvipsk>=0:${PORTSDIR}/print/tex-dvipsk RUN_DEPENDS= pc-updatemanager:${PORTSDIR}/sysutils/pcbsd-utils \ ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \ cdda2wav:${PORTSDIR}/sysutils/cdrtools -LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5 CONFLICTS?= pcbsd-utils-qt4-[0-9]* @@ -24,7 +30,7 @@ ONLY_FOR_ARCHS= amd64 USE_LDCONFIG= yes USE_QT5= core gui network svg linguist \ buildtools x11extras -USES= qmake tar:xz python +USES= qmake tar:xz python desktop-file-utils WRKSRC= ${WRKDIR}/src-qt5 @@ -36,4 +42,8 @@ QMAKE_ARGS= CONFIG+="configure" IGNORE= requires FreeBSD 10 or later .endif +post-install: + @${FIND} ${STAGEDIR}${PREFIX}/share/pcbsd/doc/html -type f | \ + ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} + .include <bsd.port.mk> diff --git a/sysutils/pcbsd-utils-qt5/distinfo b/sysutils/pcbsd-utils-qt5/distinfo index 0e89286b0202..b560b66ef7b2 100644 --- a/sysutils/pcbsd-utils-qt5/distinfo +++ b/sysutils/pcbsd-utils-qt5/distinfo @@ -1,2 +1,2 @@ -SHA256 (pcbsd-utils-qt5-1422974666.tar.xz) = 07e836704b8ec1b4a3db2105ec9527abd821c58908407eb57ba358c26c63989f -SIZE (pcbsd-utils-qt5-1422974666.tar.xz) = 64680540 +SHA256 (pcbsd-utils-qt5-1431700504.tar.xz) = f6bb993162aac40e6dba352ea2ae18a02ed00ef6425599266115aceca76a8005 +SIZE (pcbsd-utils-qt5-1431700504.tar.xz) = 107950556 diff --git a/sysutils/pcbsd-utils-qt5/pkg-plist b/sysutils/pcbsd-utils-qt5/pkg-plist index 60e76bbc55b4..87fe656b14da 100644 --- a/sysutils/pcbsd-utils-qt5/pkg-plist +++ b/sysutils/pcbsd-utils-qt5/pkg-plist @@ -19,16 +19,18 @@ bin/pc-mixer bin/pc-mounttray bin/pc-netmanager bin/pc-nettray -bin/pc-pfmanager +bin/pc-fwmanager +bin/pc-pdfviewer bin/pc-servicemanager -bin/pc-softwaremanager bin/pc-softweb +bin/pc-softwaremanager bin/pc-sysinstaller bin/pc-syskeyboard bin/pc-sysmanager bin/pc-systemupdatertray bin/pc-updategui bin/pc-usermanager +bin/pc-webkitviewer bin/pc-welcome bin/pc-wificonfig bin/pc-xgui @@ -41,6 +43,12 @@ etc/pcdm.conf.dist etc/rc.d/pc-hwdetect etc/rc.d/pcbsdinit etc/rc.d/pcdm +etc/xdg/autostart/pcbsd-life-preserver.desktop +etc/xdg/autostart/pcbsd-mixer.desktop +etc/xdg/autostart/pcbsd-mounttray.desktop +etc/xdg/autostart/pcbsd-nettray.desktop +etc/xdg/autostart/pcbsd-updater.desktop +etc/xdg/autostart/pcbsd-welcome.desktop include/pcbsd-DLProcess.h include/pcbsd-SingleApplication.h include/pcbsd-dialogAPsetup.h @@ -70,6 +78,7 @@ share/PCDM/themes/default/default.theme share/PCDM/themes/default/keyboardlayout.png share/PCDM/themes/default/localechange.png share/PCDM/themes/default/login.png +share/PCDM/themes/default/login-stealth.png share/PCDM/themes/default/nextDE.png share/PCDM/themes/default/password.png share/PCDM/themes/default/previousDE.png @@ -78,15 +87,18 @@ share/PCDM/themes/default/system.png share/PCDM/themes/default/virtualkeyboard.png share/applications/EasyPBI.desktop share/applications/about.desktop +share/applications/fwmanager.desktop +share/applications/handbook.desktop share/applications/pc-dmconf.desktop share/applications/pc-updategui.desktop share/applications/pc-welcome.desktop share/applications/pcbsdpbu.desktop share/applications/pcbugreport.desktop share/applications/pccontrol.desktop +share/applications/pc-pdfviewer.desktop share/applications/pcsyskeyboard.desktop -share/applications/softmanager.desktop share/applications/warden.desktop +share/applications/softmanager.desktop share/apps/ksplash/Themes/pcbsd10/1024x768/background.png share/apps/ksplash/Themes/pcbsd10/1280x1024/background.png share/apps/ksplash/Themes/pcbsd10/1280x800/background.png @@ -222,6 +234,7 @@ share/pcbsd/pc-controlpanel/items/hardware/nvidia-settings.desktop share/pcbsd/pc-controlpanel/items/hardware/pc-mounttray.desktop share/pcbsd/pc-controlpanel/items/hardware/pc-paprefs.desktop share/pcbsd/pc-controlpanel/items/hardware/pc-pavucontrol.desktop +share/pcbsd/pc-controlpanel/items/hardware/pc-mixer.desktop share/pcbsd/pc-controlpanel/items/hardware/pc-xgui.desktop share/pcbsd/pc-controlpanel/items/hardware/pc-zmanager.desktop share/pcbsd/pc-controlpanel/items/hardware/pcsyskeyboard.desktop @@ -230,7 +243,7 @@ share/pcbsd/pc-controlpanel/items/hardware/xfce-keyboard-settings.desktop share/pcbsd/pc-controlpanel/items/hardware/xfce-mouse-settings.desktop share/pcbsd/pc-controlpanel/items/hardware/xsane.desktop share/pcbsd/pc-controlpanel/items/network/pcnetwork.desktop -share/pcbsd/pc-controlpanel/items/network/pfmanager.desktop +share/pcbsd/pc-controlpanel/items/network/fwmanager.desktop share/pcbsd/pc-controlpanel/items/software/appcafe.desktop share/pcbsd/pc-controlpanel/items/software/easypbi.desktop share/pcbsd/pc-controlpanel/items/software/pc-updategui.desktop @@ -295,6 +308,7 @@ share/pcbsd/scripts/portsnap-noterm.sh share/pcbsd/scripts/set-lang.sh share/pcbsd/scripts/sound-dev-changed.sh share/pcbsd/scripts/vbox-check +share/pcbsd/scripts/waitforsystray.sh share/pcbsd/splash-screens/loading-screen-af.pcx share/pcbsd/splash-screens/loading-screen-ar.pcx share/pcbsd/splash-screens/loading-screen-az.pcx @@ -347,6 +361,13 @@ share/pcbsd/splash-screens/loading-screen-vi.pcx share/pcbsd/splash-screens/loading-screen-xh.pcx share/pcbsd/splash-screens/loading-screen-zh_CN.pcx share/pcbsd/splash-screens/loading-screen-zh_TW.pcx +share/pcbsd/xdg-auto/checkupdater.sh +share/pcbsd/xdg-auto/checkwelcome.sh +share/pcbsd/xdg-auto/life-preserver.sh +share/pcbsd/xdg-auto/net-trays.sh +share/pcbsd/xdg-auto/pc-mixer.sh +share/pcbsd/xdg-auto/pc-mounttray.sh +share/pcbsd/xdg-auto/pc-trayapps.sh share/pcbsd/xorg-gui/bin/rundetect.sh share/pcbsd/xorg-gui/bin/setupconf.sh share/pcbsd/xorg-gui/cardDetect/XF86Config.compat @@ -443,20 +464,9 @@ share/pcbsd/xorg-gui/templates/header/vmware.xorg.conf share/pcbsd/xorg-gui/templates/header/vmwlegacy.xorg.conf share/pcbsd/xorg-gui/templates/header/xorg.conf.generic share/pcbsd/xorg-gui/templates/scripts/README -share/pcbsd/xstartup/checkupdater.sh -share/pcbsd/xstartup/checkwelcome.sh share/pcbsd/xstartup/enable-ibus.sh share/pcbsd/xstartup/gpg-agent.sh -share/pcbsd/xstartup/life-preserver.sh -share/pcbsd/xstartup/net-trays.sh -share/pcbsd/xstartup/nspluginscan.sh -share/pcbsd/xstartup/pc-mixer.sh -share/pcbsd/xstartup/pc-mounttray.sh -share/pcbsd/xstartup/screensaver.sh -share/pcbsd/xstartup/setmix.sh share/pcbsd/xstartup/ssh-agent.sh -share/pcbsd/xstartup/startpulseaudio.sh -share/pcbsd/xstartup/vkeyboard.sh share/wallpapers/FreeBSD/a_1280x1024.jpg share/wallpapers/FreeBSD/a_1600x900.jpg share/wallpapers/FreeBSD/b_1280x1024.jpg diff --git a/sysutils/pcbsd-utils/Makefile b/sysutils/pcbsd-utils/Makefile index 896e7ad452e4..c358797a2169 100644 --- a/sysutils/pcbsd-utils/Makefile +++ b/sysutils/pcbsd-utils/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pcbsd-utils -PORTVERSION= 1422974289 +PORTVERSION= 1431457302 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ @@ -10,19 +10,15 @@ MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ MAINTAINER= kmoore@FreeBSD.org COMMENT= PC-BSD Command-Line Utilities -LICENSE= BSD - -BROKEN= Fails to stage, has both build dependencies and NO_BUILD=yes +LICENSE= BSD3CLAUSE RUN_DEPENDS= sipcalc:${PORTSDIR}/net-mgmt/sipcalc \ eject:${PORTSDIR}/sysutils/eject \ unzip:${PORTSDIR}/archivers/unzip WRKSRC= ${WRKDIR}/pcbsd-utils -CONFLICTS?= pbi-manager-[0-9]* USE_QT5= core network buildtools qmake USES= pkgconfig tar:xz -NO_BUILD= yes MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} .include <bsd.port.pre.mk> diff --git a/sysutils/pcbsd-utils/distinfo b/sysutils/pcbsd-utils/distinfo index 947eef812252..700628977103 100644 --- a/sysutils/pcbsd-utils/distinfo +++ b/sysutils/pcbsd-utils/distinfo @@ -1,2 +1,2 @@ -SHA256 (pcbsd-utils-1422974289.tar.xz) = 22ba04a1ab54b1b9902a498bc48aff8f482b5df156b94affa148050d0bdd5bb2 -SIZE (pcbsd-utils-1422974289.tar.xz) = 15376948 +SHA256 (pcbsd-utils-1431457302.tar.xz) = afd466b2a5d7c49c6ae6622f01e28eccfcdedd8b2bc40fbfda61e200db450400 +SIZE (pcbsd-utils-1431457302.tar.xz) = 15405696 diff --git a/sysutils/pcbsd-utils/pkg-install b/sysutils/pcbsd-utils/pkg-install deleted file mode 100644 index 54842d99b2cb..000000000000 --- a/sysutils/pcbsd-utils/pkg-install +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Script for any install setup - -PREFIX=${PKG_PREFIX-/usr/local} - -if [ "$2" != "POST-INSTALL" ] ; then - exit 0 -fi - -# If this is during staging, we can skip for now -echo $PREFIX | grep -q '/stage/' -if [ $? -eq 0 ] ; then - exit 0 -fi - -# Check if we have our warden.conf file -if [ ! -e "${PREFIX}/etc/warden.conf" ] ; then - cp ${PREFIX}/etc/warden.conf.dist ${PREFIX}/etc/warden.conf - chmod 644 ${PREFIX}/etc/warden.conf -fi - -exit 0 diff --git a/sysutils/pcbsd-utils/pkg-plist b/sysutils/pcbsd-utils/pkg-plist index 4bada88821b8..812cded3865b 100644 --- a/sysutils/pcbsd-utils/pkg-plist +++ b/sysutils/pcbsd-utils/pkg-plist @@ -1,11 +1,15 @@ bin/about +bin/de-info +bin/de-logout +bin/disable-tor-mode +bin/enable-tor-mode +bin/pbreg bin/pc-autoupdate bin/pc-pkg bin/pc-extractoverlay bin/pc-updatemanager bin/pc-fbsdupdatecheck bin/pc-su -bin/pbreg bin/pc-krbconf bin/pc-ldapconf bin/pc-nssconf @@ -14,8 +18,6 @@ bin/pc-pamconf bin/pc-sambaconf bin/pc-adctl bin/pc-ldapctl -bin/de-info -bin/de-logout bin/pc-thinclient bin/pc-xdgutil bin/pc-firstgui @@ -25,6 +27,7 @@ bin/pc-installdialog bin/pc-sysconfig bin/pc-sysconfig-daemon bin/pc-systemflag +bin/personacrypt bin/restamp-grub sbin/pc-sysinstall share/pc-sysinstall/examples/pcinstall.cfg.upgrade @@ -96,7 +99,7 @@ share/pc-sysinstall/doc/help-disk-list share/pc-sysinstall/doc/help-index share/pc-sysinstall/doc/help-disk-size share/pc-sysinstall/doc/help-start-autoinstall -share/pcbsd/bin/pkg +share/pcbsd/conf/freebsd-update.conf share/pcbsd/conf/pcbsd-mirrors share/pcbsd/conf/pbi-mirror share/pcbsd/conf/pkg-mirror @@ -108,6 +111,10 @@ share/pcbsd/conf/server-excludes share/pcbsd/conf/linux-compat-version share/pcbsd/conf/loader.conf.pcbsd share/pcbsd/conf/loader.conf.trueos +share/pcbsd/conf/ntpd.conf +share/pcbsd/conf/rc.conf.pcbsd +share/pcbsd/conf/smb4.conf +share/pcbsd/conf/torrc share/pcbsd/distfiles/desktop-overlay.txz share/pcbsd/distfiles/port-overlay.txz share/pcbsd/distfiles/server-overlay.txz @@ -194,11 +201,14 @@ share/pcbsd/pc-updatemanager/rc-update share/pcbsd/pc-updatemanager/rc-doupdate share/pcbsd/scripts/mkzfsdir.sh share/pcbsd/scripts/reset-firewall +share/pcbsd/scripts/reset-firewall-tor share/pcbsd/scripts/rmzfsdir.sh share/pcbsd/scripts/sys-init.sh share/pcbsd/version etc/pc-activedirectory.conf etc/pc-ldap.conf +etc/pcupdate.d/post/README +etc/pcupdate.d/pre/README etc/rc.activedirectory etc/rc.ldap etc/rc.d/pc-activedirectory diff --git a/sysutils/warden/Makefile b/sysutils/warden/Makefile index b79f974a15a1..e10616b38d20 100644 --- a/sysutils/warden/Makefile +++ b/sysutils/warden/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= warden -PORTVERSION= 1422974289 -PORTREVISION= 1 +PORTVERSION= 1431457302 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ @@ -11,9 +10,10 @@ MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ MAINTAINER= kmoore@FreeBSD.org COMMENT= Warden jail management system utility -LICENSE= BSD +LICENSE= BSD3CLAUSE RUN_DEPENDS= ${LOCALBASE}/share/pcbsd/scripts/functions.sh:${PORTSDIR}/sysutils/pcbsd-libsh \ + debootstrap:${PORTSDIR}/sysutils/debootstrap \ jailme:${PORTSDIR}/sysutils/jailme WRKSRC= ${WRKDIR}/warden diff --git a/sysutils/warden/distinfo b/sysutils/warden/distinfo index cbe17871ccab..f1ae0dd3a859 100644 --- a/sysutils/warden/distinfo +++ b/sysutils/warden/distinfo @@ -1,2 +1,2 @@ -SHA256 (warden-1422974289.tar.xz) = 3d40e62098242d375aa6af7d344e5356b5312c067c1042ef90eaf105144d060a -SIZE (warden-1422974289.tar.xz) = 37664 +SHA256 (warden-1431457302.tar.xz) = 919d9be4f2e98be05582ad0d53e71febb82af8dfe14f4b978e8991559391957c +SIZE (warden-1431457302.tar.xz) = 38208 diff --git a/sysutils/warden/pkg-install b/sysutils/warden/pkg-install deleted file mode 100644 index 99e8d6539859..000000000000 --- a/sysutils/warden/pkg-install +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Script for any install setup - -PREFIX=${PKG_PREFIX-/usr/local} - -if [ "$2" != "POST-INSTALL" ] ; then - exit 0 -fi - -# If this is during staging, we can skip for now -echo $PREFIX | grep -q '/stage/' -if [ $? -eq 0 ] ; then - exit 0 -fi - -# Check if we have our warden.conf file -#if [ ! -e "${PREFIX}/etc/warden.conf" ] ; then -# cp ${PREFIX}/etc/warden.conf.dist ${PREFIX}/etc/warden.conf -# chmod 644 ${PREFIX}/etc/warden.conf -#fi - -exit 0 diff --git a/sysutils/warden/pkg-plist b/sysutils/warden/pkg-plist index a18c0b9c37cd..c8c7edc7dd76 100644 --- a/sysutils/warden/pkg-plist +++ b/sysutils/warden/pkg-plist @@ -1,37 +1,37 @@ bin/warden -share/warden/agent.png -share/warden/warden.png -share/warden/scripts/rc.d/wardenrc -share/warden/scripts/rc.d/startup.sh -share/warden/scripts/rc.d/shutdown.sh -share/warden/scripts/backend/checkupdates.sh -share/warden/scripts/backend/createjail.sh -share/warden/scripts/backend/createtemplate.sh -share/warden/scripts/backend/zfslistsnap.sh -share/warden/scripts/backend/zfsrevertsnap.sh -share/warden/scripts/backend/details.sh -share/warden/scripts/backend/zfsmksnap.sh -share/warden/scripts/backend/startjail.sh -share/warden/scripts/backend/chrootjail.sh -share/warden/scripts/backend/listjails.sh -share/warden/scripts/backend/listpbis.sh -share/warden/scripts/backend/cronsnap.sh -share/warden/scripts/backend/setupusers.sh -share/warden/scripts/backend/checkstatus.sh -share/warden/scripts/backend/functions.sh -share/warden/scripts/backend/fbsdupdate.sh -share/warden/scripts/backend/fbsdupgrade.sh -share/warden/scripts/backend/pkgupdate.sh -share/warden/scripts/backend/importjail.sh -share/warden/scripts/backend/stopjail.sh -share/warden/scripts/backend/zfsrmsnap.sh -share/warden/scripts/backend/zfsrmsnapdate.sh -share/warden/scripts/backend/listpkgs.sh -share/warden/scripts/backend/exportjail.sh -share/warden/scripts/backend/deletejail.sh -share/warden/scripts/backend/zfsclone.sh -share/warden/scripts/backend/zfscronsnap.sh -share/warden/linux-installs/debian-7-wheezy -share/warden/linux-installs/gentoo-stage3-i486 etc/warden.conf.dist etc/rc.d/wardenrc +%%DATADIR%%/agent.png +%%DATADIR%%/warden.png +%%DATADIR%%/scripts/rc.d/wardenrc +%%DATADIR%%/scripts/rc.d/startup.sh +%%DATADIR%%/scripts/rc.d/shutdown.sh +%%DATADIR%%/scripts/backend/checkupdates.sh +%%DATADIR%%/scripts/backend/createjail.sh +%%DATADIR%%/scripts/backend/createtemplate.sh +%%DATADIR%%/scripts/backend/zfslistsnap.sh +%%DATADIR%%/scripts/backend/zfsrevertsnap.sh +%%DATADIR%%/scripts/backend/details.sh +%%DATADIR%%/scripts/backend/zfsmksnap.sh +%%DATADIR%%/scripts/backend/startjail.sh +%%DATADIR%%/scripts/backend/chrootjail.sh +%%DATADIR%%/scripts/backend/listjails.sh +%%DATADIR%%/scripts/backend/listpbis.sh +%%DATADIR%%/scripts/backend/cronsnap.sh +%%DATADIR%%/scripts/backend/setupusers.sh +%%DATADIR%%/scripts/backend/checkstatus.sh +%%DATADIR%%/scripts/backend/functions.sh +%%DATADIR%%/scripts/backend/fbsdupdate.sh +%%DATADIR%%/scripts/backend/fbsdupgrade.sh +%%DATADIR%%/scripts/backend/pkgupdate.sh +%%DATADIR%%/scripts/backend/importjail.sh +%%DATADIR%%/scripts/backend/stopjail.sh +%%DATADIR%%/scripts/backend/zfsrmsnap.sh +%%DATADIR%%/scripts/backend/zfsrmsnapdate.sh +%%DATADIR%%/scripts/backend/listpkgs.sh +%%DATADIR%%/scripts/backend/exportjail.sh +%%DATADIR%%/scripts/backend/deletejail.sh +%%DATADIR%%/scripts/backend/zfsclone.sh +%%DATADIR%%/scripts/backend/zfscronsnap.sh +%%DATADIR%%/linux-installs/debian-7-wheezy +%%DATADIR%%/linux-installs/gentoo-stage3-i486 |