From 68b3c0e550c8bf2727836aa2b9b1039a332e8e32 Mon Sep 17 00:00:00 2001 From: hackbard Date: Fri, 12 Aug 2005 02:42:46 +0000 Subject: [PATCH] more fixes/updates --- packages/hackbard/dfbsee/dfbsee | 12 +++--------- packages/science/gnuplot/gnuplot | 22 +++++++++++----------- packages/science/grace/grace | 4 ++-- packages/x11/imagemagick/imagemagick | 13 +++++++------ packages/x11/pango/pango | 6 ++---- packages/x11/qt/qt | 12 +++++++----- 6 files changed, 32 insertions(+), 37 deletions(-) diff --git a/packages/hackbard/dfbsee/dfbsee b/packages/hackbard/dfbsee/dfbsee index e2c2a71..4329a41 100644 --- a/packages/hackbard/dfbsee/dfbsee +++ b/packages/hackbard/dfbsee/dfbsee @@ -2,14 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] cvs +# [V] 0.7.4 # [S] 3-6 -# [D] dfbsee.tar.bz2 cvs:anonymous:directfb.org:cvs/directfb:DFBSee +# [D] DFBSee-0.7.4.tar.gz http://directfb.org/downloads/Programs/ -srcdir="DFBSee" - -export PKG_CONFIG=/usr/bin/pkg-config - -pre_install() { - ./autogen.sh - } +srcdir="DFBSee-$ver" diff --git a/packages/science/gnuplot/gnuplot b/packages/science/gnuplot/gnuplot index a924ce7..7a19ac7 100644 --- a/packages/science/gnuplot/gnuplot +++ b/packages/science/gnuplot/gnuplot @@ -4,18 +4,18 @@ # # [V] 4.0.0 # [S] 3-6 -# [D] gnuplot-4.0.0.tar.gz ftp://ftp.ucc.ie/pub/gnuplot/ +# [D] gnuplot-4.0.0.tar.gz ftp://ftp.gnuplot.info/pub/gnuplot/ flist_pruned="$flist_pruned|usr/include/libpng12/pngconf.h" confopt="$confopt --without-gd" -pre_install() { - # ugly hack - modify pngconf.h - cp $prefix/include/libpng12/pngconf.h orig~ - sed 's%__png.h__%// __png.h__%' orig~ > tmp~ - sed 's%__dont__%// __dont__%' tmp~ > $prefix/include/libpng12/pngconf.h - } - -post_install() { - cp orig~ $prefix/include/libpng12/pngconf.h - } +#pre_install() { +# # ugly hack - modify pngconf.h +# cp $prefix/include/libpng12/pngconf.h orig~ +# sed 's%__png.h__%// __png.h__%' orig~ > tmp~ +# sed 's%__dont__%// __dont__%' tmp~ > $prefix/include/libpng12/pngconf.h +# } +# +#post_install() { +# cp orig~ $prefix/include/libpng12/pngconf.h +# } diff --git a/packages/science/grace/grace b/packages/science/grace/grace index 9101ea3..50fd164 100644 --- a/packages/science/grace/grace +++ b/packages/science/grace/grace @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 5.1.16 +# [V] 5.1.18 # [S] 3-6 -# [D] grace-5.1.16.tar.gz ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ +# [D] grace-5.1.18.tar.gz ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/ # install to /opt/grace confopt="--prefix=$root/opt" diff --git a/packages/x11/imagemagick/imagemagick b/packages/x11/imagemagick/imagemagick index c511dff..8711891 100644 --- a/packages/x11/imagemagick/imagemagick +++ b/packages/x11/imagemagick/imagemagick @@ -2,14 +2,15 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 6.2.3-5 +# [V] 6.2.3-6 # [S] 3-6 -# [D] ImageMagick-6.2.3-5.tar.bz2 http://www.imagemagick.org/download/ +# [D] ImageMagick-6.2.3-6.tar.bz2 http://www.imagemagick.org/download/ xtraver="`echo $ver | awk -F- '{ print $1 }'`" srcdir="ImageMagick-${xtraver}" +confopt="$confopt --with-modules" -export CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS" - -confopt="$confopt --enable-shared --with-modules --enable-lzw" -confopt="$confopt --enable-16bit-pixel --with-x" +pre_install() { + sed 's/\$(LIBLTDL) \$/\$/' Makefile.in > tmp~ + mv tmp~ Makefile.in + } diff --git a/packages/x11/pango/pango b/packages/x11/pango/pango index e8a20ef..4391574 100644 --- a/packages/x11/pango/pango +++ b/packages/x11/pango/pango @@ -2,11 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.5.0 +# [V] 1.9.1 # [S] 3-6 -# [D] pango-1.5.0.tar.bz2 http://ftp.gnome.org/pub/gnome/sources/pango/1.5/ - -export PKG_CONFIG_PATH="/usr/X11R6/lib/pkgconfig" +# [D] pango-1.9.1.tar.bz2 http://ftp.gnome.org/pub/gnome/sources/pango/1.9/ # optional # confopt="$confopt --disable-debug" diff --git a/packages/x11/qt/qt b/packages/x11/qt/qt index 826e30c..9cf6d77 100644 --- a/packages/x11/qt/qt +++ b/packages/x11/qt/qt @@ -17,11 +17,13 @@ pre_install() { mv -vf configure_tmp configure ; chmod 755 configure } -confopt="-prefix $prefix -headerdir $root/usr/include/qt" -confopt="$confopt -docdir $docdir" -confopt="$confopt -system-zlib -thread -no-stl -no-g++-exceptions" -confopt="$confopt -system-libpng -system-libjpeg -qt-gif" -confopt="$confopt -plugin-imgfmt-mng" +confopt="-prefix $prefix -headerdir $prefix/include/qt -docdir $docdir" +confopt="$confopt -plugindir $prefix/lib/qt/plugins -datadir $prefix/share/qt" +confopt="$confopt -translationdir $prefix/share/qt/translation" +confopt="$confopt -sysconfdir $sysconfdir/qt" +confopt="$confopt -thread -no-exceptions" +confopt="$confopt -system-zlib -system-libpng -system-libjpeg -qt-gif" +confopt="$confopt -plugin-imgfmt-mng -plugin-imgfmt-png" post_install() { # compatibility symlinks -- 2.39.2