wok diff nano/receipt @ rev 21517

updated nano and nano-doc (2.6.1 -> 4.2)
author Hans-G?nter Theisgen
date Fri May 03 15:33:28 2019 +0100 (2019-05-03)
parents 11b5e93cb5f2
children 0bae549e1050
line diff
     1.1 --- a/nano/receipt	Tue Jul 05 15:34:01 2016 +0300
     1.2 +++ b/nano/receipt	Fri May 03 15:33:28 2019 +0100
     1.3 @@ -1,22 +1,24 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nano"
     1.7 -VERSION="2.6.1"
     1.8 +VERSION="4.2"
     1.9  CATEGORY="utilities"
    1.10 -SHORT_DESC="Nano Text Editor"
    1.11 +TAGS="text-editor"
    1.12 +SHORT_DESC="Nano Text Editor."
    1.13  MAINTAINER="pankso@slitaz.org"
    1.14  LICENSE="GPL3"
    1.15  WEB_SITE="https://nano-editor.org/"
    1.16 +
    1.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.18  WGET_URL="${WEB_SITE}dist/v${VERSION%.*}/$TARBALL"
    1.19 -TAGS="text-editor"
    1.20 +
    1.21 +SUGGESTED="gpm"
    1.22 +DEPENDS="ncursesw zlib"
    1.23 +BUILD_DEPENDS="groff ncursesw-dev zlib-dev"
    1.24 +SPLIT="nano-doc"
    1.25 +
    1.26  HOST_ARCH="i486 arm"
    1.27  
    1.28 -DEPENDS="ncursesw zlib"
    1.29 -SUGGESTED="gpm"
    1.30 -BUILD_DEPENDS="ncursesw-dev zlib-dev groff"
    1.31 -SPLIT="nano-doc"
    1.32 -
    1.33  # Handle cross compilation
    1.34  case "$ARCH" in
    1.35  	arm*) BUILD_DEPENDS="ncursesw-dev zlib-dev" ;;
    1.36 @@ -25,13 +27,14 @@
    1.37  # Rules to configure and make the package.
    1.38  compile_rules()
    1.39  {
    1.40 -	./configure \
    1.41 -		--sysconfdir=/etc \
    1.42 -		--localstatedir=/var \
    1.43 -		--disable-wrapping-as-root \
    1.44 -		--enable-utf8 \
    1.45 +#		--disable-wrapping-as-root no longer supported in 4.2
    1.46 +	./configure			\
    1.47 +		--sysconfdir=/etc	\
    1.48 +		--localstatedir=/var	\
    1.49 +		--enable-utf8		\
    1.50  		$CONFIGURE_ARGS $ARCH_ARGS &&
    1.51 -	make && make install
    1.52 +	make &&
    1.53 +	make install
    1.54  }
    1.55  
    1.56  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.57 @@ -40,10 +43,15 @@
    1.58  	cp -a $install/* $fs
    1.59  	rm -r $fs/usr/share/doc $fs/usr/share/locale $fs/usr/share/man
    1.60  
    1.61 -	# Config file.
    1.62 +	# Configuration file.
    1.63  	mkdir -p $fs/etc
    1.64  	cp $src/doc/nanorc.sample $fs/etc/nanorc
    1.65 -	cd $fs; patch -p0 < $stuff/nano.patch
    1.66 +
    1.67 +	cd $fs
    1.68 +	patch --input=$stuff/patches/nanorc.patch \
    1.69 +		etc/nanorc
    1.70 +	patch --input=$stuff/patches/sh.nanorc.patch \
    1.71 +		usr/share/nano/sh.nanorc
    1.72  
    1.73  	# Shrink
    1.74  	for i in $fs/usr/share/nano/*.nanorc; do