wok rev 11722

Up: emacs to 23.4 again. I think it maybe fix from my last commit.
author Christopher Rogers <slaxemulator@gmail.com>
date Mon Feb 20 16:50:59 2012 -0500 (2012-02-20)
parents 3a1ba78e55ca
children 0c849a954ff9
files emacs-help/receipt emacs-lisp-sources/receipt emacs/receipt
line diff
     1.1 --- a/emacs-help/receipt	Mon Feb 20 14:11:54 2012 -0500
     1.2 +++ b/emacs-help/receipt	Mon Feb 20 16:50:59 2012 -0500
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="emacs-help"
     1.7 -VERSION="23.3"
     1.8 +VERSION="23.4"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="The GNU Emacs editor - Help files"
    1.11  MAINTAINER="domcox@slitaz.org"
    1.12 @@ -14,23 +14,23 @@
    1.13  {
    1.14  	# Help files
    1.15  	echo -n "Copying info files"
    1.16 -	mkdir -p $fs/usr/share/emacs/info && \
    1.17 -	cp -a $_pkg/usr/share/emacs/info/em* $fs/usr/share/emacs/info && \
    1.18 -	cp -a $_pkg/usr/share/emacs/info/info $fs/usr/share/emacs/info
    1.19 +	mkdir -p $fs/usr/share/info && \
    1.20 +	cp -a $_pkg/usr/share/info/em* $fs/usr/share/info && \
    1.21 +	cp -a $_pkg/usr/share/info/info $fs/usr/share/info
    1.22  	status
    1.23  	# Tutorial
    1.24  	echo -n "Copying tutorial files"
    1.25 -	mkdir -p $fs/usr/share/emacs/$VERSION/etc && \
    1.26 -	cp -a $_pkg/usr/share/emacs/$VERSION/etc/tutorials $fs/usr/share/emacs/$VERSION/etc
    1.27 +	mkdir -p $fs/usr/share/emacs/${VERSION:0:4}/etc && \
    1.28 +	cp -a $_pkg/usr/share/emacs/${VERSION:0:4}/etc/tutorials $fs/usr/share/emacs/${VERSION:0:4}/etc
    1.29  	status
    1.30  	# Doc
    1.31  	echo -n "Copying doc files"
    1.32 -	DOC_FILES="	COOKIES DOC-$VERSION.1 DEVEL.HUMOR ERC-NEWS ETAGS.EBNF GNUS-NEWS HELLO \
    1.33 +	DOC_FILES="	COOKIES DOC-${VERSION:0:4}.1 DEVEL.HUMOR ERC-NEWS ETAGS.EBNF GNUS-NEWS HELLO \
    1.34  				INTERVIEW JOKES LINUX-GNU MH-E-NEWS MORE.STUFF MOTIVATION NEWS NEWS.1-17 \
    1.35  				NEWS.19 NEWS.19 NEWS.20 NEWS.21 NEWS.22 NXML-NEWS PROBLEMS TERMS THE-GNU-PROJECT \
    1.36  				WHY-FREE compilation.txt enriched.doc gnus-tut.txt grep.txt"
    1.37  	for file in $DOC_FILES; do
    1.38 -		cp -a $_pkg/usr/share/emacs/$VERSION/etc/$file $fs/usr/share/emacs/$VERSION/etc
    1.39 +		cp -a $_pkg/usr/share/emacs/${VERSION:0:4}/etc/$file $fs/usr/share/emacs/${VERSION:0:4}/etc
    1.40  	done
    1.41  	status
    1.42  }
     2.1 --- a/emacs-lisp-sources/receipt	Mon Feb 20 14:11:54 2012 -0500
     2.2 +++ b/emacs-lisp-sources/receipt	Mon Feb 20 16:50:59 2012 -0500
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="emacs-lisp-sources"
     2.7 -VERSION="23.3"
     2.8 +VERSION="23.4"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="The GNU Emacs editor - Lisp source files"
    2.11  MAINTAINER="domcox@slitaz.org"
    2.12 @@ -21,31 +21,31 @@
    2.13  
    2.14  	for dir in $LISP_DIR; do
    2.15  		echo -n "Copying $dir sources"
    2.16 -		mkdir -p $fs/usr/share/$WANTED/$VERSION/$dir && \
    2.17 -		cp $_pkg/usr/share/$WANTED/$VERSION/$dir/*.el.gz $fs/usr/share/$WANTED/$VERSION/$dir
    2.18 +		mkdir -p $fs/usr/share/$WANTED/${VERSION:0:4}/$dir && \
    2.19 +		cp $_pkg/usr/share/$WANTED/${VERSION:0:4}/$dir/*.el.gz $fs/usr/share/$WANTED/${VERSION:0:4}/$dir
    2.20  		status
    2.21  	done
    2.22  	# Use linux term only
    2.23  	LINUX_TERM="rxvt.el.gz tty-colors.el.gz vt100.el.gz xterm.el.gz"
    2.24  	echo -n "Copying lisp/term sources"
    2.25 -	mkdir -p $fs/usr/share/$WANTED/$VERSION/lisp/term && \
    2.26 +	mkdir -p $fs/usr/share/$WANTED/${VERSION:0:4}/lisp/term && \
    2.27  	for file in $LINUX_TERM; do
    2.28 -		cp -a $_pkg/usr/share/$WANTED/$VERSION/lisp/term/$file $fs/usr/share/$WANTED/$VERSION/lisp/term
    2.29 +		cp -a $_pkg/usr/share/$WANTED/${VERSION:0:4}/lisp/term/$file $fs/usr/share/$WANTED/${VERSION:0:4}/lisp/term
    2.30  	done
    2.31  	status
    2.32  	# leim files
    2.33  	LEIM_FILES="leim/ja-dic leim/quail"
    2.34  	for dir in $LEIM_FILES; do
    2.35  		echo -n "Copying $dir sources"
    2.36 -		mkdir -p $fs/usr/share/$WANTED/$VERSION/$dir && \
    2.37 -		cp $_pkg/usr/share/$WANTED/$VERSION/$dir/*.el.gz $fs/usr/share/$WANTED/$VERSION/$dir && \
    2.38 +		mkdir -p $fs/usr/share/$WANTED/${VERSION:0:4}/$dir && \
    2.39 +		cp $_pkg/usr/share/$WANTED/${VERSION:0:4}/$dir/*.el.gz $fs/usr/share/$WANTED/${VERSION:0:4}/$dir && \
    2.40  		status
    2.41  	done
    2.42  	# Doc
    2.43  	echo -n "Copying doc files"
    2.44  	DOC_FILES="CONTRIBUTE DEBUG MACHINES MAILINGLISTS TODO"
    2.45  	for file in $DOC_FILES; do
    2.46 -		cp -a $_pkg/usr/share/emacs/$VERSION/etc/$file $fs/usr/share/emacs/$VERSION/etc
    2.47 +		cp -a $_pkg/usr/share/emacs/${VERSION:0:4}/etc/$file $fs/usr/share/emacs/${VERSION:0:4}/etc
    2.48  	done
    2.49  	status
    2.50  }
     3.1 --- a/emacs/receipt	Mon Feb 20 14:11:54 2012 -0500
     3.2 +++ b/emacs/receipt	Mon Feb 20 16:50:59 2012 -0500
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="emacs"
     3.7 -VERSION="23.3"
     3.8 +VERSION="23.4"
     3.9  CATEGORY="development"
    3.10  SHORT_DESC="The GNU Emacs editor"
    3.11  MAINTAINER="domcox@slitaz.org"
    3.12 @@ -25,7 +25,7 @@
    3.13  	sed -i 's/${GZIP_PROG} -9n/${GZIP_PROG}/g' leim/Makefile.in
    3.14  	# Configure (with GCC 4.5.0 workaround)
    3.15  	CFLAGS="-g -O2 -fno-optimize-sibling-calls" ./configure $CONFIGURE_ARGS \
    3.16 -		--infodir=/usr/share/emacs/info \
    3.17 +		--infodir=/usr/share/info \
    3.18  		--mandir=/usr/share/man \
    3.19  		--without-makeinfo \
    3.20  		--without-gconf \
    3.21 @@ -38,7 +38,7 @@
    3.22  		--sharedstatedir=/var/lib \
    3.23  		--prefix=/usr && \
    3.24  	make $MAKEFLAGS && \
    3.25 -	make DESTDIR=$PWD/_pkg install
    3.26 +	make DESTDIR=$DESTDIR install
    3.27  }
    3.28  
    3.29  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.30 @@ -56,7 +56,7 @@
    3.31  	echo -n "Copying emacs lib files"
    3.32  	cp -a $_pkg/usr/lib $fs/usr
    3.33  	status
    3.34 -	strip -s $fs/usr/lib/$PACKAGE/$VERSION/i486-pc-linux-gnu/* 2> /dev/null
    3.35 +	strip -s $fs/usr/lib/$PACKAGE/${VERSION:0:4}/i486-pc-linux-gnu/* 2> /dev/null
    3.36  	# lisp files
    3.37  	LISP_DIR="	lisp lisp/calc lisp/calendar lisp/cedet lisp/cedet/ede lisp/cedet/semantic \
    3.38  				lisp/cedet/semantic/analyze lisp/cedet/semantic/bovine lisp/cedet/semantic/decorate \
    3.39 @@ -65,14 +65,14 @@
    3.40  				lisp/net lisp/nxml lisp/obsolete lisp/org lisp/play lisp/progmodes lisp/textmodes lisp/url"
    3.41  	for dir in $LISP_DIR; do
    3.42  		echo -n "Copying $dir files"
    3.43 -		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \
    3.44 -		cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.elc $fs/usr/share/$PACKAGE/$VERSION/$dir
    3.45 -		if [ `ls $_pkg/usr/share/$PACKAGE/$VERSION/$dir/ | grep -c \.el$` -gt 0 ]; then
    3.46 -			cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.el $fs/usr/share/$PACKAGE/$VERSION/$dir
    3.47 +		mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \
    3.48 +		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.elc $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
    3.49 +		if [ `ls $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/ | grep -c \.el$` -gt 0 ]; then
    3.50 +			cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.el $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
    3.51  		fi
    3.52  		for file in COPYING README TODO; do
    3.53 -			if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
    3.54 -				cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file $fs/usr/share/$PACKAGE/$VERSION/$dir
    3.55 +			if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then
    3.56 +				cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
    3.57  			fi
    3.58  		done
    3.59  		status
    3.60 @@ -80,24 +80,24 @@
    3.61  	# Use linux term only
    3.62  	LINUX_TERM="README linux.el rxvt.elc tty-colors.elc vt100.elc xterm.elc"
    3.63  	echo -n "Copying lisp/term files (linux only)"
    3.64 -	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/lisp/term && \
    3.65 +	mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term && \
    3.66  	for file in $LINUX_TERM; do
    3.67 -		cp -a $_pkg/usr/share/$PACKAGE/$VERSION/lisp/term/$file $fs/usr/share/$PACKAGE/$VERSION/lisp/term
    3.68 +		cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term
    3.69  	done
    3.70  	status
    3.71  	# leim files
    3.72  	echo -n "Copying leim files"
    3.73 -	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/leim && \
    3.74 -	cp $_pkg/usr/share/$PACKAGE/$VERSION/leim/*.el $fs/usr/share/$PACKAGE/$VERSION/leim
    3.75 +	mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/leim && \
    3.76 +	cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/leim/*.el $fs/usr/share/$PACKAGE/${VERSION:0:4}/leim
    3.77  	status
    3.78  	LEIM_FILES="leim/ja-dic leim/quail"
    3.79  	for dir in $LEIM_FILES; do
    3.80  		echo -n "Copying $dir files"
    3.81 -		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \
    3.82 -		cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.elc $fs/usr/share/$PACKAGE/$VERSION/$dir && \
    3.83 +		mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \
    3.84 +		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.elc $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \
    3.85  		for file in COPYING README TODO; do
    3.86 -			if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
    3.87 -				cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file $fs/usr/share/$PACKAGE/$VERSION/$dir
    3.88 +			if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then
    3.89 +				cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
    3.90  			fi
    3.91  		done
    3.92  		status
    3.93 @@ -107,9 +107,9 @@
    3.94  	CONF_FILES="ETAGS.README charsets e edt-user.el emacs2.py emacs3.py emacs-buffer.gdb emacs.py \
    3.95  				forms-d2.dat gnus nxml schema enriched.doc ms-kermit ps-prin0.ps ps-prin1.ps \
    3.96  				ses-example.ses spook.lines yow.lines"
    3.97 -	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc && \
    3.98 +	mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc && \
    3.99  	for file in $CONF_FILES; do
   3.100 -		cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$file $fs/usr/share/$PACKAGE/$VERSION/etc
   3.101 +		cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc
   3.102  	done
   3.103  	status
   3.104  	# Pixmaps files
   3.105 @@ -118,11 +118,11 @@
   3.106  				images/tree-widget/folder"
   3.107  	for dir in $XPM_DIR; do
   3.108  		echo -n "Copying $dir xpm files"
   3.109 -		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
   3.110 -		cp $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.xpm $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
   3.111 +		mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \
   3.112 +		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir/*.xpm $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \
   3.113  		for file in COPYING README TODO; do
   3.114 -			if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
   3.115 -				cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file $fs/usr/share/$PACKAGE/$VERSION/$dir
   3.116 +			if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then
   3.117 +				cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
   3.118  			fi
   3.119  		done
   3.120  		status
   3.121 @@ -130,37 +130,37 @@
   3.122  	PNG_DIR="	images images/gnus images/tree-widget/default images/tree-widget/folder"
   3.123  	for dir in $PNG_DIR; do
   3.124  		echo -n "Copying $dir png files"
   3.125 -		cp $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.png $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
   3.126 +		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir/*.png $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \
   3.127  		status
   3.128  	done
   3.129  	# Licence
   3.130  	GNU_FILES="AUTHORS BABYL CENSORSHIP COPYING DISTRIB FTP GNU ORDERS SERVICE copying.paper"
   3.131  	echo -n "Copying License files"
   3.132  	for file in $GNU_FILES; do
   3.133 -		cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$file $fs/usr/share/$PACKAGE/$VERSION/etc
   3.134 +		cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc
   3.135  	done
   3.136  	status
   3.137  	# Install specific site file
   3.138  	echo -n "Installing specific SliTaz file"
   3.139  	mkdir -p $fs/usr/share/$PACKAGE/site-lisp/site-start.d && \
   3.140  	cp -a $_pkg/usr/share/$PACKAGE/site-lisp $fs/usr/share/$PACKAGE && \
   3.141 -	cp -a stuff/default.el $fs/usr/share/$PACKAGE/site-lisp && \
   3.142 -	cp -a stuff/90-slitaz.el $fs/usr/share/$PACKAGE/site-lisp/site-start.d
   3.143 +	cp -a $stuff/default.el $fs/usr/share/$PACKAGE/site-lisp && \
   3.144 +	cp -a $stuff/90-slitaz.el $fs/usr/share/$PACKAGE/site-lisp/site-start.d
   3.145  	status
   3.146  	# Install desktop files for emacs
   3.147  	echo -n "Installing emacs menu"
   3.148  	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications && \
   3.149 -	cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/emacs.desktop $fs/usr/share/applications/ && \
   3.150 +	cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/emacs.desktop $fs/usr/share/applications/ && \
   3.151  	cp -a $_pkg/usr/share/icons/hicolor/32x32/apps/emacs.png $fs/usr/share/pixmaps
   3.152  	status
   3.153  	# Add a desktop file for emacs client
   3.154  	echo -n "Installing emacsclient menu"
   3.155 -	cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/emacs.desktop $fs/usr/share/applications/emacsclient.desktop && \
   3.156 +	cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/emacs.desktop $fs/usr/share/applications/emacsclient.desktop && \
   3.157  	sed -i 's/Exec.*/Exec=xterm -e emacsclient --alternate-editor="" %F/' $fs/usr/share/applications/emacsclient.desktop && \
   3.158  	sed -i 's/Name=.*/Name=Emacsclient/' $fs/usr/share/applications/emacsclient.desktop
   3.159  	status
   3.160  	# Directory  workaround
   3.161 -	cd $fs/usr/share/$PACKAGE/$VERSION
   3.162 +	cd $fs/usr/share/$PACKAGE/${VERSION:0:4}
   3.163  	ln -s ../site-lisp site-lisp
   3.164  }
   3.165