[freeside-commits] freeside/rt .gitignore, 1.1.1.1, NONE Makefile, 1.6, 1.7 config.status, 1.3, 1.4

Ivan,,, ivan at wavetail.420.am
Thu Dec 31 06:00:00 PST 2009


Update of /home/cvs/cvsroot/freeside/rt
In directory wavetail.420.am:/tmp/cvs-serv560

Modified Files:
	Makefile config.status 
Removed Files:
	.gitignore 
Log Message:
merging 3.8.7!!!

Index: config.status
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/config.status,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config.status	4 Aug 2007 00:13:47 -0000	1.3
+++ config.status	31 Dec 2009 13:59:58 -0000	1.4
@@ -249,18 +249,10 @@
 
 # Open the log real soon, to keep \$[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by RT $as_me 3.6.4, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+# values after options handling.
+ac_log="
+This file was extended by RT $as_me 3.8.7, which was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -268,10 +260,11 @@
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-config_files=" sbin/rt-dump-database sbin/rt-setup-database sbin/rt-test-dependencies bin/mason_handler.fcgi bin/mason_handler.scgi bin/standalone_httpd bin/rt-crontool bin/rt-mailgate bin/rt Makefile etc/RT_Config.pm lib/RT.pm bin/mason_handler.svc bin/webmux.pl"
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+# Files that config.status was made for.
+config_files=" etc/upgrade/3.8-branded-queues-extension etc/upgrade/3.8-ical-extension etc/upgrade/split-out-cf-categories sbin/rt-attributes-viewer sbin/rt-dump-database sbin/rt-setup-database sbin/rt-test-dependencies sbin/rt-email-digest sbin/rt-email-dashboards sbin/rt-clean-sessions sbin/rt-shredder sbin/rt-validator sbin/rt-email-group-admin sbin/rt-server bin/mason_handler.fcgi bin/mason_handler.scgi bin/standalone_httpd bin/rt-crontool bin/rt-mailgate bin/rt Makefile etc/RT_Config.pm lib/RT.pm bin/mason_handler.svc bin/webmux.pl t/data/configs/apache2.2+mod_perl.conf t/data/configs/apache2.2+fastcgi.conf"
 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
@@ -292,17 +285,20 @@
 
 Report bugs to <bug-autoconf at gnu.org>."
 ac_cs_version="\
-RT config.status 3.6.4
-configured by ./configure, generated by GNU Autoconf 2.59,
-  with options \"'--enable-layout=Freeside' '--with-db-type=Pg' '--with-db-dba=freeside' '--with-db-database=freeside' '--with-db-rt-user=freeside' '--with-db-rt-pass=' '--with-web-user=freeside' '--with-web-group=freeside' '--with-rt-group=freeside'\"
+RT config.status 3.8.7
+configured by ./configure, generated by GNU Autoconf 2.64,
+  with options \"'--with-db-type=SQLite' '--enable-layout=relative' '--with-web-handler=standalone' 'PERL=/usr/bin/perl'\"
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=.
-INSTALL="/usr/bin/install -c"
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+
+ac_pwd='/Users/falcone/work/rt/releases/rt-3.8.7'
+srcdir='.'
+INSTALL='install-sh'
+AWK='gawk'
+test -n "$AWK" || AWK=awk
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -373,31 +369,46 @@
 fi
 
 if $ac_cs_recheck; then
-  echo "running /bin/sh ./configure " '--enable-layout=Freeside' '--with-db-type=Pg' '--with-db-dba=freeside' '--with-db-database=freeside' '--with-db-rt-user=freeside' '--with-db-rt-pass=' '--with-web-user=freeside' '--with-web-group=freeside' '--with-rt-group=freeside' $ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec /bin/sh ./configure '--enable-layout=Freeside' '--with-db-type=Pg' '--with-db-dba=freeside' '--with-db-database=freeside' '--with-db-rt-user=freeside' '--with-db-rt-pass=' '--with-web-user=freeside' '--with-web-group=freeside' '--with-rt-group=freeside' $ac_configure_extra_args --no-create --no-recursion
+  set X '/bin/sh' './configure'  '--with-db-type=SQLite' '--enable-layout=relative' '--with-web-handler=standalone' 'PERL=/usr/bin/perl' $ac_configure_extra_args --no-create --no-recursion
+  shift
+  $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
+  CONFIG_SHELL='/bin/sh'
+  export CONFIG_SHELL
+  exec "$@"
 fi
 
 for ac_config_target in $ac_config_targets
 do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "sbin/rt-dump-database" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-dump-database" ;;
