Index: scripts/untested/blfs-scripts/blfs-mysql-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-mysql-32.sh	(revision 12ba0a4befc9c224c703e88a7281e28e9547b02a)
+++ scripts/untested/blfs-scripts/blfs-mysql-32.sh	(revision 0ee931e35f5b98741e0bbce4ef00fb6aaf7b9197)
@@ -1,102 +1,1 @@
-#!/bin/bash
-
-### mysql ###
-
-cd ${SRC}
-LOG=mysql-blfs.log
-
-SELF=`basename ${0}`
-set_buildenv
-set_libdirname
-setup_multiarch
-if [ ! "${libdirname}" = "lib" ]; then
-   extra_conf="--libdir=/usr/${libdirname}"
-fi
-
-unpack_tarball mysql-${MYSQL_VER}
-cd ${PKGDIR}
-
-max_log_init mysql ${MYSQL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-CC="${CC-gcc} ${ARCH_CFLAGS}" \
-CXX="${CXX-g++} ${ARCH_CFLAGS}" \
-CFLAGS="${TGT_CFLAGS}" \
-CXXLAGS="${TGT_CFLAGS}" \
-CPPFLAGS="-D_GNU_SOURCE" \
-./configure --prefix=/usr ${extra_conf} \
-   --libexecdir=/usr/${libdirname}/mysql --localstatedir=/var/lib/mysql \
-   --enable-thread-safe-client --enable-assembler \
-   --enable-local-infile --with-named-thread-libs=-lpthread \
-   --with-unix-socket-path=/var/run/mysql/mysql.sock \
-   --without-debug --without-bench --without-readline \
-   --with-libwrap --with-openssl \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" &&
-
-min_log_init ${BUILDLOGS} &&
-make ${PMFLAGS} testdir=/usr/${libdirname}/mysql/mysql-test \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" &&
-
-min_log_init ${INSTLOGS} &&
-make testdir=/usr/${libdirname}/mysql/mysql-test install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
-if [ "Y" = "${MULTIARCH}" ]; then
-   use_wrapper /usr/bin/{mysql_config,mysql_fix_privilege_tables,mysql_install_db,mysqlbug}
-   create_stub_hdrs /usr/include/mysql/my_config.h
-fi
-
-cd /usr/${libdirname} &&
-ln -sf mysql/libmysqlclient{,_r}.so* .
-#!/bin/bash
-
-### mysql ###
-
-cd ${SRC}
-LOG=mysql-blfs.log
-
-SELF=`basename ${0}`
-set_buildenv
-set_libdirname
-setup_multiarch
-if [ ! "${libdirname}" = "lib" ]; then
-   extra_conf="--libdir=/usr/${libdirname}"
-fi
-
-unpack_tarball mysql-${MYSQL_VER}
-cd ${PKGDIR}
-
-max_log_init mysql ${MYSQL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-CC="${CC-gcc} ${ARCH_CFLAGS}" \
-CXX="${CXX-g++} ${ARCH_CFLAGS}" \
-CFLAGS="${TGT_CFLAGS}" \
-CXXLAGS="${TGT_CFLAGS}" \
-CPPFLAGS="-D_GNU_SOURCE" \
-./configure --prefix=/usr ${extra_conf} \
-   --libexecdir=/usr/${libdirname}/mysql --localstatedir=/var/lib/mysql \
-   --enable-thread-safe-client --enable-assembler \
-   --enable-local-infile --with-named-thread-libs=-lpthread \
-   --with-unix-socket-path=/var/run/mysql/mysql.sock \
-   --without-debug --without-bench --without-readline \
-   --with-libwrap --with-openssl \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" &&
-
-min_log_init ${BUILDLOGS} &&
-make ${PMFLAGS} testdir=/usr/${libdirname}/mysql/mysql-test \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" &&
-
-min_log_init ${INSTLOGS} &&
-make testdir=/usr/${libdirname}/mysql/mysql-test install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
-if [ "Y" = "${MULTIARCH}" ]; then
-   use_wrapper /usr/bin/{mysql_config,mysql_fix_privilege_tables,mysql_install_db,mysqlbug}
-   create_stub_hdrs /usr/include/mysql/my_config.h
-fi
-
-cd /usr/${libdirname} &&
-ln -sf mysql/libmysqlclient{,_r}.so* .
+blfs-mysql.sh
Index: scripts/untested/blfs-scripts/blfs-mysql-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-mysql-64.sh	(revision 12ba0a4befc9c224c703e88a7281e28e9547b02a)
+++ scripts/untested/blfs-scripts/blfs-mysql-64.sh	(revision 0ee931e35f5b98741e0bbce4ef00fb6aaf7b9197)
@@ -1,102 +1,1 @@
-#!/bin/bash
-
-### mysql ###
-
-cd ${SRC}
-LOG=mysql-blfs.log
-
-SELF=`basename ${0}`
-set_buildenv
-set_libdirname
-setup_multiarch
-if [ ! "${libdirname}" = "lib" ]; then
-   extra_conf="--libdir=/usr/${libdirname}"
-fi
-
-unpack_tarball mysql-${MYSQL_VER}
-cd ${PKGDIR}
-
-max_log_init mysql ${MYSQL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-CC="${CC-gcc} ${ARCH_CFLAGS}" \
-CXX="${CXX-g++} ${ARCH_CFLAGS}" \
-CFLAGS="${TGT_CFLAGS}" \
-CXXLAGS="${TGT_CFLAGS}" \
-CPPFLAGS="-D_GNU_SOURCE" \
-./configure --prefix=/usr ${extra_conf} \
-   --libexecdir=/usr/${libdirname}/mysql --localstatedir=/var/lib/mysql \
-   --enable-thread-safe-client --enable-assembler \
-   --enable-local-infile --with-named-thread-libs=-lpthread \
-   --with-unix-socket-path=/var/run/mysql/mysql.sock \
-   --without-debug --without-bench --without-readline \
-   --with-libwrap --with-openssl \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" &&
-
-min_log_init ${BUILDLOGS} &&
-make ${PMFLAGS} testdir=/usr/${libdirname}/mysql/mysql-test \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" &&
-
-min_log_init ${INSTLOGS} &&
-make testdir=/usr/${libdirname}/mysql/mysql-test install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
-if [ "Y" = "${MULTIARCH}" ]; then
-   use_wrapper /usr/bin/{mysql_config,mysql_fix_privilege_tables,mysql_install_db,mysqlbug}
-   create_stub_hdrs /usr/include/mysql/my_config.h
-fi
-
-cd /usr/${libdirname} &&
-ln -sf mysql/libmysqlclient{,_r}.so* .
-#!/bin/bash
-
-### mysql ###
-
-cd ${SRC}
-LOG=mysql-blfs.log
-
-SELF=`basename ${0}`
-set_buildenv
-set_libdirname
-setup_multiarch
-if [ ! "${libdirname}" = "lib" ]; then
-   extra_conf="--libdir=/usr/${libdirname}"
-fi
-
-unpack_tarball mysql-${MYSQL_VER}
-cd ${PKGDIR}
-
-max_log_init mysql ${MYSQL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-CC="${CC-gcc} ${ARCH_CFLAGS}" \
-CXX="${CXX-g++} ${ARCH_CFLAGS}" \
-CFLAGS="${TGT_CFLAGS}" \
-CXXLAGS="${TGT_CFLAGS}" \
-CPPFLAGS="-D_GNU_SOURCE" \
-./configure --prefix=/usr ${extra_conf} \
-   --libexecdir=/usr/${libdirname}/mysql --localstatedir=/var/lib/mysql \
-   --enable-thread-safe-client --enable-assembler \
-   --enable-local-infile --with-named-thread-libs=-lpthread \
-   --with-unix-socket-path=/var/run/mysql/mysql.sock \
-   --without-debug --without-bench --without-readline \
-   --with-libwrap --with-openssl \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" &&
-
-min_log_init ${BUILDLOGS} &&
-make ${PMFLAGS} testdir=/usr/${libdirname}/mysql/mysql-test \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" &&
-
-min_log_init ${INSTLOGS} &&
-make testdir=/usr/${libdirname}/mysql/mysql-test install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
-if [ "Y" = "${MULTIARCH}" ]; then
-   use_wrapper /usr/bin/{mysql_config,mysql_fix_privilege_tables,mysql_install_db,mysqlbug}
-   create_stub_hdrs /usr/include/mysql/my_config.h
-fi
-
-cd /usr/${libdirname} &&
-ln -sf mysql/libmysqlclient{,_r}.so* .
+blfs-mysql.sh
Index: scripts/untested/blfs-scripts/blfs-python-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-python-32.sh	(revision 12ba0a4befc9c224c703e88a7281e28e9547b02a)
+++ scripts/untested/blfs-scripts/blfs-python-32.sh	(revision 0ee931e35f5b98741e0bbce4ef00fb6aaf7b9197)
@@ -1,126 +1,1 @@
-#!/bin/bash
-#
-# python
-#
-# Dependencies: None
-#
-
-cd ${SRC}
-LOG=blfs-python.log
-
-SELF=`basename ${0}`
-set_buildenv
-set_libdirname
-setup_multiarch
-if [ ! "${libdirname}" = "lib" ]; then
-   extra_conf="--libdir=/usr/${libdirname}"
-fi
-
-unpack_tarball Python-${PYTHON_VER} &&
-cd ${PKGDIR}
-
-case ${PYTHON_VER}} in
-   2.4 ) apply_patch Python-2.4-db43-1 ;;
-esac
-# Still applies to 2.4.1
-apply_patch Python-2.4-gdbm-1
-
-#------------------------------------------
-# TODO: need to do some edits for lib64 ...
-#------------------------------------------
-if [ "lib64" = ${libdirname} ]; then
-   case ${PYTHON_VER}} in
-      2.4 )   apply_patch Python-2.4-lib64-1 ;;
-      2.4.* ) apply_patch Python-2.4.1-lib64-1 ;;
-   esac
-fi
-
-max_log_init python ${PYTHON_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-CC="${CC-gcc} ${ARCH_CFLAGS}" \
-CXX="${CXX-g++} ${ARCH_CFLAGS}" \
-CFLAGS="${TGT_CFLAGS}" \
-CXXFLAGS="${TGT_CFLAGS}" \
-./configure --prefix=/usr --build="${TARGET}" \
-   --mandir=/usr/share/man --infodir=/usr/share/info \
-   --enable-shared ${extra_conf} \
-   --enable-ipv6 \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" &&
-
-min_log_init ${BUILDLOGS} &&
-make ${PMFLAGS} LDFLAGS="-s" \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" &&
-
-min_log_init ${INSTLOGS} &&
-make install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
-if [ "Y" = "${MULTIARCH}" ]; then
-   use_wrapper /usr/bin/{python,python2.4}
-   create_stub_hdrs /usr/include/python2.4/pyconfig.h
-fi
-#!/bin/bash
-#
-# python
-#
-# Dependencies: None
-#
-
-cd ${SRC}
-LOG=blfs-python.log
-
-SELF=`basename ${0}`
-set_buildenv
-set_libdirname
-setup_multiarch
-if [ ! "${libdirname}" = "lib" ]; then
-   extra_conf="--libdir=/usr/${libdirname}"
-fi
-
-unpack_tarball Python-${PYTHON_VER} &&
-cd ${PKGDIR}
-
-case ${PYTHON_VER}} in
-   2.4 ) apply_patch Python-2.4-db43-1 ;;
-esac
-# Still applies to 2.4.1
-apply_patch Python-2.4-gdbm-1
-
-#------------------------------------------
-# TODO: need to do some edits for lib64 ...
-#------------------------------------------
-if [ "lib64" = ${libdirname} ]; then
-   case ${PYTHON_VER}} in
-      2.4 )   apply_patch Python-2.4-lib64-1 ;;
-      2.4.* ) apply_patch Python-2.4.1-lib64-1 ;;
-   esac
-fi
-
-max_log_init python ${PYTHON_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-CC="${CC-gcc} ${ARCH_CFLAGS}" \
-CXX="${CXX-g++} ${ARCH_CFLAGS}" \
-CFLAGS="${TGT_CFLAGS}" \
-CXXFLAGS="${TGT_CFLAGS}" \
-./configure --prefix=/usr --build="${TARGET}" \
-   --mandir=/usr/share/man --infodir=/usr/share/info \
-   --enable-shared ${extra_conf} \
-   --enable-ipv6 \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" &&
-
-min_log_init ${BUILDLOGS} &&
-make ${PMFLAGS} LDFLAGS="-s" \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" &&
-
-min_log_init ${INSTLOGS} &&
-make install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
-if [ "Y" = "${MULTIARCH}" ]; then
-   use_wrapper /usr/bin/{python,python2.4}
-   create_stub_hdrs /usr/include/python2.4/pyconfig.h
-fi
+blfs-python.sh
Index: scripts/untested/blfs-scripts/blfs-xml-parser-pm-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-xml-parser-pm-32.sh	(revision 12ba0a4befc9c224c703e88a7281e28e9547b02a)
+++ scripts/untested/blfs-scripts/blfs-xml-parser-pm-32.sh	(revision 0ee931e35f5b98741e0bbce4ef00fb6aaf7b9197)
@@ -1,72 +1,1 @@
-#!/bin/bash
-
-### XML-Parser perl module ###
-
-cd ${SRC}
-LOG=xml-parser-pm-blfs.log
-
-SELF=`basename ${0}`
-set_buildenv
-
-# No need to set libdirname etc, will use perl defaults which should
-# correctly set CC and libdir 
-
-unpack_tarball XML-Parser-${XML_PARSER_PM_VER}
-cd ${PKGDIR}
-
-max_log_init XML-Parser ${XML_PARSER_PM_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-perl Makefile.PL \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" || barf
-
-min_log_init ${BUILDLOGS} &&
-make \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" || barf
-
-min_log_init ${TESTLOGS} &&
-make test \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Test OK" || barf
-
-min_log_init ${INSTLOGS} &&
-make install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
-#!/bin/bash
-
-### XML-Parser perl module ###
-
-cd ${SRC}
-LOG=xml-parser-pm-blfs.log
-
-SELF=`basename ${0}`
-set_buildenv
-
-# No need to set libdirname etc, will use perl defaults which should
-# correctly set CC and libdir 
-
-unpack_tarball XML-Parser-${XML_PARSER_PM_VER}
-cd ${PKGDIR}
-
-max_log_init XML-Parser ${XML_PARSER_PM_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-perl Makefile.PL \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" || barf
-
-min_log_init ${BUILDLOGS} &&
-make \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" || barf
-
-min_log_init ${TESTLOGS} &&
-make test \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Test OK" || barf
-
-min_log_init ${INSTLOGS} &&
-make install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
+blfs-xml-parser-pm.sh
Index: scripts/untested/blfs-scripts/blfs-xml-parser-pm-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-xml-parser-pm-64.sh	(revision 12ba0a4befc9c224c703e88a7281e28e9547b02a)
+++ scripts/untested/blfs-scripts/blfs-xml-parser-pm-64.sh	(revision 0ee931e35f5b98741e0bbce4ef00fb6aaf7b9197)
@@ -1,72 +1,1 @@
-#!/bin/bash
-
-### XML-Parser perl module ###
-
-cd ${SRC}
-LOG=xml-parser-pm-blfs.log
-
-SELF=`basename ${0}`
-set_buildenv
-
-# No need to set libdirname etc, will use perl defaults which should
-# correctly set CC and libdir 
-
-unpack_tarball XML-Parser-${XML_PARSER_PM_VER}
-cd ${PKGDIR}
-
-max_log_init XML-Parser ${XML_PARSER_PM_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-perl Makefile.PL \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" || barf
-
-min_log_init ${BUILDLOGS} &&
-make \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" || barf
-
-min_log_init ${TESTLOGS} &&
-make test \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Test OK" || barf
-
-min_log_init ${INSTLOGS} &&
-make install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
-#!/bin/bash
-
-### XML-Parser perl module ###
-
-cd ${SRC}
-LOG=xml-parser-pm-blfs.log
-
-SELF=`basename ${0}`
-set_buildenv
-
-# No need to set libdirname etc, will use perl defaults which should
-# correctly set CC and libdir 
-
-unpack_tarball XML-Parser-${XML_PARSER_PM_VER}
-cd ${PKGDIR}
-
-max_log_init XML-Parser ${XML_PARSER_PM_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-perl Makefile.PL \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" || barf
-
-min_log_init ${BUILDLOGS} &&
-make \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Build OK" || barf
-
-min_log_init ${TESTLOGS} &&
-make test \
-   >> ${LOGFILE} 2>&1 &&
-echo " o Test OK" || barf
-
-min_log_init ${INSTLOGS} &&
-make install \
-   >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
-
+blfs-xml-parser-pm.sh
