diff -u -r1.9 -r1.10
--- aclocal.m4	1 Dec 2005 22:41:37 -0000	1.9
+++ aclocal.m4	27 Jan 2006 09:05:45 -0000	1.10
@@ -1,3 +1,24 @@

+dnl Change a version with letters and underscores to one containing dots, only
+AC_DEFUN(VERSION_DOT, [
+  v=$(echo $2 | sed -e 's/[[vrp]]/\./g' -e 's/^\.//g' -e 's/_/./g')
+  AC_SUBST($1, $v)
+  echo $v
+])
+
+dnl Change version with letters and underscores to one containing underscores, only
+AC_DEFUN(VERSION_UNDERSCORE, [
+  v=$(echo $2 | sed -e 's/[[vrp]]/_/g' -e 's/^_//g')
+  AC_SUBST($1, $v)
+  echo $v
+])
+
+dnl
+AC_DEFUN(VERSION_GEANT4, [
+  v=$(echo $2 | sed 's/[[vr]]/\./g' | sed 's/p/\.p/g')
+  AC_SUBST($1, $v)
+  echo $v
+])
+

 dnl macro to add .in files for each package
 AC_DEFUN(MAKE_CONFIG_FILES_LIST, [
 

@@ -9,7 +30,7 @@

 do
 
   dnl Makefile

-  SIM_ADD_CONFIG_FILE(packages/$p/GNUmakefile)

+  SIM_ADD_CONFIG_FILE(packages/$p/Makefile)

 
   dnl variables for the build system
   SIM_ADD_CONFIG_FILE(packages/$p/package.gmk)

@@ -84,6 +105,17 @@

   AC_SUBST(JAVA)
 fi
 

+dnl ant
+AC_CHECK_PROG(have_ant, ant, yes, no)
+
+if test $have_ant == "no"
+then
+  AC_MSG_ERROR(ant not found)
+else
+  ANT=ant
+  AC_SUBST(ANT)
+fi
+

 dnl wget
 AC_CHECK_PROG(have_wget, wget, yes, no)
 

@@ -111,6 +143,9 @@

 dnl macro to do top-level initialization of the build system and set some common variables and substitutions
 AC_DEFUN(SIM_INIT, [
 

+cvsuser=anonymous
+cvsroot=:pserver:[log in to unmask]:/cvs/lcd
+

 packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd slic"
 AC_SUBST(packages_dep_order)
 

@@ -201,54 +236,178 @@

 fi
 
 dnl fully qualified base dir

+package_dir=${sim_packages_dir}/${package_name}

 package_base_dir=${sim_packages_dir}/${package_name}/${package_version}
 
 dnl set package name, version, base dir and build dir for each dep
 dnl FIXME: should be a way to do this without explicitly naming each package here
 case "$package_name" in
 

-clhep   )

+clhep )
+
+  # package vars
+  AC_SUBST(clhep, clhep)
+  AC_SUBST(clhep_package_dir, ${package_dir})

   AC_SUBST(clhep_base_dir, ${package_base_dir})
   AC_SUBST(clhep_version, ${package_version})
   AC_SUBST(clhep_package_name, ${package_name})

-  AC_SUBST(clhep_build_dir, ${package_base_dir}/CLHEP);;
-gdml    )

+  AC_SUBST(clhep_build_dir, ${package_base_dir}/CLHEP)
+
+  # url
+  clhep_url=http://cern.ch/clhep
+  AC_SUBST(clhep_url, http://cern.ch/clhep)
+
+  # local tgz
+dnl  clhep_tgz_local=clhep.tar.gz
+  AC_SUBST(clhep_tgz_local, clhep.tar.gz)
+
+  # version with dots
+  clhep_version_dot=$(VERSION_DOT(clhep_version_dot, ${package_version}))
+
+  # remote tgz
+  clhep_tgz=clhep-${clhep_version_dot}.tgz
+  AC_SUBST(clhep_tgz)
+
+  # original dir from tgz
+dnl  clhep_dir_orig=$clhep_version_dot
+  AC_SUBST(clhep_dir_orig, $clhep_version_dot)
+
+  # full download url
+dnl  clhep_download=${clhep_url}/clhep-${clhep_version_dot}.tgz
+  AC_SUBST(clhep_download, ${clhep_url}/${clhep_tgz})
+
+  clhep_config_opts="--prefix=@clhep_base_dir@ --disable-shared"
+  AC_SUBST(clhep_config_opts)
+
+  ;;
+
+gdml )
+
+  # package vars
+  AC_SUBST(gdml, gdml)
+  AC_SUBST(gdml_package_dir, ${package_dir})

   AC_SUBST(gdml_base_dir, ${package_base_dir})
   AC_SUBST(gdml_version, ${package_version})
   AC_SUBST(gdml_package_name, ${package_name})

-  AC_SUBST(gdml_build_dir, ${package_base_dir}/CPPGDML);;
-geant4  )

+  AC_SUBST(gdml_build_dir, ${package_base_dir}/CPPGDML)
+
+  gdml_url=http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2
+  AC_SUBST(gdml_url)
+
+  AC_SUBST(gdml_tgz_local, gdml.tar.gz)
+
+  gdml_tgz=GDML2.tar.gz?tarball=1
+  AC_SUBST(gdml_tgz, $gdml_tgz)
+
+  AC_SUBST(gdml_dir_orig, GDML2)
+
+  AC_SUBST(gdml_download, $gdml_url/$gdml_tgz)
+
+  AC_SUBST(gdml_config_opts, "--enable-shared-libs=no")
+
+  ;;
+
+dnl  AC_SUBST(gdml_url)
+dnl  AC_SUBST(gdml_tgz_local)
+dnl  AC_SUBST(gdml_tgz)
+dnl  AC_SUBST(gdml_dir_orig)
+dnl  AC_SUBST(gdml_download)
+dnl
+dnl
+
+geant4 )
+  geant4_version=${package_version}
+  AC_SUBST(geant4, geant4)
+  AC_SUBST(geant4_package_dir, ${package_dir})
+  AC_SUBST(geant4_url, http://geant4.cern.ch/geant4/source/source)

   AC_SUBST(geant4_base_dir, ${package_base_dir})
   AC_SUBST(geant4_version, ${package_version})
   AC_SUBST(geant4_package_name, ${package_name})

-  AC_SUBST(geant4_build_dir, ${package_base_dir}/source);;
-lcdd    )

