wok diff magicpoint/receipt @ rev 16434

Merge branches
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Apr 18 13:51:05 2014 +0300 (2014-04-18)
parents 73641efed1cc
children 8417cbe6fdae
line diff
     1.1 --- a/magicpoint/receipt	Mon Apr 23 16:30:27 2012 +0200
     1.2 +++ b/magicpoint/receipt	Fri Apr 18 13:51:05 2014 +0300
     1.3 @@ -5,6 +5,11 @@
     1.4  CATEGORY="x-window"
     1.5  SHORT_DESC="An X11-based presentation tool."
     1.6  MAINTAINER="rcx@zoominternet.net"
     1.7 +LICENSE="BSD"
     1.8 +TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.9 +WEB_SITE="http://member.wide.ad.jp/wg/mgp/"
    1.10 +WGET_URL="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/$TARBALL"
    1.11 +
    1.12  DEPENDS="glibc-base expat zlib util-linux-uuid fontconfig freetype1 freetype \
    1.13  giflib jpeg libpng tiff imlib xorg-libICE xorg-libSM xorg-libX11 \
    1.14  xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft xorg-libXmu \
    1.15 @@ -13,9 +18,6 @@
    1.16  freetype1 freetype1-dev freetype-dev giflib-dev imlib-dev xorg-imake \
    1.17  xorg-cf-files xorg-libX11-dev xorg-libXft-dev xorg-libXmu-dev \
    1.18  xorg-libXrender-dev xorg-xproto xorg-xextproto"
    1.19 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.20 -WEB_SITE="http://member.wide.ad.jp/wg/mgp/"
    1.21 -WGET_URL="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/$TARBALL"
    1.22  
    1.23  # Rules to configure and make the package.
    1.24  compile_rules()
    1.25 @@ -29,14 +31,14 @@
    1.26  	xmkmf &&
    1.27  	make -j1 Makefiles &&
    1.28  	make -j1 &&
    1.29 -	make -j1 DESTDIR=$src/_pkg install
    1.30 +	make -j1 DESTDIR=$DESTDIR install
    1.31  }
    1.32  
    1.33  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.34  genpkg_rules()
    1.35  {
    1.36  	mkdir -p $fs/usr/lib/X11/mgp
    1.37 -	cp -f $_pkg/usr/lib/X11/mgp/default.mgp $fs/usr/lib/X11/mgp
    1.38 +	cp -f $install/usr/lib/X11/mgp/default.mgp $fs/usr/lib/X11/mgp
    1.39  	
    1.40 -	cp -a $_pkg/usr/bin $fs/usr
    1.41 +	cp -a $install/usr/bin $fs/usr
    1.42  }