update org-mode.el to 7.8.11

PR:		ports/168944
Submitted by:	Dryice Liu <dryice@freebsd.org>
Approved by:	Maintainer timed out
Feature safe:	yes

4 files changed, 91 insertions, 21 deletions

diff --git a/deskutils/org-mode.el/Makefile b/deskutils/org-mode.el/Makefile
index f1a401763fa..38b3995cb4b 100644
--- a/deskutils/org-mode.el/Makefile
+++ b/deskutils/org-mode.el/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	org-mode.el
-PORTVERSION=	7.4
-PORTREVISION=	2
+PORTVERSION=	7.8.11
 CATEGORIES=	deskutils elisp
 MASTER_SITES=	http://orgmode.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -18,27 +17,33 @@ COMMENT=	An Emacs mode for notes and project planning
 
 DOCSDIR=	${PREFIX}/share/doc/org-mode
 USE_EMACS=	yes
+USE_GMAKE=	yes
 
 INFO=		org${PORTVERSION}
 
 CONTRIBS=	\
+	babel/langs/ob-fomus.el \
 	babel/langs/ob-oz.el \
 	babel/library-of-babel.org \
+	doc/fr-orgcard.tex \
 	lisp/htmlize.el \
 	lisp/org-annotate-file.el \
 	lisp/org-bookmark.el \
 	lisp/org-checklist.el \
 	lisp/org-choose.el \
 	lisp/org-collector.el \
+	lisp/org-contacts.el \
 	lisp/org-contribdir.el \
 	lisp/org-depend.el \
 	lisp/org-drill.el \
+	lisp/org-element.el \
 	lisp/org-elisp-symbol.el \
 	lisp/org-eval-light.el \
 	lisp/org-eval.el \
 	lisp/org-exp-bibtex.el \
 	lisp/org-expiry.el \
 	lisp/org-export-generic.el \
+	lisp/org-export.el \
 	lisp/org-git-link.el \
 	lisp/org-interactive-query.el \
 	lisp/org-invoice.el \
@@ -54,15 +59,23 @@ CONTRIBS=	\
 	lisp/org-registry.el \
 	lisp/org-screen.el \
 	lisp/org-secretary.el \
-	lisp/org-special-blocks.el \
 	lisp/org-static-mathjax.el \
+	lisp/org-sudoku.el \
 	lisp/org-toc.el \
 	lisp/org-track.el \
 	lisp/org-velocity.el \
 	lisp/org-wikinodes.el \
+	lisp/org-xhtml.el \
 	lisp/org2rem.el \
 	lisp/orgtbl-sqlinsert.el \
 	lisp/test-org-export-preproc.el \
+	odt/BasicODConverter/BasicODConverter-0.8.0.oxt \
+	odt/BasicODConverter/Filters.bas \
+	odt/BasicODConverter/Main.bas \
+	odt/etc/schema/od-manifest-schema-v1.2-cs01.rnc \
+	odt/etc/schema/od-schema-v1.2-cs01.rnc \
+	odt/etc/schema/schemas.xml \
+	odt/README.org \
 	README \
 	scripts/dir2org.zsh \
 	scripts/ditaa.jar \
@@ -85,7 +98,10 @@ post-patch:
 post-install:
 	${INSTALL} -d ${DOCSDIR} \
 	    ${DOCSDIR}/contrib/babel/langs \
+	    ${DOCSDIR}/contrib/doc \
 	    ${DOCSDIR}/contrib/lisp \
+	    ${DOCSDIR}/contrib/odt/BasicODConverter \
+	    ${DOCSDIR}/contrib/odt/etc/schema \
 	    ${DOCSDIR}/contrib/scripts/staticmathjax/chrome/content \
 	    ${DOCSDIR}/contrib/scripts/staticmathjax/defaults/preferences
 .for i in ${CONTRIBS}
