[Lunar-commits] CVS: moonbase/web/firefox firefox.desktop, NONE, 1.1 BUILD, 1.5, 1.6 DETAILS, 1.8, 1.9 POST_INSTALL, 1.6, 1.7 POST_REMOVE, 1.3, 1.4

[Moritz Heiber]

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

Modified Files:
	BUILD DETAILS POST_INSTALL POST_REMOVE 
Added Files:
	firefox.desktop 
Log Message:
Right on, reworked the module again. Looks a bit cleaner and is
more consistent. Enjoy firefox 0.10.1.


--- NEW FILE: firefox.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Firefox
Comment=Firefox Web Browser
Exec=firefox
Icon=/usr/share/pixmaps/firefox.xpm
Terminal=false
Type=Application
Categories=Application;Network;

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/BUILD,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- BUILD	16 Jun 2004 09:35:29 -0000	1.5
+++ BUILD	11 Oct 2004 21:10:29 -0000	1.6
@@ -1,4 +1,3 @@
-
 ( 
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION 
   
@@ -22,9 +21,7 @@
 
   echo "$OPTS" > /tmp/mozz
 
-  unpack $SOURCE2 &&
-  
-    ./configure \
+  ./configure \
     --prefix=/usr	\
     --with-x            \
     --with-pthreads     \
@@ -47,6 +44,15 @@
     --with-user-appdir=".firefox"	\
     $OPTS               &&
               
-    default_make      
+    default_make	&&
+
+    # Install the plugins in the right direction
+    mkdir -p /opt/lunar/plugins		&&
+    for plugin in `ls /usr/lib/firefox-$VERSION/plugins`; do
+	 `install -m755 /usr/lib/firefox-$VERSION/plugins/$plugin /opt/lunar/plugins`; done  &&
+    
+    # Now the .desktop files
+    mkdir -p /usr/share/applications	&&
+    install -m644 $SCRIPT_DIRECTORY/firefox.desktop /usr/share/applications
 
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/DETAILS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DETAILS	5 Oct 2004 09:30:21 -0000	1.8
+++ DETAILS	11 Oct 2004 21:10:29 -0000	1.9
@@ -1,15 +1,13 @@
           MODULE=firefox
-         VERSION=0.9.3
-          SOURCE=$MODULE-$VERSION-source.tar.bz2
-         SOURCE2=firefox-0.8-lunar.tar.bz2
+         VERSION=0.10.1
+          SOURCE=$MODULE-1.0PR-source.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
-   SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/
-      SOURCE_VFY=md5:641ebf96d2211b3c5527e88389b9687e
+   SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10.1/
+      SOURCE_VFY=sha1:e12f861c8e55fe591053f30e9c9259fa8e662c41
   SOURCE2_URL[0]=$PATCH_URL/
-     SOURCE2_VFY=md5:5aeecf3bdf9dcc9995d2d961d290439f
         WEB_SITE=http://www.mozilla.org/projects/firefox
          ENTERED=20030810
-         UPDATED=20040804
+         UPDATED=20041011
       MAINTAINER="tchan at lunar-linux.org"
            FUZZY="off"
            SHORT="Mozilla Firefox is a speedy, full-featured web browser."

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/POST_INSTALL,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- POST_INSTALL	29 Jul 2004 17:34:01 -0000	1.6
+++ POST_INSTALL	11 Oct 2004 21:10:29 -0000	1.7
@@ -1,14 +1,7 @@
 FIREFOX_HOME=/usr
-# Never put VERSION in here!!
-FFOX_VERSION=0.8
 FFOX_LIBDIR=firefox-$VERSION
 J2SDK_VER=`lvu installed j2sdk`
 
-mkdir -p /opt/lunar/plugins
-cp -f $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins/* /opt/lunar/plugins
-rm -rf $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins
-ln -sf /opt/lunar/plugins $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins
-
 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
@@ -20,15 +13,13 @@
 ./regxpcom
 ./regchrome
 
+rm -rf $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins
+ln -sf /opt/lunar/plugins $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins
+
 if module_installed j2sdk; then
-ln -sf /usr/lib/j2sdk${J2SDK_VER}/jre/plugin/i386/mozilla/libjavaplugin_oji.so $FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins/libjavaplugin_oji.so 
+ln -sf /usr/lib/j2sdk${J2SDK_VER}/jre/plugin/i386/mozilla/libjavaplugin_oji.so \
+	$FIREFOX_HOME/lib/$FFOX_LIBDIR/plugins/libjavaplugin_oji.so 
 fi
 
-if [ ! -d /usr/share/applications ] ; then
-  mkdir -p /usr/share/applications
-fi
-if [ ! -d /usr/share/pixmaps ] ; then
-  mkdir -p /usr/share/pixmaps
-fi
-cp $SOURCE_DIRECTORY/firefox-$FFOX_VERSION-lunar/firefox.desktop /usr/share/applications/firefox.desktop &&
-cp $SOURCE_DIRECTORY/firefox-$FFOX_VERSION-lunar/firefox.xpm /usr/share/pixmaps/firefox.xpm
+mkdir -p /usr/share/pixmaps
+ln -sf $FIREFOX_HOME/lib/$FFOX_LIBDIR/icons/default.xpm /usr/share/pixmaps/firefox.xpm

Index: POST_REMOVE
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/firefox/POST_REMOVE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- POST_REMOVE	16 Jun 2004 09:35:29 -0000	1.3
+++ POST_REMOVE	11 Oct 2004 21:10:29 -0000	1.4
@@ -1,2 +1,2 @@
-rm -f /usr/share/applications/firefox.desktop
+rm -rf /usr/share/pixmaps/firefox.xpm
 rm -rf /usr/lib/firefox-$VERSION