[PC-BSD Commits] r21200 - in pcbsd/current: overlays/desktop-overlay/usr/local/bin overlays/desktop-overlay/usr/local/share/pcbsd/scripts src-sh src-sh/port-files src-sh/xtrafiles src-sh/xtrafiles/local src-sh/xtrafiles/local/bin src-sh/xtrafiles/local/share src-sh/xtrafiles/local/share/pcbsd src-sh/xtrafiles/local/share/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2013-01-25 20:23:06 +0000 (Fri, 25 Jan 2013)
New Revision: 21200

Added:
   pcbsd/current/src-sh/xtrafiles/
   pcbsd/current/src-sh/xtrafiles/Makefile
   pcbsd/current/src-sh/xtrafiles/install.sh
   pcbsd/current/src-sh/xtrafiles/local/
   pcbsd/current/src-sh/xtrafiles/local/bin/
   pcbsd/current/src-sh/xtrafiles/local/bin/enable_user_pefs
   pcbsd/current/src-sh/xtrafiles/local/share/
   pcbsd/current/src-sh/xtrafiles/local/share/pcbsd/
   pcbsd/current/src-sh/xtrafiles/local/share/pcbsd/scripts/
   pcbsd/current/src-sh/xtrafiles/local/share/pcbsd/scripts/mkzfsdir.sh
   pcbsd/current/src-sh/xtrafiles/local/share/pcbsd/scripts/reset-firewall
   pcbsd/current/src-sh/xtrafiles/local/share/pcbsd/scripts/rmzfsdir.sh
Removed:
   pcbsd/current/overlays/desktop-overlay/usr/local/bin/enable_user_pefs
   pcbsd/current/overlays/desktop-overlay/usr/local/share/pcbsd/scripts/mkzfsdir.sh
   pcbsd/current/overlays/desktop-overlay/usr/local/share/pcbsd/scripts/reset-firewall
   pcbsd/current/overlays/desktop-overlay/usr/local/share/pcbsd/scripts/rmzfsdir.sh
Modified:
   pcbsd/current/src-sh/Makefile
   pcbsd/current/src-sh/port-files/pkg-plist
Log:

Move some files out of overlays/ into src-sh/xtrafiles

This will allow us to package them with the pcbsd-utils port



Modified: pcbsd/current/src-sh/Makefile
===================================================================
--- pcbsd/current/src-sh/Makefile	2013-01-25 19:57:47 UTC (rev 21199)
+++ pcbsd/current/src-sh/Makefile	2013-01-25 20:23:06 UTC (rev 21200)
@@ -25,6 +25,7 @@
 		sub-pcad \
 		sub-pcsu \
 		sub-pcex \
+		sub-pcxt \
 		sub-pcrunx \
 		sub-pcup \
 		sub-pcfbsd \
@@ -87,6 +88,19 @@
 sub-pbreg-install_subtargets: pbreg/$(MAKEFILE) FORCE
 	cd pbreg/ && $(MAKE) -f $(MAKEFILE) install
 
+sub-pcxt: xtrafiles/$(MAKEFILE) FORCE
+	cd xtrafiles/ && $(MAKE) -f $(MAKEFILE)
+sub-pcxt-make_default: xtrafiles/$(MAKEFILE) FORCE
+	cd xtrafiles/ && $(MAKE) -f $(MAKEFILE) 
+sub-pcxt-make_first: xtrafiles/$(MAKEFILE) FORCE
+	cd xtrafiles/ && $(MAKE) -f $(MAKEFILE) first
+sub-pcxt-all: xtrafiles/$(MAKEFILE) FORCE
+	cd xtrafiles/ && $(MAKE) -f $(MAKEFILE) all
+sub-pcxt-clean: xtrafiles/$(MAKEFILE) FORCE
+	cd xtrafiles/ && $(MAKE) -f $(MAKEFILE) clean
+sub-pcxt-install_subtargets: xtrafiles/$(MAKEFILE) FORCE
+	cd xtrafiles/ && $(MAKE) -f $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) install
+
 sub-pcex: pc-extractoverlay/$(MAKEFILE) FORCE
 	cd pc-extractoverlay/ && $(MAKE) -f $(MAKEFILE)
 sub-pcex-make_default: pc-extractoverlay/$(MAKEFILE) FORCE
@@ -242,6 +256,7 @@
 	sub-pcad-make_default \
 	sub-pcsu-make_default \
 	sub-pcex-make_default \
+	sub-pcxt-make_default \
 	sub-deinfo-make_default \
 	sub-pcthinclient-make_default \
 	sub-xdgutil-make_default \
@@ -257,6 +272,7 @@
 	sub-pcfirst-make_first \
 	sub-pcsu-make_first \
 	sub-pcex-make_first \
+	sub-pcxt-make_first \
 	sub-pbreg-make_first \
 	sub-pcad-make_first \
 	sub-deinfo-make_first \
@@ -274,6 +290,7 @@
 	sub-pcfirst-all \
 	sub-pcsu-all \
 	sub-pcex-all \
+	sub-pcxt-all \
 	sub-pbreg-all \
 	sub-pcad-all \
 	sub-deinfo-all \
@@ -291,6 +308,7 @@
 	sub-pcfirst-clean \
 	sub-pcsu-clean \
 	sub-pcex-clean \
+	sub-pcxt-clean \
 	sub-pbreg-clean \
 	sub-pcad-clean \
 	sub-deinfo-clean \
@@ -308,6 +326,7 @@
 	sub-pcfirst-install_subtargets \
 	sub-pcsu-install_subtargets \
 	sub-pcex-install_subtargets \
+	sub-pcxt-install_subtargets \
 	sub-pbreg-install_subtargets \
 	sub-pcad-install_subtargets \
 	sub-deinfo-install_subtargets \

Modified: pcbsd/current/src-sh/port-files/pkg-plist
===================================================================
--- pcbsd/current/src-sh/port-files/pkg-plist	2013-01-25 19:57:47 UTC (rev 21199)
+++ pcbsd/current/src-sh/port-files/pkg-plist	2013-01-25 20:23:06 UTC (rev 21200)
@@ -18,6 +18,7 @@
 bin/pc-xdgutil
 bin/pc-firstgui
 bin/pc-runxgui
+bin/enable_user_pefs
 share/warden/agent.png
 share/warden/warden.png
 share/warden/scripts/rc.d/wardenrc
@@ -122,6 +123,9 @@
 share/pcbsd/metaconf/prune-files
 share/pcbsd/metaconf/overlay.txz
 share/pcbsd/scripts/functions.sh
+share/pcbsd/scripts/mkzfsdir.sh
+share/pcbsd/scripts/reset-firewall
+share/pcbsd/scripts/rmzfsdir.sh
 etc/warden.conf
 etc/pc-activedirectory.conf
 etc/pc-ldap.conf