6 files changed, 346 insertions, 82 deletions

diff --git a/deskutils/org-mode.el/Makefile b/deskutils/org-mode.el/Makefile
index 131c8851b070..01828079aecf 100644
--- a/deskutils/org-mode.el/Makefile
+++ b/deskutils/org-mode.el/Makefile
@@ -6,71 +6,94 @@
 #
 
 PORTNAME=	org-mode.el
-PORTVERSION=	4.64
-PORTREVISION=	4
+PORTVERSION=	7.4
 CATEGORIES=	deskutils elisp
-MASTER_SITES=	http://staff.science.uva.nl/~dominik/Tools/org/ \
-		http://web.student.chalmers.se/~kaiw/FreeBSD/disfiles/
+MASTER_SITES=	http://orgmode.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	org-${PORTVERSION}
 
 MAINTAINER=	jhein@symmetricom.com
 COMMENT=	An Emacs mode for notes and project planning
 
+DOCSDIR=	${PREFIX}/share/doc/org-mode
 USE_EMACS=	yes
-USE_GMAKE=	yes
-EMACS_PORT_NAME?=	emacs21
 
-INFO=		org
+INFO=		org${PORTVERSION}
 
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if (${EMACS_PORT_NAME} == "xemacs21") || \
-    (${EMACS_PORT_NAME} == "xemacs21-mule") || \
-    (${EMACS_PORT_NAME} == "xemacs-devel") || \
-    (${EMACS_PORT_NAME} == "xemacs-devel-mule") || \
-    (${EMACS_PORT_NAME} == "xemacs-mule-xft")
-PLIST_SUB+=	XEMACS=""
-.else
-PLIST_SUB+=	XEMACS="@comment "
-.endif
+CONTRIBS=	\
+	babel/langs/ob-oz.el \
+	babel/library-of-babel.org \
+	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-contribdir.el \
+	lisp/org-depend.el \
+	lisp/org-drill.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-git-link.el \
+	lisp/org-interactive-query.el \
+	lisp/org-invoice.el \
+	lisp/org-jira.el \
+	lisp/org-learn.el \
+	lisp/org-mac-iCal.el \
+	lisp/org-mac-link-grabber.el \
+	lisp/org-mairix.el \
+	lisp/org-man.el \
+	lisp/org-mime.el \
+	lisp/org-mtags.el \
+	lisp/org-panel.el \
+	lisp/org-registry.el \
+	lisp/org-screen.el \
+	lisp/org-secretary.el \
+	lisp/org-special-blocks.el \
+	lisp/org-static-mathjax.el \
+	lisp/org-toc.el \
+	lisp/org-track.el \
+	lisp/org-velocity.el \
+	lisp/org-wikinodes.el \
+	lisp/org2rem.el \
+	lisp/orgtbl-sqlinsert.el \
+	lisp/test-org-export-preproc.el \
+	README \
+	scripts/dir2org.zsh \
+	scripts/ditaa.jar \
+	scripts/org2hpda \
+	scripts/StartOzServer.oz \
+	scripts/staticmathjax/application.ini \
+	scripts/staticmathjax/chrome/chrome.manifest \
+	scripts/staticmathjax/chrome/content/main.js \
+	scripts/staticmathjax/chrome/content/main.xul \
+	scripts/staticmathjax/defaults/preferences/prefs.js \
+	scripts/staticmathjax/README.org \
+	scripts/staticmathjax/README.txt \
 
 post-patch:
-.if (${EMACS_PORT_NAME} == "xemacs21") || \
-    (${EMACS_PORT_NAME} == "xemacs21-mule") || \
-    (${EMACS_PORT_NAME} == "xemacs-devel") || \
-    (${EMACS_PORT_NAME} == "xemacs-devel-mule") || \
-    (${EMACS_PORT_NAME} == "xemacs-mule-xft")
-	${REINPLACE_CMD} -Ee \
-		's%^(EMACS=)emacs%\1xemacs%; \
-		 s%^(lispdir =.*)/share/emacs%\1/lib/xemacs%' \
-		 ${WRKSRC}/Makefile
-.endif
-
-pre-build:
-.if (${EMACS_PORT_NAME} == "xemacs21") || \
-    (${EMACS_PORT_NAME} == "xemacs21-mule") || \
-    (${EMACS_PORT_NAME} == "xemacs-devel") || \
-    (${EMACS_PORT_NAME} == "xemacs-devel-mule") || \
-    (${EMACS_PORT_NAME} == "xemacs-mule-xft")
-	cd ${WRKSRC} && ${GMAKE} PREFIX=${PREFIX} install-noutline
-.endif
-
-post-build:
-	${MV} ${WRKSRC}/org ${WRKSRC}/org.info
+	@${REINPLACE_CMD} -i .pv 's|%%PORTVERSION%%|${PORTVERSION}|' ${WRKSRC}/Makefile
+	${SED} 's|\(Org Mode\):|\1 (${PORTVERSION}):|; \
+	    s|\(File: \)org,|\1${INFO},|; \
+	    s|(org)|(${INFO})|' ${WRKSRC}/doc/org > ${WRKSRC}/doc/${INFO}.info
 
 post-install:
+	${INSTALL} -d ${DOCSDIR} \
+	    ${DOCSDIR}/contrib/babel/langs \
+	    ${DOCSDIR}/contrib/lisp \
+	    ${DOCSDIR}/contrib/scripts/staticmathjax/chrome/content \
+	    ${DOCSDIR}/contrib/scripts/staticmathjax/defaults/preferences
+.for i in ${CONTRIBS}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${DOCSDIR}/contrib/$$(dirname ${i})
+.endfor
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${GMAKE} org.html
-	${MKDIR} ${DOCSDIR}
-.for i in org.html org.pdf orgcard.pdf
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.for i in org.pdf orgcard.pdf orgguide.pdf
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .endif
-	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/org-mode.el/distinfo b/deskutils/org-mode.el/distinfo
index aafc0fe226d8..e9abdc396153 100644
--- a/deskutils/org-mode.el/distinfo
+++ b/deskutils/org-mode.el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (org-4.64.tar.gz) = eafda30d3700f729958c530d176911134708d85fa3a44ad10865e87db9207764
-SIZE (org-4.64.tar.gz) = 907283
+SHA256 (org-7.4.tar.gz) = cf191491446ff8cab81d9267eee8b332cd58db962c44250cf7ef592f0d76ff3a
+SIZE (org-7.4.tar.gz) = 2981061
diff --git a/deskutils/org-mode.el/files/patch-Makefile b/deskutils/org-mode.el/files/patch-Makefile
index 428b93c062b4..75d8146d0075 100644
--- a/deskutils/org-mode.el/files/patch-Makefile
+++ b/deskutils/org-mode.el/files/patch-Makefile
@@ -1,37 +1,36 @@
---- Makefile.orig	Fri Feb 16 00:45:34 2007
-+++ Makefile	Fri Feb 16 00:56:08 2007
+--- Makefile.orig	2010-12-10 06:16:34.000000000 -0700
++++ Makefile	2011-02-28 11:03:44.000000000 -0700
 @@ -14,13 +14,13 @@
  EMACS=emacs
  
  # Where local software is found
 -prefix=/usr/local
-+PREFIX=/usr/local
++prefix=${PREFIX}
  
  # Where local lisp files go.
--lispdir = $(prefix)/share/emacs/site-lisp
-+lispdir = $(PREFIX)/share/emacs/site-lisp
+ lispdir   = $(prefix)/share/emacs/site-lisp
  
  # Where info files go.
--infodir = $(prefix)/info
-+infodir = $(PREFIX)/info
+-infodir = $(prefix)/share/info
++infodir = $(prefix)/info
  
  ##----------------------------------------------------------------------
  ## YOU MAY NEED TO EDIT THESE
-@@ -59,7 +59,7 @@
- ELCFILES   = $(LISPFILES:.el=.elc)
- DOCFILES   = org.texi org.pdf org orgcard.tex orgcard.pdf
- TEXIFILES  = org.texi
--INFOFILES  = org
-+INFOFILES  = org.info
- HTMLDIR    = /home/dominik/public_html/Tools/org
+@@ -164,7 +164,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
  
- .SUFFIXES: .el .elc .texi
-@@ -70,7 +70,7 @@
+ # Package Manager (ELPA)
+ PKG_TAG = $(shell date +%Y%m%d)
+@@ -200,7 +200,7 @@
  
- all:	$(ELCFILES)
+ compile: $(ELCFILES0) $(ELCBFILES)
  
 -install: install-lisp
 +install: install-lisp install-info
  