diff --git a/deskutils/org-mode.el/distinfo b/deskutils/org-mode.el/distinfo
index e9abdc39615..d0ae45964fa 100644
--- a/deskutils/org-mode.el/distinfo
+++ b/deskutils/org-mode.el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (org-7.4.tar.gz) = cf191491446ff8cab81d9267eee8b332cd58db962c44250cf7ef592f0d76ff3a
-SIZE (org-7.4.tar.gz) = 2981061
+SHA256 (org-7.8.11.tar.gz) = 2f6a69aaff5cd66162a9a1a6df900c6050434bced1bbc7eea715b5579a0487c1
+SIZE (org-7.8.11.tar.gz) = 3303681
diff --git a/deskutils/org-mode.el/files/patch-Makefile b/deskutils/org-mode.el/files/patch-Makefile
index 75d8146d007..2d96102f0ce 100644
--- a/deskutils/org-mode.el/files/patch-Makefile
+++ b/deskutils/org-mode.el/files/patch-Makefile
@@ -1,36 +1,42 @@
---- Makefile.orig	2010-12-10 06:16:34.000000000 -0700
-+++ Makefile	2011-02-28 11:03:44.000000000 -0700
-@@ -14,13 +14,13 @@
+--- Makefile.orig	2012-05-26 05:12:51.000000000 +0800
++++ Makefile	2012-06-11 09:31:16.000000000 +0800
+@@ -14,7 +14,7 @@
  EMACS=emacs
  
  # Where local software is found
 -prefix=/usr/local
 +prefix=${PREFIX}
  
- # Where local lisp files go.
+ # Where local lisp files go
  lispdir   = $(prefix)/share/emacs/site-lisp
- 
- # Where info files go.
+@@ -22,10 +22,10 @@
+ # Where data files go
+ # $(datadir) contains auxiliary files for use with ODT exporter.
+ # See comments under DATAFILES.
+-datadir = $(prefix)/share/emacs/etc
++datadir = $(prefix)/share/emacs/etc/org-mode
+ 
+ # Where info files go
 -infodir = $(prefix)/share/info
 +infodir = $(prefix)/info
  
  ##----------------------------------------------------------------------
  ## YOU MAY NEED TO EDIT THESE
-@@ -164,7 +164,7 @@
+@@ -181,7 +181,7 @@
                doc/orgguide.texi doc/orgguide.pdf
  CARDFILES   = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
  TEXIFILES   = doc/org.texi
 -INFOFILES   = doc/org
-+INFOFILES   = doc/org%%PORTVERSION%%.info
++INFOFILES   = doc/org7.8.11.info
  
- # Package Manager (ELPA)
- PKG_TAG = $(shell date +%Y%m%d)
-@@ -200,7 +200,7 @@
+ # etc/styles contains OpenDocument style files.  These files *must* be
+ # installed for the ODT exporter to function.  These files are
+@@ -238,7 +238,7 @@
  
  compile: $(ELCFILES0) $(ELCBFILES)
  
--install: install-lisp
-+install: install-lisp install-info
+-install: install-lisp install-data
++install: install-lisp install-data install-info
  
  doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt
  
diff --git a/deskutils/org-mode.el/pkg-plist b/deskutils/org-mode.el/pkg-plist
index 95f5e6bd5b0..0e1f5495630 100644
--- a/deskutils/org-mode.el/pkg-plist
+++ b/deskutils/org-mode.el/pkg-plist
@@ -1,10 +1,15 @@
 @comment $FreeBSD$
+%%EMACS_LIBDIR%%/etc/org-mode/styles/OrgOdtContentTemplate.xml
+%%EMACS_LIBDIR%%/etc/org-mode/styles/OrgOdtStyles.xml
+%%EMACS_LIBDIR%%/etc/org-mode/styles/README
 %%EMACS_SITE_LISPDIR%%/ob-C.el
 %%EMACS_SITE_LISPDIR%%/ob-C.elc
 %%EMACS_SITE_LISPDIR%%/ob-R.el
 %%EMACS_SITE_LISPDIR%%/ob-R.elc
 %%EMACS_SITE_LISPDIR%%/ob-asymptote.el
 %%EMACS_SITE_LISPDIR%%/ob-asymptote.elc
+%%EMACS_SITE_LISPDIR%%/ob-awk.el
+%%EMACS_SITE_LISPDIR%%/ob-awk.elc
 %%EMACS_SITE_LISPDIR%%/ob-calc.el
 %%EMACS_SITE_LISPDIR%%/ob-calc.elc
 %%EMACS_SITE_LISPDIR%%/ob-clojure.el