-  "sbin/rt-setup-database" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-setup-database" ;;
-  "sbin/rt-test-dependencies" ) CONFIG_FILES="$CONFIG_FILES sbin/rt-test-dependencies" ;;
-  "bin/mason_handler.fcgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.fcgi" ;;
-  "bin/mason_handler.scgi" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.scgi" ;;
-  "bin/standalone_httpd" ) CONFIG_FILES="$CONFIG_FILES bin/standalone_httpd" ;;
-  "bin/rt-crontool" ) CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
-  "bin/rt-mailgate" ) CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
-  "bin/rt" ) CONFIG_FILES="$CONFIG_FILES bin/rt" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "etc/RT_Config.pm" ) CONFIG_FILES="$CONFIG_FILES etc/RT_Config.pm" ;;
-  "lib/RT.pm" ) CONFIG_FILES="$CONFIG_FILES lib/RT.pm" ;;
-  "bin/mason_handler.svc" ) CONFIG_FILES="$CONFIG_FILES bin/mason_handler.svc" ;;
-  "bin/webmux.pl" ) CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  case $ac_config_target in
+    "etc/upgrade/3.8-branded-queues-extension") CONFIG_FILES="$CONFIG_FILES etc/upgrade/3.8-branded-queues-extension" ;;
+    "etc/upgrade/3.8-ical-extension") CONFIG_FILES="$CONFIG_FILES etc/upgrade/3.8-ical-extension" ;;
+    "etc/upgrade/split-out-cf-categories") CONFIG_FILES="$CONFIG_FILES etc/upgrade/split-out-cf-categories" ;;
+    "sbin/rt-attributes-viewer") CONFIG_FILES="$CONFIG_FILES sbin/rt-attributes-viewer" ;;
+    "sbin/rt-dump-database") CONFIG_FILES="$CONFIG_FILES sbin/rt-dump-database" ;;
+    "sbin/rt-setup-database") CONFIG_FILES="$CONFIG_FILES sbin/rt-setup-database" ;;
+    "sbin/rt-test-dependencies") CONFIG_FILES="$CONFIG_FILES sbin/rt-test-dependencies" ;;
+    "sbin/rt-email-digest") CONFIG_FILES="$CONFIG_FILES sbin/rt-email-digest" ;;
+    "sbin/rt-email-dashboards") CONFIG_FILES="$CONFIG_FILES sbin/rt-email-dashboards" ;;
+    "sbin/rt-clean-sessions") CONFIG_FILES="$CONFIG_FILES sbin/rt-clean-sessions" ;;
+    "sbin/rt-shredder") CONFIG_FILES="$CONFIG_FILES sbin/rt-shredder" ;;
+    "sbin/rt-validator") CONFIG_FILES="$CONFIG_FILES sbin/rt-validator" ;;
+    "sbin/rt-email-group-admin") CONFIG_FILES="$CONFIG_FILES sbin/rt-email-group-admin" ;;
+    "sbin/rt-server") CONFIG_FILES="$CONFIG_FILES sbin/rt-server" ;;
+    "bin/mason_handler.fcgi") CONFIG_FILES="$CONFIG_FILES bin/mason_handler.fcgi" ;;
+    "bin/mason_handler.scgi") CONFIG_FILES="$CONFIG_FILES bin/mason_handler.scgi" ;;
+    "bin/standalone_httpd") CONFIG_FILES="$CONFIG_FILES bin/standalone_httpd" ;;
+    "bin/rt-crontool") CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
+    "bin/rt-mailgate") CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
+    "bin/rt") CONFIG_FILES="$CONFIG_FILES bin/rt" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "etc/RT_Config.pm") CONFIG_FILES="$CONFIG_FILES etc/RT_Config.pm" ;;
+    "lib/RT.pm") CONFIG_FILES="$CONFIG_FILES lib/RT.pm" ;;
+    "bin/mason_handler.svc") CONFIG_FILES="$CONFIG_FILES bin/mason_handler.svc" ;;
+    "bin/webmux.pl") CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
+    "t/data/configs/apache2.2+mod_perl.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+mod_perl.conf" ;;
+    "t/data/configs/apache2.2+fastcgi.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+fastcgi.conf" ;;
+
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -426,9 +437,189 @@
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+cat >>"$tmp/subs1.awk" <<\_ACAWK &&
+S["LTLIBOBJS"]=""
+S["LIBOBJS"]=""
+S["RT_LOG_PATH_R"]="/opt/rt3/var/log"
+S["LOCAL_LIB_PATH_R"]="/opt/rt3/local/lib"
+S["LOCAL_LEXICON_PATH_R"]="/opt/rt3/local/po"
+S["MASON_LOCAL_HTML_PATH_R"]="/opt/rt3/local/html"
+S["LOCAL_ETC_PATH_R"]="/opt/rt3/local/etc"
+S["MASON_HTML_PATH_R"]="/opt/rt3/share/html"
+S["MASON_SESSION_PATH_R"]="/opt/rt3/var/session_data"
+S["MASON_DATA_PATH_R"]="/opt/rt3/var/mason_data"
+S["RT_PLUGIN_PATH_R"]="/opt/rt3/plugins"
+S["RT_MAN_PATH_R"]="/opt/rt3/man"
+S["RT_VAR_PATH_R"]="/opt/rt3/var"
+S["RT_SBIN_PATH_R"]="/opt/rt3/sbin"
+S["RT_BIN_PATH_R"]="/opt/rt3/bin"
+S["CONFIG_FILE_PATH_R"]="/opt/rt3/etc"
+S["RT_ETC_PATH_R"]="/opt/rt3/etc"
+S["RT_LIB_PATH_R"]="/opt/rt3/lib"
+S["RT_LOCAL_PATH_R"]="/opt/rt3/local"
+S["RT_DOC_PATH_R"]="/opt/rt3/share/doc"
+S["RT_PATH_R"]="/opt/rt3"
+S["RT_LOG_PATH"]="var/log"
+S["LOCAL_LIB_PATH"]="local/lib"
+S["LOCAL_LEXICON_PATH"]="local/po"
+S["MASON_LOCAL_HTML_PATH"]="local/html"
+S["LOCAL_ETC_PATH"]="local/etc"
+S["MASON_HTML_PATH"]="share/html"
+S["MASON_SESSION_PATH"]="var/session_data"
+S["MASON_DATA_PATH"]="var/mason_data"
+S["RT_PLUGIN_PATH"]="plugins"
+S["RT_MAN_PATH"]="man"
+S["RT_VAR_PATH"]="var"
+S["RT_SBIN_PATH"]="sbin"
+S["RT_BIN_PATH"]="bin"
+S["CONFIG_FILE_PATH"]="etc"
+S["RT_ETC_PATH"]="etc"
+S["RT_LIB_PATH"]="lib"
+S["RT_LOCAL_PATH"]="local"
+S["RT_DOC_PATH"]="share/doc"
+S["RT_PATH"]="/opt/rt3"
+S["RT_VERSION_PATCH"]="7"
+S["RT_VERSION_MINOR"]="8"
+S["RT_VERSION_MAJOR"]="3"
+S["RT_GPG"]="1"
+S["RT_GD"]="1"
+S["RT_GRAPHVIZ"]="0"
+S["OBJEXT"]="o"
+S["EXEEXT"]=""
+S["ac_ct_CC"]="gcc"
+S["CPPFLAGS"]=""
+S["LDFLAGS"]=""
+S["CFLAGS"]="-g -O2"
+S["CC"]="gcc"
+S["RT_DEVEL_MODE"]="0"
+S["APACHECTL"]="/usr/sbin/apachectl"
+S["RTGROUP"]="www"
+S["WEB_GROUP"]="www"
+S["WEB_USER"]="www"
+S["DB_RT_PASS"]="rt_pass"
+S["DB_RT_USER"]="rt_user"
+S["DB_DATABASE"]="rt3"
+S["DB_DBA"]="root"
+S["DB_RT_HOST"]="localhost"
+S["DB_PORT"]=""
+S["DB_HOST"]="localhost"
+S["DATABASE_ENV_PREF"]=""
+S["DB_TYPE"]="SQLite"
+S["LIBS_GROUP"]="bin"
+S["LIBS_OWNER"]="root"
+S["BIN_OWNER"]="root"
+S["COMMENT_INPLACE_LAYOUT"]=""
+S["rt_layout_name"]="relative"
+S["exp_customlibdir"]="local/lib"
+S["customlibdir"]="local/lib"
+S["exp_customlexdir"]="local/po"
+S["customlexdir"]="local/po"
+S["exp_customhtmldir"]="local/html"
+S["customhtmldir"]="local/html"
+S["exp_custometcdir"]="local/etc"
+S["custometcdir"]="local/etc"
+S["exp_customdir"]="local"
+S["customdir"]="local"
+S["exp_sessionstatedir"]="var/session_data"
+S["sessionstatedir"]="var/session_data"
+S["exp_masonstatedir"]="var/mason_data"
+S["masonstatedir"]="var/mason_data"
+S["exp_logfiledir"]="var/log"
+S["logfiledir"]="var/log"
+S["exp_localstatedir"]="var"
+S["exp_plugindir"]="plugins"
+S["plugindir"]="plugins"
+S["exp_manualdir"]="share/doc"
+S["manualdir"]="share/doc"
+S["exp_htmldir"]="share/html"
+S["exp_datadir"]="share"
+S["exp_libdir"]="lib"
+S["exp_mandir"]="man"
+S["exp_sysconfdir"]="etc"
+S["exp_sbindir"]="sbin"
+S["exp_bindir"]="bin"
+S["exp_exec_prefix"]="/opt/rt3"
+S["exp_prefix"]="/opt/rt3"
+S["SPEEDY_BIN"]="/usr/local/bin/speedy"
+S["WEB_HANDLER"]="standalone"
+S["PERL"]="/usr/bin/perl"
+S["AWK"]="gawk"
+S["INSTALL_DATA"]="${INSTALL} -m 644"
+S["INSTALL_SCRIPT"]="${INSTALL}"
+S["INSTALL_PROGRAM"]="${INSTALL}"
+S["rt_version_patch"]="7"
+S["rt_version_minor"]="8"
+S["rt_version_major"]="3"
+S["target_alias"]=""
+S["host_alias"]=""
+S["build_alias"]=""
+S["LIBS"]=""
+S["ECHO_T"]=""
+S["ECHO_N"]=""
+S["ECHO_C"]="\\c"
+S["DEFS"]="-DPACKAGE_NAME=\\\"RT\\\" -DPACKAGE_TARNAME=\\\"rt\\\" -DPACKAGE_VERSION=\\\"3.8.7\\\" -DPACKAGE_STRING=\\\"RT\\ 3.8.7\\\" -DPACKAGE_BUGREPORT=\\\"rt-bugs at bestpractica"\
+"l.com\\\" -DPACKAGE_URL=\\\"\\\""
+S["mandir"]="man"
+S["localedir"]="${datarootdir}/locale"
+S["libdir"]="lib"
+S["psdir"]="${docdir}"
+S["pdfdir"]="${docdir}"
+S["dvidir"]="${docdir}"
+S["htmldir"]="share/html"
+S["infodir"]="${datarootdir}/info"
+S["docdir"]="${datarootdir}/doc/${PACKAGE_TARNAME}"
+S["oldincludedir"]="/usr/include"
+S["includedir"]="${prefix}/include"
+S["localstatedir"]="var"
+S["sharedstatedir"]="${prefix}/com"
+S["sysconfdir"]="etc"
+S["datadir"]="share"
+S["datarootdir"]="${prefix}/share"
+S["libexecdir"]="${exec_prefix}/libexec"
+S["sbindir"]="sbin"
+S["bindir"]="bin"
+S["program_transform_name"]="s,x,x,"
+S["prefix"]="/opt/rt3"
+S["exec_prefix"]="/opt/rt3"
+S["PACKAGE_URL"]=""
+S["PACKAGE_BUGREPORT"]="rt-bugs at bestpractical.com"
+S["PACKAGE_STRING"]="RT 3.8.7"
+S["PACKAGE_VERSION"]="3.8.7"
+S["PACKAGE_TARNAME"]="rt"
+S["PACKAGE_NAME"]="RT"
+S["PATH_SEPARATOR"]=":"
+S["SHELL"]="/bin/sh"
+_ACAWK
+cat >>"$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
 {
    echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
@@ -716,58 +907,39 @@
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  sed "/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  ac_datarootdir_hack='
+  s&@datadir@&share&g
+  s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g
+  s&@infodir@&${datarootdir}/info&g
+  s&@localedir@&${datarootdir}/locale&g
+  s&@mandir@&man&g
+  s&\${datarootdir}&${prefix}/share&g' ;;
+esac
+ac_sed_extra="/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
 }
 
 :t
