wok-6.x rev 7393

merge
author Christopher Rogers <slaxemulator@gmail.com>
date Fri Nov 26 05:10:35 2010 +0000 (2010-11-26)
parents 6eb25ce63fce 582724377a48
children fd2978445c1a
files
line diff
     1.1 --- a/dahdi-dev/receipt	Fri Nov 26 05:09:19 2010 +0000
     1.2 +++ b/dahdi-dev/receipt	Fri Nov 26 05:10:35 2010 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="dahdi-dev"
     1.7 -VERSION="2.3.0"
     1.8 +VERSION="2.4.0"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Digium Asterisk Hardware Device Interface development files."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
     2.1 --- a/dahdi-linux-dev/receipt	Fri Nov 26 05:09:19 2010 +0000
     2.2 +++ b/dahdi-linux-dev/receipt	Fri Nov 26 05:10:35 2010 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="dahdi-linux-dev"
     2.7 -VERSION="2.3.0"
     2.8 +VERSION="2.4.0"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="Digium Asterisk Hardware Device Interface: kernel modules dev files."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
     3.1 --- a/dahdi-linux/receipt	Fri Nov 26 05:09:19 2010 +0000
     3.2 +++ b/dahdi-linux/receipt	Fri Nov 26 05:10:35 2010 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="dahdi-linux"
     3.7 -VERSION="2.3.0"
     3.8 +VERSION="2.4.0"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="Digium Asterisk Hardware Device Interface: kernel modules."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
     4.1 --- a/dahdi-man/receipt	Fri Nov 26 05:09:19 2010 +0000
     4.2 +++ b/dahdi-man/receipt	Fri Nov 26 05:10:35 2010 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="dahdi-man"
     4.7 -VERSION="2.3.0"
     4.8 +VERSION="2.4.0"
     4.9  CATEGORY="network"
    4.10  SHORT_DESC="Digium Asterisk Hardware Device Interface man pages."
    4.11  MAINTAINER="pascal.bellard@slitaz.org"
     5.1 --- a/dahdi-perl/receipt	Fri Nov 26 05:09:19 2010 +0000
     5.2 +++ b/dahdi-perl/receipt	Fri Nov 26 05:10:35 2010 +0000
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="dahdi-perl"
     5.7 -VERSION="2.3.0"
     5.8 +VERSION="2.4.0"
     5.9  CATEGORY="development"
    5.10  SHORT_DESC="Digium Asterisk Hardware Device Interface PERL modules."
    5.11  MAINTAINER="pascal.bellard@slitaz.org"
     6.1 --- a/dahdi-ppp/receipt	Fri Nov 26 05:09:19 2010 +0000
     6.2 +++ b/dahdi-ppp/receipt	Fri Nov 26 05:10:35 2010 +0000
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="dahdi-ppp"
     6.7 -VERSION="2.3.0"
     6.8 +VERSION="2.4.0"
     6.9  CATEGORY="network"
    6.10  SHORT_DESC="Digium Asterisk Hardware Device Interface PPP plugin."
    6.11  MAINTAINER="pascal.bellard@slitaz.org"
     7.1 --- a/dahdi-tools/receipt	Fri Nov 26 05:09:19 2010 +0000
     7.2 +++ b/dahdi-tools/receipt	Fri Nov 26 05:10:35 2010 +0000
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="dahdi-tools"
     7.7 -VERSION="2.3.0"
     7.8 +VERSION="2.4.0"
     7.9  CATEGORY="network"
    7.10  SHORT_DESC="Digium Asterisk Hardware Device Interface userland tools."
    7.11  MAINTAINER="pascal.bellard@slitaz.org"
     8.1 --- a/flam3/receipt	Fri Nov 26 05:09:19 2010 +0000
     8.2 +++ b/flam3/receipt	Fri Nov 26 05:10:35 2010 +0000
     8.3 @@ -14,20 +14,18 @@
     8.4  # Rules to configure and make the package.
     8.5  compile_rules()
     8.6  {
     8.7 -	src=$WOK/$PACKAGE/$PACKAGE-$VERSION/src
     8.8 -	cd $src
     8.9 +	cd $src/src
    8.10  	./configure \
    8.11  		--prefix=/usr \
    8.12  		--infodir=/usr/share/info \
    8.13  		--mandir=/usr/share/man \
    8.14  		$CONFIGURE_ARGS &&
    8.15 -	make -j 4 && make DESTDIR=$PWD/_pkg install
    8.16 +	make -j 4 && make DESTDIR=$PWD/../_pkg install
    8.17  }
    8.18  
    8.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.20  genpkg_rules()
    8.21  {
    8.22 -	_pkg=$WOK/$PACKAGE/$PACKAGE-$VERSION/src/_pkg
    8.23  	mkdir -p $fs/usr/share
    8.24  	cp -a $_pkg/usr/bin $fs/usr/
    8.25  	cp -a $_pkg/usr/share/flam3 $fs/usr/share/