[Lunar-commits] <moonbase> seamonkey: updated to: 1.1.18, fixed file conflict

[Zbigniew Luszpinski]

commit d84bc1d1de3e805336e7e45b63c4d2cf8c033d50
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Sep 4 22:10:10 2009 +0200

    seamonkey: updated to: 1.1.18, fixed file conflict
---
 web/seamonkey/BUILD   |    9 ++++++---
 web/seamonkey/DETAILS |    6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/web/seamonkey/BUILD b/web/seamonkey/BUILD
index 510fcab..8225873 100644
--- a/web/seamonkey/BUILD
+++ b/web/seamonkey/BUILD
@@ -6,6 +6,9 @@
   # This should always be just a link
   rm -rf /usr/lib/seamonkey-$VERSION/plugins &&
 
+  # Do not conflict with the same plugin from firefox
+  sedit 's/nullplugin$/nullpluginSM/' modules/plugin/samples/default/unix/Makefile.in &&
+
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
 
   MOZ_EXTENSIONS="default,xmlextras,xforms,webservices,universalchardet,transformiix,tasks,schema-validation,reporter,cookie,cview,datetime,finger,p3p,permissions,spellcheck,irc,wallet,-gnomevfs"
@@ -79,12 +82,12 @@
   cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/seamonkey-$VERSION/nss &&
 
   # Install the plugins in the right directories
-  mkdir -p /opt/lunar/plugins/seamonkey-$VERSION         &&
+  mkdir -p /opt/lunar/plugins         &&
   for plugin in `ls /usr/lib/seamonkey-$VERSION/plugins`; do
-       `install -m755 /usr/lib/seamonkey-$VERSION/plugins/$plugin /opt/lunar/plugins/seamonkey-$VERSION`; done  &&
+       `install -m755 /usr/lib/seamonkey-$VERSION/plugins/$plugin /opt/lunar/plugins`; done  &&
 
   rm -rf /usr/lib/seamonkey-$VERSION/plugins &&
-  ln -snf /opt/lunar/plugins/seamonkey-$VERSION /usr/lib/seamonkey-$VERSION/plugins &&
+  ln -snf /opt/lunar/plugins /usr/lib/seamonkey-$VERSION/plugins &&
 
   # Now the .desktop file and the icon
   mkdir -p /usr/share/applications /usr/share/pixmaps &&
diff --git a/web/seamonkey/DETAILS b/web/seamonkey/DETAILS
index f569287..ea95a31 100644
--- a/web/seamonkey/DETAILS
+++ b/web/seamonkey/DETAILS
@@ -1,15 +1,15 @@
           MODULE=seamonkey
-         VERSION=1.1.17
+         VERSION=1.1.18
           SOURCE=$MODULE-$VERSION.source.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
    SOURCE_URL[0]=ftp://mozilla.isc.org/pub/mozilla.org/$MODULE/releases/$VERSION/
    SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/
    SOURCE_URL[2]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/$MODULE/releases/$VERSION/
-      SOURCE_VFY=sha1:81fea04abe908066311e5e13b268b078c45f577a
+      SOURCE_VFY=sha1:11c154ea7f77f903449f3b8394678e0a2d64e7d2
         WEB_SITE=http://www.seamonkey-project.org/
            PSAFE=no
          ENTERED=20051208
-         UPDATED=20090623
+         UPDATED=20090904
       MAINTAINER=zbiggy at o2.pl
            SHORT="Seamonkey is a next generation mozilla web browser."
 cat << EOF