@@ -793,13 +965,47 @@
 
   # Run the commands associated with the file.
   case $ac_file in
-    sbin/rt-dump-database ) chmod ug+x $ac_file
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+
+  esac
+
+
+  case $ac_file$ac_mode in
+    "etc/upgrade/3.8-branded-queues-extension":F) chmod ug+x $ac_file
+                ;;
+    "etc/upgrade/3.8-ical-extension":F) chmod ug+x $ac_file
+                ;;
+    "etc/upgrade/split-out-cf-categories":F) chmod ug+x $ac_file
+                ;;
+    "sbin/rt-attributes-viewer":F) chmod ug+x $ac_file
+                ;;
+    "sbin/rt-dump-database":F) chmod ug+x $ac_file
                 ;;
     sbin/rt-setup-database ) chmod ug+x $ac_file
                 ;;
     sbin/rt-test-dependencies ) chmod ug+x $ac_file
                 ;;
-    bin/mason_handler.fcgi ) chmod ug+x $ac_file
+    "sbin/rt-email-digest":F) chmod ug+x $ac_file
+                ;;
+    "sbin/rt-email-dashboards":F) chmod ug+x $ac_file
+                ;;
+    "sbin/rt-clean-sessions":F) chmod ug+x $ac_file
+                ;;
+    "sbin/rt-shredder":F) chmod ug+x $ac_file
+                ;;
+    "sbin/rt-validator":F) chmod ug+x $ac_file
+                ;;
+    "sbin/rt-email-group-admin":F) chmod ug+x $ac_file
+                ;;
+    "sbin/rt-server":F) chmod ug+x $ac_file
+                ;;
+    "bin/mason_handler.fcgi":F) chmod ug+x $ac_file
                 ;;
     bin/mason_handler.scgi ) chmod ug+x $ac_file
                 ;;

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	31 Dec 2009 12:56:36 -0000	1.6
+++ Makefile	31 Dec 2009 13:59:58 -0000	1.7
@@ -1,8 +1,8 @@
 # BEGIN BPS TAGGED BLOCK {{{
 # 
 # COPYRIGHT:
