#
@@ -31,7 +29,7 @@ if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
if ! test -f $MOZILLA_HOME/libnssckbi.so ||
test -h $MOZILLA_HOME/libnssckbi.so; then
ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $MOZILLA_HOME/libnssckbi.so
- fi
+ fi
fi &&
if [[ "$SEAMONKEY_NULLPLUGIN" == "n" ]]
then
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 9fff8df..a0bb413 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -3,48 +3,5 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd comm-release &&
-cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&
-
-if [[ "$SEAMONKEY_OFFICIAL" == "y" ]]; then
- sed -i '78iac_add_options --enable-official-branding' .mozconfig
-fi &&
-
-#This option is broke will not build without mailnews component
-#if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
-# sed -i '78iac_add_options --disable-mailnews' .mozconfig
-#fi &&
-
-if [[ "$SEAMONKEY_COMPOSER" == "n" ]]; then
- sed -i '78iac_add_options --disable-composer' .mozconfig
-fi &&
-
-if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
- sed -i '78iac_add_options --enable-system-cairo' .mozconfig
-else
- sed -i '78iac_add_options --disable-system-cairo' .mozconfig
-fi &&
-
-if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
- sed -i '78iac_add_options --enable-pango' .mozconfig
-fi &&
-
-if [[ "$SEAMONKEY_STRIP" == "y" ]]; then
- sed -i '78iac_add_options --enable-strip' .mozconfig
-fi &&
-
-if is_depends_enabled $SPELL wireless_tools; then
- sed -i '78iac_add_options --enable-necko-wifi' .mozconfig
-else
- sed -i '78iac_add_options --disable-necko-wifi' .mozconfig
-fi &&
-
-if ! is_depends_enabled $SPELL alsa-lib; then
- sed -i '78iac_add_options --disable-ogg' .mozconfig &&
- sed -i '78iac_add_options --disable-wave' .mozconfig
-fi &&
-
-# GNOME support is broken (at least for download manager)
-echo "ac_add_options --disable-gnomeui" >> .mozconfig &&
-echo "ac_add_options --disable-gnomevfs" >> .mozconfig &&
-
-echo "ac_add_options --disable-crashreporter" >> .mozconfig
+patch -p0 < "$SPELL_DIRECTORY/ldap.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/mailnews.patch"
diff --git a/http/seamonkey/blfs-mozconfig b/http/seamonkey/blfs-mozconfig
deleted file mode 100644
index e2fc65d..0000000
--- a/http/seamonkey/blfs-mozconfig
+++ /dev/null
@@ -1,83 +0,0 @@
-# $LastChangedBy: bdubbs $
-# $Date: 2009-11-04 14:57:47 +0000 (Wed, 04 Nov 2009) $
-#
-# This file contains the options used in the SeaMonkey build. You may
-# need to specify additional options for your specific build needs.
-# Use the information provided by running './configure --help' to
-# help you determine if you need to add any additional options.
-# Some additional options can be added by uncommenting the examples
-# in this file or adding options by inserting a line containing
-# 'ac_add_options --some-option-you-need'.
-
-
-# Create an object directory and specify to build the package in that
-# directory. If desired, modify the location of the object directory
-# to a directory inside the source tree by removing '../' from the
-# line below.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonkey-build
-mk_add_options AUTOCONF=autoconf2.13
-
-# This option is used to specify that the SeaMonkey suite is
-# being built and to use all the default options for SeaMonkey.
-ac_add_options --enable-application=suite
-
-# Specify the installation prefix. If you would prefer SeaMonkey
-# installed in a different prefix, modify the line below to fit
-# your needs. You'll also need to modify some of the instructions in
-# the BLFS book to point to your desired prefix.
-ac_add_options --prefix=/usr
-
-# These options are used so that the SeaMonkey binaries are linked to
-# the system-installed copies of the specified libraries instead of
-# the source tree code which may not be the most recent versions.
-ac_add_options --with-system-zlib
-ac_add_options --without-system-png
-ac_add_options --with-system-jpeg
-
-# This option specifies to include support for rendering the HTML
-# <canvas></canvas> tag in the SeaMonkey browser.
-ac_add_options --enable-canvas
-
-# This option is added so that test libraries and programs are not
-# built. These would only be required for debugging purposes.
-ac_add_options --disable-tests
-
-# This option is added so that the Mozilla Installer program is not
-# built or installed. The program is not required for a BLFS
-# installation of SeaMonkey.
-ac_add_options --disable-installer
-
-# This option is used to disable the a11y support in the SeaMonkey
-# binaries. Comment out this option if you require a11y support.
-ac_add_options --disable-accessibility
-
-# This option is used to enable support for rendering SVG files in the
-# SeaMonkey browser.
-ac_add_options --enable-svg
-
-# This option is used to enable source tree included LDAP support in
-# the SeaMonkey binaries.
-ac_add_options --enable-ldap
-
-# Uncomment this option if you desire support for dual-monitor
-# display of SeaMonkey using the X-Window Xinerama libraries.
-#ac_add_options --enable-xinerama
-
-# Complex scripts such as Thai can only be rendered in SeaMonkey with the
-# help of Pango. This option significantly slows rendering, so only use
-# it if necessary.
-#ac_add_options --enable-pango
-
-# This option identifies the default binary directory of the SeaMonkey
-# installation and is used to locate SeaMonkey's installed files. This
-# option is not required for end-user browsing, and is only used for
-# development purposes.
-ac_add_options --with-default-mozilla-five-home=/usr/lib/seamonkey
-
-# These two options enable support for building SeaMonkey with
-# system-installed versions of the Network Security Services (NSS)
-# and Netscape Portable Runtime (NSPR) libraries. Uncomment both
-# lines to enable support for system-installed NSS/NSPR.
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --enable-crypto
diff --git a/http/seamonkey/ldap.patch b/http/seamonkey/ldap.patch
new file mode 100644
index 0000000..a4ede55
--- /dev/null
+++ b/http/seamonkey/ldap.patch
@@ -0,0 +1,15 @@
+--- bridge/bridge.mk.orig 2011-11-21 14:20:07.000000000 +0400
++++ bridge/bridge.mk 2011-12-10 03:22:55.578752146 +0400
+@@ -38,10 +38,10 @@
+
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
+
+-#ifdef MOZ_LDAP_XPCOM
++ifdef MOZ_LDAP_XPCOM
+ APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
+-#endif
++endif
+
+ #ifdef MOZ_MORK
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork
diff --git a/http/seamonkey/mailnews.patch b/http/seamonkey/mailnews.patch
new file mode 100644
index 0000000..2f402a9
--- /dev/null
+++ b/http/seamonkey/mailnews.patch
@@ -0,0 +1,38 @@
+--- mozilla/configure.orig 2011-11-21 14:29:14.000000000 +0400
++++ mozilla/configure 2011-12-10 16:04:46.337188291 +0400
+@@ -14788,6 +14788,7 @@
+ MOZ_FEEDS=1
+ MOZ_INSTALLER=1
+ MOZ_JSDEBUGGER=1
++MOZ_MAIL_NEWS=
+ MOZ_AUTH_EXTENSION=1
+ MOZ_OGG=1
+ MOZ_RAW=
+@@ -17714,8 +17715,17 @@
+ fi
+
+
+-
+-
++# Check whether --enable-mailnews or --disable-mailnews was given.
++if test "${enable_mailnews+set}" = set; then
++ enableval="$enable_mailnews"
++ if test "$enableval" = "no"; then
++ MOZ_MAIL_NEWS=
++ elif test "$enableval" = "yes"; then
++ MOZ_MAIL_NEWS=1
++ else
++ { echo "configure: error: Option, mailnews, does not take an argument
($enableval)." 1>&2; exit 1; }
++ fi
++fi
+
+
+ # Check whether --enable-crypto or --disable-crypto was given.
+@@ -26203,6 +26213,7 @@
+ s%@MOZ_DFB@%$MOZ_DFB%g
+ s%@MOZ_X11@%$MOZ_X11%g
+ s%@MOZ_UI_LOCALE@%$MOZ_UI_LOCALE%g
++s%@MOZ_MAIL_NEWS@%$MOZ_MAIL_NEWS%g
+ s%@MOZ_OFFICIAL_BRANDING@%$MOZ_OFFICIAL_BRANDING%g
+ s%@MOZ_BRANDING_DIRECTORY@%$MOZ_BRANDING_DIRECTORY%g
+ s%@MOZ_DISTRIBUTION_ID@%$MOZ_DISTRIBUTION_ID%g
diff --git a/net/nsd/DETAILS b/net/nsd/DETAILS
index ab20e67..964b7ae 100755
--- a/net/nsd/DETAILS
+++ b/net/nsd/DETAILS
@@ -1,9 +1,9 @@
SPELL=nsd
- VERSION=3.2.8
+ VERSION=3.2.9
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:ddd2916a8043a509443b6dd111f815ace93479a102441f0b274f5412a365a044d4840f98f5344695322d82f67f215708b2137f32ee17b072610984d3f08b1794
+
SOURCE_HASH=sha512:1146c5ac1035ec2b3421ef8c7bb2eea4505928546678f76f287c0544db9fc449521a26b47a716e57c4ae90f3eb531c02930f07d6aca0e2c74e9e2ee64858f3e3
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.nlnetlabs.nl/projects/nsd/
LICENSE[0]=BSD
diff --git a/net/nsd/HISTORY b/net/nsd/HISTORY
index a6d312b..78475c8 100644
--- a/net/nsd/HISTORY
+++ b/net/nsd/HISTORY
@@ -1,3 +1,6 @@
+2011-12-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.9
+
2011-04-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.2.8
* init.d/nsd: fixed pidfile path
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (34f6b219cd7b20c992e964b13d6e1750fe2c055d),
Vlad Glagolev, 12/10/2011