-Updated PCManFM (bug with file associations);

-Try to automatically generate missing configure script with autoreconf;
-Fixed bug with UTF-8 -> utf8;
-Automatically add supplementary groups after stage5;
-Automatically regenerate /usr/share/applications/mimeinfo.cache after stage 5 with update-desktop-database;

diff --git a/config/packages-list b/config/packages-list
index 0aa2d22..96bc02d 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -253,6 +253,7 @@ MILTER_GREYLIST="milter-greylist-4.0"
 MILTER_SPF="smf-spf-2.0.2"
 MOC="moc-2.4.4"
 KMOD="kmod-8"
+MMM_MODE="mmm-mode-purcell-2012-09-21"
 MPC="mpc-0.9"
 MPFR="mpfr-3.1.0"
 MSMTP="msmtp-1.4.29"
@@ -282,8 +283,8 @@ PARTED="parted-3.1"
 PATCH_PACKAGE="patch-2.6.1"
 PCIUTILS="pciutils-3.1.10"
 MENU_CACHE="menu-cache-0.3.3"
-LIBFM="libfm-1.0"
-PCMANFM="pcmanfm-1.0.1"
+LIBFM="libfm-1.1.0"
+PCMANFM="pcmanfm-1.1.0"
 PCRE="pcre-8.31"
 PERL="perl-5.14.2"
 PERL_MOD_PDL="PDL-2.4.9"

diff --git a/functions/ipkg b/functions/ipkg
index b3cba7c..9de1728 100644 (file)
--- a/functions/ipkg
+++ b/functions/ipkg
@@ -66,6 +66,14 @@ hvconfig()
         # accept the default configuration.
         perl Makefile.PL -n ${CONFIGURE_OPTS}
     else
+        if [ ! -f ${LFS_TMP}/${PACKAGE}/configure ]; then
+            if [ -f ${LFS_TMP}/${PACKAGE}/configure.in -o \
+                -f ${LFS_TMP}/${PACKAGE}/configure.ac ]; then
+                # Try to automatically generate missing configure script.
+                autoreconf -vi
+            fi
+        fi
+
         # Standard configure script
         ${LFS_TMP}/${PACKAGE}/configure ${CONFIGURE_OPTS}
     fi

diff --git a/stage1/create-config-files b/stage1/create-config-files
index 2b98fb0..d10c021 100755 (executable)
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -70,7 +70,7 @@ ulimit -c 0
 
 MANPATH=/usr/share/man:/usr/local/share/man
 
-LANG="en_US.UTF-8"
+LANG="en_US.utf8"
 
 # The sort order of ls output is affected by  the  locale  and
 # can  be  overridden  by the LC_COLLATE environment variable.

diff --git a/stage3/pkg/git b/stage3/pkg/git
index 3947125..3f8ea78 100644 (file)
--- a/stage3/pkg/git
+++ b/stage3/pkg/git
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-hvconfig_pre()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-    autoreconf -i
-}
-
 hvbuild_post()
 {
     local GIT_MANPAGES="git-manpages-$(get_pkg_ver ${PACKAGE})"

diff --git a/stage3/pkg/sgml-common b/stage3/pkg/sgml-common
index 137d072..68337f4 100644 (file)
--- a/stage3/pkg/sgml-common
+++ b/stage3/pkg/sgml-common
@@ -19,9 +19,6 @@ hvconfig_pre()
             ${INSTALL_CATALOG} --remove ${CAT3} ${CAT4}
         fi
     fi
-
-    cd ${LFS_TMP}/${PACKAGE}
-    autoreconf -f -i
 }
 
 hvbuild_post()

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 27d8666..77c9cf7 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -38,6 +38,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg ${PYGTK}
 
     ipkg ${EMACS}
+    ipkg ${MMM_MODE}
     ipkg ${HVCLOCK}
     ipkg ${WMNOTIFY}
 
@@ -236,7 +237,7 @@ ipkg ${TRANSMISSION} "--disable-daemon"
 #ipkg ${GEDA_SYMCHECK}
 #ipkg ${GEDA_GATTRIB}
 
-#rscr mult  "Performing post-install" post-install
+rscr mult  "Performing post-install" post-install
 
 write_completed_stage
 display_stage_build_stats

diff --git a/stage5/packages-update b/stage5/packages-update
index 2d3fde5..c282036 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -39,6 +39,8 @@ fpkg -e "tar.bz2" ${PYCAIRO} ${CAIRO_URL}
 fpkg -m gnome ${PYGTK}
 
 fpkg -m gnu ${EMACS}
+fpkg -m hv ${MMM_MODE}
+
 fpkg -e "tar.gz" ${HVCLOCK}  "http://www.hugovil.com/repository/hvclock"
 fpkg -e "tar.gz" ${WMNOTIFY} "http://www.hugovil.com/repository/wmnotify"
 

diff --git a/stage5/pkg/bridge-utils b/stage5/pkg/bridge-utils
deleted file mode 100644 (file)
index fb85105..0000000
--- a/stage5/pkg/bridge-utils
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-    autoreconf -vi
-}

diff --git a/stage5/pkg/libdvdread b/stage5/pkg/libdvdread
deleted file mode 100644 (file)
index d0a62ed..0000000
--- a/stage5/pkg/libdvdread
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-    sh autogen.sh --prefix=/usr
-    make distclean
-}

diff --git a/stage5/post-install b/stage5/post-install
index 6c953a9..3086b3a 100755 (executable)
--- a/stage5/post-install
+++ b/stage5/post-install
@@ -2,9 +2,13 @@
 
 source ../functions/main
 
+update-desktop-database
+
 if [ -n "${REGUSER}" ]; then
-    hv_useradd -g users -G audio,video,cdrom,usb,shutdown,halusers \
-        -s /bin/bash -m ${REGUSER}
+    hv_useradd -g users -s /bin/bash -m ${REGUSER}
+
+    # Add user to these supplementary groups:
+    usermod -a -G audio,video,cdrom,usb,shutdown ${REGUSER}
 fi
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
@@ -13,44 +17,43 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     # Apache
     #########################################
     READ_VALID="no"
-    
+
     while [ "${READ_VALID}" = "no" ]; do
        echo "Do you want to generate SSL self-signed"
        echo -n "certificate for Apache? (y/n): "
        read USE_SSL
-       
+
        if [ "${USE_SSL}" = "y" -o "${USE_SSL}" = "n" ]; then
            READ_VALID="yes"
        else
            echo "Error, answer y or n"
        fi
     done
-    
+
     if [ "${USE_SSL}" = "y" ]; then
        /etc/apache/generate-ssl-certs
     fi
-    
+
     #########################################
     # imap
     #########################################
     READ_VALID="no"
-    
+
     while [ "${READ_VALID}" = "no" ]; do
        echo "Do you want to generate SSL self-signed"
        echo -n "certificate for IMAP server? (y/n): "
        read USE_SSL
-       
+
        if [ "${USE_SSL}" = "y" -o "${USE_SSL}" = "n" ]; then
            READ_VALID="yes"
        else
            echo "Error, answer y or n"
        fi
     done
-    
+
     if [ "${USE_SSL}" = "y" ]; then
        /etc/mail/imap-ssl-certs
     fi
-    
 fi
 
 exit $?