-#  
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
+# 
+# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
 #                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -51,19 +51,22 @@
 #
 
 
-PERL			= 	/usr/bin/perl
+PERL			=	/usr/bin/perl
+INSTALL			=	install-sh
+
+RT_LAYOUT		=	relative
 
 CONFIG_FILE_PATH	=	/opt/rt3/etc
-CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_Config.pm
-SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
+CONFIG_FILE		=	$(CONFIG_FILE_PATH)/RT_Config.pm
+SITE_CONFIG_FILE	=	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
 
 
 RT_VERSION_MAJOR	=	3
-RT_VERSION_MINOR	=	6
-RT_VERSION_PATCH	=	10
+RT_VERSION_MINOR	=	8
+RT_VERSION_PATCH	=	7
 
-RT_VERSION =	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
-TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
+RT_VERSION		=	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
+TAG 			=	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
 
 
 # This is the group that all of the installed files will be chgrp'ed to.
@@ -88,11 +91,13 @@
 # {{{ Files and directories 
 
 # DESTDIR allows you to specify that RT be installed somewhere other than
-# where it will eventually reside
+# where it will eventually reside. DESTDIR _must_ have a trailing slash
+# if it's defined.
 
 DESTDIR			=	
 
 
+
 RT_PATH			=	/opt/rt3
 RT_ETC_PATH		=	/opt/rt3/etc
 RT_BIN_PATH		=	/opt/rt3/bin
@@ -102,6 +107,7 @@
 RT_VAR_PATH		=	/opt/rt3/var
 RT_DOC_PATH		=	/opt/rt3/share/doc
 RT_LOCAL_PATH		=	/opt/rt3/local
+LOCAL_PLUGIN_PATH	=	/opt/rt3/local/plugins
 LOCAL_ETC_PATH		=	/opt/rt3/local/etc
 LOCAL_LIB_PATH		=	/opt/rt3/local/lib
 LOCAL_LEXICON_PATH	=	/opt/rt3/local/po
@@ -109,7 +115,7 @@
 MASON_LOCAL_HTML_PATH	=	/opt/rt3/local/html
 MASON_DATA_PATH		=	/usr/local/etc/freeside/masondata
 MASON_SESSION_PATH	=	/opt/rt3/var/session_data
-RT_LOG_PATH	    =       /opt/rt3/var/log
+RT_LOG_PATH		=       /opt/rt3/var/log
 
 # RT_READABLE_DIR_MODE is the mode of directories that are generally meant
 # to be accessable
@@ -121,34 +127,69 @@
 # {{{ all these define the places that RT's binaries should get installed
 
 # RT_MODPERL_HANDLER is the mason handler script for mod_perl
-RT_MODPERL_HANDLER	=	$(RT_BIN_PATH)/webmux.pl
+RT_MODPERL_HANDLER	=	webmux.pl
 # RT_STANDALONE_SERVER is a stand-alone HTTP server