@@ -23,10 +28,14 @@
 %%EMACS_SITE_LISPDIR%%/ob-eval.elc
 %%EMACS_SITE_LISPDIR%%/ob-exp.el
 %%EMACS_SITE_LISPDIR%%/ob-exp.elc
+%%EMACS_SITE_LISPDIR%%/ob-fortran.el
+%%EMACS_SITE_LISPDIR%%/ob-fortran.elc
 %%EMACS_SITE_LISPDIR%%/ob-gnuplot.el
 %%EMACS_SITE_LISPDIR%%/ob-gnuplot.elc
 %%EMACS_SITE_LISPDIR%%/ob-haskell.el
 %%EMACS_SITE_LISPDIR%%/ob-haskell.elc
+%%EMACS_SITE_LISPDIR%%/ob-java.el
+%%EMACS_SITE_LISPDIR%%/ob-java.elc
 %%EMACS_SITE_LISPDIR%%/ob-js.el
 %%EMACS_SITE_LISPDIR%%/ob-js.elc
 %%EMACS_SITE_LISPDIR%%/ob-keys.el
@@ -35,10 +44,16 @@
 %%EMACS_SITE_LISPDIR%%/ob-latex.elc
 %%EMACS_SITE_LISPDIR%%/ob-ledger.el
 %%EMACS_SITE_LISPDIR%%/ob-ledger.elc
+%%EMACS_SITE_LISPDIR%%/ob-lilypond.el
+%%EMACS_SITE_LISPDIR%%/ob-lilypond.elc
+%%EMACS_SITE_LISPDIR%%/ob-lisp.el
+%%EMACS_SITE_LISPDIR%%/ob-lisp.elc
 %%EMACS_SITE_LISPDIR%%/ob-lob.el
 %%EMACS_SITE_LISPDIR%%/ob-lob.elc
 %%EMACS_SITE_LISPDIR%%/ob-matlab.el
 %%EMACS_SITE_LISPDIR%%/ob-matlab.elc
+%%EMACS_SITE_LISPDIR%%/ob-maxima.el
+%%EMACS_SITE_LISPDIR%%/ob-maxima.elc
 %%EMACS_SITE_LISPDIR%%/ob-mscgen.el
 %%EMACS_SITE_LISPDIR%%/ob-mscgen.elc
 %%EMACS_SITE_LISPDIR%%/ob-ocaml.el
@@ -49,6 +64,8 @@
 %%EMACS_SITE_LISPDIR%%/ob-org.elc
 %%EMACS_SITE_LISPDIR%%/ob-perl.el
 %%EMACS_SITE_LISPDIR%%/ob-perl.elc
+%%EMACS_SITE_LISPDIR%%/ob-picolisp.el
+%%EMACS_SITE_LISPDIR%%/ob-picolisp.elc
 %%EMACS_SITE_LISPDIR%%/ob-plantuml.el
 %%EMACS_SITE_LISPDIR%%/ob-plantuml.elc
 %%EMACS_SITE_LISPDIR%%/ob-python.el
@@ -65,6 +82,8 @@
 %%EMACS_SITE_LISPDIR%%/ob-screen.elc
 %%EMACS_SITE_LISPDIR%%/ob-sh.el
 %%EMACS_SITE_LISPDIR%%/ob-sh.elc
+%%EMACS_SITE_LISPDIR%%/ob-shen.el
+%%EMACS_SITE_LISPDIR%%/ob-shen.elc
 %%EMACS_SITE_LISPDIR%%/ob-sql.el
 %%EMACS_SITE_LISPDIR%%/ob-sql.elc
 %%EMACS_SITE_LISPDIR%%/ob-sqlite.el
@@ -99,8 +118,6 @@
 %%EMACS_SITE_LISPDIR%%/org-colview.elc
 %%EMACS_SITE_LISPDIR%%/org-compat.el
 %%EMACS_SITE_LISPDIR%%/org-compat.elc
