wok diff emacs/receipt @ rev 11733

up wireshark (1.6.5)
author: Samuel Trassare <samuel_trassare@yahoo.com>
date: Tue Feb 21 11:41:48 2012 -0800 (2012-02-21)
parents: aa285ce6348c
children: 73641efed1cc
     1.1 --- a/emacs/receipt	Mon Feb 20 17:53:47 2012 +0100
     1.2 +++ b/emacs/receipt	Tue Feb 21 11:41:48 2012 -0800
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="emacs"
     1.7 -VERSION="23.3"
     1.8 +VERSION="23.4"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="The GNU Emacs editor"
    1.11  MAINTAINER="domcox@slitaz.org"
    1.12 @@ -25,7 +25,7 @@
    1.13  	sed -i 's/${GZIP_PROG} -9n/${GZIP_PROG}/g' leim/Makefile.in
    1.14  	# Configure (with GCC 4.5.0 workaround)
    1.15  	CFLAGS="-g -O2 -fno-optimize-sibling-calls" ./configure $CONFIGURE_ARGS \
    1.16 -		--infodir=/usr/share/emacs/info \
    1.17 +		--infodir=/usr/share/info \
    1.18  		--mandir=/usr/share/man \
    1.19  		--without-makeinfo \
    1.20  		--without-gconf \
    1.21 @@ -38,7 +38,7 @@
    1.22  		--sharedstatedir=/var/lib \
    1.23  		--prefix=/usr && \
    1.24  	make $MAKEFLAGS && \
    1.25 -	make DESTDIR=$PWD/_pkg install
    1.26 +	make DESTDIR=$DESTDIR install
    1.27  }
    1.28  
    1.29  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.30 @@ -56,7 +56,7 @@
    1.31  	echo -n "Copying emacs lib files"
    1.32  	cp -a $_pkg/usr/lib $fs/usr
    1.33  	status
    1.34 -	strip -s $fs/usr/lib/$PACKAGE/$VERSION/i486-pc-linux-gnu/* 2> /dev/null
    1.35 +	strip -s $fs/usr/lib/$PACKAGE/${VERSION:0:4}/i486-pc-linux-gnu/* 2> /dev/null
    1.36  	# lisp files
    1.37  	LISP_DIR="	lisp lisp/calc lisp/calendar lisp/cedet lisp/cedet/ede lisp/cedet/semantic \
    1.38  				lisp/cedet/semantic/analyze lisp/cedet/semantic/bovine lisp/cedet/semantic/decorate \
    1.39 @@ -65,14 +65,14 @@
    1.40  				lisp/net lisp/nxml lisp/obsolete lisp/org lisp/play lisp/progmodes lisp/textmodes lisp/url"
    1.41  	for dir in $LISP_DIR; do
    1.42  		echo -n "Copying $dir files"
    1.43 -		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \
    1.44 -		cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.elc $fs/usr/share/$PACKAGE/$VERSION/$dir
    1.45 -		if [ `ls $_pkg/usr/share/$PACKAGE/$VERSION/$dir/ | grep -c \.el$` -gt 0 ]; then
    1.46 -			cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.el $fs/usr/share/$PACKAGE/$VERSION/$dir
    1.47 +		mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \
    1.48 +		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.elc $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
    1.49 +		if [ `ls $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/ | grep -c \.el$` -gt 0 ]; then
    1.50 +			cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.el $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
    1.51  		fi
    1.52  		for file in COPYING README TODO; do
    1.53 -			if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
    1.54 -				cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file $fs/usr/share/$PACKAGE/$VERSION/$dir
    1.55 +			if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then
    1.56 +				cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
    1.57  			fi
    1.58  		done
    1.59  		status
    1.60 @@ -80,24 +80,24 @@
    1.61  	# Use linux term only
    1.62  	LINUX_TERM="README linux.el rxvt.elc tty-colors.elc vt100.elc xterm.elc"
    1.63  	echo -n "Copying lisp/term files (linux only)"
    1.64 -	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/lisp/term && \
    1.65 +	mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term && \
    1.66  	for file in $LINUX_TERM; do
    1.67 -		cp -a $_pkg/usr/share/$PACKAGE/$VERSION/lisp/term/$file $fs/usr/share/$PACKAGE/$VERSION/lisp/term
    1.68 +		cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term
    1.69  	done
    1.70  	status
    1.71  	# leim files
    1.72  	echo -n "Copying leim files"
    1.73 -	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/leim && \
    1.74 -	cp $_pkg/usr/share/$PACKAGE/$VERSION/leim/*.el $fs/usr/share/$PACKAGE/$VERSION/leim
    1.75 +	mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/leim && \
    1.76 +	cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/leim/*.el $fs/usr/share/$PACKAGE/${VERSION:0:4}/leim
    1.77  	status
    1.78  	LEIM_FILES="leim/ja-dic leim/quail"
    1.79  	for dir in $LEIM_FILES; do
    1.80  		echo -n "Copying $dir files"
    1.81 -		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \
    1.82 -		cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.elc $fs/usr/share/$PACKAGE/$VERSION/$dir && \
    1.83 +		mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \
    1.84 +		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.elc $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \
    1.85  		for file in COPYING README TODO; do
    1.86 -			if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
    1.87 -				cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file $fs/usr/share/$PACKAGE/$VERSION/$dir
    1.88 +			if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then
    1.89 +				cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
    1.90  			fi
    1.91  		done
    1.92  		status
    1.93 @@ -107,9 +107,9 @@
    1.94  	CONF_FILES="ETAGS.README charsets e edt-user.el emacs2.py emacs3.py emacs-buffer.gdb emacs.py \
    1.95  				forms-d2.dat gnus nxml schema enriched.doc ms-kermit ps-prin0.ps ps-prin1.ps \
    1.96  				ses-example.ses spook.lines yow.lines"
    1.97 -	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc && \
    1.98 +	mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc && \
    1.99  	for file in $CONF_FILES; do
   1.100 -		cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$file $fs/usr/share/$PACKAGE/$VERSION/etc
   1.101 +		cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc
   1.102  	done
   1.103  	status
   1.104  	# Pixmaps files
   1.105 @@ -118,11 +118,11 @@
   1.106  				images/tree-widget/folder"
   1.107  	for dir in $XPM_DIR; do
   1.108  		echo -n "Copying $dir xpm files"
   1.109 -		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
   1.110 -		cp $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.xpm $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
   1.111 +		mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \
   1.112 +		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir/*.xpm $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \
   1.113  		for file in COPYING README TODO; do
   1.114 -			if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
   1.115 -				cp $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file $fs/usr/share/$PACKAGE/$VERSION/$dir
   1.116 +			if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then
   1.117 +				cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir
   1.118  			fi
   1.119  		done
   1.120  		status
   1.121 @@ -130,37 +130,37 @@
   1.122  	PNG_DIR="	images images/gnus images/tree-widget/default images/tree-widget/folder"
   1.123  	for dir in $PNG_DIR; do
   1.124  		echo -n "Copying $dir png files"
   1.125 -		cp $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.png $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
   1.126 +		cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir/*.png $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \
   1.127  		status
   1.128  	done
   1.129  	# Licence
   1.130  	GNU_FILES="AUTHORS BABYL CENSORSHIP COPYING DISTRIB FTP GNU ORDERS SERVICE copying.paper"
   1.131  	echo -n "Copying License files"
   1.132  	for file in $GNU_FILES; do
   1.133 -		cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$file $fs/usr/share/$PACKAGE/$VERSION/etc
   1.134 +		cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc
   1.135  	done
   1.136  	status
   1.137  	# Install specific site file
   1.138  	echo -n "Installing specific SliTaz file"
   1.139  	mkdir -p $fs/usr/share/$PACKAGE/site-lisp/site-start.d && \
   1.140  	cp -a $_pkg/usr/share/$PACKAGE/site-lisp $fs/usr/share/$PACKAGE && \
   1.141 -	cp -a stuff/default.el $fs/usr/share/$PACKAGE/site-lisp && \
   1.142 -	cp -a stuff/90-slitaz.el $fs/usr/share/$PACKAGE/site-lisp/site-start.d
   1.143 +	cp -a $stuff/default.el $fs/usr/share/$PACKAGE/site-lisp && \
   1.144 +	cp -a $stuff/90-slitaz.el $fs/usr/share/$PACKAGE/site-lisp/site-start.d
   1.145  	status
   1.146  	# Install desktop files for emacs
   1.147  	echo -n "Installing emacs menu"
   1.148  	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications && \
   1.149 -	cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/emacs.desktop $fs/usr/share/applications/ && \
   1.150 +	cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/emacs.desktop $fs/usr/share/applications/ && \
   1.151  	cp -a $_pkg/usr/share/icons/hicolor/32x32/apps/emacs.png $fs/usr/share/pixmaps
   1.152  	status
   1.153  	# Add a desktop file for emacs client
   1.154  	echo -n "Installing emacsclient menu"
   1.155 -	cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/emacs.desktop $fs/usr/share/applications/emacsclient.desktop && \
   1.156 +	cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/emacs.desktop $fs/usr/share/applications/emacsclient.desktop && \
   1.157  	sed -i 's/Exec.*/Exec=xterm -e emacsclient --alternate-editor="" %F/' $fs/usr/share/applications/emacsclient.desktop && \
   1.158  	sed -i 's/Name=.*/Name=Emacsclient/' $fs/usr/share/applications/emacsclient.desktop
   1.159  	status
   1.160  	# Directory  workaround
   1.161 -	cd $fs/usr/share/$PACKAGE/$VERSION
   1.162 +	cd $fs/usr/share/$PACKAGE/${VERSION:0:4}
   1.163  	ln -s ../site-lisp site-lisp
   1.164  }
   1.165
author	Samuel Trassare <samuel_trassare@yahoo.com>
date	Tue Feb 21 11:41:48 2012 -0800 (2012-02-21)
parents	aa285ce6348c
children	73641efed1cc