wok rev 16885

Strip deps: gettext -> gettext-base.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jul 13 23:12:56 2014 +0300 (2014-07-13)
parents 16be2bb769c6
children bb9bf4103dfd
files freeciv/receipt gliv/receipt hexchat-plugin/receipt hexchat/receipt poedit/receipt sbackup/receipt warmux-music/receipt warmux/receipt xchat-plugin/receipt xchat/receipt
line diff
     1.1 --- a/freeciv/receipt	Sun Jul 13 15:40:48 2014 -0300
     1.2 +++ b/freeciv/receipt	Sun Jul 13 23:12:56 2014 +0300
     1.3 @@ -3,22 +3,27 @@
     1.4  PACKAGE="freeciv"
     1.5  VERSION="2.2.5"
     1.6  CATEGORY="games"
     1.7 -SHORT_DESC="Empire-building strategy game."
     1.8 +SHORT_DESC="Empire-building strategy game"
     1.9  MAINTAINER="pascal.bellard@slitaz.org"
    1.10  LICENSE="GPL2"
    1.11 +WEB_SITE="http://freeciv.wikia.com/wiki/Main_Page"
    1.12  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.13 -WEB_SITE="http://freeciv.wikia.com/wiki/Main_Page"
    1.14  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.15 -DEPENDS="zlib ncurses readline gtk+ gettext xorg-libXdamage libsdl-mixer bzip2"
    1.16 -BUILD_DEPENDS="zlib-dev ncurses-dev readline-dev gtk+-dev gettext libsdl-mixer-dev glibc-locale bzip2-dev expat-dev"
    1.17  TAGS="strategy"
    1.18  
    1.19 +DEPENDS="zlib ncurses readline gtk+ gettext-base xorg-libXdamage libsdl-mixer \
    1.20 +bzip2"
    1.21 +BUILD_DEPENDS="zlib-dev ncurses-dev readline-dev gtk+-dev gettext \
    1.22 +libsdl-mixer-dev glibc-locale bzip2-dev expat-dev"
    1.23 +
    1.24  # Rules to configure and make the package.
    1.25  compile_rules()
    1.26  {
    1.27 -	cd $src
    1.28  	sed -i 's/--best/-9/' Makefile* data/scenario/Makefile*
    1.29 -	./configure --enable-client=gtk --enable-shared \
    1.30 +
    1.31 +	./configure \
    1.32 +		--enable-client=gtk \
    1.33 +		--enable-shared \
    1.34  		$CONFIGURE_ARGS &&
    1.35  	make -j1 &&
    1.36  	make -j1 install
     2.1 --- a/gliv/receipt	Sun Jul 13 15:40:48 2014 -0300
     2.2 +++ b/gliv/receipt	Sun Jul 13 23:12:56 2014 +0300
     2.3 @@ -6,19 +6,21 @@
     2.4  SHORT_DESC="An image viewer that uses OpenGL"
     2.5  MAINTAINER="devl547@gmail.com"
     2.6  LICENSE="GPL2"
     2.7 +WEB_SITE="http://guichaz.free.fr/gliv/"
     2.8  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     2.9 -WEB_SITE="http://guichaz.free.fr/gliv/"
    2.10  WGET_URL="$WEB_SITE/files/$TARBALL"
    2.11  
    2.12 +DEPENDS="gtk+ gtkglext gettext-base"
    2.13  BUILD_DEPENDS="gtk+-dev gtkglext gtkglext-dev bison mesa-dev"
    2.14 -DEPENDS="gtk+ gtkglext gettext"
    2.15  
    2.16  # Rules to configure and make the package.
    2.17  compile_rules()
    2.18  {
    2.19 -	cd $src
    2.20 -	./configure --prefix=/usr --infodir=/usr/share/info \
    2.21 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    2.22 +	./configure \
    2.23 +		--prefix=/usr \
    2.24 +		--infodir=/usr/share/info \
    2.25 +		--mandir=/usr/share/man \
    2.26 +		$CONFIGURE_ARGS &&
    2.27  	make &&
    2.28  	make DESTDIR=$DESTDIR install
    2.29  }
     3.1 --- a/hexchat-plugin/receipt	Sun Jul 13 15:40:48 2014 -0300
     3.2 +++ b/hexchat-plugin/receipt	Sun Jul 13 23:12:56 2014 +0300
     3.3 @@ -6,39 +6,39 @@
     3.4  SHORT_DESC="IRC client using GTK+ with plugins support"
     3.5  MAINTAINER="lenios@slitaz.org"
     3.6  LICENSE="GPL2"
     3.7 +WEB_SITE="http://hexchat.github.io/"
     3.8  SOURCE="hexchat"
     3.9  TARBALL="$SOURCE-$VERSION.tar.xz"
    3.10 -WEB_SITE="http://hexchat.github.io/"
    3.11  WGET_URL="http://dl.hexchat.net/hexchat/$TARBALL"
    3.12  PROVIDE="hexchat"
    3.13  
    3.14 -DEPENDS="gtk+ dbus openssl gettext dbus-glib xorg-libXdamage python"
    3.15 +DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage python"
    3.16  BUILD_DEPENDS="gtk+-dev dbus-dev openssl shared-mime-info python-dev"
    3.17  
    3.18  # Rules to configure and make the package.
    3.19  compile_rules()
    3.20  {
    3.21 -    cd $src
    3.22 -    sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \
    3.23 -	   -e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|'
    3.24 -    sed -i 's|glib/ghash.h|glib.h|' src/common/servlist.c src/common/text.c
    3.25 -    sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c
    3.26 -    ./configure  --prefix=/usr \
    3.27 -	  --infodir=/usr/share/info \
    3.28 -	  --mandir=/usr/share/man \
    3.29 -	  --disable-tcl \
    3.30 -	  --enable-spell=static \
    3.31 -	  --enable-ipv6 \
    3.32 -      $CONFIGURE_ARGS &&
    3.33 -    make &&
    3.34 -    make DESTDIR=$DESTDIR install
    3.35 +	sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \
    3.36 +		-e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|'
    3.37 +	sed -i 's|glib/ghash.h|glib.h|' src/common/servlist.c src/common/text.c
    3.38 +	sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c
    3.39 +
    3.40 +	./configure \
    3.41 +		--prefix=/usr \
    3.42 +		--infodir=/usr/share/info \
    3.43 +		--mandir=/usr/share/man \
    3.44 +		--disable-tcl \
    3.45 +		--enable-spell=static \
    3.46 +		--enable-ipv6 \
    3.47 +		$CONFIGURE_ARGS &&
    3.48 +	make &&
    3.49 +	make DESTDIR=$DESTDIR install
    3.50  }
    3.51  
    3.52  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.53  genpkg_rules()
    3.54  {
    3.55 -    mkdir -p $fs/usr \
    3.56 -    	$fs/usr/share
    3.57 -    cp -a $install/usr/bin $fs/usr
    3.58 -#    cp -a $install/usr/share/dbus-1 $fs/usr/share
    3.59 +	mkdir -p $fs/usr
    3.60 +	cp -a $install/usr/bin $fs/usr
    3.61 +	# cp -a $install/usr/share/dbus-1 $fs/usr/share
    3.62  }
     4.1 --- a/hexchat/receipt	Sun Jul 13 15:40:48 2014 -0300
     4.2 +++ b/hexchat/receipt	Sun Jul 13 23:12:56 2014 +0300
     4.3 @@ -6,34 +6,33 @@
     4.4  SHORT_DESC="IRC client using GTK+"
     4.5  MAINTAINER="lenios@slitaz.org"
     4.6  LICENSE="GPL2"
     4.7 +WEB_SITE="http://hexchat.github.io/"
     4.8  TARBALL="$PACKAGE-$VERSION.tar.xz"
     4.9 -WEB_SITE="http://hexchat.github.io/"
    4.10  WGET_URL="http://dl.hexchat.net/hexchat/$TARBALL"
    4.11  
    4.12 -DEPENDS="gtk+ dbus openssl gettext dbus-glib xorg-libXdamage python"
    4.13 +DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage python"
    4.14  BUILD_DEPENDS="gtk+-dev dbus-dev openssl shared-mime-info python-dev"
    4.15  
    4.16  # Rules to configure and make the package.
    4.17  compile_rules()
    4.18  {
    4.19 -    cd $src
    4.20 -    ./configure  --prefix=/usr \
    4.21 -	  --infodir=/usr/share/info \
    4.22 -	  --mandir=/usr/share/man \
    4.23 -	  --disable-plugin \
    4.24 -	  --disable-tcl \
    4.25 -	  --enable-spell=static \
    4.26 -	  --enable-ipv6 \
    4.27 -      $CONFIGURE_ARGS &&
    4.28 -    make &&
    4.29 -    make DESTDIR=$DESTDIR install
    4.30 +	./configure \
    4.31 +		--prefix=/usr \
    4.32 +		--infodir=/usr/share/info \
    4.33 +		--mandir=/usr/share/man \
    4.34 +		--disable-plugin \
    4.35 +		--disable-tcl \
    4.36 +		--enable-spell=static \
    4.37 +		--enable-ipv6 \
    4.38 +		$CONFIGURE_ARGS &&
    4.39 +	make &&
    4.40 +	make DESTDIR=$DESTDIR install
    4.41  }
    4.42  
    4.43  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.44  genpkg_rules()
    4.45  {
    4.46 -    mkdir -p $fs/usr \
    4.47 -    	$fs/usr/share
    4.48 -    cp -a $install/usr/bin $fs/usr
    4.49 -   # cp -a $install/usr/share/dbus-1 $fs/usr/share
    4.50 +	mkdir -p $fs/usr
    4.51 +	cp -a $install/usr/bin $fs/usr
    4.52 +	# cp -a $install/usr/share/dbus-1 $fs/usr/share
    4.53  }
     5.1 --- a/poedit/receipt	Sun Jul 13 15:40:48 2014 -0300
     5.2 +++ b/poedit/receipt	Sun Jul 13 23:12:56 2014 +0300
     5.3 @@ -3,23 +3,25 @@
     5.4  PACKAGE="poedit"
     5.5  VERSION="1.4.6.1"
     5.6  CATEGORY="development"
     5.7 -SHORT_DESC="Editor for i18n po files."
     5.8 +SHORT_DESC="Editor for i18n po files"
     5.9  MAINTAINER="pankso@slitaz.org"
    5.10  LICENSE="MIT"
    5.11 +WEB_SITE="http://www.poedit.net/"
    5.12  TARBALL="$PACKAGE-$VERSION.tar.gz"
    5.13 -WEB_SITE="http://www.poedit.net/"
    5.14  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    5.15  
    5.16 -DEPENDS="xorg wxWidgets pango gettext libdb xorg-libXdamage xorg-libXxf86vm \
    5.17 -gtkspell"
    5.18 +DEPENDS="xorg wxWidgets pango gettext-base libdb xorg-libXdamage \
    5.19 +xorg-libXxf86vm gtkspell"
    5.20  BUILD_DEPENDS="wxWidgets-dev gettext"
    5.21  
    5.22  # Rules to configure and make the package.
    5.23  compile_rules()
    5.24  {
    5.25 -	cd $src
    5.26 -	./configure --prefix=/usr --infodir=/usr/share/info \
    5.27 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    5.28 +	./configure \
    5.29 +		--prefix=/usr \
    5.30 +		--infodir=/usr/share/info \
    5.31 +		--mandir=/usr/share/man \
    5.32 +		$CONFIGURE_ARGS &&
    5.33  	make &&
    5.34  	make DESTDIR=$DESTDIR install
    5.35  }
    5.36 @@ -27,10 +29,9 @@
    5.37  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.38  genpkg_rules()
    5.39  {
    5.40 -	mkdir -p $fs/usr/share/locale
    5.41 +	mkdir -p $fs/usr/share
    5.42  	cp -a $install/usr/bin $fs/usr
    5.43  	cp -a $install/usr/share/pixmaps $fs/usr/share
    5.44  	cp -a $install/usr/share/poedit $fs/usr/share
    5.45 -    	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
    5.46  }
    5.47  
     6.1 --- a/sbackup/receipt	Sun Jul 13 15:40:48 2014 -0300
     6.2 +++ b/sbackup/receipt	Sun Jul 13 23:12:56 2014 +0300
     6.3 @@ -3,21 +3,20 @@
     6.4  PACKAGE="sbackup"
     6.5  VERSION="0.11.4"
     6.6  CATEGORY="network"
     6.7 -SHORT_DESC="Simple backup."
     6.8 +SHORT_DESC="Simple backup"
     6.9  MAINTAINER="pascal.bellard@slitaz.org"
    6.10  LICENSE="GPL3"
    6.11  WEB_SITE="http://sourceforge.net/projects/sbackup/"
    6.12  TARBALL="${PACKAGE}_$VERSION.tar.gz"
    6.13  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    6.14  
    6.15 -DEPENDS="python notify-python gettext pygtk gvfs fuse \
    6.16 -sshfs-fuse curlftpfs desktop-file-utils"
    6.17 +DEPENDS="python notify-python gettext-base pygtk gvfs fuse sshfs-fuse \
    6.18 +curlftpfs desktop-file-utils"
    6.19  BUILD_DEPENDS="$DEPENDS setuptools"
    6.20  
    6.21  # Rules to configure and make the package.
    6.22  compile_rules()
    6.23  {
    6.24 -	cd $src
    6.25  	make && make DESTDIR=$DESTDIR/usr install
    6.26  	# sudo sbackupconfig
    6.27  }
     7.1 --- a/warmux-music/receipt	Sun Jul 13 15:40:48 2014 -0300
     7.2 +++ b/warmux-music/receipt	Sun Jul 13 23:12:56 2014 +0300
     7.3 @@ -3,13 +3,12 @@
     7.4  PACKAGE="warmux-music"
     7.5  VERSION="11.04.1"
     7.6  CATEGORY="games"
     7.7 -SHORT_DESC="Warmux game music (~35Mb)."
     7.8 -WANTED="warmux"
     7.9 +SHORT_DESC="Warmux game music (~35Mb)"
    7.10  MAINTAINER="slaxemulator@gmail.com"
    7.11  LICENSE="GPL2"
    7.12  WEB_SITE="http://www.wormux.org/"
    7.13 -PROVIDE="wormux"
    7.14  
    7.15 +WANTED="warmux"
    7.16  DEPENDS="warmux"
    7.17  
    7.18  # Rules to gen a SliTaz package suitable for Tazpkg.
     8.1 --- a/warmux/receipt	Sun Jul 13 15:40:48 2014 -0300
     8.2 +++ b/warmux/receipt	Sun Jul 13 23:12:56 2014 +0300
     8.3 @@ -3,17 +3,17 @@
     8.4  PACKAGE="warmux"
     8.5  VERSION="11.04.1"
     8.6  CATEGORY="games"
     8.7 -SHORT_DESC="Warmux game."
     8.8 +SHORT_DESC="Warmux game"
     8.9  MAINTAINER="slaxemulator@gmail.com"
    8.10  LICENSE="GPL2"
    8.11 -SUGGESTED="warmux-music"
    8.12 +WEB_SITE="http://www.wormux.org/"
    8.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    8.14 -WEB_SITE="http://www.wormux.org/"
    8.15  WGET_URL="http://download.gna.org/warmux/$TARBALL"
    8.16  PROVIDE="wormux"
    8.17 +SUGGESTED="warmux-music"
    8.18  
    8.19  DEPENDS="libsdl-gfx libsdl-image libsdl-mixer libsdl-net libsdl-ttf \
    8.20 -curl freetype libxml2 libxml++ gcc-lib-base gettext"
    8.21 +curl freetype libxml2 libxml++ gcc-lib-base gettext-base"
    8.22  BUILD_DEPENDS="libsdl-dev libsdl-gfx-dev libsdl-image-dev libsdl-mixer-dev \
    8.23  libsdl-net-dev libsdl-ttf-dev curl-dev freetype-dev libxml2-dev libxml++-dev \
    8.24  pkg-config"
    8.25 @@ -21,14 +21,11 @@
    8.26  # Rules to configure and make the package.
    8.27  compile_rules()
    8.28  {
    8.29 -	cd $src
    8.30 -	#sed -i s:"INSTALL = /usr/bin/install -c":"INSTALL = /usr/bin/install -c -d":\
    8.31 -	#	Makefile
    8.32 -	sed -i 's/test -z "$(pkgdatadir)"/test -d "$(pkgdatadir)"/'\
    8.33 -		 data/Makefile.in
    8.34 +	sed -i 's/test -z "$(pkgdatadir)"/test -d "$(pkgdatadir)"/' data/Makefile.in
    8.35  	sed -i 's|if USE_X11|if SKIP_USE_X11|' src/tool/copynpaste.cpp
    8.36  	sed -i "s|test -d \"\\\$(pkgdatadir|test -d \"\\\$(DESTDIR)\\\$(pkgdatadir|" data/Makefile*
    8.37  	mkdir -p $DESTDIR/usr/share/warmux
    8.38 +
    8.39  	./configure \
    8.40  		--bindir=/usr/games \
    8.41  		--with-font-path=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf \
    8.42 @@ -44,9 +41,9 @@
    8.43  	cp -a $install/usr/games $fs/usr
    8.44  	cp -a $install/usr/share/pixmaps $fs/usr/share
    8.45  	cp -a $install/usr/share/warmux $fs/usr/share
    8.46 +
    8.47  	# Remove unecessary files
    8.48  	rm -rf $fs/usr/share/warmux/font
    8.49  	rm -rf $fs/usr/share/warmux/music
    8.50  	#rm -rf $fs/usr/share/warmux/sound
    8.51  }
    8.52 -
     9.1 --- a/xchat-plugin/receipt	Sun Jul 13 15:40:48 2014 -0300
     9.2 +++ b/xchat-plugin/receipt	Sun Jul 13 23:12:56 2014 +0300
     9.3 @@ -6,40 +6,40 @@
     9.4  SHORT_DESC="IRC client using GTK+ with plugins support"
     9.5  MAINTAINER="lenios@slitaz.org"
     9.6  LICENSE="GPL2"
     9.7 +WEB_SITE="http://www.xchat.org/"
     9.8  SOURCE="xchat"
     9.9  TARBALL="$SOURCE-$VERSION.tar.bz2"
    9.10 -WEB_SITE="http://www.xchat.org/"
    9.11 -WGET_URL="http://www.xchat.org/files/source/2.8/$TARBALL"
    9.12 +WGET_URL="http://www.xchat.org/files/source/${VERSION%.*}/$TARBALL"
    9.13  PROVIDE="xchat"
    9.14  
    9.15 -DEPENDS="gtk+ dbus openssl gettext dbus-glib xorg-libXdamage"
    9.16 +DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage"
    9.17  BUILD_DEPENDS="gtk+-dev dbus-dev openssl shared-mime-info"
    9.18  
    9.19  # Rules to configure and make the package.
    9.20  compile_rules()
    9.21  {
    9.22 -    cd $src
    9.23 -    sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \
    9.24 -	   -e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' \
    9.25 -	   -e 's|glib/gutils.h|glib.h|' src/common/xchat.h
    9.26 -    sed -i 's|glib/ghash.h|glib.h|' src/common/servlist.c src/common/text.c
    9.27 -    sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c
    9.28 -    ./configure  --prefix=/usr \
    9.29 -	  --infodir=/usr/share/info \
    9.30 -	  --mandir=/usr/share/man \
    9.31 -	  --disable-tcl \
    9.32 -	  --enable-spell=static \
    9.33 -	  --enable-ipv6 \
    9.34 -      $CONFIGURE_ARGS &&
    9.35 -    make &&
    9.36 -    make DESTDIR=$DESTDIR install
    9.37 +	sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \
    9.38 +		-e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' \
    9.39 +		-e 's|glib/gutils.h|glib.h|' src/common/xchat.h
    9.40 +	sed -i 's|glib/ghash.h|glib.h|' src/common/servlist.c src/common/text.c
    9.41 +	sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c
    9.42 +
    9.43 +	./configure \
    9.44 +		--prefix=/usr \
    9.45 +		--infodir=/usr/share/info \
    9.46 +		--mandir=/usr/share/man \
    9.47 +		--disable-tcl \
    9.48 +		--enable-spell=static \
    9.49 +		--enable-ipv6 \
    9.50 +		$CONFIGURE_ARGS &&
    9.51 +	make &&
    9.52 +	make DESTDIR=$DESTDIR install
    9.53  }
    9.54  
    9.55  # Rules to gen a SliTaz package suitable for Tazpkg.
    9.56  genpkg_rules()
    9.57  {
    9.58 -    mkdir -p $fs/usr \
    9.59 -    	$fs/usr/share
    9.60 -    cp -a $install/usr/bin $fs/usr
    9.61 -#    cp -a $install/usr/share/dbus-1 $fs/usr/share
    9.62 +	mkdir -p $fs/usr
    9.63 +	cp -a $install/usr/bin $fs/usr
    9.64 +	# cp -a $install/usr/share/dbus-1 $fs/usr/share
    9.65  }
    10.1 --- a/xchat/receipt	Sun Jul 13 15:40:48 2014 -0300
    10.2 +++ b/xchat/receipt	Sun Jul 13 23:12:56 2014 +0300
    10.3 @@ -6,39 +6,39 @@
    10.4  SHORT_DESC="IRC client using GTK+"
    10.5  MAINTAINER="lenios@slitaz.org"
    10.6  LICENSE="GPL2"
    10.7 +WEB_SITE="http://www.xchat.org/"
    10.8  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    10.9 -WEB_SITE="http://www.xchat.org/"
   10.10 -WGET_URL="http://www.xchat.org/files/source/2.8/$TARBALL"
   10.11 +WGET_URL="http://www.xchat.org/files/source/${VERSION%.*}/$TARBALL"
   10.12  
   10.13 -DEPENDS="gtk+ dbus openssl gettext dbus-glib xorg-libXdamage"
   10.14 +DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage"
   10.15  BUILD_DEPENDS="gtk+-dev dbus-dev openssl shared-mime-info"
   10.16  
   10.17  # Rules to configure and make the package.
   10.18  compile_rules()
   10.19  {
   10.20 -    cd $src
   10.21 -    sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \
   10.22 -	   -e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' \
   10.23 -	   -e 's|glib/gutils.h|glib.h|' src/common/xchat.h
   10.24 -    sed -i 's|glib/ghash.h|glib.h|' src/common/servlist.c src/common/text.c
   10.25 -    sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c
   10.26 -    ./configure  --prefix=/usr \
   10.27 -	  --infodir=/usr/share/info \
   10.28 -	  --mandir=/usr/share/man \
   10.29 -	  --disable-plugin \
   10.30 -	  --disable-tcl \
   10.31 -	  --enable-spell=static \
   10.32 -	  --enable-ipv6 \
   10.33 -      $CONFIGURE_ARGS &&
   10.34 -    make &&
   10.35 -    make DESTDIR=$DESTDIR install
   10.36 +	sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \
   10.37 +		-e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' \
   10.38 +		-e 's|glib/gutils.h|glib.h|' src/common/xchat.h
   10.39 +	sed -i 's|glib/ghash.h|glib.h|' src/common/servlist.c src/common/text.c
   10.40 +	sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c
   10.41 +
   10.42 +	./configure \
   10.43 +		--prefix=/usr \
   10.44 +		--infodir=/usr/share/info \
   10.45 +		--mandir=/usr/share/man \
   10.46 +		--disable-plugin \
   10.47 +		--disable-tcl \
   10.48 +		--enable-spell=static \
   10.49 +		--enable-ipv6 \
   10.50 +		$CONFIGURE_ARGS &&
   10.51 +	make &&
   10.52 +	make DESTDIR=$DESTDIR install
   10.53  }
   10.54  
   10.55  # Rules to gen a SliTaz package suitable for Tazpkg.
   10.56  genpkg_rules()
   10.57  {
   10.58 -    mkdir -p $fs/usr \
   10.59 -    	$fs/usr/share
   10.60 -    cp -a $install/usr/bin $fs/usr
   10.61 -   # cp -a $install/usr/share/dbus-1 $fs/usr/share
   10.62 +	mkdir -p $fs/usr
   10.63 +	cp -a $install/usr/bin $fs/usr
   10.64 +	# cp -a $install/usr/share/dbus-1 $fs/usr/share
   10.65  }