-%%EMACS_SITE_LISPDIR%%/org-complete.el
-%%EMACS_SITE_LISPDIR%%/org-complete.elc
 %%EMACS_SITE_LISPDIR%%/org-crypt.el
 %%EMACS_SITE_LISPDIR%%/org-crypt.elc
 %%EMACS_SITE_LISPDIR%%/org-ctags.el
@@ -113,6 +130,8 @@
 %%EMACS_SITE_LISPDIR%%/org-docview.elc
 %%EMACS_SITE_LISPDIR%%/org-entities.el
 %%EMACS_SITE_LISPDIR%%/org-entities.elc
+%%EMACS_SITE_LISPDIR%%/org-eshell.el
+%%EMACS_SITE_LISPDIR%%/org-eshell.elc
 %%EMACS_SITE_LISPDIR%%/org-exp-blocks.el
 %%EMACS_SITE_LISPDIR%%/org-exp-blocks.elc
 %%EMACS_SITE_LISPDIR%%/org-exp.el
@@ -151,6 +170,8 @@
 %%EMACS_SITE_LISPDIR%%/org-latex.elc
 %%EMACS_SITE_LISPDIR%%/org-list.el
 %%EMACS_SITE_LISPDIR%%/org-list.elc
+%%EMACS_SITE_LISPDIR%%/org-lparse.el
+%%EMACS_SITE_LISPDIR%%/org-lparse.elc
 %%EMACS_SITE_LISPDIR%%/org-mac-message.el
 %%EMACS_SITE_LISPDIR%%/org-mac-message.elc
 %%EMACS_SITE_LISPDIR%%/org-macs.el
@@ -165,6 +186,10 @@
 %%EMACS_SITE_LISPDIR%%/org-mobile.elc
 %%EMACS_SITE_LISPDIR%%/org-mouse.el
 %%EMACS_SITE_LISPDIR%%/org-mouse.elc
+%%EMACS_SITE_LISPDIR%%/org-odt.el
+%%EMACS_SITE_LISPDIR%%/org-odt.elc
+%%EMACS_SITE_LISPDIR%%/org-pcomplete.el
+%%EMACS_SITE_LISPDIR%%/org-pcomplete.elc
 %%EMACS_SITE_LISPDIR%%/org-plot.el
 %%EMACS_SITE_LISPDIR%%/org-plot.elc
 %%EMACS_SITE_LISPDIR%%/org-protocol.el
@@ -175,6 +200,8 @@
 %%EMACS_SITE_LISPDIR%%/org-remember.elc
 %%EMACS_SITE_LISPDIR%%/org-rmail.el
 %%EMACS_SITE_LISPDIR%%/org-rmail.elc
+%%EMACS_SITE_LISPDIR%%/org-special-blocks.el
+%%EMACS_SITE_LISPDIR%%/org-special-blocks.elc
 %%EMACS_SITE_LISPDIR%%/org-src.el
 %%EMACS_SITE_LISPDIR%%/org-src.elc
 %%EMACS_SITE_LISPDIR%%/org-table.el
@@ -197,22 +224,27 @@
 %%PORTDOCS%%%%DOCSDIR%%/orgcard.pdf
 %%PORTDOCS%%%%DOCSDIR%%/orgguide.pdf
 %%DOCSDIR%%/contrib/babel/langs/ob-oz.el
+%%DOCSDIR%%/contrib/babel/langs/ob-fomus.el
 %%DOCSDIR%%/contrib/babel/library-of-babel.org
+%%DOCSDIR%%/contrib/doc/fr-orgcard.tex
 %%DOCSDIR%%/contrib/lisp/htmlize.el
 %%DOCSDIR%%/contrib/lisp/org-annotate-file.el
 %%DOCSDIR%%/contrib/lisp/org-bookmark.el
 %%DOCSDIR%%/contrib/lisp/org-checklist.el
 %%DOCSDIR%%/contrib/lisp/org-choose.el
 %%DOCSDIR%%/contrib/lisp/org-collector.el
+%%DOCSDIR%%/contrib/lisp/org-contacts.el
 %%DOCSDIR%%/contrib/lisp/org-contribdir.el
 %%DOCSDIR%%/contrib/lisp/org-depend.el
 %%DOCSDIR%%/contrib/lisp/org-drill.el