+  AC_SUBST(geant4_build_dir, ${package_base_dir}/source)
+  AC_SUBST(geant4_url, http://geant4.cern.ch/geant4/source/source)
+  AC_SUBST(geant4_tgz_local, geant4.tar.gz)
+  geant4_version_download=$(VERSION_GEANT4(geant4_version_download, ${geant4_version}))
+
+  geant4_tgz=geant4${geant4_version_download}.tar.gz
+  AC_SUBST(geant4_tgz, $geant4_tgz)
+  AC_SUBST(geant4_dir_orig, geant4${geant4_version_download})
+  AC_SUBST(geant4_download, ${geant4_url}/${geant4_tgz})
+
+  ;;
+
+lcdd )
+  AC_SUBST(lcdd, lcdd)
+  AC_SUBST(lcdd_package_dir, ${package_dir})

   AC_SUBST(lcdd_base_dir, ${package_base_dir})
   AC_SUBST(lcdd_version, ${package_version})
   AC_SUBST(lcdd_package_name, ${package_name})

-  AC_SUBST(lcdd_build_dir, ${package_base_dir});;
-lcio    )

+  AC_SUBST(lcdd_build_dir, ${package_base_dir})
+  AC_SUBST(lcdd_cvsroot, ${cvsroot})
+
+  ;;
+
+lcio )
+  AC_SUBST(lcio, lcio)
+  AC_SUBST(lcio_package_dir, ${package_dir})

   AC_SUBST(lcio_base_dir, ${package_base_dir})
   AC_SUBST(lcio_version, ${package_version})
   AC_SUBST(lcio_package_name, ${package_name})

-  AC_SUBST(lcio_build_dir, ${package_base_dir});;
-lcphys  )

+  AC_SUBST(lcio_build_dir, ${package_base_dir})
+  AC_SUBST(lcio_cvsroot,${cvsroot})
+  ;;
+
+lcphys )
+  AC_SUBST(lcphys, lcphys)
+  AC_SUBST(lcphys_package_dir, ${package_dir})

   AC_SUBST(lcphys_base_dir, ${package_base_dir})
   AC_SUBST(lcphys_version, ${package_version})
   AC_SUBST(lcphys_package_name, ${package_name})

-  AC_SUBST(lcphys_build_dir, ${package_base_dir});;
-slic    )

+  AC_SUBST(lcphys_build_dir, ${package_base_dir})
+  AC_SUBST(lcphys_cvsroot,${cvsroot})
+  AC_SUBST(lcphys_cvsmodule, LCPhys)
+  ;;
+
+slic )

   slic_version=${package_version} dnl save this for dist tarball naming

+  AC_SUBST(slic, slic)
+  AC_SUBST(slic_package_dir, ${package_dir})

   AC_SUBST(slic_base_dir, ${package_base_dir})
   AC_SUBST(slic_version, ${package_version})
   AC_SUBST(slic_package_name, ${package_name})

-  AC_SUBST(slic_build_dir, ${package_base_dir});;
-xerces  )

+  AC_SUBST(slic_build_dir, ${package_base_dir})
+  AC_SUBST(slic_cvsroot,${cvsroot})
+  ;;
+
+xerces )
+  AC_SUBST(xerces, xerces)
+  AC_SUBST(xerces_package_dir, ${package_dir})

   AC_SUBST(xerces_base_dir, ${package_base_dir})

-  AC_SUBST(xerces_version, ${package_version})

+  AC_SUBST(xerces_url, http://www.apache.org/dist/xml/xerces-c/source)
+  AC_SUBST(xerces_base_dir, ${package_base_dir})
+
+  xerces_version=${package_version}
+  AC_SUBST(xerces_version)

   AC_SUBST(xerces_package_name, ${package_name})

-  AC_SUBST(xerces_build_dir, ${package_base_dir}/src/xercesc);;
-*       )

+  AC_SUBST(xerces_build_dir, ${package_base_dir}/src/xercesc)
+
+  xerces_version_underscore=$(VERSION_UNDERSCORE(xerces_version_underscore, ${xerces_version}))
+  xerces_tgz=xerces-c-src_${xerces_version_underscore}.tar.gz
+  AC_SUBST(xerces_tgz)
+
+  AC_SUBST(xerces_dir_orig, xerces-c-src_${xerces_version_underscore})
+
+  AC_SUBST(xerces_download, ${xerces_url}/${xerces_tgz})
+
+  xerces_config_opts="@xerces_configure_args@"
+  AC_SUBST(xerces_config_opts)
+
+  AC_SUBST(xerces_config, ./runConfigure)
+
+  AC_SUBST(xerces_tgz_local, xerces.tar.gz)
+
+  ;;
+
+* )

   AC_MSG_ERROR($package_name is an unknown package.)
 
 esac

@@ -292,10 +451,10 @@

 
 if test $host_os == "Linux"
 then

-  xerces_configure_args="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(xerces_base_dir)"

+  xerces_configure_args="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(PACKAGE_BASEDIR)"

 elif test $host_os == "WIN32"
 then

-  xerces_configure_args="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(xerces_base_dir)"

+  xerces_configure_args="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(PACKAGE_BASEDIR)"

 elif test $host_os == "Darwin"
 then
   xerces_configure_args="-p macosx -nnative -tnative -P \$(xerces_base_dir)"

@@ -419,7 +578,7 @@

 dnl This won't work for anyone but Jeremy McCormick (SLAC).
 slac_dist="[log in to unmask]:/nfs/slac/g/lcd/mc/prj/www/lcsim/dist/slic"
 

-dnl Set the SCP-style destination directory 

