wok-next rev 19793

Up giflib, imlib2, libsndfile, xorg-cf-files; switch icewm and magicpoint from imlib to imlib2; remove imlib - no one need it anymore.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jun 23 12:00:00 2017 +0300 (2017-06-23)
parents 6e60cb130afd
children e2e4dedc6cb9
files giflib-dev/receipt giflib/description.txt giflib/receipt icewm/receipt imlib-dev/receipt imlib/receipt imlib2-dev/receipt imlib2-test/receipt imlib2/receipt libsndfile-dev/receipt libsndfile/receipt magicpoint/description.txt magicpoint/receipt magicpoint/stuff/patches/01_mgpnet_in.diff magicpoint/stuff/patches/04_tex2ps_bashism.diff magicpoint/stuff/patches/05_rakugaki_cursor.diff magicpoint/stuff/patches/568339.patch magicpoint/stuff/patches/series xorg-cf-files/receipt
line diff
     1.1 --- a/giflib-dev/receipt	Fri Jun 23 10:28:06 2017 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,19 +0,0 @@
     1.4 -# SliTaz package receipt.
     1.5 -
     1.6 -PACKAGE="giflib-dev"
     1.7 -VERSION="5.1.4"
     1.8 -CATEGORY="development"
     1.9 -SHORT_DESC="giflib devel files."
    1.10 -MAINTAINER="rcx@zoominternet.net"
    1.11 -LICENSE="MIT"
    1.12 -WEB_SITE="https://sourceforge.net/projects/giflib/"
    1.13 -HOST_ARCH="i486 arm"
    1.14 -
    1.15 -WANTED="giflib"
    1.16 -DEPENDS="giflib"
    1.17 -
    1.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.19 -genpkg_rules()
    1.20 -{
    1.21 -	copy *.h *.la
    1.22 -}
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/giflib/description.txt	Fri Jun 23 12:00:00 2017 +0300
     2.3 @@ -0,0 +1,3 @@
     2.4 +`giflib` is a library for reading and writing gif images. It is API and ABI
     2.5 +compatible with `libungif` which was in wide use while the LZW compression
     2.6 +algorithm was patented.
     3.1 --- a/giflib/receipt	Fri Jun 23 10:28:06 2017 +0200
     3.2 +++ b/giflib/receipt	Fri Jun 23 12:00:00 2017 +0300
     3.3 @@ -1,18 +1,18 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="giflib"
     3.8  VERSION="5.1.4"
     3.9  CATEGORY="graphics"
    3.10 -SHORT_DESC="A library for processing GIFs."
    3.11 +SHORT_DESC="A library and utilities for processing GIFs"
    3.12  MAINTAINER="rcx@zoominternet.net"
    3.13  LICENSE="MIT"
    3.14  WEB_SITE="https://sourceforge.net/projects/giflib/"
    3.15  HOST_ARCH="i486 arm"
    3.16  
    3.17 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.18 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    3.19 +TARBALL="giflib-$VERSION.tar.bz2"
    3.20 +WGET_URL="$SF_MIRROR/giflib/$TARBALL"
    3.21  
    3.22 -DEPENDS="glibc-base"
    3.23 +SPLIT="giflib-dev"
    3.24  
    3.25  # Rules to configure and make the package.
    3.26  compile_rules()
    3.27 @@ -26,5 +26,8 @@
    3.28  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.29  genpkg_rules()
    3.30  {
    3.31 -	copy bin/ *.so*
    3.32 +	case $PACKAGE in
    3.33 +		giflib) copy @std;;
    3.34 +		*-dev)  copy @dev;;
    3.35 +	esac
    3.36  }
     4.1 --- a/icewm/receipt	Fri Jun 23 10:28:06 2017 +0200
     4.2 +++ b/icewm/receipt	Fri Jun 23 12:00:00 2017 +0300
     4.3 @@ -1,42 +1,38 @@
     4.4 -# SliTaz package receipt.
     4.5 +# SliTaz package receipt v2.
     4.6  
     4.7  PACKAGE="icewm"
     4.8 -VERSION="1.3.8"
     4.9 +VERSION="1.3.12"
    4.10  CATEGORY="x-window"
    4.11  SHORT_DESC="Ice Window Manager with Themes"
    4.12  MAINTAINER="devl547@gmail.com"
    4.13  LICENSE="GPL2"
    4.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    4.15  WEB_SITE="http://www.icewm.org/"
    4.16 -WGET_URL="$SF_MIRROR/icewm/icewm-${VERSION%.*}/$VERSION/$TARBALL"
    4.17 -TAGS="window-manager"
    4.18  
    4.19 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXrandr-dev xorg-libXext-dev \
    4.20 -xorg-libXpm-dev xorg-libXrender-dev xorg-libXft xorg-libXft-dev xorg-libSM-dev \
    4.21 -xorg-libICE-dev xorg-libXrandr-dev imlib-dev freetype-dev giflib-dev \
    4.22 -xorg-libXinerama xorg-libXinerama-dev \
    4.23 -xorg-xproto xorg-xextproto xorg-randrproto fontconfig-dev gettext \
    4.24 -gdk-pixbuf-dev pkg-config"
    4.25 -DEPENDS="xorg-libX11 xorg-libXrandr xorg-libXext xorg-libXpm xorg-libXinerama \
    4.26 -xorg-libXrender xorg-libXft xorg-libSM xorg-libICE imlib freetype \
    4.27 -gdk-pixbuf gettext-base"
    4.28 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    4.29 +WGET_URL="https://github.com/bbidulock/icewm/releases/download/$VERSION/$TARBALL"
    4.30 +
    4.31 +BUILD_DEPENDS="xorg-mkfontdir gettext fontconfig-dev xorg-libXext-dev \
    4.32 +xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev \
    4.33 +xorg-libXft-dev alsa-lib-dev libsndfile-dev xorg-libXinerama-dev fribidi-dev \
    4.34 +gdk-pixbuf-dev"
    4.35  
    4.36  # Rules to configure and make the package.
    4.37  compile_rules()
    4.38  {
    4.39 -	sed -i '/deprecated/d' src/base.h
    4.40 -	sed -i 's/^CORE_LIBS =/& -lfontconfig/' src/Makefile.in
    4.41 -	./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/icewm \
    4.42 -	 --localstatedir=/var --mandir=/usr/share/man \
    4.43 -	 $CONFIGURE_ARGS &&
    4.44 -	make &&
    4.45 -	make DESTDIR=$DESTDIR install
    4.46 +	./configure \
    4.47 +		--sysconfdir=/etc \
    4.48 +		--docdir=/usr/share/doc/icewm-$VERSION \
    4.49 +		--enable-guievents --with-icesound=ALSA \
    4.50 +		$CONFIGURE_ARGS &&
    4.51 +	make && make install &&
    4.52 +	rm $install/usr/share/xsessions/icewm.desktop
    4.53  }
    4.54  
    4.55  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.56  genpkg_rules()
    4.57  {
    4.58 -	mkdir -p $fs/usr/
    4.59 -	cp -a $install/usr/bin $fs/usr
    4.60 -	cp -a $install/usr/share $fs/usr
    4.61 +	copy @std
    4.62 +	TAGS="window-manager"
    4.63 +	DEPENDS="alsa-lib flac fribidi gdk-pixbuf libsndfile libvorbis xorg-libSM \
    4.64 +	xorg-libXft xorg-libXinerama xorg-libXrandr"
    4.65  }
     5.1 --- a/imlib-dev/receipt	Fri Jun 23 10:28:06 2017 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,23 +0,0 @@
     5.4 -# SliTaz package receipt.
     5.5 -
     5.6 -PACKAGE="imlib-dev"
     5.7 -VERSION="1.9.15"
     5.8 -CATEGORY="development"
     5.9 -SHORT_DESC="imlib devel files."
    5.10 -WEB_SITE="http://freshmeat.net/projects/imlib/"
    5.11 -MAINTAINER="rcx@zoominternet.net"
    5.12 -LICENSE="GPL2"
    5.13 -WANTED="imlib"
    5.14 -
    5.15 -DEPENDS="pkg-config"
    5.16 -
    5.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
    5.18 -genpkg_rules()
    5.19 -{
    5.20 -	mkdir -p $fs/usr/lib
    5.21 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    5.22 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    5.23 -	cp -a $install/usr/include $fs/usr
    5.24 -	mkdir -p $fs/usr/share/aclocal
    5.25 -	cp -a $install/usr/share/aclocal $fs/usr/share
    5.26 -}
     6.1 --- a/imlib/receipt	Fri Jun 23 10:28:06 2017 +0200
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,37 +0,0 @@
     6.4 -# SliTaz package receipt.
     6.5 -
     6.6 -PACKAGE="imlib"
     6.7 -VERSION="1.9.15"
     6.8 -CATEGORY="graphics"
     6.9 -SHORT_DESC="An advanced replacement imaging library for libraries like libXpm."
    6.10 -MAINTAINER="rcx@zoominternet.net"
    6.11 -LICENSE="GPL2"
    6.12 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    6.13 -WEB_SITE="http://freshmeat.net/projects/imlib/"
    6.14 -WGET_URL="ftp://ftp.gnome.org/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
    6.15 -
    6.16 -DEPENDS="glibc-base xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext giflib jpeg libpng tiff zlib util-linux-uuid"
    6.17 -BUILD_DEPENDS="slitaz-toolchain xorg-dev xorg-xextproto giflib giflib-dev jpeg jpeg-dev libpng libpng-dev tiff tiff-dev zlib zlib-dev util-linux-uuid-dev"
    6.18 -
    6.19 -# Rules to configure and make the package.
    6.20 -compile_rules()
    6.21 -{
    6.22 -	./configure \
    6.23 -		--prefix=/usr \
    6.24 -		--sysconfdir=/etc \
    6.25 -		--infodir=/usr/share/info \
    6.26 -		--mandir=/usr/share/man \
    6.27 -		$CONFIGURE_ARGS &&
    6.28 -	make && make DESTDIR=$DESTDIR install
    6.29 -}
    6.30 -
    6.31 -# Rules to gen a SliTaz package suitable for Tazpkg.
    6.32 -genpkg_rules()
    6.33 -{
    6.34 -	mkdir -p $fs/usr
    6.35 -	cp -a $install/usr/bin $fs/usr
    6.36 -	mkdir -p $fs/usr/lib
    6.37 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    6.38 -	mkdir -p $fs/etc
    6.39 -	cp -a $install/etc $fs
    6.40 -}
    6.41 \ No newline at end of file
     7.1 --- a/imlib2-dev/receipt	Fri Jun 23 10:28:06 2017 +0200
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,22 +0,0 @@
     7.4 -# SliTaz package receipt.
     7.5 -
     7.6 -PACKAGE="imlib2-dev"
     7.7 -VERSION="1.4.9"
     7.8 -CATEGORY="development"
     7.9 -SHORT_DESC="Imlib2 graphic library (development files)"
    7.10 -MAINTAINER="pankso@slitaz.org"
    7.11 -LICENSE="GPL LGPL2"
    7.12 -WEB_SITE="https://sourceforge.net/projects/enlightenment/"
    7.13 -HOST_ARCH="i486 arm"
    7.14 -
    7.15 -WANTED="imlib2"
    7.16 -DEPENDS="imlib2 bzip2-dev freetype-dev giflib-dev glib-dev glibc-dev \
    7.17 -harfbuzz-dev libid3tag-dev libjpeg-turbo-dev liblzma-dev libpng-dev libxcb-dev \
    7.18 -pcre-dev tiff-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \
    7.19 -xorg-libXext-dev zlib-dev"
    7.20 -
    7.21 -# Rules to gen a SliTaz package suitable for Tazpkg.
    7.22 -genpkg_rules()
    7.23 -{
    7.24 -	copy *.h *.la *.pc imlib2-config
    7.25 -}
     8.1 --- a/imlib2-test/receipt	Fri Jun 23 10:28:06 2017 +0200
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,20 +0,0 @@
     8.4 -# SliTaz package receipt.
     8.5 -
     8.6 -PACKAGE="imlib2-test"
     8.7 -VERSION="1.4.9"
     8.8 -CATEGORY="development"
     8.9 -SHORT_DESC="Imlib2 graphic library (testing utilities)"
    8.10 -MAINTAINER="al.bobylev@gmail.com"
    8.11 -LICENSE="GPL LGPL2"
    8.12 -WEB_SITE="https://sourceforge.net/projects/enlightenment/"
    8.13 -HOST_ARCH="i486 arm"
    8.14 -
    8.15 -WANTED="imlib2"
    8.16 -DEPENDS="imlib2"
    8.17 -
    8.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
    8.19 -genpkg_rules()
    8.20 -{
    8.21 -	copy imlib2_bumpmap imlib2_colorspace imlib2_poly imlib2_show \
    8.22 -		imlib2_test data/
    8.23 -}
     9.1 --- a/imlib2/receipt	Fri Jun 23 10:28:06 2017 +0200
     9.2 +++ b/imlib2/receipt	Fri Jun 23 12:00:00 2017 +0300
     9.3 @@ -1,9 +1,9 @@
     9.4 -# SliTaz package receipt.
     9.5 +# SliTaz package receipt v2.
     9.6  
     9.7  PACKAGE="imlib2"
     9.8  VERSION="1.4.9"
     9.9  CATEGORY="graphics"
    9.10 -SHORT_DESC="Imlib2 graphic library."
    9.11 +SHORT_DESC="Imlib2 graphic library"
    9.12  MAINTAINER="pankso@slitaz.org"
    9.13  LICENSE="GPL LGPL2"
    9.14  WEB_SITE="https://sourceforge.net/projects/enlightenment/"
    9.15 @@ -12,11 +12,9 @@
    9.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    9.17  WGET_URL="$SF_MIRROR/enlightenment/$TARBALL"
    9.18  
    9.19 -DEPENDS="bzlib freetype giflib glib harfbuzz libid3tag libjpeg-turbo liblzma \
    9.20 -libpng libxcb pcre tiff xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext zlib"
    9.21 -BUILD_DEPENDS="freetype-dev xorg-libX11-dev libjpeg-turbo-dev tiff-dev \
    9.22 -giflib-dev libid3tag-dev xorg-libXext-dev liblzma-dev"
    9.23 -SPLIT="imlib2-test"
    9.24 +BUILD_DEPENDS="freetype-dev xorg-libX11-dev xorg-libICE-dev libjpeg-turbo-dev \
    9.25 +tiff-dev giflib-dev libid3tag-dev xorg-libXext-dev xz-dev"
    9.26 +SPLIT="imlib2-test imlib2-dev"
    9.27  
    9.28  # ARM: jpeg-dev must be installed in build chroot and libjpeg.la must
    9.29  # be modified manually
    9.30 @@ -37,5 +35,24 @@
    9.31  # Rules to gen a SliTaz package suitable for Tazpkg.
    9.32  genpkg_rules()
    9.33  {
    9.34 -	copy *.so* imlib2_conv imlib2_grab imlib2_view
    9.35 +	case $PACKAGE in
    9.36 +		imlib2)
    9.37 +			copy *.so* imlib2_conv imlib2_grab imlib2_view
    9.38 +			DEPENDS="bzlib freetype giflib glib harfbuzz libid3tag \
    9.39 +			libjpeg-turbo libpng16 libxcb pcre tiff xorg-libX11 xorg-libXau \
    9.40 +			xorg-libXdmcp xorg-libXext zlib"
    9.41 +			;;
    9.42 +		imlib2-test)
    9.43 +			copy @std
    9.44 +			remove_already_packed
    9.45 +			CAT="development|testing utilities"
    9.46 +			;;
    9.47 +		imlib2-dev)
    9.48 +			copy @dev
    9.49 +			DEPENDS="imlib2 imlib2-test bzip2-dev freetype-dev giflib-dev \
    9.50 +			glib-dev harfbuzz-dev libid3tag-dev libjpeg-turbo-dev libpng16-dev \
    9.51 +			libxcb-dev pcre-dev tiff-dev xorg-libX11-dev xorg-libXau-dev \
    9.52 +			xorg-libXdmcp-dev xorg-libXext-dev zlib-dev"
    9.53 +			;;
    9.54 +	esac
    9.55  }
    10.1 --- a/libsndfile-dev/receipt	Fri Jun 23 10:28:06 2017 +0200
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,22 +0,0 @@
    10.4 -# SliTaz package receipt.
    10.5 -
    10.6 -PACKAGE="libsndfile-dev"
    10.7 -VERSION="1.0.23"
    10.8 -CATEGORY="development"
    10.9 -SHORT_DESC="libsndfile devel files"
   10.10 -MAINTAINER="jozee@slitaz.org"
   10.11 -LICENSE="LGPL2.1"
   10.12 -WANTED="libsndfile"
   10.13 -WEB_SITE="http://www.mega-nerd.com/libsndfile/"
   10.14 -HOST_ARCH="i486 arm"
   10.15 -
   10.16 -DEPENDS="libsndfile pkg-config"
   10.17 -
   10.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   10.19 -genpkg_rules()
   10.20 -{
   10.21 -	mkdir -p $fs/usr/lib 
   10.22 -	cp -a $install/usr/include $fs/usr
   10.23 -	cp -a $install/usr/lib/*.*a $fs/usr/lib/
   10.24 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   10.25 -}
    11.1 --- a/libsndfile/receipt	Fri Jun 23 10:28:06 2017 +0200
    11.2 +++ b/libsndfile/receipt	Fri Jun 23 12:00:00 2017 +0300
    11.3 @@ -1,41 +1,46 @@
    11.4 -# SliTaz package receipt.
    11.5 +# SliTaz package receipt v2.
    11.6  
    11.7  PACKAGE="libsndfile"
    11.8 -VERSION="1.0.23"
    11.9 +VERSION="1.0.27"
   11.10  CATEGORY="multimedia"
   11.11  SHORT_DESC="A C library for reading and writing files containing sampled sound"
   11.12  MAINTAINER="jozee@slitaz.org"
   11.13  LICENSE="LGPL2.1"
   11.14 +WEB_SITE="http://www.mega-nerd.com/libsndfile/"
   11.15 +
   11.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   11.17 -WEB_SITE="http://www.mega-nerd.com/libsndfile/" 
   11.18  WGET_URL="$WEB_SITE/files/$TARBALL"
   11.19 -HOST_ARCH="i486 arm"
   11.20  
   11.21 -DEPENDS="alsa-lib libvorbis"
   11.22 -BUILD_DEPENDS="alsa-lib-dev libvorbis-dev"
   11.23 -
   11.24 -# Handle slitaz arch
   11.25 -case "$SLITAZ_ARCH" in
   11.26 -	i?86) DEPENDS="$DEPENDS flac" ;;
   11.27 -esac
   11.28 -
   11.29 -# Handle cross compilation.
   11.30 -case "$ARCH" in
   11.31 -	i?86) BUILD_DEPENDS="$BUILD_DEPENDS flac-dev" ;;
   11.32 -esac
   11.33 +BUILD_DEPENDS="alsa-lib-dev libvorbis-dev flac-dev"
   11.34 +SPLIT="libsndfile-apps libsndfile-dev"
   11.35  
   11.36  # Rules to configure and make the package.
   11.37  compile_rules()
   11.38  {
   11.39 -	cd $src
   11.40 -	./configure --prefix=/usr --disable-sqlite $CONFIGURE_ARGS &&
   11.41 -	make &&
   11.42 -	make DESTDIR=$DESTDIR install
   11.43 +	./configure \
   11.44 +		--disable-static \
   11.45 +		--docdir=/usr/share/doc/libsndfile-$VERSION \
   11.46 +		$CONFIGURE_ARGS &&
   11.47 +	make && make install
   11.48  }
   11.49  
   11.50  # Rules to gen a SliTaz package suitable for Tazpkg.
   11.51  genpkg_rules()
   11.52  {
   11.53 -	mkdir -p $fs/usr/lib
   11.54 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
   11.55 +	case $PACKAGE in
   11.56 +		libsndfile)
   11.57 +			copy *.so*
   11.58 +			DEPENDS="flac libogg libvorbis"
   11.59 +			;;
   11.60 +		*-apps)
   11.61 +			copy bin/
   11.62 +			CAT="multimedia|applications"
   11.63 +			DEPENDS="alsa-lib libsndfile"
   11.64 +			;;
   11.65 +		*-dev)
   11.66 +			copy @dev
   11.67 +			DEPENDS="libsndfile libsndfile-apps flac-dev libogg-dev \
   11.68 +			libvorbis-dev"
   11.69 +			;;
   11.70 +	esac
   11.71  }
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/magicpoint/description.txt	Fri Jun 23 12:00:00 2017 +0300
    12.3 @@ -0,0 +1,3 @@
    12.4 +MagicPoint is an X11 based presentation tool. MagicPoint's presentation files
    12.5 +(typically .mgp files) are plain text so you can create presentation files
    12.6 +quickly with your favorite editor.
    13.1 --- a/magicpoint/receipt	Fri Jun 23 10:28:06 2017 +0200
    13.2 +++ b/magicpoint/receipt	Fri Jun 23 12:00:00 2017 +0300
    13.3 @@ -1,43 +1,37 @@
    13.4 -# SliTaz package receipt.
    13.5 +# SliTaz package receipt v2.
    13.6  
    13.7  PACKAGE="magicpoint"
    13.8 -VERSION="1.13a"
    13.9 +VERSION="1.13a+upstream20090219"
   13.10  CATEGORY="x-window"
   13.11 -SHORT_DESC="An X11-based presentation tool."
   13.12 +SHORT_DESC="An X11-based presentation tool"
   13.13  MAINTAINER="rcx@zoominternet.net"
   13.14  LICENSE="BSD"
   13.15 +WEB_SITE="http://member.wide.ad.jp/wg/mgp/"
   13.16 +
   13.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
   13.18 -WEB_SITE="http://member.wide.ad.jp/wg/mgp/"
   13.19 -WGET_URL="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/$TARBALL"
   13.20 +#WGET_URL="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/$TARBALL"
   13.21 +# use Debian patches with Debian sources
   13.22 +WGET_URL="http://http.debian.net/debian/pool/main/m/mgp/mgp_$VERSION.orig.tar.gz"
   13.23  
   13.24 -DEPENDS="glibc-base expat zlib util-linux-uuid fontconfig freetype1 freetype \
   13.25 -giflib jpeg libpng tiff imlib xorg-libICE xorg-libSM xorg-libX11 \
   13.26 -xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft xorg-libXmu \
   13.27 -xorg-libXrender xorg-libXt"
   13.28 -BUILD_DEPENDS="bison flex m4 gettext fontconfig-dev \
   13.29 -freetype1 freetype1-dev freetype-dev giflib-dev imlib-dev xorg-imake \
   13.30 -xorg-cf-files xorg-libX11-dev xorg-libXft-dev xorg-libXmu-dev \
   13.31 -xorg-libXrender-dev xorg-xproto xorg-xextproto"
   13.32 +BUILD_DEPENDS="perl xorg-libX11-dev xorg-libXft-dev fontconfig-dev xorg-imake \
   13.33 +xorg-cf-files imlib2-dev xorg-libXmu-dev"
   13.34  
   13.35  # Rules to configure and make the package.
   13.36  compile_rules()
   13.37  {
   13.38 -	./configure \
   13.39 -		--prefix=/usr \
   13.40 -		--infodir=/usr/share/info \
   13.41 -		--mandir=/usr/share/man \
   13.42 -		$CONFIGURE_ARGS &&
   13.43 +	./configure $CONFIGURE_ARGS &&
   13.44  	xmkmf &&
   13.45  	make -j1 Makefiles &&
   13.46  	make -j1 &&
   13.47 -	make -j1 DESTDIR=$DESTDIR install
   13.48 +	make -j1 DESTDIR=$DESTDIR install &&
   13.49 +
   13.50 +	chmod -R u+w $install/usr/lib/X11/mgp
   13.51  }
   13.52  
   13.53  # Rules to gen a SliTaz package suitable for Tazpkg.
   13.54  genpkg_rules()
   13.55  {
   13.56 -	mkdir -p $fs/usr/lib/X11/mgp
   13.57 -	cp -f $install/usr/lib/X11/mgp/default.mgp $fs/usr/lib/X11/mgp
   13.58 -	
   13.59 -	cp -a $install/usr/bin $fs/usr
   13.60 -}
   13.61 \ No newline at end of file
   13.62 +	copy @std
   13.63 +	DEPENDS="giflib imlib2 libpng16 xorg-libSM xorg-libX11 xorg-libXext \
   13.64 +	xorg-libXft xorg-libXmu xorg-libXt"
   13.65 +}
    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/magicpoint/stuff/patches/01_mgpnet_in.diff	Fri Jun 23 12:00:00 2017 +0300
    14.3 @@ -0,0 +1,117 @@
    14.4 +Index: magicpoint-1.13a/contrib/mgpnet.in
    14.5 +===================================================================
    14.6 +--- magicpoint-1.13a.orig/contrib/mgpnet.in	2008-12-24 10:52:03.000000000 -0500
    14.7 ++++ magicpoint-1.13a/contrib/mgpnet.in	2008-12-24 11:00:47.000000000 -0500
    14.8 +@@ -32,7 +32,7 @@
    14.9 + 
   14.10 + # configurations
   14.11 + $tmpdir = '/tmp';
   14.12 +-$httpdatestr = "date '+\%a, \%d \%b \%Y \%H:\%M:\%S \%Z'";
   14.13 ++$httpdatestr = "env LC_ALL=C date '+\%a, \%d \%b \%Y \%H:\%M:\%S \%Z'";
   14.14 + $seltimeout = 1;
   14.15 + $refreshtimeout = 10;
   14.16 + $debug = 0;
   14.17 +@@ -53,6 +53,7 @@
   14.18 + 		} while ($hostname =~ /^127\./);
   14.19 + 		close(IN);
   14.20 + 	};
   14.21 ++	$hostname =~ s/^addr://; # for GNU/Linux, by ukai
   14.22 + 	print "http://$hostname:$port/\n";
   14.23 + 	exit 0;
   14.24 + }
   14.25 +@@ -214,7 +215,7 @@
   14.26 + 		$imgtmp = &tmpname;
   14.27 + 		$errout = ($debug ? '' : '2>&-');
   14.28 + 		system "xwintoppm -silent -name MagicPoint | ".
   14.29 +-			"ppmquant 256 $errout | ppmtogif $errout > $imgtmp";
   14.30 ++			"ppmquant 256 $errout | ppmtopng $errout > $imgtmp";
   14.31 + 		if (-z $imgtmp) {
   14.32 + 			unlink $imgtmp;
   14.33 + 			$checkcontent = '';
   14.34 +@@ -245,10 +246,10 @@
   14.35 + 	local($httpreq, $httpmethod, $httppath, $httpver, $httphost);
   14.36 + 	local($httpagent);
   14.37 + 	local($imgplace, $imgwidth, $imgheight, $buf, $imglen);
   14.38 +-	local($cthtml, $ctgif);
   14.39 ++	local($cthtml, $ctpng);
   14.40 + 
   14.41 + 	$cthtml = ($usecharset ? 'text/html; charset=us-ascii' : 'text/html');
   14.42 +-	$ctgif = 'image/gif';
   14.43 ++	$ctgif = 'image/png';
   14.44 + 
   14.45 + 	$httpreq = <NS>;
   14.46 + 	print STDERR 'HTTP in> ' . $httpreq if ($debug);
   14.47 +@@ -256,7 +257,7 @@
   14.48 + 	$httpmethod = $httppath = $httpver = '';
   14.49 + 	($httpmethod, $httppath, $httpver) = split(/\s+/, $httpreq);
   14.50 + 	$httppath =~ s/http:\/\/[^:\/]+(:\d+)\//\//;
   14.51 +-	if ($httpver eq '' || $httpver eq 'HTTP/1.0') {
   14.52 ++	if ($httpver eq '' || $httpver =~ m'HTTP/1.0') {
   14.53 + 		;	# ok
   14.54 + 	} else {
   14.55 + 		&httpheader(501, $cthtml) if ($httpver);
   14.56 +@@ -318,7 +319,7 @@
   14.57 + 		print <<EOF;
   14.58 + <HEAD><TITLE>MagicPoint Netserver</TITLE></HEAD>
   14.59 + <BODY>
   14.60 +-<IMG SRC=\"/presentation.gif\" ALT=\"presentation image\"
   14.61 ++<IMG SRC=\"/presentation.png\" ALT=\"presentation image\"
   14.62 + $imgplace ALIGN=left><BR>
   14.63 + <TABLE border=0>
   14.64 + <TR><TD NOWRAP><A HREF=/index.html>normal</A>
   14.65 +@@ -340,7 +341,7 @@
   14.66 + </TABLE>
   14.67 + </BODY></HTML>
   14.68 + EOF
   14.69 +-	} elsif ($httppath eq '/presentation.gif') {
   14.70 ++	} elsif ($httppath eq '/presentation.png') {
   14.71 + 		open(IMG, "< $imagefile") || do {
   14.72 + 			$checkcontent = '';	# invalidate
   14.73 + 			&httpheader(404, $cthtml) if ($httpver);
   14.74 +@@ -350,13 +351,13 @@
   14.75 + <HEAD><TITLE>File Not found</TITLE></HEAD>
   14.76 + <BODY><H1>File Not found</H1>
   14.77 + The requested URL $httppath was not found on this server.<P>
   14.78 +-Looks like a mitake in configuration.
   14.79 ++Looks like a mistake in configuration.
   14.80 + Contact the administrator.<P>
   14.81 + </BODY>
   14.82 + EOF
   14.83 + 			return;
   14.84 + 		};
   14.85 +-		&httpheader(200, $ctgif) if ($httpver);
   14.86 ++		&httpheader(200, $ctpng) if ($httpver);
   14.87 + 		return if ($httpmethod ne 'GET');
   14.88 + 
   14.89 + 		while (0 < ($imglen = sysread(IMG, $buf, 4096))) {
   14.90 +@@ -415,7 +416,7 @@
   14.91 + 'XXX4', 'SO_REUSEPORT',	'XXX5', 'SOCK_STREAM',	'XXX6', 'WNOHANG',
   14.92 + );
   14.93 + 	$tmpnam = &tmpname;
   14.94 +-	open(CPP, "| @CPP@ >$tmpnam") || return;
   14.95 ++	open(CPP, "| @CPP@ - >$tmpnam") || return;
   14.96 + 	print CPP "#include <sys/socket.h>\n";
   14.97 + 	print CPP "#include <sys/wait.h>\n";
   14.98 + 	foreach $tmp (keys %varnames) {
   14.99 +@@ -439,12 +440,19 @@
  14.100 + 		$havesinlen = 0; $sockaddr = 'S n a4 x8';
  14.101 + 	}
  14.102 + 
  14.103 ++	use Socket;
  14.104 + 	foreach $i (keys %varnames) {
  14.105 + 		if (@tmp2 = grep($_ =~ /^$i/, @tmp1)) {
  14.106 + 			$tmp = (split(/\s+/, @tmp2[0]))[1];
  14.107 + 			$tmp = oct($tmp) if ($tmp =~ /^0/);
  14.108 +-			next if ($tmp !~ /^[0-9]+$/);
  14.109 +-			eval "\$$varnames{$i} = \$tmp;";
  14.110 ++			if ($tmp =~ /^[0-9]+$/) {
  14.111 ++			    eval "\$$varnames{$i} = \$tmp;";
  14.112 ++			} else {
  14.113 ++			    # some constant defined by enum, so we can not
  14.114 ++			    # always use cpp as above. I believe use Socket
  14.115 ++			    # is more reliable in these days.
  14.116 ++			    eval "\$$varnames{$i} = &$varnames{$i};";
  14.117 ++			}
  14.118 + 		}
  14.119 + 	}
  14.120 + }
    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/magicpoint/stuff/patches/04_tex2ps_bashism.diff	Fri Jun 23 12:00:00 2017 +0300
    15.3 @@ -0,0 +1,13 @@
    15.4 +Index: magicpoint-1.13a/contrib/tex2eps.sh
    15.5 +===================================================================
    15.6 +--- magicpoint-1.13a.orig/contrib/tex2eps.sh	2008-12-24 11:59:36.000000000 -0500
    15.7 ++++ magicpoint-1.13a/contrib/tex2eps.sh	2008-12-24 12:00:07.000000000 -0500
    15.8 +@@ -13,7 +13,7 @@
    15.9 + # temporary filename (without .eps suffix)
   15.10 + tmp=$1
   15.11 + 
   15.12 +-echo '\nopagenumbers' > $tmp.tex
   15.13 ++printf '\\nopagenumbers\n' > $tmp.tex
   15.14 + cat >> $tmp.tex
   15.15 + echo '\end' >> $tmp.tex
   15.16 + tex $tmp.tex > /dev/null 2> /dev/null
    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/magicpoint/stuff/patches/05_rakugaki_cursor.diff	Fri Jun 23 12:00:00 2017 +0300
    16.3 @@ -0,0 +1,22 @@
    16.4 +Index: kit/mgp.c
    16.5 +===================================================================
    16.6 +--- kit.orig/mgp.c	2009-02-22 11:29:35.000000000 -0500
    16.7 ++++ kit/mgp.c	2009-02-22 11:31:10.000000000 -0500
    16.8 +@@ -64,7 +64,7 @@
    16.9 + 	"red", "green", "blue", "yellow", "black", "white",
   16.10 + };
   16.11 + static char *rakugaki_backcolors[] = {
   16.12 +-	"black", "black", "black", "black", "gray", "gray",
   16.13 ++	"red", "green", "blue", "yellow", "black", "white",
   16.14 + };
   16.15 + static int demointerval = 0;	/* XXX define option for this */
   16.16 + 
   16.17 +@@ -783,7 +783,7 @@
   16.18 + 	state.width = window_width;
   16.19 + 	state.height = window_height;
   16.20 + 	if (!pen_curs) {
   16.21 +-		pen_curs = XCreateFontCursor(display, XC_pencil);
   16.22 ++		pen_curs = XCreateFontCursor(display, XC_dot);
   16.23 + 		rakugaki_updatecolor(pen_curs);
   16.24 + 	}
   16.25 + 	state_goto(&state, start_page, 0);
    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/magicpoint/stuff/patches/568339.patch	Fri Jun 23 12:00:00 2017 +0300
    17.3 @@ -0,0 +1,25 @@
    17.4 +--- a/draw.c
    17.5 ++++ b/draw.c
    17.6 +@@ -5425,7 +5425,6 @@
    17.7 + 	char *p, *p2;
    17.8 + 	char style[100];
    17.9 + 	char font[100];
   17.10 +-	int stlen;
   17.11 + 
   17.12 + 	bzero(style, sizeof(style));
   17.13 + 	bzero(font, sizeof(font));
   17.14 +@@ -5471,12 +5470,12 @@
   17.15 + 		    XFT_FAMILY, XftTypeString, font,
   17.16 + 		    XFT_ENCODING, XftTypeString, registry,
   17.17 + 		    XFT_STYLE, XftTypeString, style,
   17.18 +-		    XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
   17.19 ++		    XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, (char*)0);
   17.20 + 	} else {
   17.21 + 		xftfont = XftFontOpen(display, screen,
   17.22 + 		    XFT_FAMILY, XftTypeString, font,
   17.23 + 		    XFT_ENCODING, XftTypeString, registry,
   17.24 +-		    XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, 0);
   17.25 ++		    XFT_PIXEL_SIZE, XftTypeDouble, (float)csize, (char*)0);
   17.26 + 	}
   17.27 + 	if (xftfont == 0) {
   17.28 + 		free(xfont);
    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/magicpoint/stuff/patches/series	Fri Jun 23 12:00:00 2017 +0300
    18.3 @@ -0,0 +1,8 @@
    18.4 +# used Debian patches:
    18.5 +# <https://packages.debian.org/ru/sid/x11/mgp>
    18.6 +# <http://http.debian.net/debian/pool/main/m/mgp/mgp_1.13a+upstream20090219-8.debian.tar.xz>
    18.7 +
    18.8 +01_mgpnet_in.diff
    18.9 +04_tex2ps_bashism.diff
   18.10 +05_rakugaki_cursor.diff
   18.11 +568339.patch
    19.1 --- a/xorg-cf-files/receipt	Fri Jun 23 10:28:06 2017 +0200
    19.2 +++ b/xorg-cf-files/receipt	Fri Jun 23 12:00:00 2017 +0300
    19.3 @@ -1,33 +1,24 @@
    19.4 -# SliTaz package receipt.
    19.5 +# SliTaz package receipt v2.
    19.6  
    19.7  PACKAGE="xorg-cf-files"
    19.8 -VERSION="1.0.3"
    19.9 +VERSION="1.0.6"
   19.10  CATEGORY="development"
   19.11 -SHORT_DESC="Conf files used by xorg and imake."
   19.12 +SHORT_DESC="Conf files used by xorg and imake"
   19.13  MAINTAINER="rcx@zoominternet.net"
   19.14  LICENSE="MIT"
   19.15 +WEB_SITE="http://www.x.org/"
   19.16 +
   19.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   19.18 -WEB_SITE="http://www.x.org/"
   19.19  WGET_URL="$XORG_MIRROR/util/$TARBALL"
   19.20  
   19.21 -DEPENDS=""
   19.22 -BUILD_DEPENDS=""
   19.23 -
   19.24  # Rules to configure and make the package.
   19.25  compile_rules()
   19.26  {
   19.27 -	cd $src
   19.28 -	./configure \
   19.29 -		--prefix=/usr \
   19.30 -		--infodir=/usr/share/info \
   19.31 -		--mandir=/usr/share/man \
   19.32 -		$CONFIGURE_ARGS &&
   19.33 -	make && make DESTDIR=$DESTDIR install
   19.34 +	./configure $CONFIGURE_ARGS && make && make install
   19.35  }
   19.36  
   19.37  # Rules to gen a SliTaz package suitable for Tazpkg.
   19.38  genpkg_rules()
   19.39  {
   19.40 -	mkdir -p $fs/usr
   19.41 -	cp -a $install/usr/lib $fs/usr
   19.42 +	copy @std
   19.43  }