wok-next rev 21659

updated fltk (1.3.4 -> 1.3.5)
author Hans-G?nter Theisgen
date Sat Jun 27 10:39:07 2020 +0100 (2020-06-27)
parents 99e53c79f216
children 77350d286baf
files flashrom/receipt fltk/receipt
line diff
     1.1 --- a/flashrom/receipt	Sat Jun 27 10:24:22 2020 +0100
     1.2 +++ b/flashrom/receipt	Sat Jun 27 10:39:07 2020 +0100
     1.3 @@ -15,15 +15,13 @@
     1.4  
     1.5  compile_rules()
     1.6  {
     1.7 -	sed -i 's|/usr/local$|/usr|' Makefile
     1.8 -
     1.9 -	make &&
    1.10 -	make DESTDIR=$install install
    1.11 +	make PREFIX=/usr &&
    1.12 +	make PREFIX=/usr DESTDIR=$install install
    1.13  }
    1.14  
    1.15  genpkg_rules()
    1.16  {
    1.17  	mkdir -p $fs/usr
    1.18 -	cp -a $install/usr/sbin $fs/usr
    1.19 +	cp -a $install/usr/sbin	$fs/usr
    1.20  	DEPENDS="pciutils"
    1.21  }
     2.1 --- a/fltk/receipt	Sat Jun 27 10:24:22 2020 +0100
     2.2 +++ b/fltk/receipt	Sat Jun 27 10:39:07 2020 +0100
     2.3 @@ -1,10 +1,10 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="fltk"
     2.7 -VERSION="1.3.4"
     2.8 +VERSION="1.3.5"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="Fast Light Tool Kit"
    2.11 -MAINTAINER="devel@slitaz.org"
    2.12 +MAINTAINER="maintainer@slitaz.org"
    2.13  LICENSE="LGPL2"
    2.14  WEB_SITE="https://www.fltk.org/index.php"
    2.15  LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/fltk.html"
    2.16 @@ -12,23 +12,30 @@
    2.17  TARBALL="$PACKAGE-$VERSION-source.tar.gz"
    2.18  WGET_URL="https://fltk.org/pub/fltk/$VERSION/$TARBALL"
    2.19  
    2.20 -BUILD_DEPENDS="alsa-lib-dev libjpeg-turbo-dev zlib-dev libpng-dev \
    2.21 -libx11-dev libice-dev libsm-dev mesa-dev libxinerama-dev \
    2.22 -freetype-dev libxft-dev libxcursor-dev xprop"
    2.23 -SPLIT="$PACKAGE-blocks $PACKAGE-checkers $PACKAGE-sudoku $PACKAGE-colbrowser \
    2.24 -$PACKAGE-editor $PACKAGE-doc $PACKAGE $PACKAGE-dev"
    2.25 +BUILD_DEPENDS="alsa-lib-dev freetype-dev libice-dev libjpeg-turbo-dev 
    2.26 +	libpng-dev libsm-dev libx11-dev libxcursor-dev libxft-dev 
    2.27 +	libxinerama-dev mesa-dev xprop zlib-dev"
    2.28 + SPLIT="$PACKAGE-blocks		$PACKAGE-checkers	$PACKAGE-sudoku 
    2.29 +	$PACKAGE-colbrowser	$PACKAGE-editor		$PACKAGE-doc 
    2.30 +	$PACKAGE		$PACKAGE-dev"
    2.31 +
    2.32  COOKOPTS="!menus"
    2.33  
    2.34 -compile_rules() {
    2.35 -	sed -i -e '/cat./d' documentation/Makefile
    2.36 +compile_rules()
    2.37 +{
    2.38 +	sed -i -e '/cat./d' \
    2.39 +		documentation/Makefile
    2.40  
    2.41 -	./configure \
    2.42 -		--enable-shared \
    2.43 -		--enable-xft \
    2.44 -		--enable-threads \
    2.45 +	./configure			\
    2.46 +		--enable-shared		\
    2.47 +		--enable-xft		\
    2.48 +		--enable-threads	\
    2.49  		$CONFIGURE_ARGS &&
    2.50 -	sed -i 's| -shared | -Wl,-Os,--as-needed\0|g' makeinclude &&
    2.51 -	sed -i s'#"rgb.txt"#"/usr/share/fltk/rgb.txt"#' test/colbrowser.cxx &&
    2.52 +	sed -i 's| -shared | -Wl,-Os,--as-needed\0|g' \
    2.53 +		makeinclude &&
    2.54 +	sed -i s'#"rgb.txt"#"/usr/share/fltk/rgb.txt"#' \
    2.55 +		test/colbrowser.cxx &&
    2.56 +
    2.57  	make $MAKEFLAGS &&
    2.58  	make DESTDIR=$install install || return 1
    2.59  
    2.60 @@ -37,56 +44,59 @@
    2.61  
    2.62  	make -C test  install-linux || return 1
    2.63  
    2.64 -	for game in blocks checkers sudoku; do
    2.65 +	for game in blocks checkers sudoku
    2.66 +	  do
    2.67  		for file in \
    2.68 -		/usr/bin/$game \
    2.69 -		/usr/share/icons/hicolor/128x128/apps/$game.png \
    2.70 -		/usr/share/icons/hicolor/32x32/apps/$game.png \
    2.71 -		/usr/share/applications/$game.desktop; do
    2.72 +			/usr/bin/$game \
    2.73 +			/usr/share/icons/hicolor/128x128/apps/$game.png \
    2.74 +			/usr/share/icons/hicolor/32x32/apps/$game.png \
    2.75 +			/usr/share/applications/$game.desktop
    2.76 +		  do
    2.77  			mv $install$file $install${file/$game/fltk-$game}
    2.78 -		done
    2.79 +		  done
    2.80  		sed -i 's|Exec=|Exec=fltk-|; s|Icon=|Icon=fltk-|; /TryExec/d' \
    2.81  			$install/usr/share/applications/fltk-$game.desktop
    2.82 -	done
    2.83 +	  done
    2.84  
    2.85 -	install -m755  $src/test/colbrowser $install/usr/bin/fltk-colbrowser
    2.86 -	install -m755  $src/test/editor     $install/usr/bin/fltk-editor
    2.87 -	install -Dm644 $src/test/rgb.txt    $install/usr/share/fltk/rgb.txt
    2.88 +	install -m755  $src/test/colbrowser	$install/usr/bin/fltk-colbrowser
    2.89 +	install -m755  $src/test/editor		$install/usr/bin/fltk-editor
    2.90 +	install -Dm644 $src/test/rgb.txt	$install/usr/share/fltk/rgb.txt
    2.91  }
    2.92  
    2.93 -genpkg_rules() {
    2.94 +genpkg_rules()
    2.95 +{
    2.96  	case $PACKAGE in
    2.97  		fltk-blocks)
    2.98  			copy $PACKAGE*
    2.99  			CAT="games|FLTK Blocks game"
   2.100  			DEPENDS="alsa-lib fontconfig libx11 libxcursor \
   2.101 -			libxext libxfixes libxft libxinerama \
   2.102 -			libxrender"
   2.103 +				libxext libxfixes libxft libxinerama \
   2.104 +				libxrender"
   2.105  			;;
   2.106  		fltk-checkers)
   2.107  			copy $PACKAGE*
   2.108  			CAT="games|FLTK Checkers game"
   2.109  			DEPENDS="fontconfig libx11 libxcursor libxext \
   2.110 -			libxfixes libxft libxinerama libxrender"
   2.111 +				libxfixes libxft libxinerama libxrender"
   2.112  			;;
   2.113  		fltk-sudoku)
   2.114  			copy $PACKAGE*
   2.115  			CAT="games|FLTK Sudoku game"
   2.116 -			DEPENDS="alsa-lib fontconfig libjpeg-turbo libpng libx11 \
   2.117 -			libxcursor libxext libxfixes libxft \
   2.118 -			libxinerama libxrender"
   2.119 +			DEPENDS="alsa-lib fontconfig libjpeg-turbo libpng 
   2.120 +				libx11 libxcursor libxext libxfixes 
   2.121 +				libxft libxinerama libxrender"
   2.122  			;;
   2.123  		fltk-colbrowser)
   2.124  			copy $PACKAGE* rgb.txt
   2.125  			CAT="graphics|FLTK Color browser"
   2.126  			DEPENDS="fontconfig libx11 libxcursor libxext \
   2.127 -			libxfixes libxft libxinerama libxrender"
   2.128 +				libxfixes libxft libxinerama libxrender"
   2.129  			;;
   2.130  		fltk-editor)
   2.131  			copy $PACKAGE*
   2.132  			CAT="development|FLTK text editor"
   2.133  			DEPENDS="fontconfig libx11 libxcursor libxext \
   2.134 -			libxfixes libxft libxinerama libxrender"
   2.135 +				libxfixes libxft libxinerama libxrender"
   2.136  			;;
   2.137  		fltk-doc)
   2.138  			copy doc/
   2.139 @@ -95,8 +105,8 @@
   2.140  		fltk)
   2.141  			copy @std @rm
   2.142  			DEPENDS="fontconfig libjpeg-turbo libpng mesa \
   2.143 -			libx11 libxcursor libxext libxfixes \
   2.144 -			libxft libxinerama libxrender"
   2.145 +				libx11 libxcursor libxext libxfixes \
   2.146 +				libxft libxinerama libxrender"
   2.147  			;;
   2.148  		fltk-dev)
   2.149  			copy @dev @rm # remove examples in doc