diff options
| author | Julien ROZO | 2008-08-21 20:57:11 +0200 |
|---|---|---|
| committer | Julien ROZO | 2008-08-21 20:57:11 +0200 |
| commit | 7a4103faaa4212018e8222542dbdfd79eadd9518 (patch) | |
| tree | fc7dd3a1e26864275ee085a3a40b25c65a870c8a | |
| parent | 98fcf06e5b1ed16cbc7a3143412777ccf474a52e (diff) | |
| parent | 4b1bb501d5d5a81342a4b90f8cd1cb08572d95e0 (diff) | |
Merge branch 'master' of ssh://jrozo@scm.sourcemage.org/smgl/grimoire
127 files changed, 431 insertions, 1638 deletions
@@ -1,3 +1,19 @@ +2008-08-21 Mathieu Lonjaret <lejatorn@sourcemage.org> + * latex/psfig: new pseudo spell to fix bugs 12213 and 12389 + +2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * FUNCTIONS: added default_grimoire_post_install which takes care of + moving bad paths into the proper place (currently man and info) + +2008-08-21 Ladislav Hagara <hgr@vabo.cz> + * video/luvcview: new spell, Sdl video Usb Video Class grabber + +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>) @@ -3,6 +3,31 @@ . $GRIMOIRE/config_query_multi.function #--------------------------------------------------------------------- +## This function automatically fixes any known bad paths +#--------------------------------------------------------------------- +function default_grimoire_post_install () { + real_default_sorcery_post_install && # currently a no-op + pushd TRANSL &> /dev/null + if [[ -d usr/man ]]; then + echo Fixing bad install path: /usr/man && + mv -v usr/man usr/share + fi && + if [[ -d usr/info ]]; then + echo Fixing bad install path: /usr/info && + mv -v usr/info usr/share + fi && + if [[ -d usr/local/man ]]; then + echo Fixing bad install path: /usr/local/man && + mv -v usr/local/man usr/share + fi && + if [[ -d usr/local/info ]]; then + echo Fixing bad install path: /usr/local/info && + mv -v usr/local/info usr/share + fi && + popd &> /dev/null +} + +#--------------------------------------------------------------------- ## Replaces sorcerys default_pre_build with a custom version using ## the invoke_gcc function from libgcc #10641 #--------------------------------------------------------------------- diff --git a/audio-creation/jamin/DEPENDS b/audio-creation/jamin/DEPENDS index e9e4e9d19d..3d44e78f67 100755 --- a/audio-creation/jamin/DEPENDS +++ b/audio-creation/jamin/DEPENDS @@ -1,5 +1,6 @@ depends glib2 && depends gtk+2 && +depends xml-parser-expat && depends pango && depends atk && depends libsndfile && diff --git a/audio-creation/jamin/HISTORY b/audio-creation/jamin/HISTORY index 0e3b69ea96..d38e233ed7 100644 --- a/audio-creation/jamin/HISTORY +++ b/audio-creation/jamin/HISTORY @@ -1,3 +1,6 @@ +2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de> + * DEPENDS: added xml-parser-expat as a dependency, fixes bug 12473 + 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. 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/audio-players/digitaldj/DETAILS b/audio-players/digitaldj/DETAILS index 3eaaead53b..4c20f6a392 100755 --- a/audio-players/digitaldj/DETAILS +++ b/audio-players/digitaldj/DETAILS @@ -1,9 +1,9 @@ SPELL=digitaldj - VERSION=0.7.2 + VERSION=0.7.5 SOURCE=${SPELL}-${VERSION}.tar.gz SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} - SOURCE_URL[0]=http://www.nostatic.org/ddj/${SOURCE} - SOURCE_HASH=sha512:cd371b8b7a88e47d4272a078c88bc48c8b7eb522a6f3fe7c593da5ca26180ac66cf2ed91f8a3d30f5207256e14aabf7bd7086c0f7d1e5f57c7b261b4bdc284b6 + SOURCE_URL[0]=${SOURCEFORGE_URL}/ddj/${SOURCE} + SOURCE_HASH=sha512:70dcc5e9dabdfc63c173423109a2eab8cf0a9010ff2413c0fab1165f92e1c6115cd38b4208ae6f5354c5364f041393a94c249cab152c4b7252418c858ed607eb WEB_SITE=http://www.nostatic.org/ddj/ ENTERED=20020803 LICENSE[0]=GPL diff --git a/audio-players/digitaldj/HISTORY b/audio-players/digitaldj/HISTORY index 195f416e87..ca28915db8 100644 --- a/audio-players/digitaldj/HISTORY +++ b/audio-players/digitaldj/HISTORY @@ -1,3 +1,8 @@ +2008-08-21 Robert Figura <template@sourcemage.org> + * DETAILS: version -> 0.7.5 + * DETAILS: updated SOURCE_URL[0] + * PRE_BUILD: fix to sedit s/CLK_TCK/CLOCKS_PER_SEC/g (bug 12235) + 2008-04-17 Thomas Orgis <sobukus@sourcemage.org> * DEPENDS: removing MPG123 provider, plain depend on mpg123 diff --git a/audio-players/digitaldj/PRE_BUILD b/audio-players/digitaldj/PRE_BUILD new file mode 100755 index 0000000000..1a741977c0 --- /dev/null +++ b/audio-players/digitaldj/PRE_BUILD @@ -0,0 +1,4 @@ +ls /usr/src +ls "$SOURCE_DIRECTORY" +default_pre_build && +sedit 's/CLK_TCK/CLOCKS_PER_SEC/g' "$SOURCE_DIRECTORY/src/ddj.c" diff --git a/devel/git/CONFIGURE b/devel/git/CONFIGURE index c1372533e9..1eb637ab7b 100755 --- a/devel/git/CONFIGURE +++ b/devel/git/CONFIGURE @@ -3,6 +3,8 @@ config_query_list GIT_SHA_OPT \ openssl \ mozilla && +config_query GIT_SYMLINKS "Enable Git symlinks (obsolete since 1.6)?" n && + if spell_ok uri && spell_ok term-readkey && spell_ok lwp; then diff --git a/devel/git/HISTORY b/devel/git/HISTORY index e4cde80321..95c747de7a 100644 --- a/devel/git/HISTORY +++ b/devel/git/HISTORY @@ -1,3 +1,10 @@ +2008-08-21 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 1.6.0 + * init.d/git-daemon: use the multicall git binary (since 1.6); fixed + running/stopping process, cleaned up + * CONFIGURE, INSTALL: added option to install symlinks for the deprecated + path binaries + 2008-08-18 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.6.0, added some more bashism * BUILD: default_build OK diff --git a/devel/git/INSTALL b/devel/git/INSTALL index 249f68da16..c9a80a305b 100755 --- a/devel/git/INSTALL +++ b/devel/git/INSTALL @@ -36,4 +36,13 @@ if is_depends_enabled $SPELL vim; then VIM_VERSION=$(installed_version vim) install -vm 644 "$SOURCE_DIRECTORY/contrib/vim/syntax/gitcommit.vim" \ "$INSTALL_ROOT/usr/share/vim/vim${VIM_VERSION/./}/syntax" +fi && + +if [[ $GIT_SYMLINKS == y ]]; then + message "Creating needed symlinks..." && + + for i in `ls "$INSTALL_ROOT/usr/libexec/git-core"`; do + ln -vsf "$TRACK_ROOT/usr/libexec/git-core/$i" \ + "$INSTALL_ROOT/usr/bin/$i" + done fi diff --git a/devel/git/init.d/git-daemon b/devel/git/init.d/git-daemon index cc4b1264de..c43b45ad1d 100755 --- a/devel/git/init.d/git-daemon +++ b/devel/git/init.d/git-daemon @@ -1,6 +1,7 @@ #!/bin/bash -PROGRAM=/usr/bin/git-daemon +PIDFILE=/var/run/git.pid +PROGRAM=/usr/bin/git RUNLEVEL=3 NEEDS="+network" @@ -9,7 +10,7 @@ NEEDS="+network" create_args() { - ARGS="$EXTRA_ARGS" + ARGS="daemon --pid-file=/var/run/git.pid $EXTRA_ARGS" [[ $TIMEOUT ]] && ARGS="$ARGS --timeout=$TIMEOUT" [[ $INIT_TIMEOUT ]] && ARGS="$ARGS --init-timeout=$INIT_TIMEOUT" [[ $PORT ]] && ARGS="$ARGS --port=$PORT" @@ -31,7 +32,14 @@ start() create_args ( unset -f echo && - su -c "$PROGRAM $ARGS >> ${LOG_FILE} 2>&1" $USER - ) & + su $USER -c "$PROGRAM $ARGS >> $LOG_FILE 2>&1 &" + ) + evaluate_retval +} + +stop() +{ + echo "Shutting down Git Daemon:" + killproc git-daemon evaluate_retval } diff --git a/devel/ltrace/DEPENDS b/devel/ltrace/DEPENDS index 183e0ca10f..b8c3660884 100755 --- a/devel/ltrace/DEPENDS +++ b/devel/ltrace/DEPENDS @@ -1 +1 @@ -depends libelf +depends LIBELF diff --git a/devel/ltrace/HISTORY b/devel/ltrace/HISTORY index 00789b16a0..202d818442 100644 --- a/devel/ltrace/HISTORY +++ b/devel/ltrace/HISTORY @@ -1,3 +1,6 @@ +2008-08-20 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: on LIBELF, not libelf + 2008-04-12 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.5, new WEB_SITE * DETAILS, PRE_BUILD: added SOURCE2, patch ltrace_0.5-3.1.diff.gz diff --git a/doc/thinkcs-java/DEPENDS b/doc/thinkcs-java/DEPENDS index c63ac28129..7d30347456 100755 --- a/doc/thinkcs-java/DEPENDS +++ b/doc/thinkcs-java/DEPENDS @@ -1,2 +1,3 @@ -depends tetex && -depends tetex-texmf +depends tetex && +depends ghostscript && +depends psfig diff --git a/doc/thinkcs-java/HISTORY b/doc/thinkcs-java/HISTORY index 4b738dc880..eea282b3c3 100644 --- a/doc/thinkcs-java/HISTORY +++ b/doc/thinkcs-java/HISTORY @@ -1,3 +1,9 @@ +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> * DEPENDS: added tetex-texmf 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/ftp/transmission/DETAILS b/ftp/transmission/DETAILS index 68502aea90..f3d0df8469 100755 --- a/ftp/transmission/DETAILS +++ b/ftp/transmission/DETAILS @@ -1,7 +1,7 @@ SPELL=transmission - VERSION=1.32 + VERSION=1.33 SOURCE=$SPELL-$VERSION.tar.bz2 - SOURCE_URL[0]=http://download.m0k.org/$SPELL/files/$SOURCE + SOURCE_URL[0]=http://mirrors.m0k.org/$SPELL/files/$SOURCE SOURCE_GPG=gurus.gpg:$SOURCE.sig SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://www.transmissionbt.com/ diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY index 0827bf8282..169f1108f9 100644 --- a/ftp/transmission/HISTORY +++ b/ftp/transmission/HISTORY @@ -1,3 +1,6 @@ +2008-08-21 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 1.33, renewed source url + 2008-08-09 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 1.32 diff --git a/ftp/transmission/transmission-1.32.tar.bz2.sig b/ftp/transmission/transmission-1.32.tar.bz2.sig Binary files differdeleted file mode 100644 index 53d707313c..0000000000 --- a/ftp/transmission/transmission-1.32.tar.bz2.sig +++ /dev/null diff --git a/ftp/transmission/transmission-1.33.tar.bz2.sig b/ftp/transmission/transmission-1.33.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..9095e81c72 --- /dev/null +++ b/ftp/transmission/transmission-1.33.tar.bz2.sig 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/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS index 8b556e1fcd..eed681ed3b 100755 --- a/gnome2-apps/gnumeric/DEPENDS +++ b/gnome2-apps/gnumeric/DEPENDS @@ -1,6 +1,10 @@ depends libole2-2 && depends libgsf && -depends goffice && +if [[ $GNUMERIC_DEVEL == y ]]; then + depends goffice-dev +else + depends goffice +fi && depends libxml2 && optional_depends gtk+2 \ diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS index d6304d8b5d..ca154ba605 100755 --- a/gnome2-apps/gnumeric/DETAILS +++ b/gnome2-apps/gnumeric/DETAILS @@ -1,6 +1,6 @@ SPELL=gnumeric if [[ $GNUMERIC_DEVEL == y ]]; then - VERSION=1.9.0 + VERSION=1.9.1 else VERSION=1.8.3 fi diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY index 947d8e532b..9878a02034 100644 --- a/gnome2-apps/gnumeric/HISTORY +++ b/gnome2-apps/gnumeric/HISTORY @@ -1,3 +1,7 @@ +2008-08-21 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated devel to 1.9.1 + * DEPENDS: Devel version depends goffice-dev + 2008-07-13 Arjan Bouter <abouter@sourcemage.org> * DEPENDS: made rarian optional diff --git a/gnome2-apps/gnumeric/gnumeric-1.9.0.tar.bz2.sig b/gnome2-apps/gnumeric/gnumeric-1.9.0.tar.bz2.sig Binary files differdeleted file mode 100644 index f38536df80..0000000000 --- a/gnome2-apps/gnumeric/gnumeric-1.9.0.tar.bz2.sig +++ /dev/null diff --git a/gnome2-apps/gnumeric/gnumeric-1.9.1.tar.bz2.sig b/gnome2-apps/gnumeric/gnumeric-1.9.1.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..895b2acc01 --- /dev/null +++ b/gnome2-apps/gnumeric/gnumeric-1.9.1.tar.bz2.sig diff --git a/gnome2-libs/goffice-dev/DETAILS b/gnome2-libs/goffice-dev/DETAILS index 2e5079b8a0..dd36272bdc 100755 --- a/gnome2-libs/goffice-dev/DETAILS +++ b/gnome2-libs/goffice-dev/DETAILS @@ -1,5 +1,5 @@ SPELL=goffice-dev - VERSION=0.4.3 + VERSION=0.7.0 BRANCH=${VERSION%\.*} SOURCE=goffice-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION diff --git a/gnome2-libs/goffice-dev/HISTORY b/gnome2-libs/goffice-dev/HISTORY index 49c373a36b..68c24ab3dc 100644 --- a/gnome2-libs/goffice-dev/HISTORY +++ b/gnome2-libs/goffice-dev/HISTORY @@ -1,3 +1,6 @@ +2008-08-21 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: Updated to version 0.7.0 + 2007-09-05 George Sherwood <george@beernabeer.com> * DETAILS: Updated to version 0.4.3 diff --git a/gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig b/gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig Binary files differdeleted file mode 100644 index c60efea3ae..0000000000 --- a/gnome2-libs/goffice-dev/goffice-0.4.3.tar.bz2.sig +++ /dev/null diff --git a/gnome2-libs/goffice-dev/goffice-0.7.0.tar.bz2.sig b/gnome2-libs/goffice-dev/goffice-0.7.0.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..ae3a564a23 --- /dev/null +++ b/gnome2-libs/goffice-dev/goffice-0.7.0.tar.bz2.sig diff --git a/gnu/g++/BUILD b/gnu/g++/BUILD index 9c985892f9..bdc36b7ef4 100755 --- a/gnu/g++/BUILD +++ b/gnu/g++/BUILD @@ -23,7 +23,8 @@ if [[ "$GCC_NOLIB64" == 'y' ]]; then fi && cd $SOURCE_DIRECTORY.bld && -$SOURCE_DIRECTORY/configure \ +# Ignore any installed g++, it could botch up configure! +CXX=/bin/false $SOURCE_DIRECTORY/configure \ --host=$HOST \ --prefix=${INSTALL_ROOT}/usr \ --infodir=${INSTALL_ROOT}/usr/share/info \ diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY index feb934f502..05926050c7 100644 --- a/gnu/g++/HISTORY +++ b/gnu/g++/HISTORY @@ -1,3 +1,7 @@ +2008-08-20 Thomas Orgis <sobukus@sourcemage.org> + * BUILD: workaround for g++ upgrade where installed g++ (older version) + is broken + 2008-06-11 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 4.3.1 diff --git a/graphics/qcad/DETAILS b/graphics/qcad/DETAILS index d012b8ca4c..50a70577d8 100755 --- a/graphics/qcad/DETAILS +++ b/graphics/qcad/DETAILS @@ -1,19 +1,21 @@ SPELL=qcad VERSION=2.0.5.0-1 - P_VERSION=2.0.1.2-1 + P_VERSION=2.1.2.8-1 SOURCE=${SPELL}-${VERSION}-community.src.tar.gz - SOURCE2=partlibrary-${P_VERSION}.zip + SOURCE2=partlibrary-${P_VERSION}.tar.gz SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-community.src SOURCE_URL[0]=http://www.ribbonsoft.com/archives/qcad/${SOURCE} - SOURCE2_URL[0]=http://www.ribbonsoft.com/archives/partlibrary/${SOURCE2} + SOURCE2_URL[0]=ftp://ribbonsoft.com/archives/partlibrary/${SOURCE2} WEB_SITE=http://www.ribbonsoft.com/qcad.html - SOURCE_GPG="gurus.gpg:$SOURCE.sig" - SOURCE2_GPG="gurus.gpg:$SOURCE2.sig" + SOURCE_HASH=sha512:a1d9f37005da9a1af57a0398e0421d50bde9c927576a9ddb26e33606aa9c2a3507f886ee0a46fa4b474e14fb2420867999a28e3ae4d287cd317d2005bb8e8b28 + SOURCE2_HASH=sha512:09a5f2b53c41f6b2282242c8412cf8aa1f7c151190ab0d94d6f06489fd5d0e8d2b4dbeea16618d7aa4d31f7115b784d06423da688df49d1fc4e0b4ae96b27d09 LICENSE[0]=GPL LICENSE[1]=GPL ENTERED=20020803 KEYWORDS="graphics" SHORT="A 2D Computer Aided Drafting system for UNIX" cat << EOF -QCad is a free open-source 2D CAD system for Linux. The developers main goals are to build a stable, fast and easy to use CAD for everyone. One doesn't need any knowledge of a CAD program to start working with QCad. +QCad is a free open-source 2D CAD system for Linux. The developers main +goals are to build a stable, fast and easy to use CAD for everyone. One +doesn't need any knowledge of a CAD program to start working with QCad. EOF diff --git a/graphics/qcad/HISTORY b/graphics/qcad/HISTORY index d11e056127..a4235661c4 100644 --- a/graphics/qcad/HISTORY +++ b/graphics/qcad/HISTORY @@ -1,3 +1,10 @@ +2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * DETAILS: Fixed SOURCE2_URL[0] + fixed long description wrap + updated partlib to to 2.1.2.8 + fixed #14652 + * INSTALL: added INSTALL_ROOT support + 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/graphics/qcad/INSTALL b/graphics/qcad/INSTALL index 20844039a4..34724ae1fa 100755 --- a/graphics/qcad/INSTALL +++ b/graphics/qcad/INSTALL @@ -1,5 +1,5 @@ INSTALL="install -o root -g root" && -Q_DIR="/usr/share/qcad" && +Q_DIR="$INSTALL_ROOT/usr/share/qcad" && cd ${SOURCE_DIRECTORY}/qcad && diff --git a/graphics/qcad/partlibrary-2.0.1.2-1.zip.sig b/graphics/qcad/partlibrary-2.0.1.2-1.zip.sig Binary files differdeleted file mode 100644 index 85d792c117..0000000000 --- a/graphics/qcad/partlibrary-2.0.1.2-1.zip.sig +++ /dev/null diff --git a/graphics/qcad/qcad-2.0.5.0-1-community.src.tar.gz.sig b/graphics/qcad/qcad-2.0.5.0-1-community.src.tar.gz.sig Binary files differdeleted file mode 100644 index 59518fd91d..0000000000 --- a/graphics/qcad/qcad-2.0.5.0-1-community.src.tar.gz.sig +++ /dev/null diff --git a/http/ijb-waldhoff/BUILD b/http/ijb-waldhoff/BUILD index 48b27fcf9d..27ba77ddaf 100755 --- a/http/ijb-waldhoff/BUILD +++ b/http/ijb-waldhoff/BUILD @@ -1,23 +1 @@ -( - - make && - prepare_install && - mkdir -p /var/log/junkbuster && - mkdir -p /etc/junkbuster && - mkdir -p /usr/doc/junkbuster && - install -s -m 755 junkbuster /usr/sbin/junkbuster && - cp -f junkbuster.1 /usr/man/man8/junkbuster.8 && - cp -f ijbman.html /usr/doc/junkbuster && - cp -f ijbfaq.html /usr/doc/junkbuster - -) > $C_FIFO 2>&1 && ( - - ETC="/etc/junkbuster" - - for file in blocklist imagelist cookiefile saclfile.ini \ - config forward strust.ini - do - [ -f $ETC/$file ] || cp $file $ETC - done - -) +true diff --git a/http/ijb-waldhoff/CONFLICTS b/http/ijb-waldhoff/CONFLICTS index 90faebb821..9ed8442d3a 100755 --- a/http/ijb-waldhoff/CONFLICTS +++ b/http/ijb-waldhoff/CONFLICTS @@ -1 +1 @@ -conflicts ijb +conflicts ijb-waldhoff y diff --git a/http/ijb-waldhoff/DEPENDS b/http/ijb-waldhoff/DEPENDS new file mode 100755 index 0000000000..5c1a0a9c97 --- /dev/null +++ b/http/ijb-waldhoff/DEPENDS @@ -0,0 +1 @@ +depends privoxy diff --git a/http/ijb-waldhoff/DETAILS b/http/ijb-waldhoff/DETAILS index f29e92201a..3cb05a89c7 100755 --- a/http/ijb-waldhoff/DETAILS +++ b/http/ijb-waldhoff/DETAILS @@ -1,14 +1,14 @@ SPELL=ijb-waldhoff VERSION=2.0.2-8 - SOURCE=junkbuster-$VERSION.tar.gz - SOURCE_HASH=sha512:ea3ff8b8f5ebfec37ff4fc3c0eb729e101788966651af06bcc3b6a8d7409917ac888f238e7c72bd134cf775212eb18d253a53ab827f2e7dfc5523fba2e179621 +# SOURCE=junkbuster-$VERSION.tar.gz +# SOURCE_HASH=sha512:ea3ff8b8f5ebfec37ff4fc3c0eb729e101788966651af06bcc3b6a8d7409917ac888f238e7c72bd134cf775212eb18d253a53ab827f2e7dfc5523fba2e179621 SOURCE_DIRECTORY=$BUILD_DIRECTORY/ijb20 - SOURCE_URL[0]=http://www.waldherr.org/redhat/rpm/srpm/$SOURCE +# SOURCE_URL[0]=http://www.waldherr.org/redhat/rpm/srpm/$SOURCE WEB_SITE=http://www.waldherr.org/junkbuster + PATCHLEVEL=1 ENTERED=20010922 UPDATED=20040220 KEYWORDS="web http" - BUILD_API=1 SHORT="junkbuster is an ad filtering web proxy" cat << EOF The Internet Junkbuster Proxy (TM) blocks unwanted banner ads and diff --git a/http/ijb-waldhoff/HISTORY b/http/ijb-waldhoff/HISTORY index 241027f23b..8170f09485 100644 --- a/http/ijb-waldhoff/HISTORY +++ b/http/ijb-waldhoff/HISTORY @@ -1,3 +1,7 @@ +2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de> + * DETAILS, PRE_BUILD, BUILD, INSTALL, CONFLICTS, DEPENDS, TRIGGERS: + deprecated the spell in favour of privoxy + 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed MAINTAINER. diff --git a/http/ijb-waldhoff/INSTALL b/http/ijb-waldhoff/INSTALL new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/http/ijb-waldhoff/INSTALL @@ -0,0 +1 @@ +true diff --git a/http/ijb-waldhoff/PRE_BUILD b/http/ijb-waldhoff/PRE_BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/http/ijb-waldhoff/PRE_BUILD @@ -0,0 +1 @@ +true diff --git a/http/ijb-waldhoff/TRIGGERS b/http/ijb-waldhoff/TRIGGERS new file mode 100644 index 0000000000..6b60c1d293 --- /dev/null +++ b/http/ijb-waldhoff/TRIGGERS @@ -0,0 +1 @@ +on_cast ijb-waldhoff dispel_self diff --git a/http/ijb/BUILD b/http/ijb/BUILD index 9cec5b58b6..27ba77ddaf 100755 --- a/http/ijb/BUILD +++ b/http/ijb/BUILD @@ -1,25 +1 @@ -( - - make && - prepare_install && - mkdir -p /var/log/junkbuster && - mkdir -p /etc/junkbuster && - mkdir -p /usr/doc/junkbuster && - install -s -m 755 junkbuster /usr/sbin/junkbuster && - cp -f junkbuster.1 /usr/man/man8/junkbuster.8 && - cp -f ijbman.html /usr/doc/junkbuster && - cp -f ijbfaq.html /usr/doc/junkbuster - -) > $C_FIFO 2>&1 && ( - - ETC="/etc/junkbuster" - - [ -f $ETC/junkbstr.ini ] || cp junkbstr.ini $ETC - [ -f $ETC/sblock.ini ] || cp sblock.ini $ETC - [ -f $ETC/scookie.ini ] || cp scookie.ini $ETC - [ -f $ETC/saclfile.ini ] || cp saclfile.ini $ETC - [ -f $ETC/sforward.ini ] || cp sforward.ini $ETC - [ -f $ETC/strust.ini ] || cp strust.ini $ETC - - -) +true diff --git a/http/ijb/CONFLICTS b/http/ijb/CONFLICTS index 09a26da516..30aef27712 100755 --- a/http/ijb/CONFLICTS +++ b/http/ijb/CONFLICTS @@ -1 +1 @@ -conflicts ijb-waldhoff +conflicts ijb y diff --git a/http/ijb/DEPENDS b/http/ijb/DEPENDS new file mode 100755 index 0000000000..5c1a0a9c97 --- /dev/null +++ b/http/ijb/DEPENDS @@ -0,0 +1 @@ +depends privoxy diff --git a/http/ijb/DETAILS b/http/ijb/DETAILS index 752842829e..30a29ee6c4 100755 --- a/http/ijb/DETAILS +++ b/http/ijb/DETAILS @@ -1,14 +1,14 @@ SPELL=ijb VERSION=20 - SOURCE=$SPELL$VERSION.tar.Z - SOURCE_HASH=sha512:cb7951767d623e517364bc37c962f6a86002eecacc96c683254a8ab6c5b85518299d18c8eb9773f91368eb6c6231f08f8d177c22c4a58d3d331d2ba1ba3b4a99 +# SOURCE=$SPELL$VERSION.tar.Z +# SOURCE_HASH=sha512:cb7951767d623e517364bc37c962f6a86002eecacc96c683254a8ab6c5b85518299d18c8eb9773f91368eb6c6231f08f8d177c22c4a58d3d331d2ba1ba3b4a99 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL$VERSION - SOURCE_URL[0]=http://www.junkbuster.com/$SOURCE +# SOURCE_URL[0]=http://www.junkbuster.com/$SOURCE WEB_SITE=http://www.junkbuster.com + PATCHLEVEL=1 ENTERED=20010922 UPDATED=20040220 KEYWORDS="web http" - BUILD_API=1 SHORT="ijb, internet junk buster is an ad filtering web proxy" cat << EOF The Internet Junkbuster Proxy (TM) blocks unwanted banner ads and diff --git a/http/ijb/HISTORY b/http/ijb/HISTORY index 62a2939424..4bb69561d1 100644 --- a/http/ijb/HISTORY +++ b/http/ijb/HISTORY @@ -1,3 +1,7 @@ +2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de> + * DETAILS, PRE_BUILD, BUILD, INSTALL, CONFLICTS, DEPENDS, TRIGGERS: + deprecated the spell in favour of privoxy + 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed MAINTAINER. diff --git a/http/ijb/INSTALL b/http/ijb/INSTALL new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/http/ijb/INSTALL @@ -0,0 +1 @@ +true diff --git a/http/ijb/PRE_BUILD b/http/ijb/PRE_BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/http/ijb/PRE_BUILD @@ -0,0 +1 @@ +true diff --git a/http/ijb/TRIGGERS b/http/ijb/TRIGGERS new file mode 100755 index 0000000000..ed53b5d6ce --- /dev/null +++ b/http/ijb/TRIGGERS @@ -0,0 +1 @@ +on_cast ijb dispel_self 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/http/pglogd/BUILD b/http/pglogd/BUILD index ceedd47e72..7fa55db0db 100755 --- a/http/pglogd/BUILD +++ b/http/pglogd/BUILD @@ -1,22 +1,2 @@ -( - sedit "s/\/usr\/local\/pgsql/\/usr/" Makefile && - make && - prepare_install - -) > $C_FIFO 2>&1 && - -( - - cp pglogd /usr/sbin - - sedit "s/\/var\/log\/pglogd.log/\/var\/log\/pglogd\/pglogd.log/" pglogd.conf - sedit "s/\/usr\/site\/logs\/pglogd_overflow/\/var\/log\/pglogd\/pglogd_overflow/" pglogd.conf - [ -e /etc/pglogd.conf ] || cp pglogd.conf /etc/pglogd.conf - chmod o-rwx /etc/pglogd.conf - - mkdir -p /usr/doc/pglogd/ - cp *.sql /usr/doc/pglogd/ - cp queries.txt /usr/doc/pglogd - cp $SCRIPT_DIRECTORY/pglogd.quick /usr/doc/pglogd - -) +sed -i -r 's:/usr/local/pgsql:/usr:' Makefile && +make diff --git a/http/pglogd/DETAILS b/http/pglogd/DETAILS index 19cf1620d3..8fad38be85 100755 --- a/http/pglogd/DETAILS +++ b/http/pglogd/DETAILS @@ -1,14 +1,12 @@ SPELL=pglogd - VERSION=2.2beta + VERSION=2.3 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=http://www.digitalstratum.com/pglogd/pglogd-2.2beta.tar.gz + SOURCE_URL[0]=http://www.digitalstratum.com/download/$SPELL-2.3.tar.gz WEB_SITE=http://www.digitalstratum.com/pglogd/index.php ENTERED=20020506 - UPDATED=20020509 - SOURCE_HASH=sha512:74c7f64987a5718c5ae83ba7c2eaad075d60877c18d490b708f1c9a963565ad613038fb91f703140c7508c84463bd659e7538b3f88eb7523417b84b51fe9d82b + SOURCE_HASH=sha512:3152affc22f3123da46d485f72c8abfb26cd51202abe35e469996ccabf1297b3a963b8ed5c264005bc2625c8df5ecf4c5f5baff2481ba0b2358ebfcd746cd126 KEYWORDS="web database http" - BUILD_API=1 SHORT="pgLOGd takes web server log entries and sends them to a database." cat << EOF pgLOGd, simply put, is a program that takes web server log entries and sends them to a database. diff --git a/http/pglogd/FINAL b/http/pglogd/FINAL deleted file mode 100755 index c160a36f24..0000000000 --- a/http/pglogd/FINAL +++ /dev/null @@ -1,4 +0,0 @@ -echo && -message "For configuration details see /usr/doc/pglogd/pglogd.quick or \n"\ - "go to http://www.digitalstratum.com/pglogd/ " -echo diff --git a/http/pglogd/HISTORY b/http/pglogd/HISTORY index 0c5672255b..5cff28f2ed 100644 --- a/http/pglogd/HISTORY +++ b/http/pglogd/HISTORY @@ -1,3 +1,10 @@ +2008-08-21: Mathieu Lonjaret <lejatorn@sourcemage.org> + * INSTALL: added, forgot it at last commit. + +2008-08-19 Mathieu Lonjaret <lejatorn@sourcemage.org> + * DETAILS, INSTALL, BUILD: setting it up to api2, cleaning up, and + update to 2.3. rm FINAL. fixes bug #12335 + 2007-03-31 David Brown <dmlb2000@gmail.com> * POST_INSTALL: moved to FINAL diff --git a/http/pglogd/INSTALL b/http/pglogd/INSTALL new file mode 100755 index 0000000000..fae1c1074f --- /dev/null +++ b/http/pglogd/INSTALL @@ -0,0 +1,12 @@ +cd ${SOURCE_DIRECTORY} && +install -m 0755 pglogd pglogctl \ +${INSTALL_ROOT}/usr/sbin/ && +sed -i -r 's:/var/log/pglogd.log:/var/log/pglogd/pglogd.log:' \ +pglogd.conf && +sed -i -r 's:/usr/site/logs/pglogd_overflow:/var/log/pglogd/pglogd_overflow:' \ +pglogd.conf && +install_config_file pglogd.conf \ +${INSTALL_ROOT}/etc/pglogd.conf && +mkdir -p ${INSTALL_ROOT}/usr/share/doc/pglogd/ && +install *.sql queries.txt $SCRIPT_DIRECTORY/pglogd.quick \ +${INSTALL_ROOT}/usr/share/doc/pglogd/ diff --git a/kde-core/kdegames/DEPENDS b/kde-core/kdegames/DEPENDS index a1e33a00b7..343f54e382 100755 --- a/kde-core/kdegames/DEPENDS +++ b/kde-core/kdegames/DEPENDS @@ -1,4 +1,5 @@ depends kdebase && +depends kdelibs && depends perl && source "$SECTION_DIRECTORY/KDE_DEPENDS" && diff --git a/kde-core/kdegames/HISTORY b/kde-core/kdegames/HISTORY index a4de83385d..ec91727ae1 100644 --- a/kde-core/kdegames/HISTORY +++ b/kde-core/kdegames/HISTORY @@ -1,3 +1,6 @@ +2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de> + * DEPENDS: added kdelibs as a dependency, see bug 14354 + 2008-02-26 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: updated version to 3.5.9 diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS index a584609580..097a995181 100755 --- a/kde4/kdebase4-runtime/DEPENDS +++ b/kde4/kdebase4-runtime/DEPENDS @@ -2,7 +2,7 @@ source $SECTION_DIRECTORY/KDE_DEPENDS && source $GRIMOIRE/FUNCTIONS && depends qimageblitz && depends xine-lib && -if check_if_xorg_modular_libs qt4 ; then +#if check_if_xorg_modular_libs qt4 ; then # depends imake && # depends libxau && # depends libxcomposite && @@ -16,8 +16,7 @@ if check_if_xorg_modular_libs qt4 ; then # depends xsetroot && # depends xset && # optional_depends libxdamage '' '' 'Compositing support' - sub_depends xine-lib libxcb -fi && +#fi && optional_depends openexr '' '' 'EXR support for thumbnails' && optional_depends samba '' '' 'build smb-ioslave' diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY index 90465c5b1f..3fc31d2e78 100644 --- a/kde4/kdebase4-runtime/HISTORY +++ b/kde4/kdebase4-runtime/HISTORY @@ -1,3 +1,7 @@ +2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * DEPENDS: don't request an invalid sub dependency #14644 + xine-lib usually depends on libxcb; if it doesn't, it isn't needed (xorg) + 2008-08-08 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.1.61 diff --git a/latex/psfig/BUILD b/latex/psfig/BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/latex/psfig/BUILD @@ -0,0 +1 @@ +true diff --git a/latex/psfig/DEPENDS b/latex/psfig/DEPENDS new file mode 100755 index 0000000000..c62d8daee4 --- /dev/null +++ b/latex/psfig/DEPENDS @@ -0,0 +1,3 @@ +depends tetex-texmf + + diff --git a/latex/psfig/DETAILS b/latex/psfig/DETAILS new file mode 100755 index 0000000000..d817842881 --- /dev/null +++ b/latex/psfig/DETAILS @@ -0,0 +1,14 @@ + SPELL=psfig + VERSION=1.0 + WEB_SITE=http://www.ctan.org/tex-archive/nonfree/graphics/psfig/ + ENTERED=21082008 + LICENSE[0]="GPL" + SHORT="psfig/tex -- TeX macros for the inclusion of postscript figures" +cat << EOF +Psfig/tex uses \special calls to manipulate the PostScript environment +within a document, and include figure files. To use psfig, you must +therefore be using a postscript device for your output. This version +of psfig/tex works with the unix "dvips" PostScript driver, which is +available from labrea.stanford.edu, and with OzTeX. +The current ‘preferred’ solution is the LaTeX graphicx package, but the graphics bundle does contain a version of epsfig for use with current LaTeX. +EOF diff --git a/latex/psfig/DOWNLOAD b/latex/psfig/DOWNLOAD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/latex/psfig/DOWNLOAD @@ -0,0 +1 @@ +true diff --git a/latex/psfig/HISTORY b/latex/psfig/HISTORY new file mode 100644 index 0000000000..4d08ee2e0d --- /dev/null +++ b/latex/psfig/HISTORY @@ -0,0 +1,4 @@ + +2008-08-21 Mathieu Lonjaret <lejatorn@sourcemage.org> + * BUILD, PRE_BUILD, DOWNLOAD, DETAILS, HISTORY, INSTALL: created this spell + diff --git a/latex/psfig/INSTALL b/latex/psfig/INSTALL new file mode 100755 index 0000000000..4b73bd10cd --- /dev/null +++ b/latex/psfig/INSTALL @@ -0,0 +1,2 @@ +cd ${INSTALL_ROOT}/usr/share/texmf/tex/latex/graphics && +ln -s epsfig.sty psfig.sty diff --git a/latex/psfig/PRE_BUILD b/latex/psfig/PRE_BUILD new file mode 100755 index 0000000000..27ba77ddaf --- /dev/null +++ b/latex/psfig/PRE_BUILD @@ -0,0 +1 @@ +true diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY index 0d43557c97..3c3e982253 100644 --- a/libs/boost/HISTORY +++ b/libs/boost/HISTORY @@ -1,3 +1,6 @@ +2008-08-21 Arjan Bouter <abouter@sourcemage.org> + * PRE_BUILD, patch: removed, no longer needed + 2008-08-16 Mathieu Lonjaret <lejatorn@sourcemage.org> * DETAILS: corrected wrong hashsum diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD deleted file mode 100755 index f32561003c..0000000000 --- a/libs/boost/PRE_BUILD +++ /dev/null @@ -1,7 +0,0 @@ -default_pre_build && -cd ${SOURCE_DIRECTORY} && - -if [[ "$(installed_version gcc | sed 's:\.::g')" -ge "430" ]] && \ - [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then - patch -p1 < ${SPELL_DIRECTORY}/boost-1_35_0-serialization_gcc43_64bit.patch -fi diff --git a/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch b/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch deleted file mode 100644 index 7f959d8b34..0000000000 --- a/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- trunk/boost/archive/polymorphic_iarchive.hpp (revision 43694) -+++ trunk/boost/archive/polymorphic_iarchive.hpp (revision 43958) -@@ -18,4 +18,5 @@ - - #include <cstddef> // std::size_t -+#include <climits> // ULONG_MAX - #include <boost/config.hpp> - -@@ -39,7 +40,14 @@ - // if there is no 64 bit int or if its the same as a long - // we shouldn't define separate functions for int64 data types. --#if defined(BOOST_NO_INT64_T) \ -- || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1 --# define BOOST_NO_INTRINSIC_INT64_T -+#if defined(BOOST_NO_INT64_T) -+ #define BOOST_NO_INTRINSIC_INT64_T -+#else -+ #if defined(ULONG_MAX) -+ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1 -+ #define BOOST_NO_INTRINSIC_INT64_T -+ #endif -+ #else -+ #define BOOST_NO_INTRINSIC_INT64_T -+ #endif - #endif - ---- trunk/boost/archive/polymorphic_oarchive.hpp (revision 43694) -+++ trunk/boost/archive/polymorphic_oarchive.hpp (revision 43958) -@@ -18,4 +18,5 @@ - - #include <cstddef> // size_t -+#include <climits> // ULONG_MAX - #include <string> - -@@ -38,7 +39,14 @@ - // if there is no 64 bit int or if its the same as a long - // we shouldn't define separate functions for int64 data types. --#if defined(BOOST_NO_INT64_T) \ -- || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1 --# define BOOST_NO_INTRINSIC_INT64_T -+#if defined(BOOST_NO_INT64_T) -+ #define BOOST_NO_INTRINSIC_INT64_T -+#else -+ #if defined(ULONG_MAX) -+ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) // 2**64 - 1 -+ #define BOOST_NO_INTRINSIC_INT64_T -+ #endif -+ #else -+ #define BOOST_NO_INTRINSIC_INT64_T -+ #endif - #endif - diff --git a/libs/elfutils/DEPENDS b/libs/elfutils/DEPENDS index 13672ab06c..061ef5d9dd 100755 --- a/libs/elfutils/DEPENDS +++ b/libs/elfutils/DEPENDS @@ -1,2 +1,2 @@ -depends libtool - +depends libtool && +depends -sub SSL wget diff --git a/libs/elfutils/DETAILS b/libs/elfutils/DETAILS index 590bdff9e4..ec09abaaea 100755 --- a/libs/elfutils/DETAILS +++ b/libs/elfutils/DETAILS @@ -1,21 +1,16 @@ SPELL=elfutils - VERSION=0.129 + VERSION=0.135 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=ftp://sources.redhat.com/pub/systemtap/elfutils/$SOURCE - SOURCE_URL[1]=http://mirrors.kernel.org/sources.redhat.com/systemtap/elfutils/$SOURCE - SOURCE_GPG="gurus.gpg:${SOURCE}.sig" - LICENSE[0]=OpenSoftware + SOURCE_URL[0]=https://fedorahosted.org/releases/e/l/elfutils/$SOURCE + SOURCE_HINTS=no-check-certificate + SOURCE_HASH=sha512:3a335324b4b0b7db3fb0b53b90f0b25e4bc086999f25fbfbc84fba4243702c3d8227dc80262e5d1bd4be4213a09993fef72b46e07ec8e39b794a5793f0010e39 + LICENSE[0]=GPL2 KEYWORDS="libs" - WEB_SITE=http://www.redhat.com/ + WEB_SITE=https://fedorahosted.org/elfutils/ ENTERED=20031203 - SHORT="prelink reduces relocation loading time and memory consumption" + SHORT="ELF binary utilities" cat << EOF -prelink is a program which modifies ELF shared libraries and ELF -dynamically linked binaries, so that the time which dynamic linker needs -for their relocation at startup significantly decreases and also due to -fewer relocations the run-time memory consumption decreases too -(especially number of unshareable pages). Such prelinking information is -only used if all its dependent libraries have not changed since -prelinking, otherwise programs are relocated normally. +A package of ELF binary format utilities, including libelf. +Most of the functionality you also get via binutils already. EOF diff --git a/libs/elfutils/HISTORY b/libs/elfutils/HISTORY index 1f2b1c08c3..cb4b25812f 100644 --- a/libs/elfutils/HISTORY +++ b/libs/elfutils/HISTORY @@ -1,3 +1,8 @@ +2008-08-20 Thomas Orgis <sobukus@sourcemage.org> + * PROVIDES: LIBELF + * DETAILS, DEPENDS, PRE_BUILD, *.sig, *portability.patch: + update to 0.135 + 2007-10-01 George Sherwood <george@beernabeer.com> * PRE_BUILD: Adjusted to -p0 * unset-file-offset.patch: moved unset's to just above diff --git a/libs/elfutils/PRE_BUILD b/libs/elfutils/PRE_BUILD index ad9028ceb7..f2e1119519 100755 --- a/libs/elfutils/PRE_BUILD +++ b/libs/elfutils/PRE_BUILD @@ -1,6 +1,5 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && -patch -p1 < $SCRIPT_DIRECTORY/$SPELL-$VERSION-portability.patch && patch -p0 < $SCRIPT_DIRECTORY/unset-file-offset.patch && sed -i "s/-Werror//" */Makefile.in && sedit "/^addr/s/)/) \$(libelf)/" src/Makefile.am && diff --git a/libs/elfutils/PROVIDES b/libs/elfutils/PROVIDES new file mode 100644 index 0000000000..622b166059 --- /dev/null +++ b/libs/elfutils/PROVIDES @@ -0,0 +1 @@ +LIBELF diff --git a/libs/elfutils/elfutils-0.129-portability.patch b/libs/elfutils/elfutils-0.129-portability.patch deleted file mode 100644 index d8cdd9a8aa..0000000000 --- a/libs/elfutils/elfutils-0.129-portability.patch +++ /dev/null @@ -1,1043 +0,0 @@ ---- elfutils/backends/ChangeLog -+++ elfutils/backends/ChangeLog -@@ -157,6 +157,11 @@ - * sparc_init.c: Likewise. - * x86_64_init.c: Likewise. - -+2005-11-22 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure. -+ (libebl_%.so rule): Use it in place of -Wl,--as-needed. -+ - 2005-11-19 Roland McGrath <roland@redhat.com> - - * ppc64_reloc.def: REL30 -> ADDR30. -@@ -179,6 +184,9 @@ - * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). - (CLEANFILES): Add libebl_$(m).so. - -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ - * ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>. - * ppc64_reloc.def: Likewise. - ---- elfutils/backends/Makefile.am -+++ elfutils/backends/Makefile.am -@@ -25,12 +25,14 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" -+WEXTRA = @WEXTRA@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ -+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \ - -std=gnu99 - INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -@@ -62,7 +64,7 @@ textrel_check = if readelf -d $@ | fgrep - libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw) - $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ - -Wl,--version-script,$(word 2,$^) \ -- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) -+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap) - $(textrel_check) - - libebl_%.map: Makefile ---- elfutils/backends/Makefile.in -+++ elfutils/backends/Makefile.in -@@ -147,6 +147,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -176,6 +177,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -231,9 +233,9 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ --@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 -+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ --@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99 -+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 - INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/lib -I.. -@@ -605,7 +607,7 @@ uninstall-am: - libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw) - $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ - -Wl,--version-script,$(word 2,$^) \ -- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) -+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap) - $(textrel_check) - - libebl_%.map: Makefile ---- elfutils/ChangeLog -+++ elfutils/ChangeLog -@@ -25,6 +25,10 @@ - * configure.ac: Add dummy automake conditional to get dependencies - for non-generic linker right. See src/Makefile.am. - -+2005-11-22 Roland McGrath <roland@redhat.com> -+ -+ * configure.ac: Check for --as-needed linker option. -+ - 2005-11-18 Roland McGrath <roland@redhat.com> - - * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. -@@ -72,6 +76,17 @@ - * Makefile.am (all_SUBDIRS): Add libdwfl. - * configure.ac: Write libdwfl/Makefile. - -+2005-05-31 Roland McGrath <roland@redhat.com> -+ -+ * configure.ac (WEXTRA): Check for -Wextra and set this substitution. -+ -+ * configure.ac: Check for struct stat st_?tim members. -+ * src/strip.c (process_file): Use st_?time if st_?tim are not there. -+ -+ * configure.ac: Check for futimes function. -+ * src/strip.c (handle_elf) [! HAVE_FUTIMES]: Use utimes instead. -+ (handle_ar) [! HAVE_FUTIMES]: Likewise. -+ - 2005-05-19 Roland McGrath <roland@redhat.com> - - * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. ---- elfutils/config/Makefile.in -+++ elfutils/config/Makefile.in -@@ -71,6 +71,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -100,6 +101,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ ---- elfutils/configure -+++ elfutils/configure -@@ -674,6 +674,8 @@ YFLAGS - LEX - LEX_OUTPUT_ROOT - LEXLIB -+WEXTRA -+LD_AS_NEEDED - LOCALEDIR - DATADIRNAME - NATIVE_LD_TRUE -@@ -3874,6 +3876,88 @@ echo "$as_me: error: gcc with C99 suppor - fi - - -+{ echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5 -+echo $ECHO_N "checking for -Wextra option to $CC... $ECHO_C" >&6; } -+if test "${ac_cv_cc_wextra+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ old_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -Wextra" -+cat >conftest.$ac_ext <<_ACEOF -+void foo (void) { } -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_cc_wextra=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_cc_wextra=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+CFLAGS="$old_CFLAGS" -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5 -+echo "${ECHO_T}$ac_cv_cc_wextra" >&6; } -+ -+if test "x$ac_cv_cc_wextra" = xyes; then -+ WEXTRA=-Wextra -+else -+ WEXTRA=-W -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking for --as-needed linker option" >&5 -+echo $ECHO_N "checking for --as-needed linker option... $ECHO_C" >&6; } -+if test "${ac_cv_as_needed+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat > conftest.c <<EOF -+int main (void) { return 0; } -+EOF -+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -+ -fPIC -shared -o conftest.so conftest.c -+ -Wl,--as-needed 1>&5' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+then -+ ac_cv_as_needed=yes -+else -+ ac_cv_as_needed=no -+fi -+rm -f conftest* -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5 -+echo "${ECHO_T}$ac_cv_as_needed" >&6; } -+if test "x$ac_cv_as_needed" = xyes; then -+ LD_AS_NEEDED=-Wl,--as-needed -+else -+ LD_AS_NEEDED= -+fi -+ -+ -+ -+ - LOCALEDIR=$datadir - - cat >>confdefs.h <<_ACEOF -@@ -5608,10 +5692,10 @@ YFLAGS!$YFLAGS$ac_delim - LEX!$LEX$ac_delim - LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim - LEXLIB!$LEXLIB$ac_delim -+WEXTRA!$WEXTRA$ac_delim -+LD_AS_NEEDED!$LD_AS_NEEDED$ac_delim - LOCALEDIR!$LOCALEDIR$ac_delim - DATADIRNAME!$DATADIRNAME$ac_delim --NATIVE_LD_TRUE!$NATIVE_LD_TRUE$ac_delim --NATIVE_LD_FALSE!$NATIVE_LD_FALSE$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -5653,6 +5737,8 @@ _ACEOF - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -+NATIVE_LD_TRUE!$NATIVE_LD_TRUE$ac_delim -+NATIVE_LD_FALSE!$NATIVE_LD_FALSE$ac_delim - base_cpu!$base_cpu$ac_delim - NEVER_TRUE!$NEVER_TRUE$ac_delim - NEVER_FALSE!$NEVER_FALSE$ac_delim -@@ -5683,7 +5769,7 @@ LIBOBJS!$LIBOBJS$ac_delim - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ---- elfutils/configure.ac -+++ elfutils/configure.ac -@@ -71,6 +71,34 @@ CFLAGS="$old_CFLAGS"]) - AS_IF([test "x$ac_cv_c99" != xyes], - AC_MSG_ERROR([gcc with C99 support required])) - -+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl -+old_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -Wextra" -+AC_COMPILE_IFELSE([void foo (void) { }], -+ ac_cv_cc_wextra=yes, ac_cv_cc_wextra=no) -+CFLAGS="$old_CFLAGS"]) -+AC_SUBST(WEXTRA) -+AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W]) -+ -+AC_CACHE_CHECK([for --as-needed linker option], -+ ac_cv_as_needed, [dnl -+cat > conftest.c <<EOF -+int main (void) { return 0; } -+EOF -+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -+ -fPIC -shared -o conftest.so conftest.c -+ -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD]) -+then -+ ac_cv_as_needed=yes -+else -+ ac_cv_as_needed=no -+fi -+rm -f conftest*]) -+AS_IF([test "x$ac_cv_as_needed" = xyes], -+ [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=]) -+AC_SUBST(LD_AS_NEEDED) -+ -+ - LOCALEDIR=$datadir - AC_SUBST(LOCALEDIR) - AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR") ---- elfutils/lib/ChangeLog -+++ elfutils/lib/ChangeLog -@@ -16,6 +16,11 @@ - * Makefile.am (libeu_a_SOURCES): Add it. - * system.h: Declare crc32_file. - -+2005-02-07 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ - 2005-04-30 Ulrich Drepper <drepper@redhat.com> - - * Makefile.am: Use -ffunction-sections for xmalloc.c. ---- elfutils/lib/Makefile.am -+++ elfutils/lib/Makefile.am -@@ -25,12 +25,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra $($(*F)_CFLAGS) -+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) $($(*F)_CFLAGS) - INCLUDES = -I$(srcdir)/../libelf -I.. - - noinst_LIBRARIES = libeu.a ---- elfutils/lib/Makefile.in -+++ elfutils/lib/Makefile.in -@@ -91,6 +91,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -120,6 +121,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -175,9 +177,9 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ --@MUDFLAP_FALSE@ -Wextra $($(*F)_CFLAGS) -+@MUDFLAP_FALSE@ $(WEXTRA) $($(*F)_CFLAGS) - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ --@MUDFLAP_TRUE@ -Wunused -Wextra $($(*F)_CFLAGS) -+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) $($(*F)_CFLAGS) - INCLUDES = -I$(srcdir)/../libelf -I.. - noinst_LIBRARIES = libeu.a - libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \ ---- elfutils/libasm/ChangeLog -+++ elfutils/libasm/ChangeLog -@@ -32,6 +32,11 @@ - * asm_error.c: Add new error ASM_E_IOERROR. - * libasmP.h: Add ASM_E_IOERROR definition. - -+2005-05-31 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ - 2005-02-15 Ulrich Drepper <drepper@redhat.com> - - * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. ---- elfutils/libasm/Makefile.am -+++ elfutils/libasm/Makefile.am -@@ -25,12 +25,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -+AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 - INCLUDES = -I. -I$(srcdir) -I.. \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ - -I$(top_srcdir)/lib ---- elfutils/libasm/Makefile.in -+++ elfutils/libasm/Makefile.in -@@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -153,6 +154,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = 1 -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -208,9 +210,9 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - @MUDFLAP_FALSE@AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \ --@MUDFLAP_FALSE@ -Wextra -Wformat=2 -+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \ --@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 - INCLUDES = -I. -I$(srcdir) -I.. \ - -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ - -I$(top_srcdir)/lib ---- elfutils/libcpu/ChangeLog -+++ elfutils/libcpu/ChangeLog -@@ -1,3 +1,8 @@ -+2005-04-04 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it instead of -Wextra. -+ - 2005-02-15 Ulrich Drepper <drepper@redhat.com> - - * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. ---- elfutils/libcpu/Makefile.am -+++ elfutils/libcpu/Makefile.am -@@ -25,7 +25,8 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H --AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused -+WEXTRA = @WEXTRA@ -+AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused - INCLUDES = -I$(srcdir) - - noinst_LIBRARIES = libcpu_i386.a ---- elfutils/libcpu/Makefile.in -+++ elfutils/libcpu/Makefile.in -@@ -87,6 +87,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -116,6 +117,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -170,7 +172,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --AM_CFLAGS = -Wall -Wshadow -Werror -Wextra -Wformat=2 -Wunused -+AM_CFLAGS = -Wall -Wshadow -Werror $(WEXTRA) -Wformat=2 -Wunused - INCLUDES = -I$(srcdir) - noinst_LIBRARIES = libcpu_i386.a - libcpu_i386_a_SOURCES = i386_dis.c ---- elfutils/libdw/ChangeLog -+++ elfutils/libdw/ChangeLog -@@ -386,6 +386,11 @@ - - 2005-05-31 Roland McGrath <roland@redhat.com> - -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ -+2005-05-31 Roland McGrath <roland@redhat.com> -+ - * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to - formref offset. - ---- elfutils/libdw/Makefile.am -+++ elfutils/libdw/Makefile.am -@@ -25,6 +25,7 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else -@@ -33,7 +34,7 @@ endif - if BUILD_STATIC - AM_CFLAGS += -fpic - endif --AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -+AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 - INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib - VERSION = 1 - ---- elfutils/libdw/Makefile.in -+++ elfutils/libdw/Makefile.in -@@ -163,6 +163,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -192,6 +193,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = 1 -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -247,9 +249,10 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \ --@MUDFLAP_FALSE@ -Wunused -Wformat=2 -Wextra -std=gnu99 -+@MUDFLAP_FALSE@ -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \ --@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -+@MUDFLAP_TRUE@ -Wshadow -Wunused -Wformat=2 $(WEXTRA) \ -+@MUDFLAP_TRUE@ -std=gnu99 - INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib - COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \ - $(COMPILE))) ---- elfutils/libdwfl/ChangeLog -+++ elfutils/libdwfl/ChangeLog -@@ -531,6 +531,11 @@ - - 2005-07-21 Roland McGrath <roland@redhat.com> - -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ -+2005-07-21 Roland McGrath <roland@redhat.com> -+ - * Makefile.am (noinst_HEADERS): Add loc2c.c. - - * test2.c (main): Check sscanf result to quiet warning. ---- elfutils/libdwfl/Makefile.am -+++ elfutils/libdwfl/Makefile.am -@@ -27,12 +27,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99 -+AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99 - INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib - VERSION = 1 ---- elfutils/libdwfl/Makefile.in -+++ elfutils/libdwfl/Makefile.in -@@ -124,6 +124,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -153,6 +154,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = 1 -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -208,9 +210,9 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \ --@MUDFLAP_FALSE@ -Wextra -std=gnu99 -+@MUDFLAP_FALSE@ $(WEXTRA) -std=gnu99 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \ --@MUDFLAP_TRUE@ -Wformat=2 -Wextra -std=gnu99 -+@MUDFLAP_TRUE@ -Wformat=2 $(WEXTRA) -std=gnu99 - INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I.. -I$(srcdir)/../lib - ---- elfutils/libebl/ChangeLog -+++ elfutils/libebl/ChangeLog -@@ -476,6 +476,11 @@ - * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency - tracking works right. - -+2005-05-31 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ - 2005-05-21 Ulrich Drepper <drepper@redhat.com> - - * libebl_x86_64.map: Add x86_64_core_note. ---- elfutils/libebl/Makefile.am -+++ elfutils/libebl/Makefile.am -@@ -25,12 +25,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\" -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else - AM_CFLAGS = - endif --AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \ -+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \ - -std=gnu99 - - INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ ---- elfutils/libebl/Makefile.in -+++ elfutils/libebl/Makefile.in -@@ -120,6 +120,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -149,6 +150,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = 1 -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -204,9 +206,9 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - @MUDFLAP_FALSE@AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ --@MUDFLAP_FALSE@ -Wextra -Wformat=2 -std=gnu99 -+@MUDFLAP_FALSE@ $(WEXTRA) -Wformat=2 -std=gnu99 - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \ --@MUDFLAP_TRUE@ -Wunused -Wextra -Wformat=2 -std=gnu99 -+@MUDFLAP_TRUE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 - INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ - -I$(top_srcdir)/lib -I.. - ---- elfutils/libelf/ChangeLog -+++ elfutils/libelf/ChangeLog -@@ -234,6 +234,11 @@ - If section content hasn't been read yet, do it before looking for the - block size. If no section data present, infer size of section header. - -+2005-05-31 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ - 2005-05-11 Ulrich Drepper <drepper@redhat.com> - - * elf.h: Update again. ---- elfutils/libelf/common.h -+++ elfutils/libelf/common.h -@@ -155,7 +155,7 @@ libelf_release_all (Elf *elf) - (Var) = (sizeof (Var) == 1 \ - ? (unsigned char) (Var) \ - : (sizeof (Var) == 2 \ -- ? bswap_16 (Var) \ -+ ? (unsigned short int) bswap_16 (Var) \ - : (sizeof (Var) == 4 \ - ? bswap_32 (Var) \ - : bswap_64 (Var)))) -@@ -164,7 +164,7 @@ libelf_release_all (Elf *elf) - (Dst) = (sizeof (Var) == 1 \ - ? (unsigned char) (Var) \ - : (sizeof (Var) == 2 \ -- ? bswap_16 (Var) \ -+ ? (unsigned short int) bswap_16 (Var) \ - : (sizeof (Var) == 4 \ - ? bswap_32 (Var) \ - : bswap_64 (Var)))) ---- elfutils/libelf/Makefile.am -+++ elfutils/libelf/Makefile.am -@@ -25,6 +25,7 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else -@@ -33,7 +34,10 @@ endif - if BUILD_STATIC - AM_CFLAGS += -fpic - endif --AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ -+if BUILD_STATIC -+AM_CFLAGS += -fpic -+endif -+AM_CFLAGS += -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ - $($(*F)_CFLAGS) - INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. - GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) ---- elfutils/libelf/Makefile.in -+++ elfutils/libelf/Makefile.in -@@ -34,7 +34,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@BUILD_STATIC_TRUE@am__append_1 = -fpic -+@BUILD_STATIC_TRUE@am__append_1 = -fpic -fpic - @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1) - @MUDFLAP_TRUE@am_libelf_pic_a_OBJECTS = - subdir = libelf -@@ -167,6 +167,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -196,6 +197,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = 1 -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -251,10 +253,10 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - @MUDFLAP_FALSE@AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \ --@MUDFLAP_FALSE@ -Wunused -Wextra -Wformat=2 -std=gnu99 \ -+@MUDFLAP_FALSE@ -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ - @MUDFLAP_FALSE@ $($(*F)_CFLAGS) - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Wshadow \ --@MUDFLAP_TRUE@ -Werror -Wunused -Wextra -Wformat=2 -std=gnu99 \ -+@MUDFLAP_TRUE@ -Werror -Wunused $(WEXTRA) -Wformat=2 -std=gnu99 \ - @MUDFLAP_TRUE@ $($(*F)_CFLAGS) - INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. - GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) ---- elfutils/m4/Makefile.in -+++ elfutils/m4/Makefile.in -@@ -70,6 +70,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -99,6 +100,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ ---- elfutils/Makefile.in -+++ elfutils/Makefile.in -@@ -97,6 +97,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -126,6 +127,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ ---- elfutils/src/ChangeLog -+++ elfutils/src/ChangeLog -@@ -220,6 +220,10 @@ - * elflint.c (valid_e_machine): Add EM_ALPHA. - Reported by Christian Aichinger <Greek0@gmx.net>. - -+ * strings.c (map_file): Define POSIX_MADV_SEQUENTIAL to -+ MADV_SEQUENTIAL if undefined. Don't call posix_madvise -+ if neither is defined. -+ - 2006-08-08 Ulrich Drepper <drepper@redhat.com> - - * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. -@@ -296,6 +300,10 @@ - * Makefile.am: Add hacks to create dependency files for non-generic - linker. - -+2006-04-05 Roland McGrath <roland@redhat.com> -+ -+ * strings.c (MAP_POPULATE): Define to 0 if undefined. -+ - 2006-06-12 Ulrich Drepper <drepper@redhat.com> - - * ldgeneric.c (ld_generic_generate_sections): Don't create .interp -@@ -644,6 +652,11 @@ - * readelf.c (print_debug_loc_section): Fix indentation for larger - address size. - -+2005-05-31 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ - 2005-05-30 Roland McGrath <roland@redhat.com> - - * readelf.c (print_debug_line_section): Print section offset of each ---- elfutils/src/findtextrel.c -+++ elfutils/src/findtextrel.c -@@ -488,7 +488,11 @@ ptrcompare (const void *p1, const void * - - - static void --check_rel (size_t nsegments, struct segments segments[nsegments], -+check_rel (size_t nsegments, struct segments segments[ -+#if __GNUC__ >= 4 -+ nsegments -+#endif -+ ], - GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw, - const char *fname, bool more_than_one, void **knownsrcs) - { ---- elfutils/src/Makefile.am -+++ elfutils/src/Makefile.am -@@ -26,6 +26,7 @@ - ## - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \ - -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" -+WEXTRA = @WEXTRA@ - if MUDFLAP - AM_CFLAGS = -fmudflap - else -@@ -33,7 +34,7 @@ AM_CFLAGS = - endif - AM_CFLAGS += -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \ - $(if $($(*F)_no_Werror),,-Werror) \ -- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ -+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \ - $(if $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F)) - - INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ ---- elfutils/src/Makefile.in -+++ elfutils/src/Makefile.in -@@ -197,6 +197,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -226,6 +227,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -d -@@ -283,13 +285,13 @@ top_srcdir = @top_srcdir@ - @MUDFLAP_FALSE@AM_CFLAGS = -Wall -Wshadow -std=gnu99 \ - @MUDFLAP_FALSE@ $(native_ld_cflags) $(if \ - @MUDFLAP_FALSE@ $($(*F)_no_Werror),,-Werror) $(if \ --@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ -+@MUDFLAP_FALSE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ - @MUDFLAP_FALSE@ $($(*F)_no_Wformat),,-Wformat=2) \ - @MUDFLAP_FALSE@ $(CFLAGS_$(*F)) - @MUDFLAP_TRUE@AM_CFLAGS = -fmudflap -Wall -Wshadow -std=gnu99 \ - @MUDFLAP_TRUE@ $(native_ld_cflags) $(if \ - @MUDFLAP_TRUE@ $($(*F)_no_Werror),,-Werror) $(if \ --@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused -Wextra) $(if \ -+@MUDFLAP_TRUE@ $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) $(if \ - @MUDFLAP_TRUE@ $($(*F)_no_Wformat),,-Wformat=2) $(CFLAGS_$(*F)) - INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ - -I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \ ---- elfutils/src/strings.c -+++ elfutils/src/strings.c -@@ -51,6 +51,10 @@ - - #include <system.h> - -+#ifndef MAP_POPULATE -+# define MAP_POPULATE 0 -+#endif -+ - - /* Prototypes of local functions. */ - static int read_fd (int fd, const char *fname, off64_t fdlen); -@@ -491,8 +495,13 @@ map_file (int fd, off64_t start_off, off - fd, start_off); - if (mem != MAP_FAILED) - { -+#if !defined POSIX_MADV_SEQUENTIAL && defined MADV_SEQUENTIAL -+# define POSIX_MADV_SEQUENTIAL MADV_SEQUENTIAL -+#endif -+#ifdef POSIX_MADV_SEQUENTIAL - /* We will go through the mapping sequentially. */ - (void) posix_madvise (mem, map_size, POSIX_MADV_SEQUENTIAL); -+#endif - break; - } - if (errno != EINVAL && errno != ENOMEM) ---- elfutils/src/strip.c -+++ elfutils/src/strip.c -@@ -52,6 +52,12 @@ - #include <libebl.h> - #include <system.h> - -+#ifdef HAVE_FUTIMES -+# define FUTIMES(fd, fname, tvp) futimes (fd, tvp) -+#else -+# define FUTIMES(fd, fname, tvp) utimes (fname, tvp) -+#endif -+ - - /* Name and version of program. */ - static void print_version (FILE *stream, struct argp_state *state); -@@ -300,8 +306,18 @@ process_file (const char *fname) - - /* If we have to preserve the timestamp, we need it in the - format utimes() understands. */ -+#ifdef HAVE_STRUCT_STAT_ST_ATIM - TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim); -+#else -+ tv[0].tv_sec = pre_st.st_atime; -+ tv[0].tv_usec = 0; -+#endif -+#ifdef HAVE_STRUCT_STAT_ST_MTIM - TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim); -+#else -+ tv[1].tv_sec = pre_st.st_atime; -+ tv[1].tv_usec = 0; -+#endif - } - - /* Open the file. */ -@@ -1702,7 +1718,7 @@ handle_elf (int fd, Elf *elf, const char - /* If requested, preserve the timestamp. */ - if (tvp != NULL) - { -- if (futimes (fd, tvp) != 0) -+ if (FUTIMES (fd, output_fname, tvp) != 0) - { - error (0, errno, gettext ("\ - cannot set access and modification date of '%s'"), -@@ -1759,7 +1775,7 @@ handle_ar (int fd, Elf *elf, const char - - if (tvp != NULL) - { -- if (unlikely (futimes (fd, tvp) != 0)) -+ if (unlikely (FUTIMES (fd, fname, tvp) != 0)) - { - error (0, errno, gettext ("\ - cannot set access and modification date of '%s'"), fname); ---- elfutils/tests/ChangeLog -+++ elfutils/tests/ChangeLog -@@ -549,6 +549,11 @@ - * Makefile.am (TESTS): Add run-elflint-test.sh. - (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. - -+2005-05-31 Roland McGrath <roland@redhat.com> -+ -+ * Makefile.am (WEXTRA): New variable, substituted by configure. -+ (AM_CFLAGS): Use it in place of -Wextra. -+ - 2005-05-24 Ulrich Drepper <drepper@redhat.com> - - * get-files.c (main): Use correct format specifier. ---- elfutils/tests/Makefile.am -+++ elfutils/tests/Makefile.am -@@ -25,12 +25,13 @@ - ## <http://www.openinventionnetwork.com>. - ## - DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE -+WEXTRA = @WEXTRA@ - if MUDFLAP --AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ -+AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - BUILD_RPATH = \$$ORIGIN/../backends - else --AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ -+AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \ - $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf - endif ---- elfutils/tests/Makefile.in -+++ elfutils/tests/Makefile.in -@@ -322,6 +322,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ -+LD_AS_NEEDED = @LD_AS_NEEDED@ - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -351,6 +352,7 @@ SHELL = @SHELL@ - STRIP = @STRIP@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ -+WEXTRA = @WEXTRA@ - XGETTEXT = @XGETTEXT@ - XGETTEXT_015 = @XGETTEXT_015@ - YACC = @YACC@ -@@ -405,10 +407,10 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ -+@MUDFLAP_FALSE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \ - @MUDFLAP_FALSE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - --@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ -+@MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\ - @MUDFLAP_TRUE@ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - - @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends diff --git a/libs/elfutils/elfutils-0.129.tar.gz.sig b/libs/elfutils/elfutils-0.129.tar.gz.sig Binary files differdeleted file mode 100644 index 9a67e65a88..0000000000 --- a/libs/elfutils/elfutils-0.129.tar.gz.sig +++ /dev/null diff --git a/libs/libelf/HISTORY b/libs/libelf/HISTORY index 90fe7c9050..55d3db7b96 100644 --- a/libs/libelf/HISTORY +++ b/libs/libelf/HISTORY @@ -1,3 +1,6 @@ +2008-08-20 Thomas Orgis <sobukus@sourcemage.org> + * PROVIDES: LIBELF + 2008-06-09 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.8.10 diff --git a/libs/libelf/PROVIDES b/libs/libelf/PROVIDES new file mode 100644 index 0000000000..b66e7d0567 --- /dev/null +++ b/libs/libelf/PROVIDES @@ -0,0 +1,2 @@ +LIBELF + diff --git a/printer/foomatic-db-hpijs/DETAILS b/printer/foomatic-db-hpijs/DETAILS index a343261602..be938b8638 100755 --- a/printer/foomatic-db-hpijs/DETAILS +++ b/printer/foomatic-db-hpijs/DETAILS @@ -1,13 +1,12 @@ SPELL=foomatic-db-hpijs - VERSION=1.4-1 - SOURCE=${SPELL}-${VERSION}.tar.gz -SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} + VERSION=snapshot + SOURCE=${SPELL}-current.tar.gz +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-current SOURCE_URL[0]=http://www.linuxprinting.org/download/foomatic/${SOURCE} WEB_SITE=http://www.linuxprinting.org/foomatic.html LICENSE[0]=GPL - SOURCE_GPG="gurus.gpg:${SOURCE}.sig" + SOURCE_IGNORE=unversioned ENTERED=20020405 - UPDATED=20020420 KEYWORDS="printer xml" SHORT="Foomatic printing system's XML data generators for HP's HPIJS driver." cat << EOF diff --git a/printer/foomatic-db-hpijs/FINAL b/printer/foomatic-db-hpijs/FINAL new file mode 100755 index 0000000000..b94d754dd8 --- /dev/null +++ b/printer/foomatic-db-hpijs/FINAL @@ -0,0 +1,3 @@ +cd $BUILD_DIRECTORY && +rm foomatic-db-hpijs-current && +rm_source_dir $CURRENT_RELEASE diff --git a/printer/foomatic-db-hpijs/HISTORY b/printer/foomatic-db-hpijs/HISTORY index 5ffe754d13..6a7e4886dd 100644 --- a/printer/foomatic-db-hpijs/HISTORY +++ b/printer/foomatic-db-hpijs/HISTORY @@ -1,3 +1,6 @@ +2008-08-21 Martin Spitzbarth <m.spitzbarth@gmx.de> + * DETAILS: use the current version which is only available as snapshots + 2008-08-15 Ethan Grammatikidis <eekee57@fastmail.fm> * DEPENDS: hpijs => hplip diff --git a/printer/foomatic-db-hpijs/PRE_BUILD b/printer/foomatic-db-hpijs/PRE_BUILD new file mode 100755 index 0000000000..5eabd8d6f3 --- /dev/null +++ b/printer/foomatic-db-hpijs/PRE_BUILD @@ -0,0 +1,5 @@ +CURRENT_RELEASE=`tar tzf ${SOURCE_CACHE}/foomatic-db-hpijs-current.tar.gz | head -1 | cut -d / -f 1` && +mk_source_dir ${BUILD_DIRECTORY}/${CURRENT_RELEASE} && +unpack_file && +cd ${BUILD_DIRECTORY} && +ln -s ${CURRENT_RELEASE} foomatic-db-hpijs-current diff --git a/printer/foomatic-db-hpijs/foomatic-db-hpijs-1.4-1.tar.gz.sig b/printer/foomatic-db-hpijs/foomatic-db-hpijs-1.4-1.tar.gz.sig Binary files differdeleted file mode 100644 index 506b3f6788..0000000000 --- a/printer/foomatic-db-hpijs/foomatic-db-hpijs-1.4-1.tar.gz.sig +++ /dev/null diff --git a/science/xephem/CONFIGURE b/science/xephem/CONFIGURE index 44d74aae17..1ce5d18311 100755 --- a/science/xephem/CONFIGURE +++ b/science/xephem/CONFIGURE @@ -1,8 +1 @@ -if ! grep -q CONFIGURED ${SPELL_CONFIG} -then - if query "Do you want the documentation (v 3.5.2)?" y - then echo 'doc="y"' >> ${SPELL_CONFIG} - fi - - echo "CONFIGURED='y'" >> ${SPELL_CONFIG} -fi +config_query X_DOCS "Do you want the documentation (v 3.5.2)?" y diff --git a/science/xephem/HISTORY b/science/xephem/HISTORY index b26d14fe46..46d2b7ace9 100644 --- a/science/xephem/HISTORY +++ b/science/xephem/HISTORY @@ -1,3 +1,7 @@ +2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * INSTALL, CONFIGURE: removed bit rot + * INSTALL: don't install to /usr/local #11507 + 2007-03-24 Jeremy Blosser <jblosser-smgl@firinn.org> * DEPENDS: Add groff, fix bug 11617. diff --git a/science/xephem/INSTALL b/science/xephem/INSTALL index ad0b5db2b3..ac26f6a8ce 100755 --- a/science/xephem/INSTALL +++ b/science/xephem/INSTALL @@ -1,18 +1,14 @@ -cp xephem /usr/bin && -mkdir -p /etc/xephem && -cp -R auxil /etc/xephem && -cp -R catalogs /etc/xephem && -cp -R fifos /etc/xephem && -cp -R fits /etc/xephem && -cp -R help /usr/local/xephem && -cp -R gallery /usr/local/xephem && -cp -R lo /usr/local/xephem && -touch /usr/lib/X11/app-defaults/XEphem && -echo "XEphem.ShareDir: /etc/xephem" > /usr/lib/X11/app-defaults/XEphem && -cp xephem.man /usr/man/man1/xephem.1 && +cp xephem "$INSTALL_ROOT"/usr/bin && +mkdir -p "$INSTALL_ROOT"/etc/xephem && +cp -R auxil catalogs fifos fits "$INSTALL_ROOT"/etc/xephem && +mkdir -p "$INSTALL_ROOT"/usr/share/xephem && +cp -R help gallery lo "$INSTALL_ROOT"/usr/share/xephem && +mkdir -p "$INSTALL_ROOT"/usr/lib/X11/app-defaults/ && +echo "XEphem.ShareDir: $TRACK_ROOT/etc/xephem" > "$INSTALL_ROOT"/usr/lib/X11/app-defaults/XEphem && +cp xephem.man "$INSTALL_ROOT"/usr/man/man1/xephem.1 && -if grep -q 'doc="y"' ${SPELL_CONFIG} +if [[ X_DOCS == "y" ]] then - mkdir -p /usr/doc/xephem && - cp /var/spool/sorcery/${SPELL}-3.5.2.pdf /usr/doc/xephem + mkdir -p "$INSTALL_ROOT"/usr/share/doc/xephem && + cp "$SOURCE_CACHE"/$SPELL-3.5.2.pdf "$INSTALL_ROOT"/usr/share/doc/xephem fi diff --git a/smgl/bashdoc/DETAILS b/smgl/bashdoc/DETAILS index f996d85868..d9a62da97a 100755 --- a/smgl/bashdoc/DETAILS +++ b/smgl/bashdoc/DETAILS @@ -2,7 +2,7 @@ VERSION=0.2 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=http://download.sourcemage.org/distro/projects/bashdoc/$SOURCE + SOURCE_URL[0]=http://download.sourcemage.org/projects/bashdoc/$SOURCE SOURCE_GPG=gurus.gpg:$SOURCE.sig:UPSTREAM_KEY WEB_SITE=http://wiki.sourcemage.org/bashdoc ENTERED=20040223 diff --git a/smgl/bashdoc/HISTORY b/smgl/bashdoc/HISTORY index 8428b0f167..ab4ddc35d6 100644 --- a/smgl/bashdoc/HISTORY +++ b/smgl/bashdoc/HISTORY @@ -1,3 +1,6 @@ +2008-08-21 Robert Figura <template@sourcemage.org> + * DETAILS: fixed SOURCE_URL[0] + 2008-04-14 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * INSTALL: removed incorporated code * DETAILS: Fixed SOURCE_URL[0] diff --git a/smgl/bashdoc/bashdoc-0.1.8.tar.bz2.sig b/smgl/bashdoc/bashdoc-0.1.8.tar.bz2.sig Binary files differdeleted file mode 100644 index e0fe03cd6b..0000000000 --- a/smgl/bashdoc/bashdoc-0.1.8.tar.bz2.sig +++ /dev/null diff --git a/smgl/bashdoc/bashdoc-0.2.tar.bz2.sig b/smgl/bashdoc/bashdoc-0.2.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..28b56bfbe7 --- /dev/null +++ b/smgl/bashdoc/bashdoc-0.2.tar.bz2.sig 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 diff --git a/video/luvcview/BUILD b/video/luvcview/BUILD new file mode 100755 index 0000000000..8f58e6df93 --- /dev/null +++ b/video/luvcview/BUILD @@ -0,0 +1 @@ +make diff --git a/video/luvcview/DEPENDS b/video/luvcview/DEPENDS new file mode 100755 index 0000000000..7ddd3ee43a --- /dev/null +++ b/video/luvcview/DEPENDS @@ -0,0 +1 @@ +depends sdl diff --git a/video/luvcview/DETAILS b/video/luvcview/DETAILS new file mode 100755 index 0000000000..886c500877 --- /dev/null +++ b/video/luvcview/DETAILS @@ -0,0 +1,15 @@ + SPELL=luvcview + VERSION=20070512 + SOURCE=$SPELL-$VERSION.tar.gz +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION + SOURCE_URL[0]=http://mxhaard.free.fr/spca50x/Investigation/uvc/$SOURCE + SOURCE_HASH=sha512:2efd7221fb6edbdc327b79859b0f2e33f87574f7201a62d1b6b0a32d3cfd48281943744a7e3c752096af3f1fcc0f3b0631e9ac378f60ffd323bfe72c0d4c273d + WEB_SITE=http://linux-uvc.berlios.de/ + ENTERED=20080821 + LICENSE[0]=GPL + KEYWORDS="video" + SHORT="sdl video usb video class grabber" +cat << EOF +luvcview: Sdl video Usb Video Class grabber +This package work with the Logitech UVC based webcams with the mjpeg feature. +EOF diff --git a/video/luvcview/HISTORY b/video/luvcview/HISTORY new file mode 100644 index 0000000000..a415978cb9 --- /dev/null +++ b/video/luvcview/HISTORY @@ -0,0 +1,3 @@ +2008-08-21 Ladislav Hagara <hgr@vabo.cz> + * DETAILS, DEPENDS, PRE_BUILD, BUILD: spell created, version 20070512 + diff --git a/video/luvcview/PRE_BUILD b/video/luvcview/PRE_BUILD new file mode 100755 index 0000000000..076b994efc --- /dev/null +++ b/video/luvcview/PRE_BUILD @@ -0,0 +1,2 @@ +default_pre_build && +sed -i 's/BIN=\/usr\/local\/bin/BIN=\/usr\/bin/g' ${SOURCE_DIRECTORY}/Makefile diff --git a/x11/lavaps/BUILD b/x11/lavaps/BUILD index 3f4aea47dc..8c2cfe9055 100755 --- a/x11/lavaps/BUILD +++ b/x11/lavaps/BUILD @@ -13,4 +13,7 @@ fi && --disable-schemas-install \ $OPTS && -make +make_single && +make && +make_normal + diff --git a/x11/lavaps/HISTORY b/x11/lavaps/HISTORY index 1f5821b920..4c90bb4a02 100644 --- a/x11/lavaps/HISTORY +++ b/x11/lavaps/HISTORY @@ -1,3 +1,8 @@ +2008-08-21 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * BUILD: make_single, failed with 5 jobs + * PRE_BUILD, 2 2.7 patches: made it compile using gentoo patches #14651 + * POST_INSTALL: fixed inclusion of build stuff into the docdir + 2008-08-19 Robert Figura <rfigura@sourcemage.org> * DEPENDS: added dependency for libgnomeui diff --git a/x11/lavaps/POST_INSTALL b/x11/lavaps/POST_INSTALL new file mode 100755 index 0000000000..cb7312b7ff --- /dev/null +++ b/x11/lavaps/POST_INSTALL @@ -0,0 +1,3 @@ +default_post_install && +cd TRANSL/usr/share/doc/lavaps && +rm doc/Makefile* doc/pod* doc/master.pod doc/lavaps.1 diff --git a/x11/lavaps/PRE_BUILD b/x11/lavaps/PRE_BUILD new file mode 100755 index 0000000000..8a08f465cd --- /dev/null +++ b/x11/lavaps/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && + +patch -p1 < $SPELL_DIRECTORY/lavaps-2.7-build-fixes.patch +patch -p1 < $SPELL_DIRECTORY/lavaps-2.7-gcc43.patch diff --git a/x11/lavaps/lavaps-2.7-build-fixes.patch b/x11/lavaps/lavaps-2.7-build-fixes.patch new file mode 100644 index 0000000000..08111f5e66 --- /dev/null +++ b/x11/lavaps/lavaps-2.7-build-fixes.patch @@ -0,0 +1,34 @@ +--- lavaps-2.7/src/process_model.cc ++++ lavaps-2.7/src/process_model.cc +@@ -86,7 +86,7 @@ + void + process_model::dump() + { +- cout << int(this) << " "<< pid_ << " " << uid_ << " " << cmd_.c_str() << " " << ++ cout << long(this) << " "<< pid_ << " " << uid_ << " " << cmd_.c_str() << " " << + endl; + } + +--- lavaps-2.7/src/blob.cc ++++ lavaps-2.7/src/blob.cc +@@ -503,7 +503,7 @@ + blob::print() + { + ENTRY_TRACE(__FILE__,__LINE__); +- cout << O_("blob: ") << (unsigned)this << O_(" x=") << x_ << O_(" step=") << x_step_ << O_(" num=") << num_ << O_(":"); ++ cout << O_("blob: ") << (unsigned long)this << O_(" x=") << x_ << O_(" step=") << x_step_ << O_(" num=") << num_ << O_(":"); + for (int i = 0; i < num_; i++) { + cout << O_(" ") << y_lows_[i] << O_("-") << y_highs_[i]; + }; +--- lavaps-2.7/src/linux/proc/ps.h ++++ lavaps-2.7/src/linux/proc/ps.h +@@ -5,9 +5,6 @@ + /* get definition of HZ */ + #include <asm/param.h> + +-/* get page info */ +-#include <asm/page.h> +- + char *wchan(unsigned long); + char *find_func(unsigned long address); + void *xcalloc(void *pointer, int size); diff --git a/x11/lavaps/lavaps-2.7-gcc43.patch b/x11/lavaps/lavaps-2.7-gcc43.patch new file mode 100644 index 0000000000..9e79ec16bc --- /dev/null +++ b/x11/lavaps/lavaps-2.7-gcc43.patch @@ -0,0 +1,30 @@ +diff -NrU5 lavaps-2.7.orig/src/const_str.hh lavaps-2.7/src/const_str.hh +--- lavaps-2.7.orig/src/const_str.hh 2008-06-29 14:39:09.000000000 +0200 ++++ lavaps-2.7/src/const_str.hh 2008-06-29 14:39:29.000000000 +0200 +@@ -22,10 +22,11 @@ + + + #ifndef lavaps_const_str_h + #define lavaps_const_str_h + ++#include <cstdlib> + #include <string.h> + + class const_str { + protected: + const char *rep_; +diff -NrU5 lavaps-2.7.orig/src/lava_signal.cc lavaps-2.7/src/lava_signal.cc +--- lavaps-2.7.orig/src/lava_signal.cc 2008-06-29 14:38:04.000000000 +0200 ++++ lavaps-2.7/src/lava_signal.cc 2008-06-29 14:40:13.000000000 +0200 +@@ -28,10 +28,11 @@ + #include "main.hh" + + #include <sys/time.h> + #include <sys/resource.h> + #include <sys/types.h> ++#include <cstring> + #include <signal.h> + + int + lava_signal(int pid, int sig) + { |