Move common.sh.{freebsd,dragonfly} to include/

6 files changed, 26 insertions, 26 deletions

diff --git a/Makefile.am b/Makefile.am
index 3cba3d14..303169d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,6 @@ dist_pkgdata_DATA=	src/share/poudriere/bulk.sh \
 			src/share/poudriere/clean.sh \
 			src/share/poudriere/common.sh \
 			src/share/poudriere/daemon.sh \
-			src/share/poudriere/common.sh.dragonfly \
-			src/share/poudriere/common.sh.freebsd \
 			src/share/poudriere/distclean.sh \
 			src/share/poudriere/jail.sh \
 			src/share/poudriere/options.sh \
@@ -43,6 +41,8 @@ dist_pkgdata_DATA=	src/share/poudriere/bulk.sh \
 			src/share/poudriere/testport.sh
 
 dist_include_HEADERS= \
+			src/share/poudriere/include/common.sh.dragonfly \
+			src/share/poudriere/include/common.sh.freebsd \
 			src/share/poudriere/include/hash.sh \
 			src/share/poudriere/include/parallel.sh
 
diff --git a/Makefile.in b/Makefile.in
index 53b6d1ca..2b93b4a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -394,8 +394,6 @@ dist_pkgdata_DATA = src/share/poudriere/bulk.sh \
 			src/share/poudriere/clean.sh \
 			src/share/poudriere/common.sh \
 			src/share/poudriere/daemon.sh \
-			src/share/poudriere/common.sh.dragonfly \
-			src/share/poudriere/common.sh.freebsd \
 			src/share/poudriere/distclean.sh \
 			src/share/poudriere/jail.sh \
 			src/share/poudriere/options.sh \
@@ -408,6 +406,8 @@ dist_pkgdata_DATA = src/share/poudriere/bulk.sh \
 			src/share/poudriere/testport.sh
 
 dist_include_HEADERS = \
+			src/share/poudriere/include/common.sh.dragonfly \
+			src/share/poudriere/include/common.sh.freebsd \
 			src/share/poudriere/include/hash.sh \
 			src/share/poudriere/include/parallel.sh
 
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 86ed20d8..253f0bb1 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -69,8 +69,8 @@
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         'AM_SET_DEPDIR' => 1,
                         '_AM_DEPENDENCIES' => 1,
-                        'm4_include' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
+                        'm4_include' => 1,
                         '_AM_PROG_CC_C_O' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AU_DEFUN' => 1,
@@ -89,59 +89,59 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_PROG_F77_C_O' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
-                        'AC_INIT' => 1,
+                        'AM_PROG_F77_C_O' => 1,
                         'm4_pattern_forbid' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_INIT' => 1,
                         '_AM_COND_IF' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'AC_SUBST' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AC_CANONICAL_HOST' => 1,
                         'AC_FC_SRCEXT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_PROG_MKDIR_P' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_PATH_GUILE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_CONFIG_LINKS' => 1,
                         'm4_sinclude' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_NLS' => 1,
                         'AC_FC_PP_DEFINE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        '_m4_warn' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
+                        '_m4_warn' => 1,
                         'AM_PROG_CXX_C_O' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
                         '_AM_COND_ENDIF' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
-                        'AM_PROG_MOC' => 1,
                         'AM_SILENT_RULES' => 1,
+                        'AM_PROG_MOC' => 1,
                         'AC_CONFIG_FILES' => 1,
-                        'include' => 1,
                         'LT_INIT' => 1,
-                        'AM_GNU_GETTEXT' => 1,
+                        'include' => 1,
                         'AM_PROG_AR' => 1,
+                        'AM_GNU_GETTEXT' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
                         'AM_PROG_FC_C_O' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
                         'AC_FC_FREEFORM' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
                         'AH_OUTPUT' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'sinclude' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'm4_pattern_allow' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AM_POT_TOOLS' => 1,
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index 6038bd64..ff4635e2 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -27,7 +27,7 @@
 # SUCH DAMAGE.
 
 BSDPLATFORM=`uname -s | tr '[:upper:]' '[:lower:]'`
-. $(dirname ${0})/common.sh.${BSDPLATFORM}
+. $(dirname ${0})/include/common.sh.${BSDPLATFORM}
 BLACKLIST=""
 
 # Return true if ran from bulk/testport, ie not daemon/status/jail
diff --git a/src/share/poudriere/common.sh.dragonfly b/src/share/poudriere/include/common.sh.dragonfly
index 5fc4f32c..5fc4f32c 100644
--- a/src/share/poudriere/common.sh.dragonfly
+++ b/src/share/poudriere/include/common.sh.dragonfly
diff --git a/src/share/poudriere/common.sh.freebsd b/src/share/poudriere/include/common.sh.freebsd
index e8b8514a..e8b8514a 100644
--- a/src/share/poudriere/common.sh.freebsd
+++ b/src/share/poudriere/include/common.sh.freebsd