summaryrefslogtreecommitdiff
path: root/office
diff options
context:
space:
mode:
Diffstat (limited to 'office')
-rw-r--r--office/org-mode/Makefile.patch32
-rw-r--r--office/org-mode/org-mode.SlackBuild5
-rw-r--r--office/org-mode/org-mode.info6
3 files changed, 9 insertions, 34 deletions
diff --git a/office/org-mode/Makefile.patch b/office/org-mode/Makefile.patch
index 314f21b6f7..d4eb8e13fd 100644
--- a/office/org-mode/Makefile.patch
+++ b/office/org-mode/Makefile.patch
@@ -1,11 +1,10 @@
---- org-7.01/Makefile 2010-07-19 10:27:15.000000000 +0400
-+++ Makefile.2 2010-07-20 01:11:21.449263023 +0400
-@@ -14,13 +14,14 @@
+--- Makefile 2010-10-29 10:43:29.000000000 +0400
++++ Makefile.new 2010-10-30 01:08:48.379339339 +0400
+@@ -14,13 +14,13 @@
EMACS=emacs
# Where local software is found
-prefix=/usr/local
-+# prefix=/usr/local
+prefix=$(DESTDIR)
# Where local lisp files go.
@@ -17,15 +16,7 @@
##----------------------------------------------------------------------
## YOU MAY NEED TO EDIT THESE
-@@ -183,6 +184,7 @@
-
- install: install-lisp
-
-+#doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf
- doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf
-
- p:
-@@ -232,13 +234,13 @@
+@@ -243,7 +243,7 @@
doc/org.html: doc/org.texi
(cd doc; $(TEXI2HTML) --no-split -o org.html org.texi)
@@ -34,18 +25,3 @@
doc/orgcard.pdf: doc/orgcard.tex
(cd doc; pdftex orgcard.tex)
-
--doc/orgcard.txt: doc/orgcard.tex
-- (cd doc; perl ../UTILITIES/orgcard2txt.pl orgcard.tex > orgcard.txt)
-+#doc/orgcard.txt: doc/orgcard.tex
-+# (cd doc; perl ../UTILITIES/orgcard2txt.pl orgcard.tex > orgcard.txt)
-
- doc/orgcard_letter.tex: doc/orgcard.tex
- perl -pe 's/\\pdflayout=\(0l\)/\\pdflayout=(1l)/' \
-@@ -430,4 +432,4 @@
- lisp/org-vm.elc: lisp/org.el
- lisp/org-w3m.elc: lisp/org.el
- lisp/org-wl.elc: lisp/org.el
--lisp/org-xoxo.elc: lisp/org-exp.el
-\ В конце файла нет новой строки
-+lisp/org-xoxo.elc: lisp/org-exp.el
diff --git a/office/org-mode/org-mode.SlackBuild b/office/org-mode/org-mode.SlackBuild
index a5caba9672..19269eec46 100644
--- a/office/org-mode/org-mode.SlackBuild
+++ b/office/org-mode/org-mode.SlackBuild
@@ -5,7 +5,7 @@
# Written by Valeriy Timchenko <ValTimchenko@gmail.com>
PRGNAM=org-mode
-VERSION=${VERSION:-7.01h}
+VERSION=${VERSION:-7.02}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -52,8 +52,7 @@ find . \
-exec chmod 644 {} \;
patch Makefile $CWD/Makefile.patch
-DESTDIR=/usr make
-DESTDIR=/usr make doc
+DESTDIR=/usr make all pdf html
DESTDIR=$PKG/usr make install
DESTDIR=$PKG/usr PKG=$PKG make install-info
diff --git a/office/org-mode/org-mode.info b/office/org-mode/org-mode.info
index f3c993718f..d4ec5c3188 100644
--- a/office/org-mode/org-mode.info
+++ b/office/org-mode/org-mode.info
@@ -1,8 +1,8 @@
PRGNAM="org-mode"
-VERSION="7.01h"
+VERSION="7.02"
HOMEPAGE="http://orgmode.org"
-DOWNLOAD="http://orgmode.org/org-7.01h.tar.gz"
-MD5SUM="111db7b77eb420b5695a109799b723f8"
+DOWNLOAD="http://orgmode.org/org-7.02.tar.gz"
+MD5SUM="02ef12a1e7b129de57752fefd73c5383"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Valeriy Timchenko"