[Lunar-commits] CVS: moonbase/libs/gettext BUILD, 1.12, 1.13 DETAILS, 1.15, 1.16 POST_INSTALL, 1.7, 1.8

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/libs/gettext
In directory espresso.foo-projects.org:/tmp/cvs-serv32320

Modified Files:
	BUILD DETAILS POST_INSTALL 
Log Message:
Much cleaner, better, cures aids, yadda.

(I ment to write down all the changes but my commit
 messages got fuzzed due to some improper left mouse
 button handling)


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/gettext/BUILD,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- BUILD	3 Apr 2005 17:01:20 -0000	1.12
+++ BUILD	6 Apr 2005 22:34:56 -0000	1.13
@@ -1,36 +1,16 @@
-if lvu installed gettext &> /dev/null; then
-  export PREV_VER=`lvu installed gettext | cut -d. -f2`
-else
-  export PREV_VER=0
-fi
-
 (
-
-  patch_it $SOURCE_CACHE/$SOURCE2 1       &&
-  
-  if ! module_installed teTeX || ! module_installed linuxdoc-tools ; then
-    sedit "s:SUBDIRS = doc:SUBDIRS =:" Makefile.am Makefile.in
-    sedit 's/cd doc && $(MAKE) ps//'   Makefile.am Makefile.in
-    sedit 's/cd doc && $(MAKE) pdf//'  Makefile.am Makefile.in
-    sedit 's/cd doc && $(MAKE) html//' Makefile.am Makefile.in
+  if module_is_expired gettext ; then
+    set_module_config OLD_VER=$(installed_version gettext)
   fi
 
-  sedit "s/docdir = \$(prefix)\/doc/docdir = \$(prefix)\/share\/doc/" \
-     gettext-tools/doc/Makefile.am gettext-tools/doc/Makefile.in \
-     gettext-runtime/intl-java/Makefile.am gettext-runtime/intl-java/Makefile.in \
-     gettext-tools/man/Makefile.am gettext-tools/man/Makefile.in &&
-
-  touch *
-
   ./configure  --build=$BUILD            \
                --host=$BUILD             \
                --prefix=/usr             \
                --sysconfdir=/etc         \
                --mandir=/usr/share/man   \
-               --infodir=/usr/share/info \
-               --disable-shared          \
-               --disable-csharp          \
-               --without-libintl-prefix  \
+	       --infodir=/usr/share/info \
+	       --disable-csharp          \
+	       --without-libintl-prefix  \
                $OPTS                     &&
   default_make
 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/gettext/DETAILS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- DETAILS	15 Mar 2005 17:00:09 -0000	1.15
+++ DETAILS	6 Apr 2005 22:34:56 -0000	1.16
@@ -1,12 +1,9 @@
           MODULE=gettext
          VERSION=0.14.3
           SOURCE=$MODULE-$VERSION.tar.gz
-	 SOURCE2=gettext-0.12.1-lunar-auto.patch.bz2
    SOURCE_URL[0]=$GNU_URL/$MODULE/
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE/
-     SOURCE2_URL=$PATCH_URL/
       SOURCE_VFY=sha1:f9fd59fc5612d6fedf4eac3921ae73c49ba99cfc
-     SOURCE2_VFY=sha1:8b244da72686a40c161773eb1d3ff6ea8e7b1a9c
         WEB_SITE=http://www.gnu.org/software/gettext
          ENTERED=20010922
          UPDATED=20050315

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/gettext/POST_INSTALL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- POST_INSTALL	20 Aug 2004 08:05:35 -0000	1.7
+++ POST_INSTALL	6 Apr 2005 22:34:56 -0000	1.8
@@ -1,6 +1,12 @@
-if [ "$PREV_VER" -lt "12" ]; then
-  lin -c glibc
-  if module_installed glib-2; then 
-    lin -c glib-2; 
+OLD_VER=$(get_module_config OLD_VER)
+
+if [ ! -z $OLD_VER ]; then
+  if [ $( echo ${OLD_VER} | cut -d. -f2) -lt "12" ]; then
+    lin -c glibc
+    if module_installed glib-2; then 
+      lin -c glib-2; 
+    fi
   fi
 fi
+
+unset_module_config OLD_VER