Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21315
Modified Files:
org-mode.info org-mode.patch
Log Message:
New upstream release, significant overhaul.
* New splitoff: org-babel.
* Compile the emacs lisp in the splitoffs.
* Update maintainer email.
Index: org-mode.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/org-mode.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org-mode.info 28 Mar 2009 21:21:41 -0000 1.9
+++ org-mode.info 11 Dec 2009 09:06:07 -0000 1.10
@@ -1,20 +1,21 @@
Package: org-mode
Description: Organize projects and take notes in emacs
-Version: 6.24b
+Version: 6.33f
Homepage: http://orgmode.org/
License: GPL
Revision: 1
-Maintainer: Jesse Alama <al...@stanford.edu>
-Depends: emacsen
-BuildDepends: fink (>=0.24.12)
+Maintainer: Jesse Alama <jesse.al...@gmail.com>
+Depends: emacsen, htmlize-el
+BuildDepends: fink (>= 0.24.12)
Recommends: remember-el, org-mode-contrib
Enhances: wl, bbdb, erc, remind
-DocFiles: ChangeLog Changes.org README doc/org.pdf
doc/orgcard.pdf:orgcard_a4.pdf doc/orgcard_letter.pdf request-assign-future.txt
contrib/ChangeLog:ChangeLog.contrib contrib/README:README.contrib
contrib/packages/org-export-freemind-0.1.0/README:README.org-export-freemind
contrib/packages/org-export-freemind-0.1.0/ChangeLog:ChangeLog.org-export-freemind
+DocFiles: ChangeLog Changes.org README doc/org.pdf
doc/orgcard.pdf:orgcard_a4.pdf doc/orgcard_letter.pdf request-assign-future.txt
+JarFiles: contrib/scripts/ditaa.jar
Source: http://orgmode.org/org-%v.tar.gz
-Source-MD5: 059c02c00e24b58ab838a77e0fea5899
+Source-MD5: c057d13dac5d9c6da9bc063273faad82
+PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
PatchFile: %n.patch
-PatchFile-MD5: 89fa04e36c34c53177d5623ae794db74
-PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile}| patch -p1
+PatchFile-MD5: da98da1767fa134ad83f0d6f714ecf8a
CompileScript: <<
<<
InstallScript: <<
@@ -26,16 +27,34 @@
mkdir -p %i/share/emacs/site-lisp/org/contrib
install -m 644 contrib/lisp/*.el %i/share/emacs/site-lisp/org/contrib
-# Contributed packages
-# org-export-freemind
-mkdir -p %i/share/emacs/site-lisp/org/contrib/org-export-freemind
-install -m 644 contrib/packages/org-export-freemind-0.1.0/*.el
%i/share/emacs/site-lisp/org/contrib/org-export-freemind
+# Upstream threw htmlize.el into the contrib lisp directory, but this
+# file belongs in another package, `htmlize-el'. Thanks to grep, I
+# believe that The functiobn defined in htmlize.el aren't used (at
+# least, not directly or explicitly) by the emacs lisp files in the
+# contrib directory, but htmlize *is* used by the main org-mode elisp.
+rm %i/share/emacs/site-lisp/org/contrib/htmlize.el
+
+# Major contrib package: babel
+# Apparently this is the only piece of documentation
+mkdir -p %i/share/doc/org-babel
+install -m 644 contrib/babel/library-of-babel.org %i/share/doc/org-babel
+# Core lisp
+mkdir %i/share/emacs/site-lisp/org-babel
+install -m 644 contrib/babel/lisp/*.el %i/share/emacs/site-lisp/org-babel
+# Babel languages
+mkdir %i/share/emacs/site-lisp/org-babel/langs
+install -m 644 contrib/babel/lisp/langs/*.el
%i/share/emacs/site-lisp/org-babel/langs
# Contributed scripts
mkdir -p %i/bin
install -m 755 contrib/scripts/dir2org.zsh %i/bin
install -m 755 contrib/scripts/org2hpda %i/bin
+# Contrib doc
+mkdir -p %i/share/doc/org-mode-contrib
+install -m 644 contrib/README %i/share/doc/org-mode-contrib
+install -m 644 contrib/ChangeLog %i/share/doc/org-mode-contrib
+
# Info
mkdir -p %i/share/info
install -m 644 doc/org %i/share/info/org-%v
@@ -45,6 +64,14 @@
mkdir -p %i/lib/emacsen-common/packages/remove
install -m 755 fink/emacsen-install %i/lib/emacsen-common/packages/install/%n
install -m 755 fink/emacsen-remove %i/lib/emacsen-common/packages/remove/%n
+install -m 755 fink/emacsen-install-contrib \
+ %i/lib/emacsen-common/packages/install/%n-contrib
+install -m 755 fink/emacsen-remove-contrib \
+ %i/lib/emacsen-common/packages/remove/%n-contrib
+install -m 755 fink/emacsen-install-babel \
+ %i/lib/emacsen-common/packages/install/org-babel
+install -m 755 fink/emacsen-remove-babel \
+ %i/lib/emacsen-common/packages/remove/org-babel
mkdir -p %i/etc/emacs/site-start.d
install -m 644 fink/50org.el %i/etc/emacs/site-start.d
@@ -128,57 +155,75 @@
add those to 50org.el, the file that is automatically loaded upon
emacs startup and which loads org-mode, because adding global bindings
seems to me to be too much of an intrusion. That is why I refrained
-from making defaults out of them and instead describe the keys in
+from making defaults out of them and instead describe the keys in
DescUsage.
<<
SplitOff: <<
Package: org-mode-contrib
Depends: %N
Files: <<
- share/emacs/site-lisp/org/contrib/*.el
- bin/dir2org.zsh
- bin/org2hpda
- share/emacs/site-lisp/org/contrib/org-export-freemind/*.el
- share/doc/org-mode/ChangeLog.contrib
- share/doc/org-mode/README.contrib
- share/doc/org-mode/README.org-export-freemind
- share/doc/org-mode/ChangeLog.org-export-freemind
+ share/emacs/site-lisp/org/contrib
+ bin
+ share/doc/org-mode-contrib
+ lib/emacsen-common/packages/install/%n
+ lib/emacsen-common/packages/remove/%n
<<
+ PostInstScript: %p/lib/emacsen-common/emacs-package-install %n
+ PreRmScript: %p/lib/emacsen-common/emacs-package-remove %n
DescDetail: <<
This package contains a grabbag of contributed add-ons to the org-mode
package. It consists of:
LISP (emacs-lisp code)
======================
+
org-annotate-file.el --- Annotate a file with org syntax
-org-annotation-helper.el --- Call remember directly from Firefox/Opera
org-bookmark.el --- Links to bookmarks
+org-choose.el --- Use TODO keywords to mark decision states
+org-collector.el --- Collect properties into tables
+org-contribdir.el --- Dummy file to mark the org contrib Lisp directory
org-depend.el --- TODO dependencies for Org-mode
org-elisp-symbol.el --- Org links to emacs-lisp symbols
org-eval.el --- The <lisp> tag, adapted from Muse
-org-expiry.el --- expiry mechanism for Org entries
-org-indent.el --- Dynamic outline indentation (does not really work)
+org-eval-light.el --- Evaluate in-buffer code on demand
+org-expiry.el --- Expiry mechanism for Org entries
+org-exp-bibtex.el --- Export citations to LaTeX and HTML
+org-export-generic.el --- Export framework for configurable backends
+org-git-link.el --- Provide org links to specific file version
org-interactive-query.el --- Interactive modification of tags query
+org-invoice.el --- Help manage client invoices in OrgMode
+org-jira.el --- Add a jira:ticket protocol to Org
+org-learn.el --- SuperMemo's incremental learning algorithm
org-mairix.el --- Hook mairix search into Org for different MUAs
+org-mac-iCal.el --- Imports events from iCal.app to the Emacs diary
org-man.el --- Support for links to manpages in Org-mode
org-mtags.el --- Support for some Muse-like tags in Org-mode
org-panel.el --- Simple routines for us with bad memory
-org-registry.el --- a registry for Org links
+org-R.el --- Computation using the R language
+org-registry.el --- A registry for Org links
org2rem.el --- Convert org appointments into reminders
-org-screen.el --- visit screen sessions through Org-mode links
+org-screen.el --- Visit screen sessions through Org-mode links
+org-special-blocks.el --- Turn blocks into LaTeX envs and HTML divs
+org-track.el --- Keep up with Org development
org-toc.el --- Table of contents for Org-mode buffer
orgtbl-sqlinsert.el --- Convert Org-mode tables to SQL insertions.
-PACKAGES
-========
-org-export-freemind --- exporting utilities from org-mode to freemind
-
SCRIPTS (shell, bash, etc.)
===========================
+
dir2org.zsh --- Org compatible fs structure output
org2hpda --- Generate hipster pda style printouts from Org-mode
+ditaa.jar --- ASCII to PNG converter by Stathis Sideris, GPL
To get started with any of these pieces of code, consult their
respective files.
<<
-<<
\ No newline at end of file
+<<
+SplitOff2: <<
+ Package: org-babel
+ Depends: %N
+ Description: Facilitating communication between programming languages and
people
+ Files: share/emacs/site-lisp/%n share/doc/%n
+ PostInstScript: %p/lib/emacsen-common/emacs-package-install %n
+ PreRmScript: %p/lib/emacsen-common/emacs-package-remove %n
+<<
Index: org-mode.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/org-mode.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org-mode.patch 28 Mar 2009 21:21:41 -0000 1.8
+++ org-mode.patch 11 Dec 2009 09:06:07 -0000 1.9
@@ -1,18 +1,18 @@
-diff -Naur --exclude='*~' org-6.24b/Makefile org-6.24b.fink/Makefile
---- org-6.24b/Makefile 2009-03-10 18:56:05.000000000 +0100
-+++ org-6.24b.fink/Makefile 2009-03-21 17:38:50.000000000 +0100
-@@ -31,7 +31,7 @@
- # BATCH=$(EMACS) -batch -q -eval "(add-to-list (quote load-path) \".\")"
+diff -Naur --exclude='*~' org-6.33f/Makefile org-6.33f.fink/Makefile
+--- org-6.33f/Makefile 2009-11-20 14:15:36.000000000 +0000
++++ org-6.33f.fink/Makefile 2009-12-10 13:12:21.000000000 +0000
+@@ -29,7 +29,7 @@
+ # Using emacs in batch mode.
- BATCH=$(EMACS) -batch -q -eval \
-- "(progn (add-to-list (quote load-path) (expand-file-name \"./lisp/\")) \
-+ "(progn (add-to-list (quote load-path) (expand-file-name \".\")) \
- (add-to-list (quote load-path) \"$(lispdir)\"))"
+ BATCH=$(EMACS) -batch -q -no-site-file -eval \
+- "(progn (add-to-list (quote load-path) \"$(lispdir)\") (add-to-list (quote
load-path) (expand-file-name \"./lisp/\")))"
++ "(progn (add-to-list (quote load-path) \"$(lispdir)\") (add-to-list (quote
load-path) (expand-file-name \".\")))"
# Specify the byte-compiler for compiling org-mode files
-@@ -95,8 +95,8 @@
- org-w3m.el \
- org-wl.el
+ ELC= $(BATCH) -f batch-byte-compile
+@@ -108,8 +108,8 @@
+ org-wl.el \
+ org-xoxo.el
-LISPFILES0 = $(LISPF:%=lisp/%)
-LISPFILES = $(LISPFILES0) lisp/org-install.el
@@ -21,7 +21,7 @@
ELCFILES0 = $(LISPFILES0:.el=.elc)
ELCFILES = $(LISPFILES:.el=.elc)
DOCFILES = doc/org.texi doc/org.pdf doc/org doc/dir doc/.nosearch
-@@ -142,9 +142,9 @@
+@@ -166,9 +166,9 @@
if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
$(CP) xemacs/noutline.el xemacs/noutline.elc $(lispdir)
@@ -33,17 +33,17 @@
$(BATCH) --eval "(require 'autoload)" \
--eval '(find-file "org-install.el")' \
--eval '(erase-buffer)' \
-@@ -209,7 +209,7 @@
- make cleancontrib
- make info
- make doc
-- make lisp/org-install.el
-+ make org-install.el
+@@ -233,7 +233,7 @@
+ ${MAKE} cleancontrib
+ ${MAKE} info
+ ${MAKE} doc
+- ${MAKE} lisp/org-install.el
++ ${MAKE} org-install.el
rm -rf org-$(TAG) org-$(TAG).zip
$(MKDIR) org-$(TAG)
$(MKDIR) org-$(TAG)/xemacs
-@@ -259,7 +259,7 @@
- make upload_manual
+@@ -277,7 +277,7 @@
+ ${MAKE} upload_manual
db:
- grep -e '(debug)' lisp/*el
@@ -51,113 +51,133 @@
cleancontrib:
find contrib -name \*~ -exec rm {} \;
-@@ -286,7 +286,7 @@
+@@ -304,7 +304,7 @@
cleanall:
- make clean
+ ${MAKE} clean
- rm -f lisp/org-install.el
+ rm -f org-install.el
.el.elc:
$(ELC) $<
-@@ -308,37 +308,37 @@
+@@ -326,53 +326,53 @@
# Dependencies
--lisp/org.elc: lisp/org-macs.el lisp/org-compat.el lisp/org-faces.el
--lisp/org-agenda.elc: lisp/org.el
--lisp/org-attach.elc: lisp/org.el lisp/org-id.el
--lisp/org-archive.elc: lisp/org.el
--lisp/org-bbdb.elc: lisp/org.el
--lisp/org-bibtex.elc: lisp/org.el
--lisp/org-clock.elc: lisp/org.el
--lisp/org-colview.elc: lisp/org.el
--lisp/org-colview-xemacs.elc: lisp/org.el
--lisp/org-compat.elc: lisp/org-macs.el
--lisp/org-exp.elc: lisp/org.el lisp/org-agenda.el
--lisp/org-export-latex.elc: lisp/org.el lisp/org-exp.el
--lisp/org-faces.elc: lisp/org-macs.el lisp/org-compat.el
--lisp/org-footnotes.elc: lisp/org-macs.el lisp/org-compat.el
--lisp/org-gnus.elc: lisp/org.el
--lisp/org-id.elc: lisp/org.el
--lisp/org-info.elc: lisp/org.el
--lisp/org-irc.elc: lisp/org.el
--lisp/org-jsinfo.elc: lisp/org.el lisp/org-exp.el
--lisp/org-list.elc: lisp/org-macs.el lisp/org-compat.el
--lisp/org-mac-message.elc: lisp/org.el
+-lisp/org.elc: lisp/org-macs.el lisp/org-compat.el lisp/org-faces.el
+-lisp/org-agenda.elc: lisp/org.el
+-lisp/org-ascii.elc: lisp/org-exp.el
+-lisp/org-attach.elc: lisp/org.el lisp/org-id.el
+-lisp/org-archive.elc: lisp/org.el
+-lisp/org-bbdb.elc: lisp/org.el
+-lisp/org-bibtex.elc: lisp/org.el
+-lisp/org-clock.elc: lisp/org.el
+-lisp/org-colview.elc: lisp/org.el
+-lisp/org-colview-xemacs.elc: lisp/org.el
+-lisp/org-compat.elc: lisp/org-macs.el
+-lisp/org-crypt.elc: lisp/org-crypt.el lisp/org.el
+-lisp/org-datetree.elc: lisp/org.el
+-lisp/org-exp.elc: lisp/org.el lisp/org-agenda.el
+-lisp/org-exp-blocks.elc: lisp/org.el
+-lisp/org-latex.elc: lisp/org.el lisp/org-exp.el
+-lisp/org-docbook.elc: lisp/org.el lisp/org-exp.el
+-lisp/org-faces.elc: lisp/org-macs.el lisp/org-compat.el
+-lisp/org-feed.elc: lisp/org.el
+-lisp/org-footnotes.elc: lisp/org-macs.el lisp/org-compat.el
+-lisp/org-freemind.elc: lisp/org.el
+-lisp/org-gnus.elc: lisp/org.el
+-lisp/org-html.elc: lisp/org-exp.el
+-lisp/org-habit.elc: lisp/org.el lisp/org-agenda.el
+-lisp/org-icalendar.elc: lisp/org-exp.el
+-lisp/org-id.elc: lisp/org.el
+-lisp/org-indent.elc: lisp/org.el lisp/org-macs.el lisp/org-compat.el
+-lisp/org-info.elc: lisp/org.el
+-lisp/org-inlinetask.elc:
+-lisp/org-irc.elc: lisp/org.el
+-lisp/org-jsinfo.elc: lisp/org.el lisp/org-exp.el
+-lisp/org-list.elc: lisp/org-macs.el lisp/org-compat.el
+-lisp/org-mac-message.elc: lisp/org.el
-lisp/org-macs.elc:
--lisp/org-mew.elc: lisp/org.el
--lisp/org-mhe.elc: lisp/org.el
--lisp/org-mouse.elc: lisp/org.el
--lisp/org-plot.elc: lisp/org.el lisp/org-exp.el lisp/org-table.el
+-lisp/org-mew.elc: lisp/org.el
+-lisp/org-mhe.elc: lisp/org.el
+-lisp/org-mobile.elc: lisp/org.el
+-lisp/org-mouse.elc: lisp/org.el
+-lisp/org-plot.elc: lisp/org.el lisp/org-exp.el lisp/org-table.el
-lisp/org-publish.elc:
--lisp/org-remember.elc: lisp/org.el
--lisp/org-rmail.elc: lisp/org.el
--lisp/org-table.elc: lisp/org.el
--lisp/org-timer.elc: lisp/org.el
--lisp/org-vm.elc: lisp/org.el
--lisp/org-w3m.elc: lisp/org.el
--lisp/org-wl.elc: lisp/org.el
-+org.elc: org-macs.el org-compat.el org-faces.el
-+org-agenda.elc: org.el
-+org-attach.elc: org.el org-id.el
-+org-archive.elc: org.el
-+org-bbdb.elc: org.el
-+org-bibtex.elc: org.el
-+org-clock.elc: org.el
-+org-colview.elc: org.el
-+org-colview-xemacs.elc: org.el
-+org-compat.elc: org-macs.el
-+org-exp.elc: org.el org-agenda.el
-+org-export-latex.elc: org.el org-exp.el
-+org-faces.elc: org-macs.el org-compat.el
-+org-footnotes.elc: org-macs.el org-compat.el
-+org-gnus.elc: org.el
-+org-id.elc: org.el
-+org-info.elc: org.el
-+org-irc.elc: org.el
-+org-jsinfo.elc: org.el org-exp.el
-+org-list.elc: org-macs.el org-compat.el
-+org-mac-message.elc: org.el
+-lisp/org-protocol.elc: lisp/org.el
+-lisp/org-remember.elc: lisp/org.el
+-lisp/org-rmail.elc: lisp/org.el
+-lisp/org-src.elc: lisp/org-macs.el lisp/org-compat.el
+-lisp/org-table.elc: lisp/org.el
+-lisp/org-timer.elc: lisp/org.el
+-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
+\ No newline at end of file
++org.elc: org-macs.el org-compat.el org-faces.el
++org-agenda.elc: org.el
++org-ascii.elc: org-exp.el
++org-attach.elc: org.el org-id.el
++org-archive.elc: org.el
++org-bbdb.elc: org.el
++org-bibtex.elc: org.el
++org-clock.elc: org.el
++org-colview.elc: org.el
++org-colview-xemacs.elc: org.el
++org-compat.elc: org-macs.el
++org-crypt.elc: org-crypt.el org.el
++org-datetree.elc: org.el
++org-exp.elc: org.el org-agenda.el
++org-exp-blocks.elc: org.el
++org-latex.elc: org.el org-exp.el
++org-docbook.elc: org.el org-exp.el
++org-faces.elc: org-macs.el org-compat.el
++org-feed.elc: org.el
++org-footnotes.elc: org-macs.el org-compat.el
++org-freemind.elc: org.el
++org-gnus.elc: org.el
++org-html.elc: org-exp.el
++org-habit.elc: org.el org-agenda.el
++org-icalendar.elc: org-exp.el
++org-id.elc: org.el
++org-indent.elc: org.el org-macs.el org-compat.el
++org-info.elc: org.el
++org-inlinetask.elc:
++org-irc.elc: org.el
++org-jsinfo.elc: org.el org-exp.el
++org-list.elc: org-macs.el org-compat.el
++org-mac-message.elc: org.el
+org-macs.elc:
-+org-mew.elc: org.el
-+org-mhe.elc: org.el
-+org-mouse.elc: org.el
-+org-plot.elc: org.el org-exp.el org-table.el
++org-mew.elc: org.el
++org-mhe.elc: org.el
++org-mobile.elc: org.el
++org-mouse.elc: org.el
++org-plot.elc: org.el org-exp.el org-table.el
+org-publish.elc:
-+org-remember.elc: org.el
-+org-rmail.elc: org.el
-+org-table.elc: org.el
-+org-timer.elc: org.el
-+org-vm.elc: org.el
-+org-w3m.elc: org.el
-+org-wl.elc: org.el
-diff -Naur --exclude='*~' org-6.24b/doc/org org-6.24b.fink/doc/org
---- org-6.24b/doc/org 2009-03-10 18:56:05.000000000 +0100
-+++ org-6.24b.fink/doc/org 2009-03-21 17:39:01.000000000 +0100
-@@ -25,7 +25,7 @@
-
- INFO-DIR-SECTION Emacs
- START-INFO-DIR-ENTRY
--* Org Mode: (org). Outline-based notes management and organizer
-+* Org Mode: (org-6.24b). Outline-based notes management and organizer
- END-INFO-DIR-ENTRY
-
-
-diff -Naur --exclude='*~' org-6.24b/fink/50org.el org-6.24b.fink/fink/50org.el
---- org-6.24b/fink/50org.el 1970-01-01 01:00:00.000000000 +0100
-+++ org-6.24b.fink/fink/50org.el 2009-02-12 23:47:04.000000000 +0100
++org-protocol.elc: org.el
++org-remember.elc: org.el
++org-rmail.elc: org.el
++org-src.elc: org-macs.el org-compat.el
++org-table.elc: org.el
++org-timer.elc: org.el
++org-vm.elc: org.el
++org-w3m.elc: org.el
++org-wl.elc: org.el
++org-xoxo.elc: org-exp.el
+\ No newline at end of file
+diff -Naur --exclude='*~' org-6.33f/fink/50org.el org-6.33f.fink/fink/50org.el
+--- org-6.33f/fink/50org.el 1970-01-01 01:00:00.000000000 +0100
++++ org-6.33f.fink/fink/50org.el 2009-02-12 22:47:04.000000000 +0000
@@ -0,0 +1,3 @@
+(require 'org-install)
+(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
+(add-hook 'org-mode-hook 'turn-on-font-lock) ; org-mode buffers only
-diff -Naur --exclude='*~' org-6.24b/fink/emacsen-install
org-6.24b.fink/fink/emacsen-install
---- org-6.24b/fink/emacsen-install 1970-01-01 01:00:00.000000000 +0100
-+++ org-6.24b.fink/fink/emacsen-install 2009-03-21 17:40:37.000000000
+0100
-@@ -0,0 +1,69 @@
+diff -Naur --exclude='*~' org-6.33f/fink/emacsen-install
org-6.33f.fink/fink/emacsen-install
+--- org-6.33f/fink/emacsen-install 1970-01-01 01:00:00.000000000 +0100
++++ org-6.33f.fink/fink/emacsen-install 2009-12-10 13:40:20.000000000
+0000
+@@ -0,0 +1,54 @@
+#!/bin/bash -e
-+#
-+# install file for the fink org-mode emacs package.
+
+set -o posix
+
@@ -165,7 +185,7 @@
+
+if [ ${FLAVOR} == emacs ]
+then
-+ # No compilation done; no need to print anything
++ # This isn't really an emacs. No need to print anything
+ exit 0
+fi
+
@@ -192,23 +212,10 @@
+
+# Install base elisp
+mkdir -p @PREFIX@/share/${FLAVOR}/site-lisp/org
-+for i in org-agenda.el org-archive.el org-attach.el org-bbdb.el org-bibtex.el
org-clock.el org-colview-xemacs.el org-colview.el org-compat.el org-exp.el
org-export-latex.el org-faces.el org-footnote.el org-gnus.el org-id.el
org-info.el org-install.el org-irc.el org-jsinfo.el org-list.el
org-mac-message.el org-macs.el org-mew.el org-mhe.el org-mouse.el org-plot.el
org-publish.el org-remember.el org-rmail.el org-table.el org-timer.el org-vm.el
org-w3m.el org-wl.el org.el Makefile; do
++for i in org-agenda.el org-archive.el org-ascii.el org-attach.el org-bbdb.el
org-bibtex.el org-clock.el org-colview-xemacs.el org-colview.el org-compat.el
org-crypt.el org-datetree.el org-docbook.el org-exp-blocks.el org-exp.el
org-faces.el org-feed.el org-footnote.el org-freemind.el org-gnus.el
org-habit.el org-html.el org-icalendar.el org-id.el org-indent.el org-info.el
org-inlinetask.el org-install.el org-irc.el org-jsinfo.el org-latex.el
org-list.el org-mac-message.el org-macs.el org-mew.el org-mhe.el org-mobile.el
org-mouse.el org-plot.el org-protocol.el org-publish.el org-remember.el
org-rmail.el org-src.el org-table.el org-timer.el org-vm.el org-w3m.el
org-wl.el org-xoxo.el org.el Makefile; do
+ ln -s -f @PREFIX@/share/emacs/site-lisp/org/${i}
@PREFIX@/share/${FLAVOR}/site-lisp/org;
+done
+
-+# Install contributed code
-+mkdir -p @PREFIX@/share/${FLAVOR}/site-lisp/org/contrib;
-+for i in org-R.el org-annotate-file.el org-annotation-helper.el
org-bookmark.el org-browser-url.el org-checklist.el org-choose.el
org-collector.el org-depend.el org-elisp-symbol.el org-eval-light.el
org-eval.el org-exp-bibtex.el org-exp-blocks.el org-expiry.el org-indent.el
org-interactive-query.el org-mairix.el org-man.el org-mtags.el org-panel.el
org-registry.el org-screen.el org-toc.el org2rem.el orgtbl-sqlinsert.el; do
-+ ln -s -f @PREFIX@/share/emacs/site-lisp/org/contrib/${i}
@PREFIX@/share/${FLAVOR}/site-lisp/org/contrib;
-+done
-+
-+# Install contributed packages
-+# org-export-freemind-0.1.0
-+mkdir -p @PREFIX@/share/${FLAVOR}/site-lisp/org/contrib/org-export-freemind;
-+for i in org-export-freemind.el org-export-freemind-install.el ; do
-+ ln -s -f
@PREFIX@/share/emacs/site-lisp/org/contrib/org-export-freemind/${i}
@PREFIX@/share/${FLAVOR}/site-lisp/org/contrib/org-export-freemind/${i};
-+done;
-+
+echo >&2 -n "install/org-mode: Byte-compiling for ${FLAVOR}..."
+
+cd @PREFIX@/share/${FLAVOR}/site-lisp/org;
@@ -224,13 +231,144 @@
+echo >&2 "install/org-mode: Compilation log saved in
@PREFIX@/share/doc/org-mode/CompilationLog-${FLAVOR}.gz."
+
+exit 0
-diff -Naur --exclude='*~' org-6.24b/fink/emacsen-remove
org-6.24b.fink/fink/emacsen-remove
---- org-6.24b/fink/emacsen-remove 1970-01-01 01:00:00.000000000 +0100
-+++ org-6.24b.fink/fink/emacsen-remove 2008-12-01 00:22:03.000000000 +0100
-@@ -0,0 +1,32 @@
+diff -Naur --exclude='*~' org-6.33f/fink/emacsen-install-babel
org-6.33f.fink/fink/emacsen-install-babel
+--- org-6.33f/fink/emacsen-install-babel 1970-01-01 01:00:00.000000000
+0100
++++ org-6.33f.fink/fink/emacsen-install-babel 2009-12-11 07:57:57.000000000
+0000
+@@ -0,0 +1,70 @@
+#!/bin/bash -e
-+#
-+# This is the Fink version of the org-mode emacs package.
++
++set -o posix
++
++FLAVOR=${1}
++
++if [ ${FLAVOR} == emacs ]
++then
++ # No compilation done; no need to print anything
++ exit 0
++fi
++
++echo >&2 "install/org-babel: Handling install of emacsen flavor ${FLAVOR}"
++
++if [ ${FLAVOR} == emacs20 ]
++then
++ echo "install/org-babel: Skipping unsupported flavor ${FLAVOR}"
++ exit 0
++fi
++
++if [ ${FLAVOR} == emacs21 ]
++then
++ echo "install/org-babel: Warning: org-babel may not work properly with
emacs21;"
++ echo "install/org-babel: Warning: consider updating to emacs version 22
or higher;"
++ exit 0
++fi
++
++if [ ${FLAVOR} == xemacs ]
++then
++ echo "install/org-babel: Skipping unsupported flavor ${FLAVOR}"
++ exit 0
++fi
++
++# Install babel core
++mkdir -p @PREFIX@/share/${FLAVOR}/site-lisp/org-babel;
++for i in org-babel-comint.el org-babel-exp.el org-babel-lob.el
org-babel-ref.el org-babel-table.el org-babel-tangle.el org-babel.el; do
++ ln -s -f @PREFIX@/share/emacs/site-lisp/org-babel/${i}
@PREFIX@/share/${FLAVOR}/site-lisp/org-babel;
++done
++
++# Install babel languages
++mkdir -p @PREFIX@/share/${FLAVOR}/site-lisp/org-babel/langs
++for i in org-babel-R.el org-babel-asymptote.el org-babel-clojure.el
org-babel-css.el org-babel-ditaa.el org-babel-dot.el org-babel-emacs-lisp.el
org-babel-gnuplot.el org-babel-haskell.el org-babel-latex.el org-babel-ocaml.el
org-babel-perl.el org-babel-python.el org-babel-ruby.el org-babel-sass.el
org-babel-screen.el org-babel-sh.el org-babel-sql.el; do
++ ln -s -f @PREFIX@/share/emacs/site-lisp/org-babel/langs/${i}
@PREFIX@/share/${FLAVOR}/site-lisp/org-babel/langs;
++done
++
++echo >&2 -n "install/org-babel: Byte-compiling for ${FLAVOR}..."
++
++cd @PREFIX@/share/${FLAVOR}/site-lisp/org-babel;
++
++# Compile core
++(${FLAVOR} -batch --no-init-file --no-site-file \
++ --execute '(push "@PREFIX@/share/${FLAVOR}/site-lisp/org" load-path)' \
++ -f batch-byte-compile *.el 2>&1) \
++ > @PREFIX@/share/doc/org-babel/CompilationLog-${FLAVOR}
++
++cd langs;
++
++# Compile languages
++(${FLAVOR} -batch --no-init-file --no-site-file \
++ --execute '(push ".." load-path)' \
++ --execute '(push "@PREFIX@/share/${FLAVOR}/site-lisp/org" load-path)' \
++ -f batch-byte-compile *.el 2>&1) \
++ >> @PREFIX@/share/doc/org-babel/CompilationLog-${FLAVOR}
++
++gzip -9qf @PREFIX@/share/doc/org-babel/CompilationLog-${FLAVOR};
++
++echo >&2 "done."
++echo >&2 "install/org-babel: Compilation log saved in
@PREFIX@/share/doc/org-babel/CompilationLog-${FLAVOR}.gz."
++
++exit 0
+diff -Naur --exclude='*~' org-6.33f/fink/emacsen-install-contrib
org-6.33f.fink/fink/emacsen-install-contrib
+--- org-6.33f/fink/emacsen-install-contrib 1970-01-01 01:00:00.000000000
+0100
++++ org-6.33f.fink/fink/emacsen-install-contrib 2009-12-11
07:56:56.000000000 +0000
+@@ -0,0 +1,54 @@
++#!/bin/bash -e
++
++set -o posix
++
++FLAVOR=${1}
++
++if [ ${FLAVOR} == emacs ]
++then
++ # No compilation done; no need to print anything
++ exit 0
++fi
++
++echo >&2 "install/org-mode-contrib: Handling install of emacsen flavor
${FLAVOR}"
++
++if [ ${FLAVOR} == emacs20 ]
++then
++ echo "install/org-mode-contrib: Skipping unsupported flavor ${FLAVOR}"
++ exit 0
++fi
++
++if [ ${FLAVOR} == emacs21 ]
++then
++ echo "install/org-mode-contrib: Warning: org-mode-contrib may not work
properly with emacs21;"
++ echo "install/org-mode-contrib: Warning: consider updating to emacs
version 22 or higher;"
++ exit 0
++fi
++
++if [ ${FLAVOR} == xemacs ]
++then
++ echo "install/org-mode-contrib: Skipping unsupported flavor ${FLAVOR}"
++ exit 0
++fi
++
++# Install contributed code
++mkdir -p @PREFIX@/share/${FLAVOR}/site-lisp/org/contrib;
++for i in org-R.el org-annotate-file.el org-babel-init.el org-bookmark.el
org-checklist.el org-choose.el org-collector.el org-contribdir.el org-depend.el
org-elisp-symbol.el org-eval-light.el org-eval.el org-exp-bibtex.el
org-expiry.el org-export-generic.el org-git-link.el org-interactive-query.el
org-invoice.el org-jira.el org-learn.el org-mac-iCal.el org-mairix.el
org-man.el org-mtags.el org-panel.el org-registry.el org-screen.el
org-special-blocks.el org-toc.el org-track.el org2rem.el orgtbl-sqlinsert.el; do
++ ln -s -f @PREFIX@/share/emacs/site-lisp/org/contrib/${i}
@PREFIX@/share/${FLAVOR}/site-lisp/org/contrib;
++done
++
++echo >&2 -n "install/org-mode-contrib: Byte-compiling for ${FLAVOR}..."
++
++cd @PREFIX@/share/${FLAVOR}/site-lisp/org;
++
++(${FLAVOR} -batch --no-init-file --no-site-file \
++ --execute '(push "@PREFIX@/share/${FLAVOR}/site-lisp/org" load-path)' \
++ -f batch-byte-compile *.el 2>&1) \
++ > @PREFIX@/share/doc/org-mode-contrib/CompilationLog-${FLAVOR}
++
++gzip -9qf @PREFIX@/share/doc/org-mode-contrib/CompilationLog-${FLAVOR};
++
++echo >&2 "done."
++echo >&2 "install/org-mode-contrib: Compilation log saved in
@PREFIX@/share/doc/org-mode-contrb/CompilationLog-${FLAVOR}.gz."
++
++exit 0
+diff -Naur --exclude='*~' org-6.33f/fink/emacsen-remove
org-6.33f.fink/fink/emacsen-remove
+--- org-6.33f/fink/emacsen-remove 1970-01-01 01:00:00.000000000 +0100
++++ org-6.33f.fink/fink/emacsen-remove 2009-12-10 13:37:52.000000000 +0000
+@@ -0,0 +1,31 @@
++#!/bin/bash -e
++
+set -o posix
+
+FLAVOR=${1}
@@ -240,24 +378,94 @@
+ exit 0
+fi
+
-+echo "remove/org: Handling removal for emacsen flavor ${FLAVOR}"
++echo "remove/org-mode: Handling removal for emacsen flavor ${FLAVOR}"
+
+if [ ${FLAVOR} == emacs20 ]
+then
-+ echo "remove/org: Skipping unsupported flavor ${FLAVOR}"
++ echo "remove/org-mode: Skipping unsupported flavor ${FLAVOR}"
+ exit 0
+fi
+
+if [ ${FLAVOR} == xemacs ]
+then
-+ echo "install/org-mode: Skipping unsupported flavor ${FLAVOR}"
++ echo "remove/org-mode: Skipping unsupported flavor ${FLAVOR}"
+ exit 0
+fi
+
-+echo >&2 -n "remove/org: Purging compilation log and byte-compiled files for
${FLAVOR}..."
++echo >&2 -n "remove/org-mode: Purging compilation log and byte-compiled files
for ${FLAVOR}..."
+rm -f @PREFIX@/share/doc/org-mode/CompilationLog-${FLAVOR}.gz
+rm -Rf @PREFIX@/share/${FLAVOR}/site-lisp/org
+echo >&2 "done."
+
+exit 0
\ No newline at end of file
+diff -Naur --exclude='*~' org-6.33f/fink/emacsen-remove-babel
org-6.33f.fink/fink/emacsen-remove-babel
+--- org-6.33f/fink/emacsen-remove-babel 1970-01-01 01:00:00.000000000
+0100
++++ org-6.33f.fink/fink/emacsen-remove-babel 2009-12-10 14:22:47.000000000
+0000
+@@ -0,0 +1,31 @@
++#!/bin/bash -e
++
++set -o posix
++
++FLAVOR=${1}
++
++if [ ${FLAVOR} == emacs ]
++then
++ exit 0
++fi
++
++echo "remove/org-babel: Handling removal for emacsen flavor ${FLAVOR}"
++
++if [ ${FLAVOR} == emacs20 ]
++then
++ echo "remove/org-babel: Skipping unsupported flavor ${FLAVOR}"
++ exit 0
++fi
++
++if [ ${FLAVOR} == xemacs ]
++then
++ echo "remove/org-babel: Skipping unsupported flavor ${FLAVOR}"
++ exit 0
++fi
++
++echo >&2 -n "remove/org-mode-babel: Purging compilation log and byte-compiled
files for ${FLAVOR}..."
++rm -f @PREFIX@/share/doc/org-babel/CompilationLog-${FLAVOR}.gz
++rm -Rf @PREFIX@/share/${FLAVOR}/site-lisp/org-babel
++echo >&2 "done."
++
++exit 0
+diff -Naur --exclude='*~' org-6.33f/fink/emacsen-remove-contrib
org-6.33f.fink/fink/emacsen-remove-contrib
+--- org-6.33f/fink/emacsen-remove-contrib 1970-01-01 01:00:00.000000000
+0100
++++ org-6.33f.fink/fink/emacsen-remove-contrib 2009-12-10 13:40:38.000000000
+0000
+@@ -0,0 +1,31 @@
++#!/bin/bash -e
++
++set -o posix
++
++FLAVOR=${1}
++
++if [ ${FLAVOR} == emacs ]
++then
++ exit 0
++fi
++
++echo "remove/org-mode-contrib: Handling removal for emacsen flavor ${FLAVOR}"
++
++if [ ${FLAVOR} == emacs20 ]
++then
++ echo "remove/org-mode-contrib: Skipping unsupported flavor ${FLAVOR}"
++ exit 0
++fi
++
++if [ ${FLAVOR} == xemacs ]
++then
++ echo "remove/org-mode-contrib: Skipping unsupported flavor ${FLAVOR}"
++ exit 0
++fi
++
++echo >&2 -n "remove/org-mode-contrib: Purging compilation log and
byte-compiled files for ${FLAVOR}..."
++rm -f @PREFIX@/share/doc/org-mode-contrib/CompilationLog-${FLAVOR}.gz
++rm -Rf @PREFIX@/share/${FLAVOR}/site-lisp/org/contrib
++echo >&2 "done."
++
++exit 0
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
