wok-6.x rev 16081

ARM: add more basic Xorg pkgs and improve jwm receipt
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 15 19:56:28 2014 +0100 (2014-03-15)
parents 5455fda86893
children 4ba762f15bab
files aterm/receipt jwm/receipt rsync/receipt slitaz-configs-base/receipt slitaz-dev-tools/receipt slitaz-icon/receipt slitaz-polar-cursors/receipt xorg-libXcursor-dev/receipt xorg-libXcursor/receipt xorg-xcursorgen/receipt xorg-xwininfo/receipt
line diff
     1.1 --- a/aterm/receipt	Sat Mar 15 13:11:09 2014 +0100
     1.2 +++ b/aterm/receipt	Sat Mar 15 19:56:28 2014 +0100
     1.3 @@ -9,19 +9,17 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     1.5  WEB_SITE="http://aterm.sourceforge.net"
     1.6  WGET_URL="http://nchc.dl.sourceforge.net/sourceforge/aterm/$TARBALL"
     1.7 +HOST_ARCH="i486 arm"
     1.8 +
     1.9  TAGS="terminal"
    1.10 -
    1.11  DEPENDS="xorg-libSM xorg-libXext"
    1.12  BUILD_DEPENDS="xorg-libSM-dev xorg-libXext-dev xorg-libXt-dev"
    1.13  
    1.14  # Rules to configure and make the package.
    1.15  compile_rules()
    1.16  {
    1.17 -	cd $src
    1.18 -	./configure --prefix=/usr --infodir=/usr/share/info \
    1.19 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    1.20 -	make &&
    1.21 -	make DESTDIR=$DESTDIR install
    1.22 +	./configure $CONFIGURE_ARGS &&
    1.23 +	make && make install
    1.24  }
    1.25  
    1.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.27 @@ -30,4 +28,3 @@
    1.28  	mkdir -p $fs/usr
    1.29  	cp -a $install/usr/bin $fs/usr
    1.30  }
    1.31 -
     2.1 --- a/jwm/receipt	Sat Mar 15 13:11:09 2014 +0100
     2.2 +++ b/jwm/receipt	Sat Mar 15 19:56:28 2014 +0100
     2.3 @@ -14,12 +14,16 @@
     2.4  
     2.5  DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \
     2.6  xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \
     2.7 -libpng slitaz-configs-base xorg-xload xorg-xclock nano imlib2 hsetroot compton"
     2.8 +libpng slitaz-configs-base xorg-xload xorg-xclock imlib2 hsetroot"
     2.9  BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev jpeg-dev libpng-dev"
    2.10  
    2.11  # Handle cross compilation
    2.12  case "$ARCH" in
    2.13 -	arm) ARCH_ARGS="--disable-nls" ;;
    2.14 +	arm)
    2.15 +		DEPENDS="$DEPENDS joe lynx ytree"
    2.16 +		ARCH_ARGS="--disable-nls" ;;
    2.17 +	i?86)
    2.18 +		DEPENDS="$DEPENDS compton nano" ;;
    2.19  esac
    2.20  
    2.21  # Rules to configure and make the package.
     3.1 --- a/rsync/receipt	Sat Mar 15 13:11:09 2014 +0100
     3.2 +++ b/rsync/receipt	Sat Mar 15 19:56:28 2014 +0100
     3.3 @@ -11,7 +11,7 @@
     3.4  WGET_URL="${WEB_SITE}ftp/rsync/$TARBALL"
     3.5  CONFIG_FILES="/etc/rsyncd.conf /etc/rsyncd.secrets"
     3.6  TAGS="sync copy secure"
     3.7 -#HOST_ARCH="i486 arm"
     3.8 +HOST_ARCH="i486 arm"
     3.9  
    3.10  DEPENDS="popt attr acl"
    3.11  BUILD_DEPENDS="popt-dev attr-dev acl-dev"
    3.12 @@ -22,7 +22,6 @@
    3.13  # Rules to configure and make the package.
    3.14  compile_rules()
    3.15  {
    3.16 -	cd $src
    3.17  	./configure \
    3.18  		--prefix=/usr \
    3.19  		--mandir=/usr/share/man \
     4.1 --- a/slitaz-configs-base/receipt	Sat Mar 15 13:11:09 2014 +0100
     4.2 +++ b/slitaz-configs-base/receipt	Sat Mar 15 19:56:28 2014 +0100
     4.3 @@ -10,26 +10,40 @@
     4.4  SOURCE="slitaz-configs"
     4.5  TARBALL="$SOURCE-$VERSION.tar.gz"
     4.6  WGET_URL="http://hg.slitaz.org/slitaz-configs/archive/$VERSION.tar.gz"
     4.7 +HOST_ARCH="i486 arm"
     4.8  
     4.9  DEPENDS="tazlito tazpkg"
    4.10  
    4.11 +# Handle SliTaz arch
    4.12 +case "$SLITAZ_ARCH" in
    4.13 +	arm*) DEPENDS="" ;;
    4.14 +esac
    4.15 +
    4.16  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.17  genpkg_rules()
    4.18  {
    4.19 -	# Copy rootfs files from the stuff and set permissions.
    4.20 -	mkdir -p \
    4.21 -		$fs/etc \
    4.22 -		$fs/boot \
    4.23 -		$fs/usr/share \
    4.24 -		$fs/etc/skel/Music \
    4.25 -		$fs/etc/skel/Documents
    4.26 -	cp -a $src/rootfs/boot $fs
    4.27 -	cp -a $src/rootfs/etc/skel $fs/etc
    4.28 -	cp -a $src/rootfs/etc/X11 $fs/etc
    4.29 -
    4.30 -	for i in images pixmaps themes webhome; do
    4.31 -		cp -r $src/rootfs/usr/share/$i $fs/usr/share
    4.32 -	done
    4.33 +	# Copy rootfs files and set permissions.
    4.34 +	case "$ARCH" in
    4.35 +	arm*)
    4.36 +		# Most ARM configs are in: slitaz-arm repo
    4.37 +		mkdir -p $fs/usr/share
    4.38 +		cp -a $src/rootfs/usr/bin $fs/usr 
    4.39 +		cp -a $src/rootfs/usr/share/webhome $fs/usr/share ;;
    4.40 +	*)
    4.41 +		mkdir -p \
    4.42 +			$fs/etc \
    4.43 +			$fs/boot \
    4.44 +			$fs/usr/share \
    4.45 +			$fs/etc/skel/Music \
    4.46 +			$fs/etc/skel/Documents
    4.47 +		cp -a $src/rootfs/boot $fs
    4.48 +		cp -a $src/rootfs/etc/skel $fs/etc
    4.49 +		cp -a $src/rootfs/etc/X11 $fs/etc
    4.50 +		
    4.51 +		for i in images pixmaps themes webhome; do
    4.52 +			cp -r $src/rootfs/usr/share/$i $fs/usr/share
    4.53 +		done ;;
    4.54 +	esac
    4.55  
    4.56  	cp -a $src/rootfs/root $fs
    4.57  	chown -R root.root $fs
     5.1 --- a/slitaz-dev-tools/receipt	Sat Mar 15 13:11:09 2014 +0100
     5.2 +++ b/slitaz-dev-tools/receipt	Sat Mar 15 19:56:28 2014 +0100
     5.3 @@ -6,8 +6,9 @@
     5.4  SHORT_DESC="SliTaz developers tools meta package."
     5.5  MAINTAINER="pankso@slitaz.org"
     5.6  LICENSE="GPL2"
     5.7 -DEPENDS="rsync tazdev tazchroot libtaz tazwok mercurial"
     5.8 +DEPENDS="rsync tazdev mercurial"
     5.9  WEB_SITE="http://www.slitaz.org/"
    5.10 +#HOST_ARCH="i486 arm"
    5.11  
    5.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.13  genpkg_rules()
     6.1 --- a/slitaz-icon/receipt	Sat Mar 15 13:11:09 2014 +0100
     6.2 +++ b/slitaz-icon/receipt	Sat Mar 15 19:56:28 2014 +0100
     6.3 @@ -9,6 +9,7 @@
     6.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     6.5  WEB_SITE="http://www.slitaz.org/"
     6.6  WGET_URL="http://mirror.slitaz.org/sources/artwok/$TARBALL"
     6.7 +HOST_ARCH="i486 arm"
     6.8  
     6.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.10  genpkg_rules()
     7.1 --- a/slitaz-polar-cursors/receipt	Sat Mar 15 13:11:09 2014 +0100
     7.2 +++ b/slitaz-polar-cursors/receipt	Sat Mar 15 19:56:28 2014 +0100
     7.3 @@ -9,6 +9,7 @@
     7.4  TARBALL=$PACKAGE-$VERSION.tar.gz
     7.5  WEB_SITE="http://www.slitaz.org/"
     7.6  WGET_URL="ftp://download.tuxfamily.org/slitaz/sources/artwok/$TARBALL"
     7.7 +HOST_ARCH="i486 arm"
     7.8  
     7.9  BUILD_DEPENDS="xorg-xcursorgen"
    7.10  
     8.1 --- a/xorg-libXcursor-dev/receipt	Sat Mar 15 13:11:09 2014 +0100
     8.2 +++ b/xorg-libXcursor-dev/receipt	Sat Mar 15 19:56:28 2014 +0100
     8.3 @@ -7,6 +7,7 @@
     8.4  MAINTAINER="pankso@slitaz.org"
     8.5  LICENSE="other"
     8.6  WEB_SITE="http://www.x.org/"
     8.7 +HOST_ARCH="i486 arm"
     8.8  
     8.9  WANTED="xorg-libXcursor"
    8.10  DEPENDS="xorg-libXcursor xorg-libXrender-dev xorg-libXfixes-dev pkg-config"
     9.1 --- a/xorg-libXcursor/receipt	Sat Mar 15 13:11:09 2014 +0100
     9.2 +++ b/xorg-libXcursor/receipt	Sat Mar 15 19:56:28 2014 +0100
     9.3 @@ -10,6 +10,7 @@
     9.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
     9.5  WEB_SITE="http://www.x.org/"
     9.6  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
     9.7 +HOST_ARCH="i486 arm"
     9.8  
     9.9  DEPENDS="xorg-libXfixes xorg-libXrender"
    9.10  BUILD_DEPENDS="xorg-libXrender-dev xorg-libXfixes-dev"
    10.1 --- a/xorg-xcursorgen/receipt	Sat Mar 15 13:11:09 2014 +0100
    10.2 +++ b/xorg-xcursorgen/receipt	Sat Mar 15 19:56:28 2014 +0100
    10.3 @@ -10,6 +10,7 @@
    10.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
    10.5  WEB_SITE="http://www.x.org/"
    10.6  WGET_URL="$XORG_MIRROR/app/$TARBALL"
    10.7 +HOST_ARCH="i486 arm"
    10.8  
    10.9  DEPENDS="xorg-libX11 xorg-libXcursor libpng"
   10.10  BUILD_DEPENDS="xorg-libX11-dev xorg-libXcursor-dev libpng-dev"
    11.1 --- a/xorg-xwininfo/receipt	Sat Mar 15 13:11:09 2014 +0100
    11.2 +++ b/xorg-xwininfo/receipt	Sat Mar 15 19:56:28 2014 +0100
    11.3 @@ -11,6 +11,7 @@
    11.4  WEB_SITE="http://xorg.freedesktop.org/"
    11.5  WGET_URL="$WEB_SITE/releases/individual/app/$TARBALL"
    11.6  TAGS="util xorg windows"
    11.7 +HOST_ARCH="i486 arm"
    11.8  
    11.9  DEPENDS="xorg-libX11"
   11.10  BUILD_DEPENDS="xorg-libX11-dev"