-RT_STANDALONE_SERVER	=	$(RT_BIN_PATH)/standalone_httpd
+RT_STANDALONE_SERVER	=	standalone_httpd
 # RT_SPEEDYCGI_HANDLER is the mason handler script for SpeedyCGI
-RT_SPEEDYCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.scgi
+RT_SPEEDYCGI_HANDLER	=	mason_handler.scgi
 # RT_FASTCGI_HANDLER is the mason handler script for FastCGI
-RT_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.fcgi
+RT_FASTCGI_HANDLER	=	mason_handler.fcgi
 # RT_WIN32_FASTCGI_HANDLER is the mason handler script for FastCGI
-RT_WIN32_FASTCGI_HANDLER	=	$(RT_BIN_PATH)/mason_handler.svc
+RT_WIN32_FASTCGI_HANDLER	=	mason_handler.svc
 # RT's CLI
-RT_CLI_BIN		=	$(RT_BIN_PATH)/rt
+RT_CLI_BIN		=	rt
 # RT's mail gateway
-RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mailgate
+RT_MAILGATE_BIN		=	rt-mailgate
 # RT's cron tool
-RT_CRON_BIN		=	$(RT_BIN_PATH)/rt-crontool
+RT_CRON_BIN		=	rt-crontool
 
 # }}}
 
 
-BINARIES		=	$(DESTDIR)/$(RT_MODPERL_HANDLER) \
-				$(DESTDIR)/$(RT_MAILGATE_BIN) \
-				$(DESTDIR)/$(RT_CLI_BIN) \
-				$(DESTDIR)/$(RT_CRON_BIN) \
-				$(DESTDIR)/$(RT_STANDALONE_SERVER) \
-				$(DESTDIR)/$(RT_SPEEDYCGI_HANDLER) \
-				$(DESTDIR)/$(RT_FASTCGI_HANDLER) \
-				$(DESTDIR)/$(RT_WIN32_FASTCGI_HANDLER)
-SYSTEM_BINARIES		=	$(DESTDIR)/$(RT_SBIN_PATH)/
+BINARIES		=	$(RT_MODPERL_HANDLER) \
+				$(RT_MAILGATE_BIN) \
+				$(RT_CLI_BIN) \
+				$(RT_CRON_BIN) \
+				$(RT_STANDALONE_SERVER) \
+				$(RT_SPEEDYCGI_HANDLER) \
+				$(RT_FASTCGI_HANDLER) \
+				$(RT_WIN32_FASTCGI_HANDLER)
+
+
+
+
+
+SYSTEM_BINARIES		=	rt-dump-database \
+				rt-setup-database \
+				rt-email-digest \
+				rt-email-dashboards \
+				rt-email-group-admin \
+				rt-server \
+				rt-test-dependencies \
+				rt-clean-sessions \
+				rt-shredder \
+				rt-validator
+
+
+ETC_FILES		=	acl.Informix \
+				acl.Pg \
+				acl.Oracle \
+				acl.mysql \
+				acl.Sybase \
+				schema.Informix \
+				schema.Pg \
+				schema.Oracle \
+				schema.mysql-4.0 \
+				schema.mysql-4.1 \
+				schema.Sybase \
+				schema.SQLite \
+				initialdata
+
+# }}}
+
+# {{{ Web frontend
+
+WEB_HANDLER		=	standalone
 
 # }}}
 
@@ -205,18 +246,21 @@
 # }}}
 
 
+TEST_FILES = t/*.t t/*/*.t
+TEST_VERBOSE = 0
+
+
 ####################################################################
 
 all: default
 
 default:
-	@echo "Please read RT's readme before installing. Not doing so could"
-	@echo "be dangerous."
+	@echo "Please read RT's README before beginning your installation."
 
 
 
 instruct:
-	@echo "Congratulations. RT has been installed. "
+	@echo "Congratulations. RT is now installed."
 	@echo ""
 	@echo ""
 	@echo "You must now configure RT by editing $(SITE_CONFIG_FILE)."
@@ -230,244 +274,214 @@
 	@echo "After that, you need to initialize RT's database by running" 
 	@echo " 'make initialize-database'"
 
-#	@echo " or by executing "       
-#	@echo " '$(RT_SBIN_PATH)/rt-setup-database --action init \ "
-#	@echo "     --dba $(DB_DBA) --prompt-for-dba-password'"
-
-
 
 upgrade-instruct: 
-	@echo "Congratulations. RT has been upgraded. You should now check-over"
+	@echo "Congratulations. RT has been upgraded. You should now check over"
 	@echo "$(CONFIG_FILE) for any necessary site customization. Additionally,"
 	@echo "you should update RT's system database objects by running "
-	@echo "   ls etc/upgrade"
-	@echo ""
-	@echo "For each item in that directory whose name is greater than"
-	@echo "your previously installed RT version, run:"
-	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action schema --datadir etc/upgrade/<version>"
-	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action acl --datadir etc/upgrade/<version>"
-	@echo "	   $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action insert --datadir etc/upgrade/<version>"
+	@echo "    $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action upgrade"
 
 
-upgrade: config-install dirs files-install fixperms upgrade-instruct
+upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
 
-upgrade-noclobber: config-install libs-install html-install bin-install local-install doc-install fixperms
+upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install fixperms
 
 
 # {{{ dependencies
+
+my_with_web_handlers= $(shell $(PERL) -e 'print join " ", map "--with-$$_", grep defined && length, split /,/, "$(WEB_HANDLER)"')
 testdeps:
