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

Conflicts: ChangeLog
author: Ismael E. Luceno 2007-12-01 09:52:29 -0200
committer: Ismael E. Luceno 2007-12-01 09:52:29 -0200
commit: a11b2efc7fe3a96760841b2f389a551a45766b74 (patch)
tree: 679df6a6653922425551f8fd1ac2258eb47a4802
parent: b72ddfb335a44848db20abc555007b79d029e617 (diff)
parent: e174f29cfe9243c9db8c3e9cccb704aac46a9ab6 (diff)
36 files changed, 211 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index 709007356e..46e10f2a78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2007-12-01 Ismael Luceno <ismael@sourcemage.org>
 	* devel/codeblocks: new spell, wxwidgets based IDE
 
+2007-12-01 Eric Sandall <sandalle@sourcemage.org>
+	* video/dvdshrink: Added spell from Daniel Goller (Bug #11796)
+
+2007-11-30 Eric Sandall <sandalle@sourcemage.org>
+	* e/e16-themes: Added e16 themes (Bug #14146)
+
 2007-11-29 Eric Sandall <sandalle@sourcemage.org>
 	* httpd/apache2/httpd.gpg: Moved to grimoire level apache.gpg
 
diff --git a/devel/jam/HISTORY b/devel/jam/HISTORY
index f97291b297..755a72d0d1 100644
--- a/devel/jam/HISTORY
+++ b/devel/jam/HISTORY
@@ -1,3 +1,7 @@
+2007-11-30 Eric Sandall <sandalle@sourcemage.org>
+	* PRE_BUILD: Override user-flags in case they set -fstrict-aliasing
+	  Thanks Jaka
+
 2007-11-29 Eric Sandall <sandalle@sourcemage.org>
 	* PRE_BUILD: Fix compilation with gcc 4.2 (Bug #14145)
 	  See http://maillist.perforce.com/pipermail/jamming/2007-May/002913.html
diff --git a/devel/jam/PRE_BUILD b/devel/jam/PRE_BUILD
index 43639b0207..7db02b6bdc 100755
--- a/devel/jam/PRE_BUILD
+++ b/devel/jam/PRE_BUILD
@@ -1,7 +1,7 @@
 mk_source_dir  $SOURCE_DIRECTORY  &&
 cd             $SOURCE_DIRECTORY  &&
 unpack_file                       &&
-CFLAGS="-fno-strict-aliasing $CFLAGS"                     &&
+CFLAGS="$CFLAGS -fno-strict-aliasing"                     &&
 sedit "s:CFLAGS =:CFLAGS = ${CFLAGS}:" Makefile           &&
 sedit "s:(CFLAGS):(CFLAGS) ${LDFLAGS}:" Makefile          &&
 sedit "s:CCFLAGS +=:CCFLAGS += ${CFLAGS}:g" Jamfile       &&
diff --git a/e/e16-themes/DEPENDS b/e/e16-themes/DEPENDS
new file mode 100755
index 0000000000..f4d42de7f0
--- /dev/null
+++ b/e/e16-themes/DEPENDS
@@ -0,0 +1 @@
+depends e16 
diff --git a/e/e16-themes/DETAILS b/e/e16-themes/DETAILS
new file mode 100755
index 0000000000..42f085cc14
--- /dev/null
+++ b/e/e16-themes/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=e16-themes
+         VERSION=0.16.8.0.1
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/${SOURCE}
+     SOURCE_HASH=sha512:01d2f50dc061e499fb3021cb2a3b764cba9846aa8681849b59e587f89dd3d0c45f45f0b1dd81ddc7e5435fb5d7f84f1e9798e2444ea8c3bffa527c609ee080d6
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.enlightenment.org/"
+      LICENSE[0]=unrestricted
+         ENTERED=20071129
+           SHORT="Install e16's base themes: BlueSteel BrushedMetal-Tigert, Ganymede, ShinyMetal"
+cat << EOF
+Aside from e16's default winter theme, four optional themes are available
+with the distribution:
+	BlueSteel
+	BrushedMetal-Tigert
+	Ganymede
+	ShinyMetal
+These should be considered as a required part of e16.
+EOF
diff --git a/e/e16-themes/HISTORY b/e/e16-themes/HISTORY
new file mode 100644
index 0000000000..50ad5fc5e2
--- /dev/null
+++ b/e/e16-themes/HISTORY
@@ -0,0 +1,3 @@
+2007-11-29 linuxfan <demaillists@comcast.net>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/e/enlightenment/DEPENDS b/e/enlightenment/DEPENDS
index da9d22c9f9..7a5c9613e0 100755
--- a/e/enlightenment/DEPENDS
+++ b/e/enlightenment/DEPENDS
@@ -4,8 +4,9 @@
 if  [  "$EPROFILE_E16"  ==  "y"  ];  then
   depends  e16  &&
 
-  optional_depends  e16-docs     ''  ''  'help docs for e16'  &&
-  optional_depends  epplet-base  ''  ''  'for plugins'        &&
+  optional_depends  e16-themes   ''  ''  'for default E16 themes'  &&
+  optional_depends  e16-docs     ''  ''  'help docs for E16'       &&
+  optional_depends  epplet-base  ''  ''  'for plugins'             &&
   optional_depends  exmms        ''  ''  'for a XMMS epplet'
 fi  &&
 
diff --git a/e/enlightenment/HISTORY b/e/enlightenment/HISTORY
index a976f16a3f..819773a8e0 100644
--- a/e/enlightenment/HISTORY
+++ b/e/enlightenment/HISTORY
@@ -1,3 +1,6 @@
+2007-11-30 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Added optional dependency on e16-themes
+
 2007-11-09 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: entice is dead. Long live entice!
 
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index a49237587a..cce6f3a7b4 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2007-12-01 Eric Sandall <sandalle@sourcemage.org>
+	* configs: Add /usr/share/vim/vimrc as a config (Bug #14128)
+
 2007-05-16 Arwed v. Merkatz <v.merkatz@gmx.net>
 	* PRE_BUILD, new_changelog_entry.patch: fix :NewChangelogEntry
 	  command
diff --git a/editors/vim/configs b/editors/vim/configs
new file mode 100755
index 0000000000..cf7e6f3f4c
--- /dev/null
+++ b/editors/vim/configs
@@ -0,0 +1 @@
+/usr/share/vim/vimrc
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index c3525aad9e..8688555b7d 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,7 +5,7 @@ if  [  "$FIREFOX_CVS"  ==  "y"  ];  then
    SOURCE_URL[0]=cvs://:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
    SOURCE_IGNORE=volatile
 else
-         VERSION=2.0.0.10
+         VERSION=2.0.0.11
           SOURCE=$SPELL-$VERSION-source.tar.bz2
          SOURCE2=${SOURCE}.asc
       SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
@@ -15,7 +15,7 @@ else
    SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
    SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL}.asc
-  SECURITY_PATCH=13
+  SECURITY_PATCH=14
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
         WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index b5e127bcf0..08c5d51c00 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2007-12-01 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: SECURITY_PATCH++
+	  updated spell to 2.0.0.11
+
 2007-11-27 George Sherwood <george@beernabeer.com>
 	* DETAILS: Updated to versoin 2.0.0.10. SECURITY_PATCH++
 	  http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.10
diff --git a/http/firefox/firefox-config.patch b/http/firefox/firefox-config.patch
index 0fddb03d1b..0c6929c223 100644
--- a/http/firefox/firefox-config.patch
+++ b/http/firefox/firefox-config.patch
@@ -14,8 +14,8 @@
        exit 0
        ;;
      --cflags)
--      if test "/usr/local/include/firefox-2.0.0.10" != /usr/include ; then
--        includes="-I/usr/local/include/firefox-2.0.0.10"
+-      if test "/usr/local/include/firefox-2.0.0.11" != /usr/include ; then
+-        includes="-I/usr/local/include/firefox-2.0.0.11"
 +      if test "/usr/include/firefox" != /usr/include ; then
 +        includes="-I/usr/include/firefox"
        fi
@@ -25,14 +25,14 @@
  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.10/$n"
+-	component_includes="$component_includes -I/usr/local/include/firefox-2.0.0.11/$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.10"
+-    echo "-I/usr/local/share/idl/firefox-2.0.0.11"
 +    echo "-I/usr/share/idl/firefox"
  fi
  
@@ -41,6 +41,6 @@
  	    ;;
          esac
      done
--    echo -L/usr/local/lib/firefox-2.0.0.10 $libs
+-    echo -L/usr/local/lib/firefox-2.0.0.11 $libs
 +    echo -L/usr/lib $libs
  fi
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index e9892f2439..6b040d4b63 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,12 +1,12 @@
            SPELL=seamonkey
-         VERSION=1.1.6
+         VERSION=1.1.7
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:7222e50b3d69969634bd39cca4b0f7b581f5f026e802b78c747b4d85e33e913889b58f5492ea5db81436baf06303b2389bbb345c79526291bdbd35783b0e41d4:UPSTREAM_HASH
+     SOURCE_HASH=sha512:5abbcfb0ee20d17221f4951884cc4b6cf2049b5218daf8e99b888d05748ab7102b90e9683d1c79756caffc145eeab037f1a3540e3678c644515d15837957137f:UPSTREAM_HASH
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
       SOURCE_URI=seamonkey/releases/$VERSION/$SOURCE
    SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
         WEB_SITE=http://www.mozilla.org/
-  SECURITY_PATCH=8
+  SECURITY_PATCH=9
          ENTERED=20010922
       LICENSE[0]=MPL
             DOCS="LICENSE README.txt"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index b5e498cb53..9892a456d4 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,7 @@
+2007-12-01 George Sherwood <george@beernabeer.com>
+	* DETAILS: Updated to version 1.1.7. SECURITY_PATCH++
+	  http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonkey
+
 2007-11-06 George Sherwood <george@beernabeer.com>
 	* DETAILS: Updated to version 1.1.6. Removed broken SOURCE_URLS.
 
diff --git a/utils/gpm/BUILD b/utils/gpm/BUILD
index ab13ac0d90..ddd570ee17 100755
--- a/utils/gpm/BUILD
+++ b/utils/gpm/BUILD
@@ -8,4 +8,6 @@ LDFLAGS="$LDFLAGS -lm"                                     &&
                    --infodir=${TRACK_ROOT}/usr/share/info  \
              $OPTS                                         &&
 sedit  "s/src doc contrib/src contrib/"  Makefile          &&
-make
+make_single  &&
+make         &&
+make_normal
diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY
index ff490ac19d..402c445492 100644
--- a/utils/gpm/HISTORY
+++ b/utils/gpm/HISTORY
@@ -1,3 +1,12 @@
+2007-12-01 Eric Sandall <sandalle@sourcemage.org>
+	* PRE_BUILD: Apply gpm-OPEN_MAX-1.patch and gpm-OPEN_MAX-2.patch
+	  (Bug #14109)
+	* BUILD: Fails to compile with multiple make jobs
+	* gpm-OPEN_MAX-1.patch: Patch from P. Berens to fix Bug #14109
+	  Updated to apply cleanly against 1.20.1
+	* gpm-OPEN_MAX-2.patch: Patch from P. Berens to fix Bug #14109
+	  Updated to apply cleanly against 1.20.1
+
 2006-07-09 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
 	* CONFIGURE: make the dialogs optional #11598 and clean it up
 	* FINAL: insert default values if none were specified
diff --git a/utils/gpm/PRE_BUILD b/utils/gpm/PRE_BUILD
index c426d5d0ca..5a905fdfc9 100755
--- a/utils/gpm/PRE_BUILD
+++ b/utils/gpm/PRE_BUILD
@@ -1,3 +1,7 @@
-default_pre_build                             &&
-patch  $SOURCE_DIRECTORY/src/lib/liblow.c  \
-       $SCRIPT_DIRECTORY/gpm.1.20.1-pts.patch
+default_pre_build                              &&
+patch  $SOURCE_DIRECTORY/src/lib/liblow.c      \
+       $SCRIPT_DIRECTORY/gpm.1.20.1-pts.patch  &&
+patch  $SOURCE_DIRECTORY/src/prog/gpm-root.y   \
+       $SCRIPT_DIRECTORY/gpm-OPEN_MAX-1.patch  &&
+patch  $SOURCE_DIRECTORY/src/special.c         \
+       $SCRIPT_DIRECTORY/gpm-OPEN_MAX-2.patch
diff --git a/utils/gpm/gpm-OPEN_MAX-1.patch b/utils/gpm/gpm-OPEN_MAX-1.patch
new file mode 100644
index 0000000000..b3be5f0fd1
--- /dev/null
+++ b/utils/gpm/gpm-OPEN_MAX-1.patch
@@ -0,0 +1,14 @@
+diff -Naur gpm-1.20.1.orig/src/prog/gpm-root.y gpm-1.20.1/src/prog/gpm-root.y
+--- gpm-1.20.1.orig/src/prog/gpm-root.y	2007-12-01 01:32:11.225537231 -0800
++++ gpm-1.20.1/src/prog/gpm-root.y	2007-12-01 01:33:21.339840854 -0800
+@@ -525,7 +525,9 @@
+ 	            open("/dev/null",O_RDONLY); /* stdin  */
+ 	            open(consolename,O_WRONLY); /* stdout */
+ 	            dup(1);                     /* stderr */  
+-	            for (i=3;i<OPEN_MAX; i++) close(i);
++		    int open_max = sysconf(_SC_OPEN_MAX);
++		    if (open_max == -1) open_max = 1024;
++	            for (i=3;i<open_max; i++) close(i);
+ 	            execl("/bin/sh","sh","-c",self->arg,(char *)NULL);
+ 	            exit(1); /* shouldn't happen */
+ 	         default: return 0;
diff --git a/utils/gpm/gpm-OPEN_MAX-2.patch b/utils/gpm/gpm-OPEN_MAX-2.patch
new file mode 100644
index 0000000000..502d62447c
--- /dev/null
+++ b/utils/gpm/gpm-OPEN_MAX-2.patch
@@ -0,0 +1,14 @@
+diff -Naur gpm-1.20.1.orig/src/special.c gpm-1.20.1/src/special.c
+--- gpm-1.20.1.orig/src/special.c	2007-12-01 01:32:11.225537231 -0800
++++ gpm-1.20.1/src/special.c	2007-12-01 01:34:00.774824800 -0800
+@@ -155,7 +155,9 @@
+       open(GPM_NULL_DEV,O_RDONLY); /* stdin  */
+       open(option.consolename,O_WRONLY); /* stdout */
+       dup(1);                     /* stderr */
+-      for (i=3;i<OPEN_MAX; i++) close(i);
++      int open_max = sysconf(_SC_OPEN_MAX);
++      if (open_max == -1) open_max = 1024;
++      for (i=3;i<open_max; i++) close(i);
+       execl("/bin/sh","sh","-c",command,(char *)NULL);
+       exit(1); /* shouldn't happen */
+       
diff --git a/video-libs/avifile/BUILD b/video-libs/avifile/BUILD
index 8ce36162f2..7c7240b45c 100755
--- a/video-libs/avifile/BUILD
+++ b/video-libs/avifile/BUILD
@@ -1,4 +1,6 @@
 # needed for xvid detection
 LDFLAGS="$LDFLAGS -lm"  &&
 disable_pic  &&
+# disable qt stuff, doesn't work with the gcc34/gcc4 combination
+OPTS="--without-qt $OPTS"  &&
 default_build
diff --git a/video-libs/avifile/DEPENDS b/video-libs/avifile/DEPENDS
index 1fc8d7424f..c740ed9ccd 100755
--- a/video-libs/avifile/DEPENDS
+++ b/video-libs/avifile/DEPENDS
@@ -1,10 +1,5 @@
 depends  gcc34  &&
 
-optional_depends  qt-x11          \
-                  ""              \
-                  "--without-qt"  \
-                  "for aviplay"   &&
-
 optional_depends  win32codecs              \
                   ""                       \
                   ""                       \
diff --git a/video-libs/avifile/HISTORY b/video-libs/avifile/HISTORY
index 41229e30b5..1e7e10cf7a 100644
--- a/video-libs/avifile/HISTORY
+++ b/video-libs/avifile/HISTORY
@@ -1,3 +1,8 @@
+2007-12-01 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* PRE_BUILD: remove player and samples from the build as they don't
+	  compile/link anymore, fixes bug #14148
+	* DEPENDS, BUILD: remove qt-x11 support, doesn't link anymore
+
 2007-04-29 John Harding <johnh@kuberaconsulting.com>
 	* BUILD: added disable_pic at ruskie's suggestion
 	  when it wouldn't compile here. It worked.
diff --git a/video-libs/avifile/PRE_BUILD b/video-libs/avifile/PRE_BUILD
index ad15d9f567..864336088c 100755
--- a/video-libs/avifile/PRE_BUILD
+++ b/video-libs/avifile/PRE_BUILD
@@ -2,4 +2,7 @@ default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 # fix the pkgconfig file, avifile install header to include/avifile-0.7,
 # not include/avifile
-sedit  's:\(@includedir@/avifile\):\1-0.7:' avifile.pc.in
+sedit  's:\(@includedir@/avifile\):\1-0.7:' avifile.pc.in  &&
+# remove player and samples from the build, they both fail due to issues
+# with newer gcc versions
+sedit 's:player samples::'  Makefile.in
diff --git a/video/dvdshrink/BUILD b/video/dvdshrink/BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/video/dvdshrink/BUILD
@@ -0,0 +1 @@
+true
diff --git a/video/dvdshrink/DEPENDS b/video/dvdshrink/DEPENDS
new file mode 100755
index 0000000000..26333a91df
--- /dev/null
+++ b/video/dvdshrink/DEPENDS
@@ -0,0 +1,7 @@
+depends  cdrtools      &&
+depends  dvdauthor     &&
+depends  dvd+rw-tools  &&
+depends  mjpegtools    &&
+depends  perl-gtk2     &&
+depends  subrip        &&
+depends  transcode
diff --git a/video/dvdshrink/DETAILS b/video/dvdshrink/DETAILS
new file mode 100755
index 0000000000..4d8988bb9f
--- /dev/null
+++ b/video/dvdshrink/DETAILS
@@ -0,0 +1,21 @@
+           SPELL=dvdshrink
+         VERSION=2.6.1
+          SOURCE=${SPELL}-${VERSION}-6mdk.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+        WEB_SITE=http://dvdshrink.sourceforge.net
+         ENTERED=20060503
+  SOURCE_HASH[0]=sha512:0794282bf2da2a331cd7c75e3a245699ecf7299c1b67ef107651ecf5a3d4c8cee0cc57fbce6fa6455e23fbc054a1df4ed9124c5fe2959c129bb4ee75f76f887c
+      LICENSE[0]=GPL
+        KEYWORDS="video"
+           SHORT="Shrinks DVD9 titles to fit on one DVD5, CLI and X GUI is supported"
+cat << EOF
+DVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use archival copies of DVD content on single-layer writable DVDs.
+
+# Command-line and graphical interface
+# Scriptable
+# Copy single movies
+# Copy multiple episodes
+# Selectable audio stream (AC3 only)
+# Option for one subtitle stream per DVD title
+EOF
diff --git a/video/dvdshrink/HISTORY b/video/dvdshrink/HISTORY
new file mode 100644
index 0000000000..6360eebf0c
--- /dev/null
+++ b/video/dvdshrink/HISTORY
@@ -0,0 +1,8 @@
+2007-12-01 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Removed UPDATED and BUILD_API
+	* DEPENDS: Alphabetize and format
+	* INSTALL: Use INSTALL_ROOT
+
+2006-05-09 Daniel Goller <dgoller@satx.rr.com>
+	* BUILD, DEPENDS, DETAILS, INSTALL: created spell
+
diff --git a/video/dvdshrink/INSTALL b/video/dvdshrink/INSTALL
new file mode 100755
index 0000000000..db27571d8f
--- /dev/null
+++ b/video/dvdshrink/INSTALL
@@ -0,0 +1,8 @@
+for DIR in doc applications; do
+   if [ ! -d $INSTALL_ROOT/usr/share/$DIR/dvdshrink ]; then
+      mkdir -p $INSTALL_ROOT/usr/share/$DIR/dvdshrink
+   fi
+done
+
+cp usr/bin/* $INSTALL_ROOT/usr/bin
+cp -R usr/share/* $INSTALL_ROOT/usr/share
diff --git a/windowmanagers/fluxbox/DOWNLOAD b/windowmanagers/fluxbox/DOWNLOAD
index 873b9fa431..36ac7e188f 100755
--- a/windowmanagers/fluxbox/DOWNLOAD
+++ b/windowmanagers/fluxbox/DOWNLOAD
@@ -8,7 +8,8 @@ function url_r_svn_crack() {
   R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
 
 }
-
+if [[ $FLUXBOX_SVN == y ]]
+then
 url_r_svn_crack ${SOURCE_URL}                                                 &&
 message "${MESSAGE_COLOR}Starting SVN checkout of"                            \
         "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"           &&
@@ -40,10 +41,7 @@ tar -jcf                                                                      \
     ${R_SVN_MODULE}                                                           &&
 cp  ${SOURCE} ${SOURCE_CACHE}/${SOURCE}                                       &&
 rm  ${SOURCE}                                                                 &&
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"            &&
-
-if [[ $SOURCE2 ]]; then
-  acquire_src 2  &&
-  acquire_src 3  &&
-  acquire_src 4
+message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
+else
+acquire_src ''
 fi
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index 33d5d991e9..d69f647610 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,6 @@
+2007-11-30 Elisamuel Resto <ryuji@mages.ath.cx>
+	* DOWNLOAD: #13828 fix didnt work properly, file from valgrind spell does
+
 2007-11-12 Arjan Bouter <abouter@sourcemage.org>
 	* DETAILS: fixed svn SOURCE_DIRECTORY
 	* DOWNLOAD: added to fix bug #13828
diff --git a/windowmanagers/xfce/BUILD b/windowmanagers/xfce/BUILD
index 6be3fd5bf6..a58ddffb59 100755
--- a/windowmanagers/xfce/BUILD
+++ b/windowmanagers/xfce/BUILD
@@ -1,3 +1,3 @@
-export CPPFLAGS="-I/usr/include/freetype2" &&
-OPTS=echo "$OPTS --data-dir=${INSTALL_ROOT}/usr/share --enable-xft=yes"
+export CPPFLAGS="-I/usr/include/freetype2"               &&
+OPTS="--with-data-dir=${INSTALL_ROOT}/usr/share  $OPTS"  &&
 default_build
diff --git a/windowmanagers/xfce/DEPENDS b/windowmanagers/xfce/DEPENDS
index eb9ef5ef50..38ba6c99e7 100755
--- a/windowmanagers/xfce/DEPENDS
+++ b/windowmanagers/xfce/DEPENDS
@@ -1,11 +1,27 @@
+depends  freetype2   &&
 depends  gcc34       &&
+depends  gdk-pixbuf  &&
+depends  glib        &&
 depends  gtk+        &&
+depends  imlib       &&
 depends  jpeg        &&
-depends  tiff        &&
-depends  libungif    &&
+depends  LIBGIF      &&
 depends  libpng      &&
+depends  tiff        &&
 depends  zlib        &&
-depends  imlib       &&
-depends  freetype2   &&
-depends  gdk-pixbuf  &&
+
+. $GRIMOIRE/FUNCTIONS  &&
+
+if check_if_xorg_modular_libs gtk+;  then
+  depends  libice                  &&
+  depends  libsm                   &&
+  depends  libx11                  &&
+  depends  libxext                 &&
+  depends  libxft  '--enable-xft'  &&
+  depends  libxinerama             &&
+  depends  libxpm
+else
+  depends  X11-LIBS  '--enable-xft'
+fi  &&
+
 optional_depends  "samba"  ""  ""  "for xfce's built in samba browser"
diff --git a/windowmanagers/xfce/HISTORY b/windowmanagers/xfce/HISTORY
index 3f9f0072df..085c694773 100644
--- a/windowmanagers/xfce/HISTORY
+++ b/windowmanagers/xfce/HISTORY
@@ -1,3 +1,14 @@
+2007-11-29 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Works with any provider of LIBGIF
+	  Add xorg-modular checks
+	  Add dependency on glib
+	  Redundant dependency on X11-LIBS for non-xorg-modular to set Xft
+	  Alphabetize list
+	* BUILD: Pass user $OPTS last to override our settings
+	  Proper data-dir switch is --with-data-dir (Bug #14140)
+	  Don't use "echo" to set OPTS
+	  Use DEPENDS to pass --enable-xft
+
 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.
 
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 0434b61832..1fbb7d9031 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -11,7 +11,7 @@ if  [[ $WINE_VCS == y ]];  then
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
   FORCE_DOWNLOAD=1
 else
-         VERSION=0.9.49
+         VERSION=0.9.50
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index fc9a66614a..4333f42132 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2007-11-30 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* DETAILS: updated spell to 0.9.50
+
 2007-11-09 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.9.49
author	Ismael E. Luceno	2007-12-01 09:52:29 -0200
committer	Ismael E. Luceno	2007-12-01 09:52:29 -0200
commit	a11b2efc7fe3a96760841b2f389a551a45766b74 (patch)
tree	679df6a6653922425551f8fd1ac2258eb47a4802
parent	b72ddfb335a44848db20abc555007b79d029e617 (diff)
parent	e174f29cfe9243c9db8c3e9cccb704aac46a9ab6 (diff)