+dnl Set the SCP-style destination directory

 AC_ARG_WITH(distdir,
             AC_HELP_STRING([--with-distdir=<path>], [Set SCP-style dist directory in form username@host:dir]),
             dist_dir=$with_distdir,

diff -u -r1.12 -r1.13
--- configure	1 Dec 2005 22:41:37 -0000	1.12
+++ configure	27 Jan 2006 09:05:45 -0000	1.13
@@ -272,7 +272,7 @@

 PACKAGE_STRING='SimDist v1r0p0'
 [log in to unmask]
 

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_wget WGET have_scp SCP platform packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep_base_dir clhep_version clhep_package_name clhep_build_dir gdml_base_dir gdml_version gdml_package_name gdml_build_dir geant4_base_dir geant4_version geant4_package_name geant4_build_dir lcdd_base_dir lcdd_version lcdd_package_name lcdd_build_dir lcio_base_dir lcio_version lcio_package_name lcio_build!
 _dir lcphys_base_dir lcphys_version lcphys_package_name lcphys_build_dir slic_base_dir slic_version slic_package_name slic_build_dir xerces_base_dir xerces_version xerces_package_name xerces_build_dir xerces_configure_args g4system os_shared_libs_var dist_tarball dist_tarball_current dist_version dist_dir LIBOBJS LTLIBOBJS'

+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT have_cvs CVS have_java JAVA have_ant ANT have_wget WGET have_scp SCP platform packages_dep_order packages_reverse_dep_order download_script cvs_script patch_script gen_files sim_dist_dir sim_packages_dir sim_build_dir sim_scripts_dir USE_OGL OGLHOME clhep clhep_package_dir clhep_base_dir clhep_version clhep_package_name clhep_build_dir clhep_url clhep_tgz_local clhep_version_dot clhep_tgz clhep_dir_orig clhep_download clhep_config_opts gdml gdml_package_dir gdml_base_dir gdml_version gdml_package_name gdml_build_dir gdml_url gdml_tgz_local !
 gdml_tgz gdml_dir_orig gdml_download gdml_config_opts geant4 geant4_package_dir geant4_url geant4_base_dir geant4_version geant4_package_name geant4_build_dir geant4_tgz_local geant4_version_download geant4_tgz geant4_dir_orig geant4_download lcdd lcdd_package_dir lcdd_base_dir lcdd_version lcdd_package_name lcdd_build_dir lcdd_cvsroot lcio lcio_package_dir lcio_base_dir lcio_version lcio_package_name lcio_build_dir lcio_cvsroot lcphys lcphys_package_dir lcphys_base_dir lcphys_version lcphys_package_name lcphys_build_dir lcphys_cvsroot lcphys_cvsmodule slic slic_package_dir slic_base_dir slic_version slic_package_name slic_build_dir slic_cvsroot xerces xerces_package_dir xerces_base_dir xerces_url xerces_version xerces_package_name xerces_build_dir xerces_version_underscore xerces_tgz xerces_dir_orig xerces_download xerces_config_opts xerces_config xerces_tgz_local xerces_configure_args g4system os_shared_libs_var dist_tarball dist_tarball_current dist_version dist_dir LIBO!
 BJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.

@@ -1881,6 +1881,53 @@

 
 fi
 

+# Extract the first word of "ant", so it can be a program name with args.
+set dummy ant; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_have_ant+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$have_ant"; then
+  ac_cv_prog_have_ant="$have_ant" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_have_ant="yes"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_have_ant" && ac_cv_prog_have_ant="no"
+fi
+fi
+have_ant=$ac_cv_prog_have_ant
+if test -n "$have_ant"; then
+  echo "$as_me:$LINENO: result: $have_ant" >&5
+echo "${ECHO_T}$have_ant" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test $have_ant == "no"
+then
+  { { echo "$as_me:$LINENO: error: ant not found" >&5
+echo "$as_me: error: ant not found" >&2;}
+   { (exit 1); exit 1; }; }
+else
+  ANT=ant
+
+fi
+

 # Extract the first word of "wget", so it can be a program name with args.
 set dummy wget; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5

@@ -2018,6 +2065,9 @@

 # initialize required autoconf vars for sim setup
 
 

+cvsuser=anonymous
+cvsroot=:pserver:[log in to unmask]:/cvs/lcd
+

 packages_dep_order="clhep geant4 lcphys xerces gdml lcio lcdd slic"
 
 

@@ -2100,16 +2150,16 @@

-#echo "add config file: packages/$p/GNUmakefile"

+#echo "add config file: packages/$p/Makefile"

-if test -z packages/$p/GNUmakefile

+if test -z packages/$p/Makefile

 then
   { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
 echo "$as_me: error: \"Missing config file to add.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 

-config_files="$config_files"packages/$p/GNUmakefile" "

+config_files="$config_files"packages/$p/Makefile" "

@@ -2286,11 +2336,18 @@

 echo "${ECHO_T}$package_version" >&6
 fi
 

+package_dir=${sim_packages_dir}/${package_name}

 package_base_dir=${sim_packages_dir}/${package_name}/${package_version}
 
 case "$package_name" in
 

-clhep   )

+clhep )
+
+  # package vars
+  clhep=clhep
+
+  clhep_package_dir=${package_dir}
+

   clhep_base_dir=${package_base_dir}
 
   clhep_version=${package_version}

@@ -2298,8 +2355,49 @@

   clhep_package_name=${package_name}
 
   clhep_build_dir=${package_base_dir}/CLHEP

-;;
-gdml    )

+
+
+  # url
+  clhep_url=http://cern.ch/clhep
+  clhep_url=http://cern.ch/clhep
+
+
+  # local tgz
+  clhep_tgz_local=clhep.tar.gz
+
+
+  # version with dots
+  clhep_version_dot=$(
+  v=$(echo ${package_version} | sed -e 's/[vrp]/\./g' -e 's/^\.//g' -e 's/_/./g')
+  clhep_version_dot=$v
+
+  echo $v
+)
+
+  # remote tgz
+  clhep_tgz=clhep-${clhep_version_dot}.tgz
+
+
+  # original dir from tgz
+  clhep_dir_orig=$clhep_version_dot
+
+
+  # full download url
+  clhep_download=${clhep_url}/${clhep_tgz}
+
+
+  clhep_config_opts="--prefix=@clhep_base_dir@ --disable-shared"
+
+
+  ;;
+
+gdml )
+
+  # package vars
+  gdml=gdml
+
+  gdml_package_dir=${package_dir}
+

   gdml_base_dir=${package_base_dir}
 
   gdml_version=${package_version}

@@ -2307,8 +2405,38 @@

   gdml_package_name=${package_name}
 
   gdml_build_dir=${package_base_dir}/CPPGDML

-;;
-geant4  )

+
+
+  gdml_url=http://simu.cvs.cern.ch/cgi-bin/simu.cgi/simu/GDML2
+
+
+  gdml_tgz_local=gdml.tar.gz
+
+
+  gdml_tgz=GDML2.tar.gz?tarball=1
+  gdml_tgz=$gdml_tgz
+
+
+  gdml_dir_orig=GDML2
+
+
+  gdml_download=$gdml_url/$gdml_tgz
+
+
+  gdml_config_opts="--enable-shared-libs=no"
+
+
+  ;;
+
+
+geant4 )
+  geant4_version=${package_version}
+  geant4=geant4
+
+  geant4_package_dir=${package_dir}
+
+  geant4_url=http://geant4.cern.ch/geant4/source/source
+

   geant4_base_dir=${package_base_dir}
 
   geant4_version=${package_version}

