[Lunar-commits] CVS: moonbase/web/firefox BUILD, 1.10, 1.11 DEPENDS, 1.6, 1.7 POST_INSTALL, 1.10, 1.11 POST_REMOVE, 1.5, 1.6

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/web/firefox
In directory espresso.foo-projects.org:/tmp/cvs-serv20836

Modified Files:
	BUILD DEPENDS POST_INSTALL POST_REMOVE 
Log Message:
* Put back the icon. Don't touch stuff you don't know about
* Better handling of upgrades
* Put nss libraries in the right place
* Beautify the DEPENDS file


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/BUILD,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- BUILD	22 Dec 2004 13:37:57 -0000	1.10
+++ BUILD	4 Mar 2005 09:34:43 -0000	1.11
@@ -1,4 +1,8 @@
 ( 
+  if module_is_expired $MODULE ; then
+        set_module_config OLD_VER "`installed_version $MODULE`"
+  fi &&
+  
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION 
   
   OPTS="$OPTS --enable-strip --enable-strip-libs"
@@ -45,9 +49,9 @@
     default_make	&&
 
     # Put some important headers in place
-    install -d /usr/include/firefox-1.0/nss &&
+    install -d /usr/include/firefox-$VERSION/nss &&
     cp -Lf dist/private/nss/*.h dist/public/nss/*.h \
-    		/usr/include/firefox-1.0/nss &&
+    		/usr/include/firefox-$VERSION/nss &&
 
     # Install the plugins in the right direction
     mkdir -p /opt/lunar/plugins		&&

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/DEPENDS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DEPENDS	17 Nov 2004 12:14:36 -0000	1.6
+++ DEPENDS	4 Mar 2005 09:34:43 -0000	1.7
@@ -1,5 +1,3 @@
-# The zlib and jpeg depends are covered by libmng
-# The pkgconfig and libpng depends is covered by gtk+-2
 depends libmng &&
 depends libIDL &&
 depends zip    &&

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/POST_INSTALL,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- POST_INSTALL	4 Mar 2005 02:47:01 -0000	1.10
+++ POST_INSTALL	4 Mar 2005 09:34:43 -0000	1.11
@@ -1,6 +1,12 @@
 FIREFOX_HOME=/usr
 FFOX_LIBDIR=firefox-$VERSION
 
+if [ ! -z $OLD_VER ]; then
+  rm -rf /usr/lib/firefox-$OLD_VER
+fi
+
+unset_module_config OLD_VER
+
 export LD_LIBRARY_PATH="$FIREFOX_HOME/lib/$FFOX_LIBDIR:$FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins:$FIREFOX_HOME/lib/$FFOX_LIBDIR/components"
 export MOZILLA_FIVE_HOME="$FIREFOX_HOME/lib/$FFOX_LIBDIR"
 ldconfig
@@ -15,6 +21,6 @@
 rm -rf $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins
 ln -sf /opt/lunar/plugins $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins
 
-#rm -f $FIREFOX_HOME/lib/$FFOX_LIBDIR/chrome/icons/default.xpm
-#ln -sf $FIREFOX_HOME/lib/$FFOX_LIBDIR/icons/default.xpm \
-#	$FIREFOX_HOME/lib/$FFOX_LIBDIR/chrome/icons/default/default.xpm
+rm -f $FIREFOX_HOME/lib/$FFOX_LIBDIR/chrome/icons/default.xpm
+ln -sf $FIREFOX_HOME/lib/$FFOX_LIBDIR/icons/default.xpm \
+	$FIREFOX_HOME/lib/$FFOX_LIBDIR/chrome/icons/default/default.xpm

Index: POST_REMOVE
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/POST_REMOVE,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- POST_REMOVE	22 Dec 2004 13:27:57 -0000	1.5
+++ POST_REMOVE	4 Mar 2005 09:34:43 -0000	1.6
@@ -1,3 +1,3 @@
-rm -rf /usr/share/pixmaps/firefox.xpm
+rm -f  /usr/share/pixmaps/firefox.xpm
 rm -rf /usr/include/firefox-$VERSION
 rm -rf /usr/lib/firefox-$VERSION