wok diff xtel/receipt @ rev 22391

Up crosstool-ng (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Nov 29 13:06:35 2019 +0100 (2019-11-29)
parents 9e01bc6321ea
children 5ea0ce1cecc0
line diff
     1.1 --- a/xtel/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/xtel/receipt	Fri Nov 29 13:06:35 2019 +0100
     1.3 @@ -3,28 +3,32 @@
     1.4  PACKAGE="xtel"
     1.5  VERSION="3.3.0"
     1.6  CATEGORY="network"
     1.7 +TAGS="emulator minitel"
     1.8  SHORT_DESC="X emulator of the French Minitel."
     1.9  MAINTAINER="pascal.bellard@slitaz.org"
    1.10  LICENSE="GPL2"
    1.11 +WEB_SITE="http://pficheux.free.fr/xtel/"
    1.12 +
    1.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.14 -WEB_SITE="http://pficheux.free.fr/xtel/"
    1.15  WGET_URL="${WEB_SITE}download/$TARBALL"
    1.16 +
    1.17 +DEPENDS="jpeg ncurses-extra xorg xorg-libXp"
    1.18 +BUILD_DEPENDS="jpeg-dev xorg-bdftopcf xorg-cf-files xorg-gccmakedep 
    1.19 +	xorg-imake xorg-libXp xorg-mkfontdir xorg-mkfontscale xorg-xbitmaps"
    1.20 +
    1.21  CONFIG_FILES="/etc/xtel"
    1.22 -TAGS="emulator minitel"
    1.23 -
    1.24 -DEPENDS="ncurses-extra jpeg xorg-libXp xorg"
    1.25 -BUILD_DEPENDS="xorg-imake xorg-cf-files xorg-gccmakedep xorg-xbitmaps \
    1.26 -xorg-libXp xorg-bdftopcf xorg-mkfontdir xorg-mkfontscale jpeg-dev"
    1.27  
    1.28  # Rules to configure and make the package.
    1.29  compile_rules()
    1.30  {
    1.31 -	cd $src &&
    1.32  	sed -i 's/sys_errlist.errno./strerror(errno)/' procedure.c teleinfo.c \
    1.33  		mdmdetect.c xteld.c Xsra/SelFile.c
    1.34 -	sed -i 's/sys_errlist.code_erreur./strerror(code_erreur)/' xaw.c xm.c
    1.35 -	sed -i '/sys_nerr;/d;s/errno <= sys_nerr/1/' Xsra/SelFile.c
    1.36 -	sed -i 's/getwd.SFstartDir/getcwd(SFstartDir, MAXPATHLEN/' Xsra/SelFile.c
    1.37 +	sed -i 's/sys_errlist.code_erreur./strerror(code_erreur)/' \
    1.38 +		xaw.c xm.c
    1.39 +	sed -i '/sys_nerr;/d;s/errno <= sys_nerr/1/' \
    1.40 +		Xsra/SelFile.c
    1.41 +	sed -i 's/getwd.SFstartDir/getcwd(SFstartDir, MAXPATHLEN/' \
    1.42 +		Xsra/SelFile.c
    1.43  	sed -i 's/, \(\$(...DIR)\)/,\1/;s/install_iminitel$/true/' \
    1.44  		Imakefile */Imakefile
    1.45  	xmkmf &&
    1.46 @@ -36,13 +40,16 @@
    1.47  # Rules to gen a SliTaz package suitable for Tazpkg.   
    1.48  genpkg_rules()                                      
    1.49  {
    1.50 -	mkdir -p $fs/usr/share/fonts/X11
    1.51 -	cp -a $install/* $fs/
    1.52 -	mv $fs/usr/lib/X11/xtel $fs/etc
    1.53 +	mkdir -p $fs/usr/share/fonts/X11/xtel
    1.54 +
    1.55 +	cp -a $install/*	$fs/
    1.56 +	mv $fs/usr/lib/X11/xtel	$fs/etc
    1.57  	ln -s /etc/xtel $fs/usr/lib/X11
    1.58 -	sed -i 's/`host/`nslookup/;s|/bin/bash|/bin/sh|' $fs/etc/ppp/ip*.iminitel
    1.59 -	sed -i 's|X11R6/||' $fs/usr/bin/make_xtel_lignes
    1.60 -	mv $fs/usr/lib/X11/fonts/* $fs/usr/share/fonts/X11
    1.61 +	sed -i 's/`host/`nslookup/;s|/bin/bash|/bin/sh|' \
    1.62 +		$fs/etc/ppp/ip*.iminitel
    1.63 +	sed -i 's|X11R6/||' \
    1.64 +		$fs/usr/bin/make_xtel_lignes
    1.65 +	mv $fs/fonts/X11/xtel/* $fs/usr/share/fonts/X11/xtel
    1.66  }
    1.67  
    1.68  # Pre and post install commands for Tazpkg.
    1.69 @@ -51,14 +58,18 @@
    1.70  	grep -qs ^xtel "$1/etc/services" || cat >> "$1/etc/services" <<EOT
    1.71  xtel		1313/tcp				# French minitel
    1.72  EOT
    1.73 +
    1.74  	grep -qs ^xtel "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
    1.75  xtel	stream	tcp	nowait	root	/usr/bin/xteld	xteld
    1.76  EOT
    1.77 +
    1.78  	chroot "$1/" /usr/bin/install_iminitel
    1.79 -	if [ -z "$1" ]; then
    1.80 +	if [ -z "$1" ]
    1.81 +	  then
    1.82  		/etc/init.d/inetd stop
    1.83  		/etc/init.d/inetd start
    1.84  	fi
    1.85 +
    1.86  	cat <<EOT
    1.87  	
    1.88  You should launch /usr/bin/make_xtel_lignes now.