diff options
author | Mathieu Lonjaret | 2008-08-21 20:05:38 +0200 |
---|---|---|
committer | Mathieu Lonjaret | 2008-08-21 20:05:38 +0200 |
commit | 966b6b93d57803b0352b2ac8b8b1b2175f6947e5 (patch) | |
tree | 1ca06f810079cfdf4cc3edc43166b345650e2c48 | |
parent | 3bc064946f179077261442a25f3ca55f77ae85c0 (diff) | |
parent | cfc039b295387f396110967f3cb2c212c81e0b65 (diff) |
Merge branch 'master' of ssh://lonjarem@scm.sourcemage.org/smgl/grimoire
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | ftp/wget/HISTORY | 8 | ||||
-rwxr-xr-x | ftp/wget/PRE_SUB_DEPENDS | 2 | ||||
-rwxr-xr-x | ftp/wget/REPAIR^all^PRE_SUB_DEPENDS | 5 | ||||
-rwxr-xr-x | ftp/wget/REPAIR^none^PRE_SUB_DEPENDS | 5 | ||||
-rwxr-xr-x | ftp/wget/SUB_DEPENDS | 2 | ||||
-rwxr-xr-x | http/mozilla-nightly/BUILD | 115 | ||||
-rwxr-xr-x | http/mozilla-nightly/CONFIGURE | 64 | ||||
-rwxr-xr-x | http/mozilla-nightly/CONFLICTS | 1 | ||||
-rwxr-xr-x | http/mozilla-nightly/DEPENDS | 12 | ||||
-rwxr-xr-x | http/mozilla-nightly/DETAILS | 29 | ||||
-rw-r--r-- | http/mozilla-nightly/HISTORY | 112 | ||||
-rwxr-xr-x | http/mozilla-nightly/PREPARE | 1 | ||||
-rwxr-xr-x | http/mozilla-nightly/PROVIDES | 6 | ||||
-rw-r--r-- | http/mozilla-nightly/desktop/mozilla.desktop | 8 | ||||
-rwxr-xr-x | http/mozilla-nightly/mozilla | 2 | ||||
-rw-r--r-- | http/mozilla-nightly/mozilla-nightly.sh | 12 | ||||
-rwxr-xr-x | smgl/quill/DEPENDS | 2 | ||||
-rwxr-xr-x | smgl/quill/DETAILS | 1 | ||||
-rw-r--r-- | smgl/quill/HISTORY | 4 |
20 files changed, 27 insertions, 366 deletions
@@ -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/ftp/wget/HISTORY b/ftp/wget/HISTORY index 28f126a2e8..79359d4267 100644 --- a/ftp/wget/HISTORY +++ b/ftp/wget/HISTORY @@ -1,4 +1,10 @@ -2008-18-19 Martin Spitzbarth <m.spitzbarth@gmx.de> +2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de> + * SUB_DEPENDS, PRE_SUB_DEPENDS: renamed the sub_depend target + from openssl to SSL + * REPAIR^none^PRE_SUB_DEPENDS: created the file + * REPAIR^all^PRE_SUB_DEPENDS: created the file + +2008-08-19 Martin Spitzbarth <m.spitzbarth@gmx.de> * SUB_DEPENDS, PRE_SUB_DEPENDS: Added openssl as a sub_depend target 2008-06-30 Vlad Glagolev <stealth@sourcemage.org> diff --git a/ftp/wget/PRE_SUB_DEPENDS b/ftp/wget/PRE_SUB_DEPENDS index 60262a725a..fe1f8b92df 100755 --- a/ftp/wget/PRE_SUB_DEPENDS +++ b/ftp/wget/PRE_SUB_DEPENDS @@ -1,5 +1,5 @@ case $THIS_SUB_DEPENDS in -openssl) is_depends_enabled $SPELL openssl && return 0 ;; + SSL) is_depends_enabled $SPELL openssl && return 0 ;; *) echo "unknown sub_depends!" ;; esac return 1 diff --git a/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS b/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..fe1f8b92df --- /dev/null +++ b/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in + SSL) is_depends_enabled $SPELL openssl && return 0 ;; + *) echo "unknown sub_depends!" ;; +esac +return 1 diff --git a/ftp/wget/REPAIR^none^PRE_SUB_DEPENDS b/ftp/wget/REPAIR^none^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..fe1f8b92df --- /dev/null +++ b/ftp/wget/REPAIR^none^PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in + SSL) is_depends_enabled $SPELL openssl && return 0 ;; + *) echo "unknown sub_depends!" ;; +esac +return 1 diff --git a/ftp/wget/SUB_DEPENDS b/ftp/wget/SUB_DEPENDS index 000017c096..0e0f7653ac 100755 --- a/ftp/wget/SUB_DEPENDS +++ b/ftp/wget/SUB_DEPENDS @@ -1,4 +1,4 @@ case $THIS_SUB_DEPENDS in -openssl) depends openssl ;; + SSL) depends openssl ;; *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; false ;; esac 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 diff --git a/smgl/quill/DEPENDS b/smgl/quill/DEPENDS index 74295b642d..f0ac0677a3 100755 --- a/smgl/quill/DEPENDS +++ b/smgl/quill/DEPENDS @@ -1,4 +1,4 @@ -depends -sub openssl wget && +depends -sub SSL wget && if [[ $QUILL_GIT == y ]] then depends git diff --git a/smgl/quill/DETAILS b/smgl/quill/DETAILS index b4899d0441..82c2d59bd9 100755 --- a/smgl/quill/DETAILS +++ b/smgl/quill/DETAILS @@ -14,6 +14,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git FORCE_DOWNLOAD=1 else VERSION=0.2.8 + PATCHLEVEL=1 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.sig SOURCE_URL[0]=http://download.sourcemage.org/projects/quill/$SOURCE diff --git a/smgl/quill/HISTORY b/smgl/quill/HISTORY index 98084f792f..c6b2ae1702 100644 --- a/smgl/quill/HISTORY +++ b/smgl/quill/HISTORY @@ -1,3 +1,7 @@ +2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de> + * DETAILS: PATCHLEVEL++ + * DEPENDS: renamed the sub-depend target from openssl to SSL + 2008-08-19 Martin Spitzbarth <m.spitzbarth@gmx.de> * DEPENDS: added wget with openssl as a sub_depend |