wok rev 11975

merge
author Samuel Trassare <samuel_trassare@yahoo.com>
date Fri Mar 02 11:54:25 2012 -0800 (2012-03-02)
parents f72c28df3f6c 9b5113ea7413
children b4e4d7de2f08
files
line diff
     1.1 --- a/libt4k_common/receipt	Fri Mar 02 11:53:04 2012 -0800
     1.2 +++ b/libt4k_common/receipt	Fri Mar 02 11:54:25 2012 -0800
     1.3 @@ -13,22 +13,20 @@
     1.4  DEPENDS="libsdl libsdl-image libsdl-mixer libsdl-ttf libsdl-net librsvg \
     1.5  libsdl-pango"
     1.6  BUILD_DEPENDS="libsdl-dev libsdl-image-dev libsdl-mixer-dev libsdl-ttf-dev \
     1.7 -libsdl-net-dev librsvg-dev libsdl-pango-dev"
     1.8 +libsdl-net-dev librsvg-dev libsdl-pango-dev wget"
     1.9  
    1.10  # Rules to configure and make the package.
    1.11  compile_rules()
    1.12  {
    1.13 -	./configure \
    1.14 -		$CONFIGURE_ARGS && 
    1.15 -	make && 
    1.16 +	./configure $CONFIGURE_ARGS &&
    1.17 +	make &&
    1.18  	make install
    1.19  }
    1.20  
    1.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.22  genpkg_rules()
    1.23  {
    1.24 -	mkdir -p $fs/usr/lib \
    1.25 -		$fs/usr/share
    1.26 +	mkdir -p $fs/usr/lib $fs/usr/share
    1.27  	cp -a $install/usr/lib/*so* $fs/usr/lib
    1.28  	cp -ar $install/usr/share/* $fs/usr/share
    1.29  }
     2.1 --- a/mplayerplug-in/receipt	Fri Mar 02 11:53:04 2012 -0800
     2.2 +++ b/mplayerplug-in/receipt	Fri Mar 02 11:54:25 2012 -0800
     2.3 @@ -47,6 +47,7 @@
     2.4  		--enable-qt \
     2.5  		--enable-rm \
     2.6  		--enable-dvx \
     2.7 +		GECKO_XPIDL="$stuff/xpidl" \
     2.8  		MOZILLA_HOME="/usr/lib/firefox-$FIREFOX_VER" \
     2.9  		GECKO_IDLDIR="/usr/share/idl/firefox-$FIREFOX_VER" &&
    2.10  	make $MAKEFLAGS &&
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/mplayerplug-in/stuff/xpidl	Fri Mar 02 11:54:25 2012 -0800
     3.3 @@ -0,0 +1,3 @@
     3.4 +#!/bin/sh
     3.5 +
     3.6 +exec python /usr/lib/firefox-devel/sdk/bin/xpidl.py "$@"
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/nmon/receipt	Fri Mar 02 11:54:25 2012 -0800
     4.3 @@ -0,0 +1,25 @@
     4.4 +# SliTaz package receipt
     4.5 +PACKAGE="nmon"
     4.6 +VERSION="14g"
     4.7 +CATEGORY="system-tools"
     4.8 +SHORT_DESC="Nigel's performance Monitor."
     4.9 +MAINTAINER="meshca@clarkson.edu"
    4.10 +DEPENDS="ncurses"
    4.11 +BUILD_DEPENDS="linux-api-headers ncurses-dev"
    4.12 +WEB_SITE="http://nmon.sourceforge.net/"
    4.13 +
    4.14 +# Rules to configure and make the package.
    4.15 +compile_rules()
    4.16 +{
    4.17 +	mkdir -p $src
    4.18 +	cd $src
    4.19 +	wget "http://downloads.sourceforge.net/project/nmon/lmon14g.c"
    4.20 +	cc -o nmon lmon14g.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g -D POWER
    4.21 +}
    4.22 +					
    4.23 +# Rules to gen a SliTaz package suitable for Tazpkg.
    4.24 +genpkg_rules()
    4.25 +{
    4.26 +	mkdir -p $fs/usr/bin/
    4.27 +	cp -a $src/nmon $fs/usr/bin/nmon
    4.28 +}
     5.1 --- a/ntop/receipt	Fri Mar 02 11:53:04 2012 -0800
     5.2 +++ b/ntop/receipt	Fri Mar 02 11:54:25 2012 -0800
     5.3 @@ -11,7 +11,7 @@
     5.4  CONFIG_FILES="/etc/ntop"
     5.5  TAGS="network"
     5.6  
     5.7 -DEPENDS="zlib openssl libpng libpcap glibc gdbm rrdtool perl pcre geoip"
     5.8 +DEPENDS="zlib openssl libpng libpcap glibc gdbm rrdtool perl pcre geoip libwrap"
     5.9  BUILD_DEPENDS="zlib-dev openssl-dev libpng-dev libpcap-dev libtool glibc-dev gdbm-dev rrdtool \
    5.10   autoconf automake rrdtool-dev wget geoip-dev libwrap"
    5.11  
     6.1 --- a/slitaz-tools-boxes/receipt	Fri Mar 02 11:53:04 2012 -0800
     6.2 +++ b/slitaz-tools-boxes/receipt	Fri Mar 02 11:54:25 2012 -0800
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="slitaz-tools-boxes"
     6.7 -VERSION="4.7"
     6.8 +VERSION="4.7.1"
     6.9  CATEGORY="system-tools"
    6.10  SHORT_DESC="All SliTaz GTKdialog boxes to command line tools."
    6.11  MAINTAINER="pankso@slitaz.org"
     7.1 --- a/slitaz-tools/receipt	Fri Mar 02 11:53:04 2012 -0800
     7.2 +++ b/slitaz-tools/receipt	Fri Mar 02 11:54:25 2012 -0800
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="slitaz-tools"
     7.7 -VERSION="4.7"
     7.8 +VERSION="4.7.1"
     7.9  CATEGORY="system-tools"
    7.10  SHORT_DESC="SliTaz tools provide installer and utils usable on termnial."
    7.11  MAINTAINER="pankso@slitaz.org"
     8.1 --- a/tazpanel/receipt	Fri Mar 02 11:53:04 2012 -0800
     8.2 +++ b/tazpanel/receipt	Fri Mar 02 11:54:25 2012 -0800
     8.3 @@ -1,7 +1,7 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="tazpanel"
     8.7 -VERSION="1.4.2"
     8.8 +VERSION="1.4.3"
     8.9  CATEGORY="system-tools"
    8.10  SHORT_DESC="SliTaz administration and configuration panel."
    8.11  MAINTAINER="pankso@slitaz.org"
     9.1 --- a/tazpkg/receipt	Fri Mar 02 11:53:04 2012 -0800
     9.2 +++ b/tazpkg/receipt	Fri Mar 02 11:54:25 2012 -0800
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt.
     9.5  
     9.6  PACKAGE="tazpkg"
     9.7 -VERSION="4.8.2"
     9.8 +VERSION="4.9"
     9.9  CATEGORY="base-system"
    9.10  SHORT_DESC="SliTaz packages manager."
    9.11  MAINTAINER="pankso@slitaz.org"
    10.1 --- a/tazusb/receipt	Fri Mar 02 11:53:04 2012 -0800
    10.2 +++ b/tazusb/receipt	Fri Mar 02 11:54:25 2012 -0800
    10.3 @@ -1,7 +1,7 @@
    10.4  # SliTaz package receipt.
    10.5  
    10.6  PACKAGE="tazusb"
    10.7 -VERSION="3.0.4"
    10.8 +VERSION="4.0"
    10.9  CATEGORY="base-system"
   10.10  SHORT_DESC="SliTaz LiveUSB utility."
   10.11  MAINTAINER="erjo@slitaz.org"
    11.1 --- a/yad/receipt	Fri Mar 02 11:53:04 2012 -0800
    11.2 +++ b/yad/receipt	Fri Mar 02 11:54:25 2012 -0800
    11.3 @@ -1,7 +1,7 @@
    11.4  # SliTaz package receipt.
    11.5  
    11.6  PACKAGE="yad"
    11.7 -VERSION="0.16.3"
    11.8 +VERSION="0.17.0"
    11.9  CATEGORY="utilities"
   11.10  SHORT_DESC="Display graphical dialogs from shell scripts or command line"
   11.11  MAINTAINER="devl547@gmail.com"
   11.12 @@ -10,13 +10,12 @@
   11.13  WGET_URL="http://yad.googlecode.com/files/$TARBALL"
   11.14  
   11.15  DEPENDS="gtk+"
   11.16 -BUILD_DEPENDS="acl intltool gettext pkg-config glib-dev gtk+-dev"
   11.17 +BUILD_DEPENDS="intltool gettext pkg-config glib-dev gtk+-dev"
   11.18  
   11.19  # Rules to configure and make the package.
   11.20  compile_rules()
   11.21  {
   11.22  	cd $src
   11.23 -	[ -f install-sh ] && chmod +x install-sh
   11.24  	./configure \
   11.25  		--enable-icon-browser &&
   11.26  	make && make install
   11.27 @@ -27,7 +26,7 @@
   11.28  {
   11.29  	mkdir -p $fs/usr/bin \
   11.30  		$fs/usr/share
   11.31 -	cp -a $_pkg/usr/bin/* $fs/usr/bin
   11.32 -	cp -ar $_pkg/usr/share/applications $fs/usr/share
   11.33 -	cp -ar $_pkg/usr/share/icons $fs/usr/share
   11.34 +	cp -a $install/usr/bin/* $fs/usr/bin
   11.35 +	cp -ar $install/usr/share/applications $fs/usr/share
   11.36 +	cp -ar $install/usr/share/icons $fs/usr/share
   11.37  }