summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Orgis2008-08-21 20:29:48 +0200
committerThomas Orgis2008-08-21 20:29:48 +0200
commit1eab6f88d7e992b9b9e4bb9c7c91b98b174d2018 (patch)
tree5b115ac502bd8a02ba70a0987d849bc798e53781
parent1af745ded0e8fe0f585cffa7af6b8440bb64c723 (diff)
parent57f9e178c22b280ab480f24838eda681bd304123 (diff)
Merge with git+ssh://thorgis@scm.sourcemage.org/smgl/grimoire.git
-rw-r--r--ChangeLog2
-rwxr-xr-xaudio-libs/ladspa/DEPENDS1
-rw-r--r--audio-libs/ladspa/HISTORY3
-rwxr-xr-xdoc/thinkcs-java/DEPENDS3
-rw-r--r--doc/thinkcs-java/HISTORY3
-rwxr-xr-xdoc/thinkcs-python/BUILD3
-rwxr-xr-xdoc/thinkcs-python/DEPENDS5
-rw-r--r--doc/thinkcs-python/HISTORY5
-rwxr-xr-xdoc/thinkcs-python/PRE_BUILD5
-rwxr-xr-xhttp/mozilla-nightly/BUILD115
-rwxr-xr-xhttp/mozilla-nightly/CONFIGURE64
-rwxr-xr-xhttp/mozilla-nightly/CONFLICTS1
-rwxr-xr-xhttp/mozilla-nightly/DEPENDS12
-rwxr-xr-xhttp/mozilla-nightly/DETAILS29
-rw-r--r--http/mozilla-nightly/HISTORY112
-rwxr-xr-xhttp/mozilla-nightly/PREPARE1
-rwxr-xr-xhttp/mozilla-nightly/PROVIDES6
-rw-r--r--http/mozilla-nightly/desktop/mozilla.desktop8
-rwxr-xr-xhttp/mozilla-nightly/mozilla2
-rw-r--r--http/mozilla-nightly/mozilla-nightly.sh12
20 files changed, 21 insertions, 371 deletions
diff --git a/ChangeLog b/ChangeLog
index cd08b0dd0f..d3e76d5e6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de>
* http/ijb-waldoff: spell deprecated, use privoxy instead
* http/ijb: spell deprecated, use privoxy instead
+ * http/mozilla-nightly: deleted the spell, because the upstream
+ sources are not available any more
2008-08-19 Vlad Glagolev <stealth@sourcemage.org>
* gnu.gpg: added key 624ACAD5 (Carlo Wood, Run on IRC <carlo@alinoe.com>)
diff --git a/audio-libs/ladspa/DEPENDS b/audio-libs/ladspa/DEPENDS
new file mode 100755
index 0000000000..a2324784f3
--- /dev/null
+++ b/audio-libs/ladspa/DEPENDS
@@ -0,0 +1 @@
+suggest_depends swh-plugins "" "" "for a set of LADSPA plugins"
diff --git a/audio-libs/ladspa/HISTORY b/audio-libs/ladspa/HISTORY
index b4c7c56ad9..e9a000cbb1 100644
--- a/audio-libs/ladspa/HISTORY
+++ b/audio-libs/ladspa/HISTORY
@@ -1,3 +1,6 @@
+2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+ * DEPENDS: suggest swh-plugins #11720
+
2008-06-21 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: don't do useless doc'ing
diff --git a/doc/thinkcs-java/DEPENDS b/doc/thinkcs-java/DEPENDS
index e835def4c6..7d30347456 100755
--- a/doc/thinkcs-java/DEPENDS
+++ b/doc/thinkcs-java/DEPENDS
@@ -1,2 +1,3 @@
-depends tetex &&
+depends tetex &&
+depends ghostscript &&
depends psfig
diff --git a/doc/thinkcs-java/HISTORY b/doc/thinkcs-java/HISTORY
index 1b9f63c937..eea282b3c3 100644
--- a/doc/thinkcs-java/HISTORY
+++ b/doc/thinkcs-java/HISTORY
@@ -1,4 +1,7 @@
2008-08-21 Mathieu Lonjaret <lejatorn@sourcemage.org>
+ * DEPENDS: ghostscript for ps2pdf
+
+2008-08-21 Mathieu Lonjaret <lejatorn@sourcemage.org>
* DEPENDS: rm tetex-texmf, added psfig (fixes bug #12389)
2008-08-19 Robert Figura <template@sourcemage.org>
diff --git a/doc/thinkcs-python/BUILD b/doc/thinkcs-python/BUILD
index bec3b1a139..7aad8f7421 100755
--- a/doc/thinkcs-python/BUILD
+++ b/doc/thinkcs-python/BUILD
@@ -1,2 +1 @@
-make &&
-unlink ${INSTALL_ROOT}/usr/share/texmf/tex/latex/graphics/psfig.sty \ No newline at end of file
+make \ No newline at end of file
diff --git a/doc/thinkcs-python/DEPENDS b/doc/thinkcs-python/DEPENDS
index 9c1597792c..7d30347456 100755
--- a/doc/thinkcs-python/DEPENDS
+++ b/doc/thinkcs-python/DEPENDS
@@ -1,2 +1,3 @@
-depends tetex &&
-depends tetex-texmf
+depends tetex &&
+depends ghostscript &&
+depends psfig
diff --git a/doc/thinkcs-python/HISTORY b/doc/thinkcs-python/HISTORY
index 031ddf56eb..7b62b7749a 100644
--- a/doc/thinkcs-python/HISTORY
+++ b/doc/thinkcs-python/HISTORY
@@ -1,3 +1,8 @@
+2008-08-21 Mathieu Lonjaret <lejatorn@sourcemage.org>
+ * BUILD, DEPENDS, PRE_BUILD: now using psfig pseudo spell to fix
+ #12213.
+ * DEPENDS: ghostscript for ps2pdf.
+
2008-08-19 Mathieu Lonjaret <lejatorn@sourcemage.org>
* DEPENDS, PRE_BUILD, BUILD: symlink hack to fix #12213
* INSTALL: formating
diff --git a/doc/thinkcs-python/PRE_BUILD b/doc/thinkcs-python/PRE_BUILD
index de97030721..55399204c8 100755
--- a/doc/thinkcs-python/PRE_BUILD
+++ b/doc/thinkcs-python/PRE_BUILD
@@ -1,7 +1,4 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file &&
-mv tex/* . &&
-cd ${INSTALL_ROOT}/usr/share/texmf/tex/latex/graphics &&
-ln -s epsfig.sty psfig.sty &&
-cd $SOURCE_DIRECTORY
+mv tex/* .
diff --git a/http/mozilla-nightly/BUILD b/http/mozilla-nightly/BUILD
deleted file mode 100755
index c1d0e9d6ad..0000000000
--- a/http/mozilla-nightly/BUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-(
-
- case $MOZILLA_MAIL in
- n|N) OPTS="$OPTS --disable-mailnews"
- ;;
- *) ;;
- esac
-
- case $MOZILLA_CHAT in
- n|N) OPTS="$OPTS --disable-chat"
- ;;
- *) ;;
- esac
-
- case $MOZILLA_JAVA in
- y|Y|j|J) OPTS="$OPTS --enable-java-supplement"
- ;;
- *) ;;
- esac
-
- case $MOZILLA_SVG in
- y|Y|j|J) OPTS="$OPTS --enable-svg"
- export MOZ_INTERNAL_LIBART_LGPL=1
- ;;
- *) ;;
- esac
-
- case $MOZILLA_MATHML in
- n|N) OPTS="$OPTS --disable-mathml"
- ;;
- *) ;;
- esac
-
- case $MOZILLA_LDAP in
- y|Y|j|J) OPTS="$OPTS --enable-ldap-experimental"
- ;;
- *) ;;
- esac
-
- case $MOZILLA_XINERAMA in
- y|Y|j|J) OPTS="$OPTS --enable-xinerama"
- ;;
- *) ;;
- esac
-
- case $MOZILLA_CRYPTO in
- y|Y|j|J) OPTS="$OPTS --enable-crypto"
- ;;
- *) ;;
- esac
-
- export CFLAGS="$( echo $CFLAGS | sed s/-ffast-math// )"
- export CXXFLAGS="$( echo $CXXFLAGS | sed s/-ffast-math// )"
-
- ./configure --disable-tests \
- --disable-debug \
- --disable-pedantic \
- --enable-optimize="$CFLAGS" \
- --without-jpeg \
- --without-zlib \
- --without-png \
- $OPTS &&
- make &&
- prepare_install &&
-
-
- if ! grep -q "mozilla" /etc/ld.so.conf
- then
- echo "/usr/lib/mozilla" >> /etc/ld.so.conf
- fi
-
-) > $C_FIFO 2>&1 && (
-
- rm -f /usr/lib/mozilla/component.reg
- mkdir -p /usr/lib/mozilla
- cp -rL dist/bin/* /usr/lib/mozilla
- mkdir -p /usr/include/mozilla
- cp -rL dist/include/* /usr/include/mozilla
- mkdir -p /usr/include/moznss
- cp -L dist/public/security/* /usr/include/moznss
-
- for library in /usr/lib/mozilla/*.so; do
- libname=`basename $library`
- ln -sf mozilla/$libname /usr/lib/$libname
- done
-
- cp $SCRIPT_DIRECTORY/mozilla /usr/bin
-
- #
- # Script to set MOZILLA_FIVE_HOME
- #
- cp ${SCRIPT_DIRECTORY}/${SPELL}.sh /etc/profile.d
-
- export MOZILLA_FIVE_HOME=/usr/lib/mozilla
- export LD_LIBRARY_PATH=/usr/lib/mozilla:$LD_LIBRARY_PATH
-
- /usr/lib/mozilla/regxpcom
- /usr/lib/mozilla/regchrome
- touch /usr/lib/mozilla/chrome/user-skins.rdf
- touch /usr/lib/mozilla/chrome/user-locales.rdf
-
-# The following lines have been commented out since they break the spell.
-# The reason is that somewhere before this check is done, the files from
-# /etc/mozilla are deleted leaving the tree intact, leaving mozilla with
-# no config files what so ever.
-
-# if [ -d /etc/mozilla ]; then
-# echo "Old mozilla config in /etc/mozilla kept."
-# echo "New default config moved to /usr/lib/mozilla/new-defaults."
-# mv /usr/lib/mozilla/defaults/ /usr/lib/mozilla/new-defaults/
-# else
-# mv /usr/lib/mozilla/defaults/ /etc/mozilla
-# fi
-# ln -s /etc/mozilla/ /usr/lib/mozilla/defaults
-)
diff --git a/http/mozilla-nightly/CONFIGURE b/http/mozilla-nightly/CONFIGURE
deleted file mode 100755
index 951b251c69..0000000000
--- a/http/mozilla-nightly/CONFIGURE
+++ /dev/null
@@ -1,64 +0,0 @@
-if ! grep -q "MOZILLA_MAIL=" $SPELL_CONFIG; then
-
- if query "Build Mail/News client?" y
- then echo "MOZILLA_MAIL=y" >> $SPELL_CONFIG
- else echo "MOZILLA_MAIL=n" >> $SPELL_CONFIG
- fi
-
-fi
-if ! grep -q "MOZILLA_CHAT=" $SPELL_CONFIG; then
-
- if query "Build Chat client?" y
- then echo "MOZILLA_CHAT=y" >> $SPELL_CONFIG
- else echo "MOZILLA_CHAT=n" >> $SPELL_CONFIG
- fi
-
-fi
-if ! grep -q "MOZILLA_CRYPTO=" $SPELL_CONFIG; then
-
- if query "Enable crypto support (Personal Security Manager)?" y
- then echo "MOZILLA_CRYPTO=y" >> $SPELL_CONFIG
- else echo "MOZILLA_CRYPTO=n" >> $SPELL_CONFIG
- fi
-
-fi
-if ! grep -q "MOZILLA_MATHML=" $SPELL_CONFIG; then
-
- if query "Enable MathML?" y
- then echo "MOZILLA_MATHML=y" >> $SPELL_CONFIG
- else echo "MOZILLA_MATHML=n" >> $SPELL_CONFIG
- fi
-
-fi
-if ! grep -q "MOZILLA_SVG=" $SPELL_CONFIG; then
-
- if query "Enable SVG?" n
- then echo "MOZILLA_SVG=y" >> $SPELL_CONFIG
- else echo "MOZILLA_SVG=n" >> $SPELL_CONFIG
- fi
-
-fi
-if ! grep -q "MOZILLA_JAVA=" $SPELL_CONFIG; then
-
- if query "Enable Blackwood Java Code (Not needed for Java Plugin support)?" n
- then echo "MOZILLA_JAVA=y" >> $SPELL_CONFIG
- else echo "MOZILLA_JAVA=n" >> $SPELL_CONFIG
- fi
-
-fi
-if ! grep -q "MOZILLA_LDAP=" $SPELL_CONFIG; then
-
- if query "Enable LDAP experimental features?" n
- then echo "MOZILLA_LDAP=y" >> $SPELL_CONFIG
- else echo "MOZILLA_LDAP=n" >> $SPELL_CONFIG
- fi
-
-fi
-if ! grep -q "MOZILLA_XINERAMA=" $SPELL_CONFIG; then
-
- if query "Enable Xinerama support?" n
- then echo "MOZILLA_XINERAMA=y" >> $SPELL_CONFIG
- else echo "MOZILLA_XINERAMA=n" >> $SPELL_CONFIG
- fi
-
-fi
diff --git a/http/mozilla-nightly/CONFLICTS b/http/mozilla-nightly/CONFLICTS
deleted file mode 100755
index fdaf96c092..0000000000
--- a/http/mozilla-nightly/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts mozilla
diff --git a/http/mozilla-nightly/DEPENDS b/http/mozilla-nightly/DEPENDS
deleted file mode 100755
index d1f84f88e4..0000000000
--- a/http/mozilla-nightly/DEPENDS
+++ /dev/null
@@ -1,12 +0,0 @@
-depends gtk+ &&
-depends jpeg &&
-depends libpng &&
-depends zlib &&
-depends zip &&
-depends orbit &&
-depends perl &&
-
-optional_depends freetype2 \
- "--with-ft-exec-prefix=/usr/bin" \
- "--disable-freetype2 --disable-freetypetest" \
- "for TrueType font support"
diff --git a/http/mozilla-nightly/DETAILS b/http/mozilla-nightly/DETAILS
deleted file mode 100755
index 14c05e4681..0000000000
--- a/http/mozilla-nightly/DETAILS
+++ /dev/null
@@ -1,29 +0,0 @@
- SPELL=mozilla-nightly
-if [[ "$MOZILLA_NIGHTLY_CVS_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=cvs
-fi
- SOURCE=mozilla-source.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
- SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/latest/$SOURCE
- WEB_SITE=http://www.mozilla.org
- ENTERED=20010922
- UPDATED=20020605
- SOURCE_IGNORE=unversioned
- KEYWORDS="mozilla http"
- BUILD_API=1
- SHORT="A nightly snapshot of the Mozilla browser."
-cat << EOF
-Mozilla is a Web browser that is being developed by the Free Software
-Community with the cooperation and support of Netscape. Initially,
-its development was based on an early version of Netscape Communicator 5.0.
-But most of it was disposed of halfway, and the current Mozilla is
-a completely new software based on the "NGLayout" layout engine
-developed for Netscape Communicator 6. "Netscape 6" (the Web browser
-from Netscape) and "Beonex Communicator" are based on Mozilla. Many
-other projects use/embed Mozilla's rendering engine.
-
-Note that this spell is based on a nightly snapshot of a work-in-progress.
-It is not an official release and certain things may not work.
-EOF
diff --git a/http/mozilla-nightly/HISTORY b/http/mozilla-nightly/HISTORY
deleted file mode 100644
index a15ad575f1..0000000000
--- a/http/mozilla-nightly/HISTORY
+++ /dev/null
@@ -1,112 +0,0 @@
-2006-11-15 Alexander Tsamutali <astsmtl@gmail.com>
- * PROVIDES: Added NS-PLUGIN-COMPATIBLE
-
-2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
- * PROVIDES: [automated] Fixed invalid entries.
-
-2006-08-28 Eric Sandall <sandalle@sourcemage.org>
- * PREPARE: Query for CVS auto-update
- * DETAILS: Check for CVS auto-update
-
-2006-06-12 Arwed v. Merkatz <v.merkatz@gmx.net>
- * DETAILS: inserted BUILD_API=1 line
-
-2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2005-11-30 Seth Woolley <seth@tautology.org>
- * DETAILS: MD5 IGNORE to SOURCE_HASH unversioned
-
-2005-09-19 Eric Sandall <sandalle@sourcemage.org>
- * DETAILS: Removed bunk (for mozilla-nightly) progeny mirror
- Updated FTP mirror (now archived under mozilla.org/)
- Removed MAINTAINER
-
-2005-03-03 Arjan Bouter <abouter@sourcemage.org>
- * desktop/mozilla.desktop: added
-
-2005-01-05 Eric Sandall <sandalle@sourcemage.org>
- * BUILD: Use --disable-pedantic (Bug #5740)
-
-2005-01-04 Eric Sandall <sandalle@sourcemage.org>
- * CONFLICTS: No longer conflicts with firefox
-
-2004-12-03 Eric Sandall <sandalle@sourcemage.org>
- * PROVIDES: Provides the GECKO SDK as well
-
-2004-07-29 Eric Sandall <sandalle@sourcemage.org>
- * BUILD: Install mozilla-nightly.sh
- * mozilla-nightly.sh: profile.d script to set MOZILLA_FIVE_HOME
-
-2004-07-18 Eric Sandall <sandalle@sourcemage.org>
- * DEPENDS: ORBit renamed to orbit
- Formatted to Guru Handbook
-
-2003-11-26 Eric Sandall <sandalle@sourcemage.org>
- * BUILD: Quick fix for gaim to work (and anything
- else which may need the mozilla libs as such) by adding
- /usr/lib/mozilla to /etc/ld.so.conf
-
-2003-10-28 Eric Sandall <sandalle@sourcemage.org>
- * PROVIDES: Uppercase provides
- * HISTORY: Formatted to Guru Handbook
-
-2003-09-19 Eric Sandall <sandalle@sourcemage.org>
- * PROVIDES: Changed mozilla to mozilla-browser (Bug #4278)
-
-2003-08-23 Eric Sandall <sandalle@sourcemage.org>
- * CONFLICTS: Conflicts with phoenix-devel and Firebird as well
-
-2003-01-30 Seth Woolley <seth@tautology.org>
- * DETAILS: added MD5[0]=IGNORE
-
-2003-01-16 Sergey Lipnevich <sergey@sourcemage.org>
- * PROVIDES: Now provides `web-browser' and `graphical-web-browser'.
-
-2002-06-13 Chris Brien <christopher_brien@hotmail.com>
- * Created -nightly spell from the 1.0 spell.
-
-2002-06-06 Mads Laursen <dossen+sgl@daimi.au.dk>
- * CONFIGURE: Even more options (mail/news, chat and freetype).
- * DETAILS: And added Mads as maintainer (Eric Schabell)
-
-2002-06-05 Mads Laursen <dossen+sgl@daimi.au.dk>
- * BUILD: updated to build with SVG support and other optional stuff.
- * DEPENDS: Added dependency for perl (configure checks for it).
- * DETAILS: Ohh, and it's version 1.0...
-
-2002-05-12 Justin Rocha <jrocha@sourcemage.org>
- * DETAILS: Bumped version to 1.0rc2
-
-2002-04-24 Eric Schabell <eric@schabell.com>
- * DETAILS: Bug fix, my fault, fixed file source line,
- copied dezmond's fix incorrectly...
- flame me not him! ;)
-
-2002-04-23 The Well-Beloved Bard <dezmond@bardicgrove.org>
- * DETAILS: Version upgrade 1.0rc1:
- Mozilla has released a new version (1.0rc1), and broken the spell in
- doing so. The directory and filename represent the version differently.
-
-2002-04-11 Yoav Avitzour <avitzour@princeton.edu>
- * BUILD: Commented the /etc/mozilla references. This means
- the spell ignores any previous configuration that existed
- in /etc/mozilla, however, since this configuration is from
- some reason deleted anyway during the cast, it does not
- matter for now and it's a bad fix (but still a fix) for a
- broken spell
-
-2002-04-08 Jon Svendsen <jon-sven@frisurf.no>
- * BUILD: Install NSS headers
- symlink libraries into /usr/lib on install
-
-2002-03-29 Mads Laursen <dossen+sgl@daimi.au.dk>
- * BUILD: Added symlink to config in /etc
-
-2002-03-18 Eric Schabell <eric@schabell.com>
- * DETAILS: Updated UPDATE field as was set to OO for
- month, sorry for the recompile.... I know...
-
-2002-03-13 Eric Schabell <eric@schabell.com>
- * HISTORY: Added this History file.
-
diff --git a/http/mozilla-nightly/PREPARE b/http/mozilla-nightly/PREPARE
deleted file mode 100755
index c53d2d295c..0000000000
--- a/http/mozilla-nightly/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query MOZILLA_NIGHTLY_CVS_AUTOUPDATE "Automatically update $SPELL on system-update?" n
diff --git a/http/mozilla-nightly/PROVIDES b/http/mozilla-nightly/PROVIDES
deleted file mode 100755
index 12b7f0f39d..0000000000
--- a/http/mozilla-nightly/PROVIDES
+++ /dev/null
@@ -1,6 +0,0 @@
-GRAPHICAL-WEB-BROWSER
-MOZILLA-BROWSER
-EMAIL-CLIENT
-WEB-BROWSER
-GECKO
-NS-PLUGIN-COMPATIBLE
diff --git a/http/mozilla-nightly/desktop/mozilla.desktop b/http/mozilla-nightly/desktop/mozilla.desktop
deleted file mode 100644
index 021820ffea..0000000000
--- a/http/mozilla-nightly/desktop/mozilla.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Mozilla
-Exec=mozilla
-Icon=
-Terminal=false
-Type=Application
-Categories=Application;Network;Browsers;
diff --git a/http/mozilla-nightly/mozilla b/http/mozilla-nightly/mozilla
deleted file mode 100755
index 7399122335..0000000000
--- a/http/mozilla-nightly/mozilla
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/lib/mozilla/mozilla $@
diff --git a/http/mozilla-nightly/mozilla-nightly.sh b/http/mozilla-nightly/mozilla-nightly.sh
deleted file mode 100644
index dc5a7e04cd..0000000000
--- a/http/mozilla-nightly/mozilla-nightly.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-# First check if this variable is already set
-# then if not set, check it (maybe), then set it
-#
-# Set MOZILLA_FIVE_HOME for packages which need
-# the mozilla libs (e.g. monodevelop)
-#
-
-if [ -z "$MOZILLA_FIVE_HOME" ] ; then
- MOZILLA_FIVE_HOME=/usr/lib/mozilla
-fi
-export MOZILLA_FIVE_HOME