Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

11 files changed, 68 insertions, 6 deletions

diff --git a/disk/devede/DETAILS b/disk/devede/DETAILS
index 30a17cca95..5bbbe88df6 100755
--- a/disk/devede/DETAILS
+++ b/disk/devede/DETAILS
@@ -1,10 +1,10 @@
            SPELL=devede
-         VERSION=29
-          SOURCE=$SPELL$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL$VERSION
+         VERSION=2.12
+          SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.rastersoft.com/descargas/$SOURCE
         WEB_SITE=http://www.rastersoft.com/programas/devede.html
-     SOURCE_HASH=sha512:0895234e43ba3968e884538fd93a9130c016f492291cee32a3cc9933851d7b9b77dc9d3d5ff9a401102f6524b329ab4c6452bd82e0671b3770a0f32aff3c6434
+     SOURCE_HASH=sha512:83dad143054e48cfa98fa781054002246ceceb1b47a172d6f6f93a1e6810345771d62a2fca7380ff9457c1a3fe7b5953540c3c201b2eafb4d21be517fb20a2ab
          ENTERED=20061231
         KEYWORDS="dvd authoring"
            SHORT="DeVeDe is a program to create video DVDs and CDs"
diff --git a/disk/devede/HISTORY b/disk/devede/HISTORY
index e88fa42443..2afbf45564 100644
--- a/disk/devede/HISTORY
+++ b/disk/devede/HISTORY
@@ -1,3 +1,6 @@
+2007-02-25 George Sherwood <george@beernabeer.com>
+	* DETAILS: Updated to version 2.12. Updated SOURCE and SOURCE_DIRECTORY
+
 2006-12-31 Tommy Boatman <tboatman2@houston.rr.com>
 	* Created HISTORY, DEPENDS, DETAILS, BUILD, PRE_BUILD,
           INSTALL
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 1541eab787..a13ef1ae78 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.3.2-8
+         VERSION=6.3.2-9
           SOURCE=ImageMagick-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION/-*/}
    SOURCE_URL[0]=ftp://ftp.imagemagick.org/pub/ImageMagick/$SOURCE
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 40ac530fda..d6f7a34d1b 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2007-02-25 George Sherwood <george@beernabeer.com>
+	* DETAILS: Updated to 6.3.2-9
+
 2007-02-20 George Sherwood <george@beernabeer.com>
 	* DETAILS: updated spell to 6.3.2-8
 
diff --git a/graphics/imagemagick/ImageMagick-6.3.2-8.tar.bz2.sig b/graphics/imagemagick/ImageMagick-6.3.2-8.tar.bz2.sig
deleted file mode 100644
index 57043aa74e..0000000000
--- a/graphics/imagemagick/ImageMagick-6.3.2-8.tar.bz2.sig
+++ /dev/null
diff --git a/graphics/imagemagick/ImageMagick-6.3.2-9.tar.bz2.sig b/graphics/imagemagick/ImageMagick-6.3.2-9.tar.bz2.sig
new file mode 100644
index 0000000000..05a7d4b5c5
--- /dev/null
+++ b/graphics/imagemagick/ImageMagick-6.3.2-9.tar.bz2.sig
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 02dabbf751..991fbbd3fe 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2007-02-25 George Sherwood <george@beernabeer.com>
+	* INSTALL: Added patch for firefox-config to match how we install.
+	* firefox-config.patch: Added patch to get paths correct.
+
 2007-02-24 George Sherwood <george@beernabeer.com>
 	* INSTALL: change fix for *.pc files from 2.0.0.1 to 2.0.0.2
 
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index c44593dc34..453322b5d0 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -3,6 +3,8 @@ FIREFOX_HOME=$INSTALL_ROOT/usr/lib/firefox &&
 if  spell_ok  Firebird;  then
   dispel Firebird
 fi  &&
+#fix firefox-config file to match installed configuration
+patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch &&
 
 # Not recommended by http://www.mozilla.org/build to use
 # make install.  Manually install the files.
diff --git a/http/firefox/firefox-config.patch b/http/firefox/firefox-config.patch
new file mode 100644
index 0000000000..3ef7fc840c
--- /dev/null
+++ b/http/firefox/firefox-config.patch
@@ -0,0 +1,46 @@
+--- build/unix/firefox-config.orig	2007-02-25 11:06:08.000000000 +0400
++++ build/unix/firefox-config	2007-02-25 13:26:14.000000000 +0400
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+-prefix=/usr/local
+-exec_prefix=/usr/local
++prefix=/usr
++exec_prefix=/usr
+ exec_prefix_set=no
+ 
+ usage()
+@@ -60,8 +60,8 @@
+       exit 0
+       ;;
+     --cflags)
+-      if test "/usr/local/include/firefox-2.0.0.2" != /usr/include ; then
+-        includes="-I/usr/local/include/firefox-2.0.0.2"
++      if test "/usr/include/firefox" != /usr/include ; then
++        includes="-I/usr/include/firefox"
+       fi
+       echo_cflags=yes
+       ;;
+@@ -105,13 +105,13 @@
+ if test "$echo_cflags" = "yes"; then
+     nspr_cflags="-I/usr/include/nspr"
+     for n in $echo_components; do
+-	component_includes="$component_includes -I/usr/local/include/firefox-2.0.0.2/$n"
++	component_includes="$component_includes -I/usr/include/firefox/$n"
+     done
+     echo $component_includes $includes $nspr_cflags
+ fi
+ 
+ if test "$echo_idlflags" = "yes"; then
+-    echo "-I/usr/local/share/idl/firefox-2.0.0.2"
++    echo "-I/usr/share/idl/firefox"
+ fi
+ 
+ _nspr_libs="-L/usr/lib -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
+@@ -138,5 +138,5 @@
+ 	    ;;
+         esac
+     done
+-    echo -L/usr/local/lib/firefox-2.0.0.2 $libs
++    echo -L/usr/lib $libs
+ fi
diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index 99af2225f3..14b1d2b728 100755
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -8,7 +8,7 @@ fi  &&
 export OPTS="$OPTS --disable-dependency-tracking --enable-release"  &&
 
 if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
-  OPTS="$OPTS MOZILLA_CONFIG=/usr/bin/firefox-config XPIDL=/usr/lib/firefox/xpidl XPIDL_INCL=-I/usr/share/idl/firefox"  &&
+  OPTS="$OPTS MOZILLA_CONFIG=/usr/lib/firefox/firefox-config XPIDL=/usr/lib/firefox/ XPIDL_INCL=-I/usr/share/idl/firefox"  &&
   CPPFLAGS="$CPPFLAGS -I/usr/include/nspr"
 elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
   OPTS="$OPTS MOZILLA_CONFIG=/usr/bin/seamonkey-config XPIDL=/usr/lib/seamonkey/xpidl XPIDL_INCL=-I/usr/share/idl/seamonkey"  &&
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 98f9cd3b2e..8097ebf008 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,7 @@
+2007-02-25 George Sherwood <george@beernabeer.com>
+	* BUILD: Updated OPTS for firefox plugin to match our install.
+	  Bug 13352.
+
 2007-02-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* TRIGGERS: added check_self in case a provider of LIBAVCODEC is
 	  cast.