@@ -2316,8 +2444,33 @@

   geant4_package_name=${package_name}
 
   geant4_build_dir=${package_base_dir}/source

-;;
-lcdd    )

+
+  geant4_url=http://geant4.cern.ch/geant4/source/source
+
+  geant4_tgz_local=geant4.tar.gz
+
+  geant4_version_download=$(
+  v=$(echo ${geant4_version} | sed 's/[vr]/\./g' | sed 's/p/\.p/g')
+  geant4_version_download=$v
+
+  echo $v
+)
+
+  geant4_tgz=geant4${geant4_version_download}.tar.gz
+  geant4_tgz=$geant4_tgz
+
+  geant4_dir_orig=geant4${geant4_version_download}
+
+  geant4_download=${geant4_url}/${geant4_tgz}
+
+
+  ;;
+
+lcdd )
+  lcdd=lcdd
+
+  lcdd_package_dir=${package_dir}
+

   lcdd_base_dir=${package_base_dir}
 
   lcdd_version=${package_version}

@@ -2325,8 +2478,17 @@

   lcdd_package_name=${package_name}
 
   lcdd_build_dir=${package_base_dir}

-;;
-lcio    )

+
+  lcdd_cvsroot=${cvsroot}
+
+
+  ;;
+
+lcio )
+  lcio=lcio
+
+  lcio_package_dir=${package_dir}
+

   lcio_base_dir=${package_base_dir}
 
   lcio_version=${package_version}

@@ -2334,8 +2496,16 @@

   lcio_package_name=${package_name}
 
   lcio_build_dir=${package_base_dir}

-;;
-lcphys  )

+
+  lcio_cvsroot=${cvsroot}
+
+  ;;
+
+lcphys )
+  lcphys=lcphys
+
+  lcphys_package_dir=${package_dir}
+

   lcphys_base_dir=${package_base_dir}
 
   lcphys_version=${package_version}

@@ -2343,26 +2513,76 @@

   lcphys_package_name=${package_name}
 
   lcphys_build_dir=${package_base_dir}

-;;
-slic    )
-  slic_version=${package_version}   slic_base_dir=${package_base_dir}

+
+  lcphys_cvsroot=${cvsroot}
+
+  lcphys_cvsmodule=LCPhys
+
+  ;;
+
+slic )
+  slic_version=${package_version}   slic=slic
+
+  slic_package_dir=${package_dir}
+
+  slic_base_dir=${package_base_dir}

 
   slic_version=${package_version}
 
   slic_package_name=${package_name}
 
   slic_build_dir=${package_base_dir}

-;;
-xerces  )

+
+  slic_cvsroot=${cvsroot}
+
+  ;;
+
+xerces )
+  xerces=xerces
+
+  xerces_package_dir=${package_dir}
+
+  xerces_base_dir=${package_base_dir}
+
+  xerces_url=http://www.apache.org/dist/xml/xerces-c/source
+

   xerces_base_dir=${package_base_dir}
 

+

   xerces_version=${package_version}
 
   xerces_package_name=${package_name}
 
   xerces_build_dir=${package_base_dir}/src/xercesc

-;;
-*       )

+
+
+  xerces_version_underscore=$(
+  v=$(echo ${xerces_version} | sed -e 's/[vrp]/_/g' -e 's/^_//g')
+  xerces_version_underscore=$v
+
+  echo $v
+)
+  xerces_tgz=xerces-c-src_${xerces_version_underscore}.tar.gz
+
+
+  xerces_dir_orig=xerces-c-src_${xerces_version_underscore}
+
+
+  xerces_download=${xerces_url}/${xerces_tgz}
+
+
+  xerces_config_opts="@xerces_configure_args@"
+
+
+  xerces_config=./runConfigure
+
+
+  xerces_tgz_local=xerces.tar.gz
+
+
+  ;;
+
+* )

   { { echo "$as_me:$LINENO: error: $package_name is an unknown package." >&5
 echo "$as_me: error: $package_name is an unknown package." >&2;}
    { (exit 1); exit 1; }; }

@@ -2376,10 +2596,10 @@

 
 if test $host_os == "Linux"
 then

-  xerces_configure_args="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(xerces_base_dir)"

+  xerces_configure_args="-plinux -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(PACKAGE_BASEDIR)"

 elif test $host_os == "WIN32"
 then

-  xerces_configure_args="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(xerces_base_dir)"

+  xerces_configure_args="-pcygwin -cgcc -xg++ -minmem -nsocket -tnative -rpthread -P \$(PACKAGE_BASEDIR)"

 elif test $host_os == "Darwin"
 then
   xerces_configure_args="-p macosx -nnative -tnative -P \$(xerces_base_dir)"

@@ -2455,7 +2675,7 @@

-# add a few random input files

+# add input files

 
 
 #echo "add config file: scripts/slic.sh"

@@ -2472,16 +2692,44 @@

-#echo "add config file: GNUmakefile"