-	$(PERL) ./sbin/rt-test-dependencies --verbose --with-$(DB_TYPE)
+	$(PERL) ./sbin/rt-test-dependencies --verbose --with-$(DB_TYPE) $(my_with_web_handlers)
 
 depends: fixdeps
 
 fixdeps:
-	$(PERL) ./sbin/rt-test-dependencies --verbose --install --with-$(DB_TYPE)
+	$(PERL) ./sbin/rt-test-dependencies --verbose --install --with-$(DB_TYPE) $(my_with_web_handlers)
 
 #}}}
 
 # {{{ fixperms
 fixperms:
 	# Make the libraries readable
-	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_PATH)
-	chown -R $(LIBS_OWNER) $(DESTDIR)/$(RT_LIB_PATH)
-	chgrp -R $(LIBS_GROUP) $(DESTDIR)/$(RT_LIB_PATH)
-	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(RT_LIB_PATH)
+	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_PATH)
+	chown -R $(LIBS_OWNER) $(DESTDIR)$(RT_LIB_PATH)
+	chgrp -R $(LIBS_GROUP) $(DESTDIR)$(RT_LIB_PATH)
+	chmod -R  u+rwX,go-w,go+rX $(DESTDIR)$(RT_LIB_PATH)
 
 
-	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)
-	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)	
+	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH)
 
