[Lunar-commits] CVS: moonbase/web/mozilla BUILD, 1.19.2.1, 1.19.2.2 POST_INSTALL, 1.7.2.1, 1.7.2.2

[Nick Hudson]

Update of /var/cvs/lunar/moonbase/web/mozilla
In directory dbguin.lunar-linux.org:/tmp/cvs-serv3033

Modified Files:
      Tag: GNOME_UNSTABLE
	BUILD POST_INSTALL 
Log Message:

OMG!! I cant believe I didnt see this 3 days ago.  FInally I think we have a good NSS install.  I am testing it now to see.  Also I cleaned up the POST_INSTALL file a bit.  Some of the stuff in there is no longer needed.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/BUILD,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -d -r1.19.2.1 -r1.19.2.2
--- BUILD	15 Feb 2004 00:33:07 -0000	1.19.2.1
+++ BUILD	15 Feb 2004 05:12:10 -0000	1.19.2.2
@@ -1,6 +1,6 @@
 (
   export patchdir=$SOURCE_DIRECTORY/$MODULE-$VERSION-lunar 
-  EXTENTIONS="--enable-extensions=default,finger,spellcheck"
+  EXTENTIONS="default,finger,spellcheck"
 
   if [ "$COM" == "n" ] ; then
     OPTS="$OPTS --disable-composer"
@@ -84,36 +84,19 @@
               --enable-xpctools                 \
               --enable-xsl                      \
               --enable-ipv6                     \
-              $OPTS $EXTENSIONS                 &&
-              make 				&&
-
-    cd $SOURCE_DIRECTORY/security/coreconf &&
-    cp headers.mk headers.mk.orig &&
-    echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm' >>header.mk   &&
-    make &&
-    cd ../nss &&
-    make moz_import &&
-    make &&
-
-    cd $SOURCE_DIRECTORY &&
-    make install &&
+              --enable-xterm-updates            \
+              --enable-extensions=all,${$EXTENSIONS} \
+              $OPTS                            &&
+              default_make                     &&
 
-    mkdir -p /usr/lib/mozilla/include/nss &&
-    cp $SOURCE_DIRECTORY/dist/public/nss/*.h /usr/lib/mozilla/include/nss &&
-    cp $SOURCE_DIRECTORY/dist/public/seccmd/*.h /usr/lib/mozilla/include/nss &&
-    rm -fr /usr/lib/mozilla/include/nss/zconf.h &&
-    rm -fr /usr/lib/mozilla/include/nss/zlib.h  &&
+    #NSS Headers are already compiled I dont know why I havent seen this till now 
+    NSS_INST_DIR=/usr/include/mozilla-$VERSION/nss 
+    mkdir -p $NSS_INST_DIR &&
+    
+    for  dir  in  private  public;  do
+      cp  -Lf  $SOURCE_DIRECTORY/dist/${dir}/nss/*.h $NSS_INST_DIR
+    done     &&
     
-    cd $SOURCE_DIRECTORY/security/nss &&
-    mkdir -p $SOURCE_DIRECTORY/nss/bin &&
-    mkdir -p $SOURCE_DIRECTORY/nss/lib &&
-    export SOURCE_BIN_DIR=$SOURCE_DIRECTORY/nss/bin 
-    export SOURCE_LIB_DIR=$SOURCE_DIRECTORY/nss/lib
-    echo "Installing Mozilla NSS" && 
-    make install &&
-    cp -Lf $SOURCE_DIRECTORY/nss/bin/* /usr/bin/ &&
-    cp -Lf $SOURCE_DIRECTORY/nss/lib/* /usr/lib/mozilla/  &&
-
 # jol change. On clean install /usr/share/applications
 mkdir -p /usr/share/applications 
 mkdir -p /usr/share/pixmaps

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/web/mozilla/POST_INSTALL,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- POST_INSTALL	15 Feb 2004 00:33:07 -0000	1.7.2.1
+++ POST_INSTALL	15 Feb 2004 05:12:10 -0000	1.7.2.2
@@ -7,33 +7,17 @@
   mv /usr/lib/mozilla-$VERSION/plugins/libnullplugin.so /usr/lib/mozilla-$VERSION
   rm -Rf /usr/lib/mozilla-$VERSION/plugins
 fi
- 
-# Symlink
-cd /usr/lib
-rm -Rf /usr/lib/mozilla
-ln -sf "mozilla-$VERSION" mozilla
-
-cd /usr/include
-rm -Rf /usr/include/mozilla
-ln -sf "mozilla-$VERSION" mozilla
 
-cd /usr/lib/mozilla-$VERSION
 mkdir -p /opt/lunar/plugins
-ln -sf /opt/lunar/plugins plugins
-
-export LD_LIBRARY_PATH="/usr/lib/mozilla-$VERSION:/usr/lib/mozilla-$VERSION/plugins:/usr/lib/mozilla-$VERSION/components"
-export MOZILLA_FIVE_HOME="/usr/lib/mozilla-$VERSION"
-ldconfig
-
-echo "skin,install,select,classic/1.0" >> chrome/installed-chrome.txt
-echo "locale,install,select,en-US" >> chrome/installed-chrome.txt
-
-./regxpcom
-./regchrome
+ln -sf /opt/lunar/plugins /usr/lib/mozilla/plugins
 
-ln -sf /usr/lib/j2sdk1.4.1/jre/plugin/i386/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/javaplugin_oji.so 
+if module_installed j2sdk; then
+   ln -sf /usr/lib/j2sdk1.4.1/jre/plugin/i386/mozilla/javaplugin_oji.so \
+   /usr/lib/mozilla/plugins/javaplugin_oji.so;
+fi 
 
 rm -fr $BOOST_LOCK
 
 if module_installed epiphany; then lin -c -r epiphany; fi
 if module_installed galeon; then lin -c -r galeon; fi
+if module_installed galeon2; then lin -c -r galeon2; fi