+%%DOCSDIR%%/contrib/lisp/org-element.el
 %%DOCSDIR%%/contrib/lisp/org-elisp-symbol.el
 %%DOCSDIR%%/contrib/lisp/org-eval-light.el
 %%DOCSDIR%%/contrib/lisp/org-eval.el
 %%DOCSDIR%%/contrib/lisp/org-exp-bibtex.el
 %%DOCSDIR%%/contrib/lisp/org-expiry.el
 %%DOCSDIR%%/contrib/lisp/org-export-generic.el
+%%DOCSDIR%%/contrib/lisp/org-export.el
 %%DOCSDIR%%/contrib/lisp/org-git-link.el
 %%DOCSDIR%%/contrib/lisp/org-interactive-query.el
 %%DOCSDIR%%/contrib/lisp/org-invoice.el
@@ -228,15 +260,23 @@
 %%DOCSDIR%%/contrib/lisp/org-registry.el
 %%DOCSDIR%%/contrib/lisp/org-screen.el
 %%DOCSDIR%%/contrib/lisp/org-secretary.el
-%%DOCSDIR%%/contrib/lisp/org-special-blocks.el
 %%DOCSDIR%%/contrib/lisp/org-static-mathjax.el
+%%DOCSDIR%%/contrib/lisp/org-sudoku.el
 %%DOCSDIR%%/contrib/lisp/org-toc.el
 %%DOCSDIR%%/contrib/lisp/org-track.el
 %%DOCSDIR%%/contrib/lisp/org-velocity.el
 %%DOCSDIR%%/contrib/lisp/org-wikinodes.el
+%%DOCSDIR%%/contrib/lisp/org-xhtml.el
 %%DOCSDIR%%/contrib/lisp/org2rem.el
 %%DOCSDIR%%/contrib/lisp/orgtbl-sqlinsert.el
 %%DOCSDIR%%/contrib/lisp/test-org-export-preproc.el
+%%DOCSDIR%%/contrib/odt/BasicODConverter/BasicODConverter-0.8.0.oxt
+%%DOCSDIR%%/contrib/odt/BasicODConverter/Filters.bas
+%%DOCSDIR%%/contrib/odt/BasicODConverter/Main.bas
+%%DOCSDIR%%/contrib/odt/etc/schema/od-manifest-schema-v1.2-cs01.rnc
+%%DOCSDIR%%/contrib/odt/etc/schema/od-schema-v1.2-cs01.rnc
+%%DOCSDIR%%/contrib/odt/etc/schema/schemas.xml
+%%DOCSDIR%%/contrib/odt/README.org
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/scripts/dir2org.zsh
 %%DOCSDIR%%/contrib/scripts/ditaa.jar
@@ -251,7 +291,12 @@
 %%DOCSDIR%%/contrib/scripts/staticmathjax/README.txt
 @dirrm %%DOCSDIR%%/contrib/babel/langs
 @dirrm %%DOCSDIR%%/contrib/babel
+@dirrm %%DOCSDIR%%/contrib/doc
 @dirrm %%DOCSDIR%%/contrib/lisp
+@dirrm %%DOCSDIR%%/contrib/odt/BasicODConverter
+@dirrm %%DOCSDIR%%/contrib/odt/etc/schema
+@dirrm %%DOCSDIR%%/contrib/odt/etc
+@dirrm %%DOCSDIR%%/contrib/odt/
 @dirrm %%DOCSDIR%%/contrib/scripts/staticmathjax/chrome/content
 @dirrm %%DOCSDIR%%/contrib/scripts/staticmathjax/chrome
 @dirrm %%DOCSDIR%%/contrib/scripts/staticmathjax/defaults/preferences
@@ -259,4 +304,7 @@
 @dirrm %%DOCSDIR%%/contrib/scripts/staticmathjax
 @dirrm %%DOCSDIR%%/contrib/scripts
 @dirrm %%DOCSDIR%%/contrib
+@dirrm %%EMACS_LIBDIR%%/etc/org-mode/styles
+@dirrm %%EMACS_LIBDIR%%/etc/org-mode
+@dirrmtry %%EMACS_LIBDIR%%/etc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%