-	chmod 0755 $(DESTDIR)/$(RT_ETC_PATH)
-	chmod 0500 $(DESTDIR)/$(RT_ETC_PATH)/*
+	chmod 0755 $(DESTDIR)$(RT_ETC_PATH)
+	cd $(DESTDIR)$(RT_ETC_PATH) && chmod 0400 $(ETC_FILES)
 
 	#TODO: the config file should probably be able to have its
 	# owner set separately from the binaries.
-	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_ETC_PATH)
-	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_ETC_PATH)
+	chown -R $(BIN_OWNER) $(DESTDIR)$(RT_ETC_PATH)
+	chgrp -R $(RTGROUP) $(DESTDIR)$(RT_ETC_PATH)
 
-	chmod 0550 $(DESTDIR)/$(CONFIG_FILE)
-	chmod 0550 $(DESTDIR)/$(SITE_CONFIG_FILE)
+	chmod 0440 $(DESTDIR)$(CONFIG_FILE)
+	chmod 0640 $(DESTDIR)$(SITE_CONFIG_FILE)
 
-	# Make the interfaces executable
-	chown $(BIN_OWNER) $(BINARIES)
-	chgrp $(RTGROUP) $(BINARIES)
-	chmod 0755  $(BINARIES)
+	# Make the system binaries
+	cd $(DESTDIR)$(RT_BIN_PATH) && ( chmod 0755 $(BINARIES) ; chown $(BIN_OWNER) $(BINARIES);  chgrp $(RTGROUP) $(BINARIES))
+
+	# Make the system binaries executable also
+	cd $(DESTDIR)$(RT_SBIN_PATH) && ( chmod 0755 $(SYSTEM_BINARIES) ; chown $(BIN_OWNER) $(SYSTEM_BINARIES);  chgrp $(RTGROUP) $(SYSTEM_BINARIES))
 
 	# Make the web ui readable by all. 
-	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(MASON_HTML_PATH) \
-					$(DESTDIR)/$(MASON_LOCAL_HTML_PATH) \
-					$(DESTDIR)/$(LOCAL_LEXICON_PATH)
-	chown -R $(LIBS_OWNER) 	$(DESTDIR)/$(MASON_HTML_PATH) \
-				$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
-	chgrp -R $(LIBS_GROUP) 	$(DESTDIR)/$(MASON_HTML_PATH) \
-				$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
+	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)$(MASON_HTML_PATH) \
+					$(DESTDIR)$(MASON_LOCAL_HTML_PATH) \
+					$(DESTDIR)$(LOCAL_LEXICON_PATH)
+	chown -R $(LIBS_OWNER) 	$(DESTDIR)$(MASON_HTML_PATH) \
+				$(DESTDIR)$(MASON_LOCAL_HTML_PATH)
+	chgrp -R $(LIBS_GROUP) 	$(DESTDIR)$(MASON_HTML_PATH) \
+				$(DESTDIR)$(MASON_LOCAL_HTML_PATH)
 
 	# Make the web ui's data dir writable
-	chmod 0770  	$(DESTDIR)/$(MASON_DATA_PATH) \
-			$(DESTDIR)/$(MASON_SESSION_PATH)
-	chown -R $(WEB_USER) 	$(DESTDIR)/$(MASON_DATA_PATH) \
-				$(DESTDIR)/$(MASON_SESSION_PATH)
-	chgrp -R $(WEB_GROUP) 	$(DESTDIR)/$(MASON_DATA_PATH) \
-				$(DESTDIR)/$(MASON_SESSION_PATH)
+	chmod 0770  	$(DESTDIR)$(MASON_DATA_PATH) \
+			$(DESTDIR)$(MASON_SESSION_PATH)
+	chown -R $(WEB_USER) 	$(DESTDIR)$(MASON_DATA_PATH) \
+				$(DESTDIR)$(MASON_SESSION_PATH)
+	chgrp -R $(WEB_GROUP) 	$(DESTDIR)$(MASON_DATA_PATH) \
+				$(DESTDIR)$(MASON_SESSION_PATH)
 # }}}
 
 # {{{ dirs
 dirs:
-	mkdir -p $(DESTDIR)/$(RT_LOG_PATH)
-	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)
-	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/cache
-	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/etc
-	mkdir -p $(DESTDIR)/$(MASON_DATA_PATH)/obj
-	mkdir -p $(DESTDIR)/$(MASON_SESSION_PATH)
-	mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
-	mkdir -p $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
-	mkdir -p $(DESTDIR)/$(LOCAL_ETC_PATH)
-	mkdir -p $(DESTDIR)/$(LOCAL_LIB_PATH)
-	mkdir -p $(DESTDIR)/$(LOCAL_LEXICON_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LOG_PATH)
+	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)
+	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)/cache
+	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)/etc
+	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)/obj
+	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_SESSION_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MASON_HTML_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MASON_LOCAL_HTML_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_ETC_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LIB_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_PLUGIN_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH)
 # }}}
 
-install: config-install dirs files-install fixperms instruct
+install: testdeps config-install dirs files-install fixperms instruct
 
-files-install: libs-install etc-install bin-install sbin-install html-install local-install doc-install
+files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install
 
 config-install:
-	mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH)	
-	-cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
-	[ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE) 
-
-	chgrp $(RTGROUP) $(DESTDIR)/$(CONFIG_FILE)
-	chown $(BIN_OWNER) $(DESTDIR)/$(CONFIG_FILE)
-
-	chgrp $(RTGROUP) $(DESTDIR)/$(SITE_CONFIG_FILE)
-	chown $(BIN_OWNER) $(DESTDIR)/$(SITE_CONFIG_FILE)
-
-	@echo "Installed configuration. about to install rt in  $(RT_PATH)"
+	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
+	-$(INSTALL) -m 0440 -o $(BIN_OWNER) -g $(RTGROUP)  etc/RT_Config.pm $(DESTDIR)$(CONFIG_FILE)
+	[ -f $(DESTDIR)$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 -o $(BIN_OWNER) -g $(RTGROUP) etc/RT_SiteConfig.pm $(DESTDIR)$(SITE_CONFIG_FILE) 
+	@echo "Installed configuration. About to install RT in  $(RT_PATH)"
 
 test: 
-	$(PERL) -Ilib lib/t/00smoke.t
-
-regression-install: config-install
-	$(PERL) -pi -e 's/Set\(\$$DatabaseName.*\);/Set\(\$$DatabaseName, "rt3regression"\);/' $(DESTDIR)/$(CONFIG_FILE)
-
-regression: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms apachectl run-regression
-
-run-regression:
-	prove -Ilib lib/t/setup_regression.t  lib/t/autogen/ lib/t/regression/
-
-
-regression-noapache: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms start-httpd  run-regression
+	$(PERL) "-MExtUtils::Command::MM" -e "test_harness($(TEST_VERBOSE), 'lib')" $(TEST_FILES)
 
-regression-quiet:
-	$(PERL) sbin/regression_harness
+parallel-test: test-parallel
 
-regression-instruct:
-	@echo "About to wipe your database for a regression test. ABORT NOW with Control-C"
+test-parallel: 
+	RT_TEST_PARALLEL=1 HARNESS_OPTIONS="j4" $(PERL) "-MExtUtils::Command::MM" -e "test_harness($(TEST_VERBOSE), 'lib')" $(TEST_FILES)
 
+regression-install: config-install
+	$(PERL) -pi -e 's/Set\(\$$DatabaseName.*\);/Set\(\$$DatabaseName, "rt3regression"\);/' $(DESTDIR)$(CONFIG_FILE)
 
 # {{{ database-installation
 
-regression-reset-db:
-	$(PERL)	$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --dba-password '' --force
-	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
+regression-reset-db: force-dropdb
+	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
 
 initdb :: initialize-database
 
 initialize-database: 
-	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
+	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
 
 dropdb: 
-	$(PERL)	$(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
+	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
+
+force-dropdb: 
+	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action drop --dba $(DB_DBA) --dba-password '' --force
 
-insert-approval-data: 
-	$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/insert_approval_scrips
 # }}}
 
 # {{{ libs-install
 libs-install: 
-	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir -p $(DESTDIR)/$(RT_LIB_PATH)
-	-cp -rp lib/* $(DESTDIR)/$(RT_LIB_PATH)
+	[ -d $(DESTDIR)$(RT_LIB_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LIB_PATH)
+	-( cd lib && find . -type d -print ) | while read dir ; do \
+	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(RT_LIB_PATH)/$$dir" ; \
+	done
+	-( cd lib && find . -type f -print ) | while read file ; do \
+	     $(INSTALL) -m 0644 "lib/$$file" "$(DESTDIR)$(RT_LIB_PATH)/$$file" ; \
+	done
 # }}}
 
 # {{{ html-install
 html-install:
-	[ -d $(DESTDIR)/$(MASON_HTML_PATH) ] || mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
-	-cp -rp ./html/* $(DESTDIR)/$(MASON_HTML_PATH)
+	[ -d $(DESTDIR)$(MASON_HTML_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(MASON_HTML_PATH)
+	-( cd share/html && find . -type d -print ) | while read dir ; do \
+	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(MASON_HTML_PATH)/$$dir" ; \
+	done
+	-( cd share/html && find . -type f -print ) | while read file ; do \
+	    $(INSTALL) -m 0644 "share/html/$$file" "$(DESTDIR)$(MASON_HTML_PATH)/$$file" ; \
+	done
 # }}}
 
 # {{{ doc-install
 doc-install:
 	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
-	-[ -f $(DESTDIR)/$(RT_DOC_PATH) ] && rm $(DESTDIR)/$(RT_DOC_PATH) 
-	[ -d $(DESTDIR)/$(RT_DOC_PATH) ] || mkdir -p $(DESTDIR)/$(RT_DOC_PATH)
-	-cp -rp ./README $(DESTDIR)/$(RT_DOC_PATH)
+	-[ -f $(DESTDIR)$(RT_DOC_PATH) ] && rm $(DESTDIR)$(RT_DOC_PATH) 
+	[ -d $(DESTDIR)$(RT_DOC_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_DOC_PATH)
+	-$(INSTALL) -m 0644 ./README $(DESTDIR)$(RT_DOC_PATH)/
 # }}}
 
 # {{{ etc-install
 
 etc-install:
-	mkdir -p $(DESTDIR)/$(RT_ETC_PATH)
-	-cp -rp \
-		etc/acl.* \
-		etc/initialdata \
-		etc/schema.* \
-		$(DESTDIR)/$(RT_ETC_PATH)
+	[ -d $(DESTDIR)$(RT_ETC_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_ETC_PATH)
+	for file in $(ETC_FILES) ; do \
+	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(RT_ETC_PATH)/" ; \
+	done
 # }}}
 
 # {{{ sbin-install
 
 sbin-install:
-	mkdir -p $(DESTDIR)/$(RT_SBIN_PATH)
-	chmod +x \
-		sbin/rt-dump-database \
-		sbin/rt-setup-database \
-		sbin/rt-test-dependencies
-	-cp -rp \
-		sbin/rt-dump-database \
-		sbin/rt-setup-database \
-		sbin/rt-test-dependencies \
-		$(DESTDIR)/$(RT_SBIN_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_SBIN_PATH)
+	for file in $(SYSTEM_BINARIES) ; do \
+	    $(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "sbin/$$file" "$(DESTDIR)$(RT_SBIN_PATH)/" ; \
+	done
 
 # }}}
 
 # {{{ bin-install
 
 bin-install:
-	mkdir -p $(DESTDIR)/$(RT_BIN_PATH)
-	chmod +x bin/rt-mailgate \
-		bin/rt-crontool
-	-cp -rp \
-		bin/rt-mailgate \
-		bin/mason_handler.fcgi \
-		bin/mason_handler.scgi \
-		bin/standalone_httpd \
-		bin/mason_handler.svc \
-		bin/rt \
-		bin/webmux.pl \
-		bin/rt-crontool \
-		$(DESTDIR)/$(RT_BIN_PATH)
-# }}}
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_BIN_PATH)
+	for file in $(BINARIES) ; do \
+	    $(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "bin/$$file" "$(DESTDIR)$(RT_BIN_PATH)/" ; \
+	done
 
 # {{{ local-install
 local-install:
-	-cp -rp ./local/html/* $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
-	-cp -rp ./local/po/* $(DESTDIR)/$(LOCAL_LEXICON_PATH)
-	-cp -rp ./local/etc/* $(DESTDIR)/$(LOCAL_ETC_PATH)
+	-( cd local/html && find . -type d -print ) | while read dir ; do \
+	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(MASON_LOCAL_HTML_PATH)/$$dir" ; \
+	done
+	-( cd local/html && find . -type f -print ) | while read file ; do \
+	    $(INSTALL) -m 0644 "local/html/$$file" "$(DESTDIR)$(MASON_LOCAL_HTML_PATH)/$$file" ; \
+	done
+	-( cd local/po && find . -type d -print ) | while read dir ; do \
+	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(LOCAL_LEXICON_PATH)/$$dir" ; \
+	done
+	-( cd local/po && find . -type f -print ) | while read file ; do \
+	    $(INSTALL) -m 0644 "local/po/$$file" "$(DESTDIR)$(LOCAL_LEXICON_PATH)/$$file" ; \
+	done
+	-( cd local/etc && find . -type d -print ) | while read dir ; do \
+	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(LOCAL_ETC_PATH)/$$dir" ; \
+	done
+	-( cd local/etc && find . -type f -print ) | while read file ; do \
+	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(LOCAL_ETC_PATH)/$$file" ; \
+	done
 # }}}
 
 # {{{ Best Practical Build targets -- no user servicable parts inside
 
-
-POD2TEST_EXE = sbin/extract_pod_tests
-
-testify-pods:
-	[ -d lib/t/autogen ] || mkdir lib/t/autogen
-	find lib -name \*pm |grep -v .svn | grep -v \*.in |xargs -n 1 $(PERL) $(POD2TEST_EXE)
-	find bin -type f |grep -v .svn | grep -v \~ | grep -v "\.in" | xargs -n 1 $(PERL) $(POD2TEST_EXE)
-	find lib -name \*pm |grep -v .svn | grep -v \*.in |xargs -n 1 $(PERL) $(POD2TEST_EXE)
-	find bin -type f |grep -v .svn | grep -v \~ | grep -v "\.in" | xargs -n 1 $(PERL) $(POD2TEST_EXE)
-
-
-
 regenerate-catalogs:
 	$(PERL) sbin/extract-message-catalog
 
@@ -486,9 +500,20 @@
 start-httpd:
 	$(PERL) bin/standalone_httpd &
 
+start-server:
+	$(PERL) sbin/rt-server &
+
 apachectl:
 	$(APACHECTL) stop
 	sleep 10
 	$(APACHECTL) start
 	sleep 5
+
+SNAPSHOT=$(shell git describe --tags)
+snapshot:
+	git archive --prefix "$(SNAPSHOT)/"  HEAD | tar -xf -
+	( cd $(SNAPSHOT) && autoconf && ./configure )
+	tar -czf "$(SNAPSHOT).tar.gz" "$(SNAPSHOT)/"
+	rm -fr "$(SNAPSHOT)/"
+
 # }}}

--- .gitignore DELETED ---



More information about the freeside-commits mailing list