- doc: org.html org.pdf orgcard.pdf
+ 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-descr b/deskutils/org-mode.el/pkg-descr
index 918afbe5ef4f..0a3e53102ba5 100644
--- a/deskutils/org-mode.el/pkg-descr
+++ b/deskutils/org-mode.el/pkg-descr
@@ -13,4 +13,4 @@ entries, and any files related to the projects. For printing and
 sharing of notes, an Org-mode file can be exported as a structured
 ASCII file, or as HTML.
 
-WWW:	http://staff.science.uva.nl/~dominik/Tools/org/
+WWW:	http://orgmode.org
diff --git a/deskutils/org-mode.el/pkg-message b/deskutils/org-mode.el/pkg-message
deleted file mode 100644
index 79ed408a3fc2..000000000000
--- a/deskutils/org-mode.el/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-********************************************************************
-* To use org-mode in Emacs/XEmacs, add the following line to your  *
-* ~/.emacs:                                                        *
-*                                                                  *
-* (require 'org-install)                                           *
-********************************************************************
diff --git a/deskutils/org-mode.el/pkg-plist b/deskutils/org-mode.el/pkg-plist
index 888b1b7e2b16..95f5e6bd5b02 100644
--- a/deskutils/org-mode.el/pkg-plist
+++ b/deskutils/org-mode.el/pkg-plist
@@ -1,14 +1,262 @@
-%%PORTDOCS%%%%DOCSDIR%%/org.html
-%%PORTDOCS%%%%DOCSDIR%%/org.pdf
-%%PORTDOCS%%%%DOCSDIR%%/orgcard.pdf
+@comment $FreeBSD$
+%%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-calc.el
+%%EMACS_SITE_LISPDIR%%/ob-calc.elc
+%%EMACS_SITE_LISPDIR%%/ob-clojure.el
+%%EMACS_SITE_LISPDIR%%/ob-clojure.elc
+%%EMACS_SITE_LISPDIR%%/ob-comint.el
+%%EMACS_SITE_LISPDIR%%/ob-comint.elc
+%%EMACS_SITE_LISPDIR%%/ob-css.el
+%%EMACS_SITE_LISPDIR%%/ob-css.elc
+%%EMACS_SITE_LISPDIR%%/ob-ditaa.el
+%%EMACS_SITE_LISPDIR%%/ob-ditaa.elc
+%%EMACS_SITE_LISPDIR%%/ob-dot.el
+%%EMACS_SITE_LISPDIR%%/ob-dot.elc
+%%EMACS_SITE_LISPDIR%%/ob-emacs-lisp.el
+%%EMACS_SITE_LISPDIR%%/ob-emacs-lisp.elc
+%%EMACS_SITE_LISPDIR%%/ob-eval.el
+%%EMACS_SITE_LISPDIR%%/ob-eval.elc
+%%EMACS_SITE_LISPDIR%%/ob-exp.el
+%%EMACS_SITE_LISPDIR%%/ob-exp.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-js.el
+%%EMACS_SITE_LISPDIR%%/ob-js.elc
+%%EMACS_SITE_LISPDIR%%/ob-keys.el
+%%EMACS_SITE_LISPDIR%%/ob-keys.elc
+%%EMACS_SITE_LISPDIR%%/ob-latex.el
+%%EMACS_SITE_LISPDIR%%/ob-latex.elc
+%%EMACS_SITE_LISPDIR%%/ob-ledger.el
+%%EMACS_SITE_LISPDIR%%/ob-ledger.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-mscgen.el
+%%EMACS_SITE_LISPDIR%%/ob-mscgen.elc
+%%EMACS_SITE_LISPDIR%%/ob-ocaml.el
+%%EMACS_SITE_LISPDIR%%/ob-ocaml.elc
+%%EMACS_SITE_LISPDIR%%/ob-octave.el
+%%EMACS_SITE_LISPDIR%%/ob-octave.elc
+%%EMACS_SITE_LISPDIR%%/ob-org.el
+%%EMACS_SITE_LISPDIR%%/ob-org.elc
+%%EMACS_SITE_LISPDIR%%/ob-perl.el
+%%EMACS_SITE_LISPDIR%%/ob-perl.elc
+%%EMACS_SITE_LISPDIR%%/ob-plantuml.el
+%%EMACS_SITE_LISPDIR%%/ob-plantuml.elc
+%%EMACS_SITE_LISPDIR%%/ob-python.el
+%%EMACS_SITE_LISPDIR%%/ob-python.elc
+%%EMACS_SITE_LISPDIR%%/ob-ref.el
+%%EMACS_SITE_LISPDIR%%/ob-ref.elc
+%%EMACS_SITE_LISPDIR%%/ob-ruby.el
+%%EMACS_SITE_LISPDIR%%/ob-ruby.elc
+%%EMACS_SITE_LISPDIR%%/ob-sass.el
+%%EMACS_SITE_LISPDIR%%/ob-sass.elc
+%%EMACS_SITE_LISPDIR%%/ob-scheme.el
+%%EMACS_SITE_LISPDIR%%/ob-scheme.elc
+%%EMACS_SITE_LISPDIR%%/ob-screen.el
+%%EMACS_SITE_LISPDIR%%/ob-screen.elc
+%%EMACS_SITE_LISPDIR%%/ob-sh.el
+%%EMACS_SITE_LISPDIR%%/ob-sh.elc
+%%EMACS_SITE_LISPDIR%%/ob-sql.el
+%%EMACS_SITE_LISPDIR%%/ob-sql.elc
+%%EMACS_SITE_LISPDIR%%/ob-sqlite.el
+%%EMACS_SITE_LISPDIR%%/ob-sqlite.elc
+%%EMACS_SITE_LISPDIR%%/ob-table.el
+%%EMACS_SITE_LISPDIR%%/ob-table.elc
+%%EMACS_SITE_LISPDIR%%/ob-tangle.el
+%%EMACS_SITE_LISPDIR%%/ob-tangle.elc
+%%EMACS_SITE_LISPDIR%%/ob.el
+%%EMACS_SITE_LISPDIR%%/ob.elc
+%%EMACS_SITE_LISPDIR%%/org-agenda.el
+%%EMACS_SITE_LISPDIR%%/org-agenda.elc
+%%EMACS_SITE_LISPDIR%%/org-archive.el
+%%EMACS_SITE_LISPDIR%%/org-archive.elc
+%%EMACS_SITE_LISPDIR%%/org-ascii.el
+%%EMACS_SITE_LISPDIR%%/org-ascii.elc
+%%EMACS_SITE_LISPDIR%%/org-attach.el
+%%EMACS_SITE_LISPDIR%%/org-attach.elc
+%%EMACS_SITE_LISPDIR%%/org-bbdb.el
+%%EMACS_SITE_LISPDIR%%/org-bbdb.elc
+%%EMACS_SITE_LISPDIR%%/org-beamer.el
+%%EMACS_SITE_LISPDIR%%/org-beamer.elc
+%%EMACS_SITE_LISPDIR%%/org-bibtex.el
+%%EMACS_SITE_LISPDIR%%/org-bibtex.elc
+%%EMACS_SITE_LISPDIR%%/org-capture.el
+%%EMACS_SITE_LISPDIR%%/org-capture.elc
+%%EMACS_SITE_LISPDIR%%/org-clock.el
+%%EMACS_SITE_LISPDIR%%/org-clock.elc
+%%EMACS_SITE_LISPDIR%%/org-colview-xemacs.el
+%%EMACS_SITE_LISPDIR%%/org-colview-xemacs.elc
+%%EMACS_SITE_LISPDIR%%/org-colview.el
+%%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
+%%EMACS_SITE_LISPDIR%%/org-ctags.elc
+%%EMACS_SITE_LISPDIR%%/org-datetree.el
+%%EMACS_SITE_LISPDIR%%/org-datetree.elc
+%%EMACS_SITE_LISPDIR%%/org-docbook.el
+%%EMACS_SITE_LISPDIR%%/org-docbook.elc
+%%EMACS_SITE_LISPDIR%%/org-docview.el
+%%EMACS_SITE_LISPDIR%%/org-docview.elc
+%%EMACS_SITE_LISPDIR%%/org-entities.el
+%%EMACS_SITE_LISPDIR%%/org-entities.elc
+%%EMACS_SITE_LISPDIR%%/org-exp-blocks.el
+%%EMACS_SITE_LISPDIR%%/org-exp-blocks.elc
+%%EMACS_SITE_LISPDIR%%/org-exp.el
+%%EMACS_SITE_LISPDIR%%/org-exp.elc
+%%EMACS_SITE_LISPDIR%%/org-faces.el
+%%EMACS_SITE_LISPDIR%%/org-faces.elc
+%%EMACS_SITE_LISPDIR%%/org-feed.el
+%%EMACS_SITE_LISPDIR%%/org-feed.elc
+%%EMACS_SITE_LISPDIR%%/org-footnote.el
+%%EMACS_SITE_LISPDIR%%/org-footnote.elc
+%%EMACS_SITE_LISPDIR%%/org-freemind.el
+%%EMACS_SITE_LISPDIR%%/org-freemind.elc
+%%EMACS_SITE_LISPDIR%%/org-gnus.el
+%%EMACS_SITE_LISPDIR%%/org-gnus.elc
+%%EMACS_SITE_LISPDIR%%/org-habit.el
+%%EMACS_SITE_LISPDIR%%/org-habit.elc
+%%EMACS_SITE_LISPDIR%%/org-html.el
+%%EMACS_SITE_LISPDIR%%/org-html.elc
+%%EMACS_SITE_LISPDIR%%/org-icalendar.el
+%%EMACS_SITE_LISPDIR%%/org-icalendar.elc
+%%EMACS_SITE_LISPDIR%%/org-id.el
+%%EMACS_SITE_LISPDIR%%/org-id.elc
+%%EMACS_SITE_LISPDIR%%/org-indent.el
+%%EMACS_SITE_LISPDIR%%/org-indent.elc
+%%EMACS_SITE_LISPDIR%%/org-info.el
+%%EMACS_SITE_LISPDIR%%/org-info.elc
+%%EMACS_SITE_LISPDIR%%/org-inlinetask.el
+%%EMACS_SITE_LISPDIR%%/org-inlinetask.elc
 %%EMACS_SITE_LISPDIR%%/org-install.el
 %%EMACS_SITE_LISPDIR%%/org-install.elc
+%%EMACS_SITE_LISPDIR%%/org-irc.el
+%%EMACS_SITE_LISPDIR%%/org-irc.elc
+%%EMACS_SITE_LISPDIR%%/org-jsinfo.el
+%%EMACS_SITE_LISPDIR%%/org-jsinfo.elc
+%%EMACS_SITE_LISPDIR%%/org-latex.el
+%%EMACS_SITE_LISPDIR%%/org-latex.elc
+%%EMACS_SITE_LISPDIR%%/org-list.el
+%%EMACS_SITE_LISPDIR%%/org-list.elc
+%%EMACS_SITE_LISPDIR%%/org-mac-message.el
+%%EMACS_SITE_LISPDIR%%/org-mac-message.elc
+%%EMACS_SITE_LISPDIR%%/org-macs.el
+%%EMACS_SITE_LISPDIR%%/org-macs.elc
+%%EMACS_SITE_LISPDIR%%/org-mew.el
+%%EMACS_SITE_LISPDIR%%/org-mew.elc
+%%EMACS_SITE_LISPDIR%%/org-mhe.el
+%%EMACS_SITE_LISPDIR%%/org-mhe.elc
+%%EMACS_SITE_LISPDIR%%/org-mks.el
+%%EMACS_SITE_LISPDIR%%/org-mks.elc
+%%EMACS_SITE_LISPDIR%%/org-mobile.el
+%%EMACS_SITE_LISPDIR%%/org-mobile.elc
 %%EMACS_SITE_LISPDIR%%/org-mouse.el
 %%EMACS_SITE_LISPDIR%%/org-mouse.elc
+%%EMACS_SITE_LISPDIR%%/org-plot.el
+%%EMACS_SITE_LISPDIR%%/org-plot.elc
+%%EMACS_SITE_LISPDIR%%/org-protocol.el
+%%EMACS_SITE_LISPDIR%%/org-protocol.elc
 %%EMACS_SITE_LISPDIR%%/org-publish.el
 %%EMACS_SITE_LISPDIR%%/org-publish.elc
+%%EMACS_SITE_LISPDIR%%/org-remember.el
+%%EMACS_SITE_LISPDIR%%/org-remember.elc
+%%EMACS_SITE_LISPDIR%%/org-rmail.el
+%%EMACS_SITE_LISPDIR%%/org-rmail.elc
+%%EMACS_SITE_LISPDIR%%/org-src.el
+%%EMACS_SITE_LISPDIR%%/org-src.elc
+%%EMACS_SITE_LISPDIR%%/org-table.el
+%%EMACS_SITE_LISPDIR%%/org-table.elc
+%%EMACS_SITE_LISPDIR%%/org-taskjuggler.el
+%%EMACS_SITE_LISPDIR%%/org-taskjuggler.elc
+%%EMACS_SITE_LISPDIR%%/org-timer.el
+%%EMACS_SITE_LISPDIR%%/org-timer.elc
+%%EMACS_SITE_LISPDIR%%/org-vm.el
+%%EMACS_SITE_LISPDIR%%/org-vm.elc
+%%EMACS_SITE_LISPDIR%%/org-w3m.el
+%%EMACS_SITE_LISPDIR%%/org-w3m.elc
+%%EMACS_SITE_LISPDIR%%/org-wl.el
+%%EMACS_SITE_LISPDIR%%/org-wl.elc
+%%EMACS_SITE_LISPDIR%%/org-xoxo.el
+%%EMACS_SITE_LISPDIR%%/org-xoxo.elc
 %%EMACS_SITE_LISPDIR%%/org.el
 %%EMACS_SITE_LISPDIR%%/org.elc
-%%XEMACS%%%%EMACS_SITE_LISPDIR%%/noutline.el
-%%XEMACS%%%%EMACS_SITE_LISPDIR%%/noutline.elc
+%%PORTDOCS%%%%DOCSDIR%%/org.pdf
+%%PORTDOCS%%%%DOCSDIR%%/orgcard.pdf
+%%PORTDOCS%%%%DOCSDIR%%/orgguide.pdf
+%%DOCSDIR%%/contrib/babel/langs/ob-oz.el
+%%DOCSDIR%%/contrib/babel/library-of-babel.org
+%%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-contribdir.el
+%%DOCSDIR%%/contrib/lisp/org-depend.el
+%%DOCSDIR%%/contrib/lisp/org-drill.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-git-link.el
+%%DOCSDIR%%/contrib/lisp/org-interactive-query.el
+%%DOCSDIR%%/contrib/lisp/org-invoice.el
+%%DOCSDIR%%/contrib/lisp/org-jira.el
+%%DOCSDIR%%/contrib/lisp/org-learn.el
+%%DOCSDIR%%/contrib/lisp/org-mac-iCal.el
+%%DOCSDIR%%/contrib/lisp/org-mac-link-grabber.el
+%%DOCSDIR%%/contrib/lisp/org-mairix.el
+%%DOCSDIR%%/contrib/lisp/org-man.el
+%%DOCSDIR%%/contrib/lisp/org-mime.el
+%%DOCSDIR%%/contrib/lisp/org-mtags.el
+%%DOCSDIR%%/contrib/lisp/org-panel.el
+%%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-toc.el
+%%DOCSDIR%%/contrib/lisp/org-track.el
+%%DOCSDIR%%/contrib/lisp/org-velocity.el
+%%DOCSDIR%%/contrib/lisp/org-wikinodes.el
+%%DOCSDIR%%/contrib/lisp/org2rem.el
+%%DOCSDIR%%/contrib/lisp/orgtbl-sqlinsert.el
+%%DOCSDIR%%/contrib/lisp/test-org-export-preproc.el
+%%DOCSDIR%%/contrib/README
+%%DOCSDIR%%/contrib/scripts/dir2org.zsh
+%%DOCSDIR%%/contrib/scripts/ditaa.jar
+%%DOCSDIR%%/contrib/scripts/org2hpda
+%%DOCSDIR%%/contrib/scripts/StartOzServer.oz
+%%DOCSDIR%%/contrib/scripts/staticmathjax/application.ini
+%%DOCSDIR%%/contrib/scripts/staticmathjax/chrome/chrome.manifest
+%%DOCSDIR%%/contrib/scripts/staticmathjax/chrome/content/main.js
+%%DOCSDIR%%/contrib/scripts/staticmathjax/chrome/content/main.xul
+%%DOCSDIR%%/contrib/scripts/staticmathjax/defaults/preferences/prefs.js
+%%DOCSDIR%%/contrib/scripts/staticmathjax/README.org
+%%DOCSDIR%%/contrib/scripts/staticmathjax/README.txt
+@dirrm %%DOCSDIR%%/contrib/babel/langs
+@dirrm %%DOCSDIR%%/contrib/babel
+@dirrm %%DOCSDIR%%/contrib/lisp
+@dirrm %%DOCSDIR%%/contrib/scripts/staticmathjax/chrome/content
+@dirrm %%DOCSDIR%%/contrib/scripts/staticmathjax/chrome
+@dirrm %%DOCSDIR%%/contrib/scripts/staticmathjax/defaults/preferences
+@dirrm %%DOCSDIR%%/contrib/scripts/staticmathjax/defaults
+@dirrm %%DOCSDIR%%/contrib/scripts/staticmathjax
+@dirrm %%DOCSDIR%%/contrib/scripts
+@dirrm %%DOCSDIR%%/contrib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%