wok-next diff emacs/receipt @ rev 14082
Up: emacs (24.2)
| author | Dominique Corbex <domcox@slitaz.org> |
|---|---|
| date | Fri Feb 22 20:43:21 2013 +0100 (2013-02-22) |
| parents | 73641efed1cc |
| children | 0bf5627a5e3f |
line diff
1.1 --- a/emacs/receipt Mon Apr 23 16:30:27 2012 +0200 1.2 +++ b/emacs/receipt Fri Feb 22 20:43:21 2013 +0100 1.3 @@ -1,19 +1,22 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="emacs" 1.7 -VERSION="23.4" 1.8 +VERSION="24.2" 1.9 CATEGORY="development" 1.10 SHORT_DESC="The GNU Emacs editor" 1.11 MAINTAINER="domcox@slitaz.org" 1.12 -DEPENDS="atk cairo dbus expat freetype fontconfig giflib glib gtk+ jpeg libgio libpng \ 1.13 -librsvg util-linux-uuid ncurses pango tiff xorg-server zlib librsvg libgsf" 1.14 -BUILD_DEPENDS="atk-dev cairo-dev expat-dev dbus-dev freetype-dev fontconfig-dev \ 1.15 -giflib-dev glib-dev gtk+-dev jpeg-dev libgio-dev libpng-dev librsvg-dev ncurses-dev \ 1.16 -pango-dev pkg-config tiff-dev xorg-dev xorg-dev-proto" 1.17 +DEPENDS="atk cairo dbus expat freetype fontconfig giflib glib gnutls gtk+ jpeg \ 1.18 +libgio libpng librsvg util-linux-uuid ncurses pango tiff xorg-server zlib \ 1.19 +librsvg libgsf" 1.20 +BUILD_DEPENDS="atk-dev cairo-dev expat-dev dbus-dev freetype-dev \ 1.21 +fontconfig-dev giflib-dev glib-dev gnutls-dev gtk+-dev jpeg-dev libgio-dev \ 1.22 +libpng-dev librsvg-dev ncurses-dev pango-dev pkg-config tiff-dev xorg-dev \ 1.23 +xorg-dev-proto" 1.24 SUGGESTED="alsa-lib" 1.25 -TARBALL="$PACKAGE-$VERSION.tar.gz" 1.26 +TARBALL="$PACKAGE-$VERSION.tar.xz" 1.27 WEB_SITE="http://www.gnu.org/software/emacs/" 1.28 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 1.29 +#WGET_URL="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-24.2.93.tar.xz" 1.30 TAGS="text-editor" 1.31 1.32 # Rules to configure and make the package. 1.33 @@ -45,7 +48,7 @@ 1.34 genpkg_rules() 1.35 { 1.36 # Binary files 1.37 - BIN_FILES="b2m ctags ebrowse emacs emacsclient etags grep-changelog rcs-checkin" 1.38 + BIN_FILES="ctags ebrowse emacs-$VERSION emacsclient etags grep-changelog" 1.39 echo -n "Copying emacs binary files" 1.40 mkdir -p $fs/usr/bin && \ 1.41 for file in $BIN_FILES; do 1.42 @@ -56,117 +59,141 @@ 1.43 echo -n "Copying emacs lib files" 1.44 cp -a $_pkg/usr/lib $fs/usr 1.45 status 1.46 - strip -s $fs/usr/lib/$PACKAGE/${VERSION:0:4}/i486-pc-linux-gnu/* 2> /dev/null 1.47 + strip -s $fs/usr/lib/$PACKAGE/$VERSION/i486-pc-linux-gnu/* 2> /dev/null 1.48 # lisp files 1.49 - LISP_DIR=" lisp lisp/calc lisp/calendar lisp/cedet lisp/cedet/ede lisp/cedet/semantic \ 1.50 - lisp/cedet/semantic/analyze lisp/cedet/semantic/bovine lisp/cedet/semantic/decorate \ 1.51 - lisp/cedet/semantic/symref lisp/cedet/semantic/wisent lisp/emacs-lisp lisp/emulation \ 1.52 - lisp/erc lisp/eshell lisp/gnus lisp/international lisp/language lisp/mail lisp/mh-e \ 1.53 - lisp/net lisp/nxml lisp/obsolete lisp/org lisp/play lisp/progmodes lisp/textmodes lisp/url" 1.54 + LISP_DIR="lisp lisp/calc lisp/calendar lisp/cedet lisp/cedet/ede \ 1.55 +lisp/cedet/semantic lisp/cedet/semantic/analyze lisp/cedet/semantic/bovine \ 1.56 +lisp/cedet/semantic/decorate lisp/cedet/semantic/symref lisp/cedet/srecode \ 1.57 +lisp/cedet/semantic/wisent lisp/emacs-lisp lisp/emulation lisp/erc lisp/eshell \ 1.58 +lisp/gnus lisp/international lisp/language lisp/mail lisp/mh-e lisp/net \ 1.59 +lisp/nxml lisp/obsolete lisp/org lisp/play lisp/progmodes lisp/textmodes \ 1.60 +lisp/url lisp/vc" 1.61 for dir in $LISP_DIR; do 1.62 echo -n "Copying $dir files" 1.63 - mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \ 1.64 - cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.elc $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir 1.65 - if [ `ls $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/ | grep -c \.el$` -gt 0 ]; then 1.66 - cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.el $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir 1.67 + mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \ 1.68 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.elc \ 1.69 + $fs/usr/share/$PACKAGE/$VERSION/$dir 1.70 + if [ $(ls $_pkg/usr/share/$PACKAGE/$VERSION/$dir/ | \ 1.71 +grep -c \.el$) -gt 0 ]; then 1.72 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.el \ 1.73 + $fs/usr/share/$PACKAGE/$VERSION/$dir 1.74 fi 1.75 for file in COPYING README TODO; do 1.76 - if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then 1.77 - cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir 1.78 + if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then 1.79 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file \ 1.80 + $fs/usr/share/$PACKAGE/$VERSION/$dir 1.81 fi 1.82 done 1.83 status 1.84 done 1.85 # Use linux term only 1.86 - LINUX_TERM="README linux.el rxvt.elc tty-colors.elc vt100.elc xterm.elc" 1.87 + LINUX_TERM="README linux.e* rxvt.elc tty-colors.elc vt100.elc xterm.elc" 1.88 echo -n "Copying lisp/term files (linux only)" 1.89 - mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term && \ 1.90 + mkdir -p $fs/usr/share/$PACKAGE/$VERSION/lisp/term && \ 1.91 for file in $LINUX_TERM; do 1.92 - cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/lisp/term 1.93 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/lisp/term/$file \ 1.94 + $fs/usr/share/$PACKAGE/$VERSION/lisp/term 1.95 done 1.96 status 1.97 # leim files 1.98 echo -n "Copying leim files" 1.99 - mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/leim && \ 1.100 - cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/leim/*.el $fs/usr/share/$PACKAGE/${VERSION:0:4}/leim 1.101 + mkdir -p $fs/usr/share/$PACKAGE/$VERSION/leim && \ 1.102 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/leim/*.el \ 1.103 + $fs/usr/share/$PACKAGE/$VERSION/leim 1.104 status 1.105 LEIM_FILES="leim/ja-dic leim/quail" 1.106 for dir in $LEIM_FILES; do 1.107 echo -n "Copying $dir files" 1.108 - mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \ 1.109 - cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/*.elc $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir && \ 1.110 + mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \ 1.111 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/$dir/*.elc \ 1.112 + $fs/usr/share/$PACKAGE/$VERSION/$dir && \ 1.113 for file in COPYING README TODO; do 1.114 - if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then 1.115 - cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir 1.116 + if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then 1.117 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file \ 1.118 + $fs/usr/share/$PACKAGE/$VERSION/$dir 1.119 fi 1.120 done 1.121 status 1.122 done 1.123 # Conf files 1.124 echo -n "Copying conf files" 1.125 - CONF_FILES="ETAGS.README charsets e edt-user.el emacs2.py emacs3.py emacs-buffer.gdb emacs.py \ 1.126 - forms-d2.dat gnus nxml schema enriched.doc ms-kermit ps-prin0.ps ps-prin1.ps \ 1.127 - ses-example.ses spook.lines yow.lines" 1.128 - mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc && \ 1.129 + CONF_FILES="ETAGS.README charsets e enriched.doc edt-user.el forms \ 1.130 +forms-d2.dat emacs-buffer.gdb gnus nxml org schema srecode ps-prin0.ps \ 1.131 +ps-prin1.ps ses-example.ses spook.lines themes yow.lines" 1.132 + mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc && \ 1.133 for file in $CONF_FILES; do 1.134 - cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc 1.135 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$file \ 1.136 + $fs/usr/share/$PACKAGE/$VERSION/etc 1.137 done 1.138 status 1.139 # Pixmaps files 1.140 - XPM_DIR=" images images/custom images/ezimage images/gnus images/gud images/mail images/mpc \ 1.141 - images/smilies images/smilies/grayscale images/smilies/medium images/tree-widget/default \ 1.142 - images/tree-widget/folder" 1.143 + XPM_DIR="images images/custom images/ezimage images/gnus images/gud \ 1.144 +images/icons/allout-widgets/*-bg images/low-color images/mail images/mpc \ 1.145 +images/newsticker images/smilies images/smilies/grayscale \ 1.146 +images/smilies/medium images/tree-widget/default images/tree-widget/folder" 1.147 for dir in $XPM_DIR; do 1.148 echo -n "Copying $dir xpm files" 1.149 - mkdir -p $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \ 1.150 - cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir/*.xpm $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \ 1.151 + mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \ 1.152 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.xpm \ 1.153 + $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \ 1.154 for file in COPYING README TODO; do 1.155 - if [ -e $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file ]; then 1.156 - cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/$dir/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/$dir 1.157 + if [ -e $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then 1.158 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/$dir/$file \ 1.159 + $fs/usr/share/$PACKAGE/$VERSION/$dir 1.160 fi 1.161 done 1.162 status 1.163 done 1.164 - PNG_DIR=" images images/gnus images/tree-widget/default images/tree-widget/folder" 1.165 + PNG_DIR="images images/gnus images/icons/allout-widgets/*-bg \ 1.166 +images/tree-widget/default images/tree-widget/folder" 1.167 for dir in $PNG_DIR; do 1.168 echo -n "Copying $dir png files" 1.169 - cp $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir/*.png $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc/$dir && \ 1.170 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$dir/*.png \ 1.171 + $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \ 1.172 status 1.173 done 1.174 # Licence 1.175 - GNU_FILES="AUTHORS BABYL CENSORSHIP COPYING DISTRIB FTP GNU ORDERS SERVICE copying.paper" 1.176 + GNU_FILES="AUTHORS CENSORSHIP COPYING DISTRIB FTP GNU ORDERS README \ 1.177 +SERVICE copying.paper" 1.178 echo -n "Copying License files" 1.179 for file in $GNU_FILES; do 1.180 - cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/$file $fs/usr/share/$PACKAGE/${VERSION:0:4}/etc 1.181 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/$file \ 1.182 + $fs/usr/share/$PACKAGE/$VERSION/etc 1.183 done 1.184 status 1.185 # Install specific site file 1.186 echo -n "Installing specific SliTaz file" 1.187 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/site-lisp \ 1.188 + $fs/usr/share/$PACKAGE && \ 1.189 mkdir -p $fs/usr/share/$PACKAGE/site-lisp/site-start.d && \ 1.190 - cp -a $_pkg/usr/share/$PACKAGE/site-lisp $fs/usr/share/$PACKAGE && \ 1.191 cp -a $stuff/default.el $fs/usr/share/$PACKAGE/site-lisp && \ 1.192 - cp -a $stuff/90-slitaz.el $fs/usr/share/$PACKAGE/site-lisp/site-start.d 1.193 + cp -a $stuff/90-slitaz.el \ 1.194 + $fs/usr/share/$PACKAGE/site-lisp/site-start.d && \ 1.195 status 1.196 # Install desktop files for emacs 1.197 echo -n "Installing emacs menu" 1.198 mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications && \ 1.199 - cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/emacs.desktop $fs/usr/share/applications/ && \ 1.200 - cp -a $_pkg/usr/share/icons/hicolor/32x32/apps/emacs.png $fs/usr/share/pixmaps 1.201 + cp -a $_pkg/usr/share/applications $fs/usr/share/ && \ 1.202 + cp -a $_pkg/usr/share/icons/hicolor/32x32/apps/emacs.png \ 1.203 + $fs/usr/share/pixmaps 1.204 status 1.205 # Add a desktop file for emacs client 1.206 echo -n "Installing emacsclient menu" 1.207 - cp -a $_pkg/usr/share/$PACKAGE/${VERSION:0:4}/etc/emacs.desktop $fs/usr/share/applications/emacsclient.desktop && \ 1.208 - sed -i 's/Exec.*/Exec=xterm -e emacsclient --alternate-editor="" %F/' $fs/usr/share/applications/emacsclient.desktop && \ 1.209 - sed -i 's/Name=.*/Name=Emacsclient/' $fs/usr/share/applications/emacsclient.desktop 1.210 + cp -a $_pkg/usr/share/$PACKAGE/$VERSION/etc/emacs.desktop \ 1.211 + $fs/usr/share/applications/emacsclient.desktop && \ 1.212 + sed -i 's/Exec.*/Exec=xterm -e emacsclient --alternate-editor="" %F/' \ 1.213 + $fs/usr/share/applications/emacsclient.desktop && \ 1.214 + sed -i 's/Name=.*/Name=Emacsclient/' \ 1.215 + $fs/usr/share/applications/emacsclient.desktop 1.216 status 1.217 - # Directory workaround 1.218 - cd $fs/usr/share/$PACKAGE/${VERSION:0:4} 1.219 + # Use default site-lisp 1.220 + cd $fs/usr/share/$PACKAGE/$VERSION 1.221 ln -s ../site-lisp site-lisp 1.222 } 1.223 1.224 post_install() 1.225 { 1.226 - cd /usr/share/emacs/site-lisp 1.227 + cd /usr/share/$PACKAGE/$VERSION/site-lisp 1.228 cat <<-EOF >site-start.el 1.229 ;; site-start.el for SliTaz -*- no-byte-compile: t -*- 1.230 ;; 1.231 @@ -177,14 +204,18 @@ 1.232 ;; own site initialisation, or even remove it completely. 1.233 ;; 1.234 EOF 1.235 - START_FILES=`ls site-start.d/ | sort` 1.236 + START_FILES="$(ls site-start.d/ | sort)" 1.237 for file in $START_FILES; do 1.238 cat site-start.d/$file >> site-start.el 1.239 done 1.240 + # linking /usr/bin/emacs to new version 1.241 + [ -h /usr/bin/emacs ] && rm -f /usr/bin/emacs 1.242 + ln -s /usr/bin/emacs-$VERSION /usr/bin/emacs 1.243 } 1.244 1.245 post_remove() 1.246 { 1.247 rm -rf /usr/share/emacs 1.248 rm -rf /usr/lib/emacs 1.249 + rm -f /usr/bin/emacs 1.250 }