+#echo "add config file: Makefile"
+
+if test -z Makefile
+then
+  { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
+echo "$as_me: error: \"Missing config file to add.\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+config_files="$config_files"Makefile" "
+
+
+
+
+#echo "add config file: packages/Makefile"
+
+if test -z packages/Makefile
+then
+  { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
+echo "$as_me: error: \"Missing config file to add.\"" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+config_files="$config_files"packages/Makefile" "
+
+
+
+
+#echo "add config file: build/package.gmk"

-if test -z GNUmakefile

+if test -z build/package.gmk

 then
   { { echo "$as_me:$LINENO: error: \"Missing config file to add.\"" >&5
 echo "$as_me: error: \"Missing config file to add.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 

-config_files="$config_files"GNUmakefile" "

+config_files="$config_files"build/package.gmk" "

@@ -3138,6 +3386,8 @@

 s,@CVS@,$CVS,;t t
 s,@have_java@,$have_java,;t t
 s,@JAVA@,$JAVA,;t t

+s,@have_ant@,$have_ant,;t t
+s,@ANT@,$ANT,;t t

 s,@have_wget@,$have_wget,;t t
 s,@WGET@,$WGET,;t t
 s,@have_scp@,$have_scp,;t t

@@ -3155,38 +3405,86 @@

 s,@sim_scripts_dir@,$sim_scripts_dir,;t t
 s,@USE_OGL@,$USE_OGL,;t t
 s,@OGLHOME@,$OGLHOME,;t t

+s,@clhep@,$clhep,;t t
+s,@clhep_package_dir@,$clhep_package_dir,;t t

 s,@clhep_base_dir@,$clhep_base_dir,;t t
 s,@clhep_version@,$clhep_version,;t t
 s,@clhep_package_name@,$clhep_package_name,;t t
 s,@clhep_build_dir@,$clhep_build_dir,;t t

+s,@clhep_url@,$clhep_url,;t t
+s,@clhep_tgz_local@,$clhep_tgz_local,;t t
+s,@clhep_version_dot@,$clhep_version_dot,;t t
+s,@clhep_tgz@,$clhep_tgz,;t t
+s,@clhep_dir_orig@,$clhep_dir_orig,;t t
+s,@clhep_download@,$clhep_download,;t t
+s,@clhep_config_opts@,$clhep_config_opts,;t t
+s,@gdml@,$gdml,;t t
+s,@gdml_package_dir@,$gdml_package_dir,;t t

 s,@gdml_base_dir@,$gdml_base_dir,;t t
 s,@gdml_version@,$gdml_version,;t t
 s,@gdml_package_name@,$gdml_package_name,;t t
 s,@gdml_build_dir@,$gdml_build_dir,;t t

+s,@gdml_url@,$gdml_url,;t t
+s,@gdml_tgz_local@,$gdml_tgz_local,;t t
+s,@gdml_tgz@,$gdml_tgz,;t t
+s,@gdml_dir_orig@,$gdml_dir_orig,;t t
+s,@gdml_download@,$gdml_download,;t t
+s,@gdml_config_opts@,$gdml_config_opts,;t t
+s,@geant4@,$geant4,;t t
+s,@geant4_package_dir@,$geant4_package_dir,;t t
+s,@geant4_url@,$geant4_url,;t t

 s,@geant4_base_dir@,$geant4_base_dir,;t t
 s,@geant4_version@,$geant4_version,;t t
 s,@geant4_package_name@,$geant4_package_name,;t t
 s,@geant4_build_dir@,$geant4_build_dir,;t t

+s,@geant4_tgz_local@,$geant4_tgz_local,;t t
+s,@geant4_version_download@,$geant4_version_download,;t t
+s,@geant4_tgz@,$geant4_tgz,;t t
+s,@geant4_dir_orig@,$geant4_dir_orig,;t t
+s,@geant4_download@,$geant4_download,;t t
+s,@lcdd@,$lcdd,;t t
+s,@lcdd_package_dir@,$lcdd_package_dir,;t t

 s,@lcdd_base_dir@,$lcdd_base_dir,;t t
 s,@lcdd_version@,$lcdd_version,;t t
 s,@lcdd_package_name@,$lcdd_package_name,;t t
 s,@lcdd_build_dir@,$lcdd_build_dir,;t t

+s,@lcdd_cvsroot@,$lcdd_cvsroot,;t t
+s,@lcio@,$lcio,;t t
+s,@lcio_package_dir@,$lcio_package_dir,;t t

 s,@lcio_base_dir@,$lcio_base_dir,;t t
 s,@lcio_version@,$lcio_version,;t t
 s,@lcio_package_name@,$lcio_package_name,;t t
 s,@lcio_build_dir@,$lcio_build_dir,;t t

+s,@lcio_cvsroot@,$lcio_cvsroot,;t t
+s,@lcphys@,$lcphys,;t t
+s,@lcphys_package_dir@,$lcphys_package_dir,;t t

 s,@lcphys_base_dir@,$lcphys_base_dir,;t t
 s,@lcphys_version@,$lcphys_version,;t t
 s,@lcphys_package_name@,$lcphys_package_name,;t t
 s,@lcphys_build_dir@,$lcphys_build_dir,;t t

+s,@lcphys_cvsroot@,$lcphys_cvsroot,;t t
+s,@lcphys_cvsmodule@,$lcphys_cvsmodule,;t t
+s,@slic@,$slic,;t t
+s,@slic_package_dir@,$slic_package_dir,;t t

 s,@slic_base_dir@,$slic_base_dir,;t t
 s,@slic_version@,$slic_version,;t t
 s,@slic_package_name@,$slic_package_name,;t t
 s,@slic_build_dir@,$slic_build_dir,;t t

+s,@slic_cvsroot@,$slic_cvsroot,;t t
+s,@xerces@,$xerces,;t t
+s,@xerces_package_dir@,$xerces_package_dir,;t t

 s,@xerces_base_dir@,$xerces_base_dir,;t t

+s,@xerces_url@,$xerces_url,;t t

 s,@xerces_version@,$xerces_version,;t t
 s,@xerces_package_name@,$xerces_package_name,;t t
 s,@xerces_build_dir@,$xerces_build_dir,;t t

+s,@xerces_version_underscore@,$xerces_version_underscore,;t t
+s,@xerces_tgz@,$xerces_tgz,;t t
+s,@xerces_dir_orig@,$xerces_dir_orig,;t t
+s,@xerces_download@,$xerces_download,;t t
+s,@xerces_config_opts@,$xerces_config_opts,;t t
+s,@xerces_config@,$xerces_config,;t t
+s,@xerces_tgz_local@,$xerces_tgz_local,;t t

 s,@xerces_configure_args@,$xerces_configure_args,;t t
 s,@g4system@,$g4system,;t t
 s,@os_shared_libs_var@,$os_shared_libs_var,;t t

diff -N package.gmk.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ package.gmk.in	27 Jan 2006 09:05:46 -0000	1.1
@@ -0,0 +1,93 @@

+# $Id: package.gmk.in,v 1.1 2006/01/27 09:05:46 jeremy Exp $
+
+# common build vars
+include @[log in to unmask]
+
+# these expected to be included or defined externally
+ifndef PACKAGE
+  $(error define PACKAGE to name of package)
+endif
+
+ifndef PACKAGE_VERSION
+  $(error define PACKAGE_VERSION)
+endif
+
+ifndef PACKAGE_DIR
+  $(error define PACKAGE_DIR)
+endif
+
+ifndef PACKAGE_BASEDIR
+  $(error define PACKAGE_BASEDIR)
+endif
+
+ifndef PACKAGE_BUILDDIR
+  $(error define PACKAGE_BUILDDIR)
+endif
+
+# default name of configure script
+ifndef PACKAGE_CONFIG
+  PACKAGE_CONFIG=./configure
+endif
+
+# default name of CVS module
+ifndef PACKAGE_CVSMODULE
+  PACKAGE_CVSMODULE=$(PACKAGE_NAME)
+endif
+
+# default CVS tag
+ifndef PACKAGE_CVSVERSION
+  PACKAGE_CVSVERSION=$(PACKAGE_VERSION)
+endif
+
+# rules that should be forced
+.PHONY: download cvs config compile install srcclean distclean
+
+# default rule
+.DEFAULT: build
+
+# build package
+build: src patch config compile install
+
+# download tgz file from WWW
+download:
+	cd $(PACKAGE_DIR) && \
+	$(WGET) $(PACKAGE_DOWNLOAD) -O $(PACKAGE_TGZ_LOCAL) && \
+	echo "Decompressing $(PACKAGE_TGZ_LOCAL) ..." && \
+	tar -zxf $(PACKAGE_TGZ_LOCAL) && \
+	mv $(PACKAGE_DIR_ORIG) $(PACKAGE_VERSION);:
+
+# check package out of CVS
+cvs:
+	cd $(PACKAGE_DIR) && \
+	rm -rf $(PACKAGE_VERSION) && \
+	cvs -d $(PACKAGE_CVSROOT) co -d $(PACKAGE_VERSION) -r $(PACKAGE_CVSVERSION) $(PACKAGE_CVSMODULE);:
+
+# patch the source if a patch script exists
+patch:
+	@if [ -e "./@patch_script@" ]; then cd $(PACKAGE_DIR) && ./@patch_script@; fi;:
+
+# run configure if a configure script exists
+config:
+	cd $(PACKAGE_BUILDDIR) && if [ -e "$(PACKAGE_CONFIG)" ]; then $(PACKAGE_CONFIG) $(PACKAGE_CONFIG_OPTS); fi;:
+
+# default compile rule
+compile_default:
+	cd $(PACKAGE_BUILDDIR) && $(MAKE);:
+
+compile: compile_default
+
+# install package
+install_default:
+	cd $(PACKAGE_BUILDDIR) && $(MAKE) install;:
+
+install: install_default
+
+# clean sources
+srcclean:
+	cd $(PACKAGE_BUILDDIR) && $(MAKE) clean;:
+
+# clean the package
+distclean:
+	cd $(PACKAGE_DIR) && \
+	rm -rf $(PACKAGE_VERSION) \
+	&& rm -rf package.gmk env.gmk download.sh cvs.sh patch.sh GNUmakefile $(PACKAGE_TGZ_LOCAL) &> /dev/null;:

diff -N Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.in	27 Jan 2006 09:05:47 -0000	1.1
@@ -0,0 +1,41 @@

+# $Id: Makefile.in,v 1.1 2006/01/27 09:05:47 jeremy Exp $
+
+include @[log in to unmask]
+
+.PHONY: build build_deporder $(packages_dep_order)
+.DEFAULT: build
+
+build: build_deporder
+
+build_deporder: 
+	@echo "Building SimDist packages in dependency order ..." ; \
+	for pkg in $(packages_dep_order) ; do \
+	echo "Building $$pkg ..." ; \
+	cd $(sim_packages_dir)/$$pkg && $(MAKE) $(TARGET); \
+	done;:
+
+#@clhep@ :
+#	cd @clhep_package_dir@ && $(MAKE) $(TARGET);:
+
+#@geant4@ :
+#@clhep@
+#	cd @geant4_package_dir@ && $(MAKE) $(TARGET);:
+
+#@lcphys@ :
+#@geant4@
+#	cd @lcphys_package_dir@ && $(MAKE) $(TARGET);:
+
+#@lcio@ :
+#	cd @lcio_package_dir@ && $(MAKE) $(TARGET);:
+
+#@gdml@ :
+#@xerces@ @geant4@
+#	cd @gdml_package_dir@ && $(MAKE) $(TARGET);:
+
+#@lcdd@ :
+#@geant4@ @gdml@
+#	cd @lcdd_package_dir@ && $(MAKE) $(TARGET);:
+
+#@slic@ :
+#@geant4@ @lcdd@ @lcio@
+#	cd @slic@ && $(MAKE) $(TARGET);:

diff -N Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.in	27 Jan 2006 09:05:47 -0000	1.1
@@ -0,0 +1,14 @@

+# $Header: /cvs/lcd/SimDist/packages/clhep/Makefile.in,v 1.1 2006/01/27 09:05:47 jeremy Exp $
+
+# package vars
+include $(PWD)/package.gmk
+
+# generic package targets
+include @[log in to unmask]
+
+# source is downloaded
+.PHONY: src
+src: download
+
+# use default compile rule
+compile: compile_default

diff -u -r1.1 -r1.2
--- package.gmk.in	20 Oct 2005 00:08:07 -0000	1.1
+++ package.gmk.in	27 Jan 2006 09:05:47 -0000	1.2
@@ -1,6 +1,12 @@

-# sim dist vars
-clhep_base_dir=@clhep_base_dir@
-clhep_build_dir=@clhep_build_dir@
-clhep_version=@clhep_version@
-clhep_package_name=@clhep_package_name@
-clhep_package_dir=@sim_packages_dir@/@clhep_package_name@

+# TODO: GENERATE THIS FILE AUTOMATICALLY
+export PACKAGE             = @clhep_package_name@
+export PACKAGE_NAME        = @clhep_package_name@
+export PACKAGE_DIR         = @clhep_package_dir@
+export PACKAGE_BASEDIR     = @clhep_base_dir@
+export PACKAGE_BUILDDIR    = @clhep_build_dir@
+export PACKAGE_VERSION     = @clhep_version@
+export PACKAGE_TGZ_LOCAL   = @clhep_tgz_local@
+export PACKAGE_DIR_ORIG    = @clhep_dir_orig@
+export PACKAGE_DOWNLOAD    = @clhep_download@
+export PACKAGE_CONFIG_OPTS = @clhep_config_opts@
+#export PACKAGE_CVSROOT     =

diff -N Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.in	27 Jan 2006 09:05:48 -0000	1.1
@@ -0,0 +1,20 @@

+# $Header: /cvs/lcd/SimDist/packages/gdml/Makefile.in,v 1.1 2006/01/27 09:05:48 jeremy Exp $
+
+# package vars
+include $(PWD)/package.gmk
+
+# generic package targets
+include @[log in to unmask]
+
+# deps
+include $(PWD)/deps.gmk
+
+# source is downloaded
+.PHONY: src
+src: download
+
+# use default compile rule
+compile: compile_default
+
+install:
+	@echo "GDML: dummy install target"

diff -u -r1.2 -r1.3
--- package.gmk.in	21 Oct 2005 19:40:39 -0000	1.2
+++ package.gmk.in	27 Jan 2006 09:05:48 -0000	1.3
@@ -1,6 +1,11 @@

-# sim dist vars
-gdml_base_dir=@gdml_base_dir@
-gdml_build_dir=@gdml_build_dir@
-gdml_version=@gdml_version@
-gdml_package_name=@gdml_package_name@
-gdml_package_dir=@sim_packages_dir@/@gdml_package_name@

+# TODO: GENERATE THIS FILE AUTOMATICALLY
+export PACKAGE             = @gdml_package_name@
+export PACKAGE_NAME        = @gdml_package_name@
+export PACKAGE_DIR         = @gdml_package_dir@
+export PACKAGE_BASEDIR     = @gdml_base_dir@
+export PACKAGE_BUILDDIR    = @gdml_build_dir@
+export PACKAGE_VERSION     = @gdml_version@
+export PACKAGE_TGZ_LOCAL   = @gdml_tgz_local@
+export PACKAGE_DIR_ORIG    = @gdml_dir_orig@
+export PACKAGE_DOWNLOAD    = @gdml_download@
+export PACKAGE_CONFIG_OPTS = @gdml_config_opts@

diff -N Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.in	27 Jan 2006 09:05:48 -0000	1.1
@@ -0,0 +1,28 @@

+# $Header: /cvs/lcd/SimDist/packages/geant4/Makefile.in,v 1.1 2006/01/27 09:05:48 jeremy Exp $
+
+# package vars
+include $(PWD)/package.gmk
+
+# generic package targets
+include @[log in to unmask]
+
+# dependencies
+include $(PWD)/deps.gmk
+
+# G4 environment vars
+include $(PWD)/env.gmk
+
+# source is downloaded
+.PHONY: src
+src: download
+
+# compile is default + physics lists + includes
+compile: compile_default phys includes
+
+# physics lists
+phys:
+	cd $(PACKAGE_BASEDIR)/physics_lists/hadronic && $(MAKE)
+
+# include files
+includes:
+	cd $(PACKAGE_BUILDDIR) && $(MAKE) includes

diff -u -r1.1 -r1.2
--- package.gmk.in	20 Oct 2005 00:08:09 -0000	1.1
+++ package.gmk.in	27 Jan 2006 09:05:48 -0000	1.2
@@ -1,6 +1,12 @@

-# sim dist vars
-geant4_base_dir=@geant4_base_dir@
-geant4_build_dir=@geant4_build_dir@
-geant4_version=@geant4_version@
-geant4_package_name=@geant4_package_name@
-geant4_package_dir=@sim_packages_dir@/@geant4_package_name@

+# TODO: GENERATE THIS FILE AUTOMATICALLY
+export PACKAGE             = @geant4_package_name@
+export PACKAGE_NAME        = @geant4_package_name@
+export PACKAGE_DIR         = @geant4_package_dir@
+export PACKAGE_BASEDIR     = @geant4_base_dir@
+export PACKAGE_BUILDDIR    = @geant4_build_dir@
+export PACKAGE_VERSION     = @geant4_version@
+export PACKAGE_TGZ_LOCAL   = @geant4_tgz_local@
+export PACKAGE_DIR_ORIG    = @geant4_dir_orig@
+export PACKAGE_DOWNLOAD    = @geant4_download@
+#export PACKAGE_CONFIG_OPTS = @geant4_config_opts@
+#export PACKAGE_CVSROOT     =

diff -N Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.in	27 Jan 2006 09:05:49 -0000	1.1
@@ -0,0 +1,19 @@

+# $Header: /cvs/lcd/SimDist/packages/lcdd/Makefile.in,v 1.1 2006/01/27 09:05:49 jeremy Exp $
+
+# package vars
+include $(PWD)/package.gmk
+
+# generic package build
+include @[log in to unmask]
+
+# environment
+include $(PWD)/env.gmk
+
+# dependencies
+include $(PWD)/deps.gmk
+
+# source by CVS
+src: cvs
+
+# use default compile rule
+compile: compile_default

diff -u -r1.1 -r1.2
--- package.gmk.in	20 Oct 2005 00:08:10 -0000	1.1
+++ package.gmk.in	27 Jan 2006 09:05:49 -0000	1.2
@@ -1,6 +1,8 @@

-# sim dist vars
-lcdd_base_dir=@lcdd_base_dir@
-lcdd_build_dir=@lcdd_build_dir@
-lcdd_version=@lcdd_version@
-lcdd_package_name=@lcdd_package_name@
-lcdd_package_dir=@sim_packages_dir@/@lcdd_package_name@

+# TODO: GENERATE THIS FILE AUTOMATICALLY
+export PACKAGE             = @lcdd_package_name@
+export PACKAGE_NAME        = @lcdd_package_name@
+export PACKAGE_DIR         = @lcdd_package_dir@
+export PACKAGE_BASEDIR     = @lcdd_base_dir@
+export PACKAGE_BUILDDIR    = @lcdd_build_dir@
+export PACKAGE_VERSION     = @lcdd_version@
+export PACKAGE_CVSROOT     = @lcdd_cvsroot@

diff -N Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.in	27 Jan 2006 09:05:49 -0000	1.1
@@ -0,0 +1,21 @@

+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.1 2006/01/27 09:05:49 jeremy Exp $
+
+# package vars
+include $(PWD)/package.gmk
+
+# generic package build
+include @[log in to unmask]
+
+# LCIO vars
+include $(PWD)/env.gmk
+
+# source from CVS
+.PHONY: src
+src: cvs
+
+# compile with ant
+compile:
+	cd $(PACKAGE_BUILDDIR) && PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" && $(ANT) aid.generate cpp
+
+#srcclean:
+#	cd $(PACKAGE_BUILDDIR) && $(ANT) clean

diff -u -r1.1 -r1.2
--- package.gmk.in	20 Oct 2005 00:08:11 -0000	1.1
+++ package.gmk.in	27 Jan 2006 09:05:49 -0000	1.2
@@ -1,6 +1,8 @@

-# sim dist vars
-lcio_base_dir=@lcio_base_dir@
-lcio_build_dir=@lcio_build_dir@
-lcio_version=@lcio_version@
-lcio_package_name=@lcio_package_name@
-lcio_package_dir=@sim_packages_dir@/@lcio_package_name@

+# TODO: GENERATE THIS FILE AUTOMATICALLY
+export PACKAGE             = @lcio_package_name@
+export PACKAGE_NAME        = @lcio_package_name@
+export PACKAGE_DIR         = @lcio_package_dir@
+export PACKAGE_BASEDIR     = @lcio_base_dir@
+export PACKAGE_BUILDDIR    = @lcio_build_dir@
+export PACKAGE_VERSION     = @lcio_version@
+export PACKAGE_CVSROOT     = @lcio_cvsroot@

diff -N Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.in	27 Jan 2006 09:05:50 -0000	1.1
@@ -0,0 +1,18 @@

+# $Header: /cvs/lcd/SimDist/packages/lcphys/Makefile.in,v 1.1 2006/01/27 09:05:50 jeremy Exp $
+
+# package vars
+include $(PWD)/package.gmk
+
+# generic package build
+include @[log in to unmask]
+
+# dependencies
+include $(PWD)/deps.gmk
+
+# source by CVS
+.PHONY: src
+src: cvs
+
+# use default compile rule
+.PHONY: compile
+compile: compile_default

diff -u -r1.1 -r1.2
--- package.gmk.in	20 Oct 2005 00:08:12 -0000	1.1
+++ package.gmk.in	27 Jan 2006 09:05:50 -0000	1.2
@@ -1,6 +1,9 @@

-# sim dist vars
-lcphys_base_dir=@lcphys_base_dir@
-lcphys_build_dir=@lcphys_build_dir@
-lcphys_version=@lcphys_version@
-lcphys_package_name=@lcphys_package_name@
-lcphys_package_dir=@sim_packages_dir@/@lcphys_package_name@

+# TODO: GENERATE THIS FILE AUTOMATICALLY
+export PACKAGE             = @lcphys_package_name@
+export PACKAGE_NAME        = @lcphys_package_name@
+export PACKAGE_DIR         = @lcphys_package_dir@
+export PACKAGE_BASEDIR     = @lcphys_base_dir@
+export PACKAGE_BUILDDIR    = @lcphys_build_dir@
+export PACKAGE_VERSION     = @lcphys_version@
+export PACKAGE_CVSROOT     = @lcphys_cvsroot@
+export PACKAGE_CVSMODULE   = @lcphys_cvsmodule@

diff -N Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.in	27 Jan 2006 09:05:50 -0000	1.1
@@ -0,0 +1,22 @@

+# $Header: /cvs/lcd/SimDist/packages/slic/Makefile.in,v 1.1 2006/01/27 09:05:50 jeremy Exp $
+
+# package vars
+include $(PWD)/package.gmk
+
+# generic package build
+include @[log in to unmask]
+
+# environment
+include $(PWD)/env.gmk
+
+# dependencies
+include $(PWD)/deps.gmk
+
+# source by CVS
+.PHONY: src
+src: cvs
+
+# custom compile rule
+.PHONY: compile
+compile:
+	cd $(PACKAGE_BUILDDIR) && $(MAKE) all;:

diff -u -r1.1 -r1.2
--- package.gmk.in	20 Oct 2005 00:08:13 -0000	1.1
+++ package.gmk.in	27 Jan 2006 09:05:50 -0000	1.2
@@ -1,6 +1,8 @@

-# sim dist vars
-slic_base_dir=@slic_base_dir@
-slic_build_dir=@slic_build_dir@
-slic_version=@slic_version@
-slic_package_name=@slic_package_name@
-slic_package_dir=@sim_packages_dir@/@slic_package_name@

+# TODO: GENERATE THIS FILE AUTOMATICALLY
+export PACKAGE             = @slic_package_name@
+export PACKAGE_NAME        = @slic_package_name@
+export PACKAGE_DIR         = @slic_package_dir@
+export PACKAGE_BASEDIR     = @slic_base_dir@
+export PACKAGE_BUILDDIR    = @slic_build_dir@
+export PACKAGE_VERSION     = @slic_version@
+export PACKAGE_CVSROOT     = @slic_cvsroot@

diff -N Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.in	27 Jan 2006 09:05:51 -0000	1.1
@@ -0,0 +1,18 @@

+# $Header: /cvs/lcd/SimDist/packages/xerces/Makefile.in,v 1.1 2006/01/27 09:05:51 jeremy Exp $
+
+# package vars
+include $(PWD)/package.gmk
+
+# generic package targets
+include @[log in to unmask]
+
+# environment
+include $(PWD)/env.gmk
+
+# source is downloaded
+.PHONY: src
+src: download
+
+# use default compile rule
+.PHONY: compile
+compile: compile_default

diff -u -r1.1 -r1.2
--- package.gmk.in	20 Oct 2005 00:08:14 -0000	1.1
+++ package.gmk.in	27 Jan 2006 09:05:51 -0000	1.2
@@ -1,6 +1,12 @@

-# package vars
-xerces_base_dir=@xerces_base_dir@
-xerces_build_dir=@xerces_build_dir@
-xerces_version=@xerces_version@
-xerces_package_name=@xerces_package_name@
-xerces_package_dir=@sim_packages_dir@/@xerces_package_name@

+# TODO: GENERATE THIS FILE AUTOMATICALLY
+export PACKAGE             = @xerces_package_name@
+export PACKAGE_NAME        = @xerces_package_name@
+export PACKAGE_DIR         = @xerces_package_dir@
+export PACKAGE_BASEDIR     = @xerces_base_dir@
+export PACKAGE_BUILDDIR    = @xerces_build_dir@
+export PACKAGE_VERSION     = @xerces_version@
+export PACKAGE_TGZ_LOCAL   = @xerces_tgz_local@
+export PACKAGE_DIR_ORIG    = @xerces_dir_orig@
+export PACKAGE_DOWNLOAD    = @xerces_download@
+export PACKAGE_CONFIG      = @xerces_config@
+export PACKAGE_CONFIG_OPTS = @xerces_config_opts@