CVS: crater/web/mozilla BUILD, 1.11, 1.12 DEPENDS, 1.8, 1.9 DETAILS, 1.8, 1.9 PRE_BUILD, 1.5, 1.6

[nhudson at lunar-linux.org]

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

Modified Files:
	BUILD DEPENDS DETAILS PRE_BUILD 
Log Message:

Hopfully fixing this for the last time 


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/web/mozilla/BUILD,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- BUILD	17 Oct 2003 22:53:04 -0000	1.11
+++ BUILD	17 Oct 2003 23:07:06 -0000	1.12
@@ -72,13 +72,11 @@
               $EXTENTIONS							&&
    make &&
 
-if module_installed gnupg; then
+if module_installed tcsh; then
   cd extensions/ipc &&
-  cp $patchdir/ipc-makemake makemake &&
   ./makemake -r     &&
   make              &&
   cd ../enigmail &&
-  cp $patchdir/enig-makemake makemake &&
   ./makemake -r  &&
   make           
 fi &&
@@ -94,7 +92,7 @@
 cp $patchdir/mozilla.desktop /usr/share/applications/mozilla.desktop &&
 cp $patchdir/mozilla.png /usr/share/pixmaps/mozilla.png &&
 
-if module_installed gnupg; then
+if module_installed tcsh; then
   cp $patchdir/mozilla-mail.png /usr/share/pixmaps/mozilla-mail.png   &&
   cp $patchdir/mozilla-mail.desktop /usr/share/applications/mozilla-mail.desktop
 fi

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/crater/web/mozilla/DEPENDS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DEPENDS	15 Oct 2003 15:24:12 -0000	1.8
+++ DEPENDS	17 Oct 2003 23:07:06 -0000	1.9
@@ -9,10 +9,10 @@
 depends freetype2 &&
 depends gtk+-2    &&
 depends librsvg   &&
-depends tcsh      &&
 
 optional_depends "libical" "--enable-calendar" "" "Enable Calendar Support" &&
-optional_depends "gnupg" "" "" "Enable gpg signing" &&
+optional_depends "gnupg" "" "--disable-mailnews" "Enable Email Support" &&
+optional_depends "tcsh" "" "" "Enable Enigmail (GPG) Support" &&
 optional_depends "openldap" "" "--disable-ldap" "Enable LDAP Support?" &&
 optional_depends "flash-plugin" "" "" "to enable shockwave flash" 
 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/web/mozilla/DETAILS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DETAILS	17 Oct 2003 18:45:40 -0000	1.8
+++ DETAILS	17 Oct 2003 23:07:06 -0000	1.9
@@ -6,8 +6,7 @@
          SOURCE4=ipc-1.0.4.tar.gz
          SOURCE5=mozilla-libart.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-   #Using this URL for now till the Moz FTP servers can fix their sources
-   SOURCE_URL[0]=http://dbguin.lunar-linux.org/~nhudson/mozilla/$SOURCE
+   SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla/releases/mozilla$VERSION/src/$SOURCE
    SOURCE_URL[1]=ftp://ftp.mirror.ac.uk/sites/ftp.mozilla.org/pub/mozilla/releases/mozilla$VERSION/src/$SOURCE
    SOURCE_URL[2]=http://archive.progeny.com/mozilla/releases/mozilla$VERSION/src/$SOURCE
   SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
@@ -18,7 +17,7 @@
          ENTERED=20010922
          UPDATED=20031015
       SOURCE_VFY=md5:9d59651eac39a95da756d38fe5385896
-     SOURCE2_VFY=md5:cf171ee39355e2d2a401f2999bb59c39
+     SOURCE2_VFY=md5:e05dc67a72c2a28000077f60e4d753b6
      SOURCE3_VFY=md5:6524ba86e4b3fbf85306bf3cedcf3924
      SOURCE4_VFY=md5:6cd6efb8cea6bb24fde3e02ba7f46676
      SOURCE5_VFY=md5:119f20f0c50b8554a1794ffdb6706c8d

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/web/mozilla/PRE_BUILD,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PRE_BUILD	15 Oct 2003 15:24:12 -0000	1.5
+++ PRE_BUILD	17 Oct 2003 23:07:06 -0000	1.6
@@ -6,7 +6,9 @@
   unpack $SOURCE &&
 
   cd $SOURCE_DIRECTORY &&
-  unpack $SOURCE2 &&
+  unpack $SOURCE2   &&
+  patch_it $patchdir/xpfe-bootstrap.diff 0    &&
+  patch_it $patchdir/libreg-standalone.diff 0 &&
 
   cd other-licenses &&
   unpack $SOURCE5   &&
@@ -14,15 +16,13 @@
 if module_installed gnupg; then
   cd $SOURCE_DIRECTORY/extensions &&
   unpack $SOURCE3 &&
-  cp $patchdir/enig-makemake enigmail/makemake &&
   unpack $SOURCE4 &&
-  cp $patchdir/ipc-makemake ipc/makemake 
+  patch_it $patchdir/extensions-enigmail-src.diff 1
 else
    true
 fi  &&
 
   # Lunar branding
   cd $SOURCE_DIRECTORY &&
-  cp $patchdir/region-browser.properties xpfe/browser/resources/locale/en-US/region.properties &&
-  cp $patchdir/region-mail.properties mailnews/base/resources/locale/en-US/region.properties 
+  cp $patchdir/region-browser.properties xpfe/browser/resources/locale/en-US/region.properties 
 )