Changes to editors/emacs and Mk/bsd.emacs.mk were taken from

PR/137956 by Ashish SHUKLA (thanks!).  [1]

Those ports which define EMACS_PORT_NAME to be "emacs21" were
not touched (this time). They may be converted to the new
world order by removing the above mentioned assignment.

Four ports were marked as BROKEN with EMACS_PORT_NAME=emacs23
(they do not compile):
. lang/bigloo;
. mail/wanderlust;
. mail/wanderlust-devel;
. www/emacs-w3m.

Three ports were marked as IGNORE with EMACS_PORT_NAME=emacs23:
. japanese/egg-canna (the port version is dated as of 2001,
  does not compile with Emacs 23 and seems it cannot be fixed);
. deskutils/remember.el (was incorporated into Emacs 23);
. editors/nxml (was incorporated into Emacs 23).

Changes that were made after (and as a result of) exp run. For
those ports:
. japanese/migemo-emacs21;
. japanese/migemo-emacs22
EMACS_PORT_NAME?= was changed to EMACS_PORT_NAME= to the apropriate
emacs port name.

PR:		ports/137956 [1], ports/141369 [2]
Submitted by:	Ashish SHUKLA <wahjava at gmail.com>  [1],
		bsam (me)  [2]
Exp-run by: miwi

3 files changed, 51 insertions, 10 deletions

diff --git a/deskutils/org-mode.el6/Makefile b/deskutils/org-mode.el6/Makefile
index bee752c45c4c..763f585cd87e 100644
--- a/deskutils/org-mode.el6/Makefile
+++ b/deskutils/org-mode.el6/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	org-mode.el
-PORTVERSION=	6.05b
-PORTREVISION=	1
+PORTVERSION=	6.33f
 CATEGORIES=	deskutils elisp
 MASTER_SITES=	http://orgmode.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -18,8 +17,6 @@ COMMENT=	An Emacs mode for notes and project planning
 
 USE_EMACS=	yes
 USE_GMAKE=	yes
-EMACS_PORT_NAME?=	emacs22
 MAKE_FLAGS=	prefix=${PREFIX}
 
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/org-mode.el6/distinfo b/deskutils/org-mode.el6/distinfo
index 4d77b3c3d153..c691c146533a 100644
--- a/deskutils/org-mode.el6/distinfo
+++ b/deskutils/org-mode.el6/distinfo
@@ -1,3 +1,3 @@
-MD5 (org-6.05b.tar.gz) = 9cfb9630de01d362c1d42139cc9c4a08
-SHA256 (org-6.05b.tar.gz) = 055e6d539d4067107a9cc4faa4f706ef835971a98647a343db96f276a374e9d3
-SIZE (org-6.05b.tar.gz) = 1557168
+MD5 (org-6.33f.tar.gz) = c057d13dac5d9c6da9bc063273faad82
+SHA256 (org-6.33f.tar.gz) = b65e73607eb72f8d35f919e6460e7441b388d23c88a1c25053c70f406f564401
+SIZE (org-6.33f.tar.gz) = 2281053
diff --git a/deskutils/org-mode.el6/pkg-plist b/deskutils/org-mode.el6/pkg-plist
index 8a2030aaacc8..c717a7042f8a 100644
--- a/deskutils/org-mode.el6/pkg-plist
+++ b/deskutils/org-mode.el6/pkg-plist
@@ -1,58 +1,102 @@
 %%EMACS_SITE_LISPDIR%%/org.el
 %%EMACS_SITE_LISPDIR%%/org-agenda.el
 %%EMACS_SITE_LISPDIR%%/org-archive.el
+%%EMACS_SITE_LISPDIR%%/org-ascii.el
+%%EMACS_SITE_LISPDIR%%/org-attach.el
 %%EMACS_SITE_LISPDIR%%/org-bbdb.el
 %%EMACS_SITE_LISPDIR%%/org-bibtex.el
 %%EMACS_SITE_LISPDIR%%/org-clock.el
 %%EMACS_SITE_LISPDIR%%/org-colview.el
 %%EMACS_SITE_LISPDIR%%/org-colview-xemacs.el
 %%EMACS_SITE_LISPDIR%%/org-compat.el
+%%EMACS_SITE_LISPDIR%%/org-crypt.el
+%%EMACS_SITE_LISPDIR%%/org-datetree.el
+%%EMACS_SITE_LISPDIR%%/org-docbook.el
 %%EMACS_SITE_LISPDIR%%/org-exp.el
-%%EMACS_SITE_LISPDIR%%/org-export-latex.el
+%%EMACS_SITE_LISPDIR%%/org-exp-blocks.el
 %%EMACS_SITE_LISPDIR%%/org-faces.el
+%%EMACS_SITE_LISPDIR%%/org-feed.el
+%%EMACS_SITE_LISPDIR%%/org-footnote.el
+%%EMACS_SITE_LISPDIR%%/org-freemind.el
 %%EMACS_SITE_LISPDIR%%/org-gnus.el
+%%EMACS_SITE_LISPDIR%%/org-habit.el
+%%EMACS_SITE_LISPDIR%%/org-html.el
+%%EMACS_SITE_LISPDIR%%/org-icalendar.el
 %%EMACS_SITE_LISPDIR%%/org-id.el
+%%EMACS_SITE_LISPDIR%%/org-indent.el
 %%EMACS_SITE_LISPDIR%%/org-info.el
+%%EMACS_SITE_LISPDIR%%/org-inlinetask.el
 %%EMACS_SITE_LISPDIR%%/org-jsinfo.el
 %%EMACS_SITE_LISPDIR%%/org-irc.el
+%%EMACS_SITE_LISPDIR%%/org-latex.el
+%%EMACS_SITE_LISPDIR%%/org-list.el
 %%EMACS_SITE_LISPDIR%%/org-mac-message.el
 %%EMACS_SITE_LISPDIR%%/org-macs.el
 %%EMACS_SITE_LISPDIR%%/org-mew.el
 %%EMACS_SITE_LISPDIR%%/org-mhe.el
+%%EMACS_SITE_LISPDIR%%/org-mobile.el
 %%EMACS_SITE_LISPDIR%%/org-mouse.el
+%%EMACS_SITE_LISPDIR%%/org-plot.el
+%%EMACS_SITE_LISPDIR%%/org-protocol.el
 %%EMACS_SITE_LISPDIR%%/org-publish.el
 %%EMACS_SITE_LISPDIR%%/org-remember.el
 %%EMACS_SITE_LISPDIR%%/org-rmail.el
+%%EMACS_SITE_LISPDIR%%/org-src.el
 %%EMACS_SITE_LISPDIR%%/org-table.el
+%%EMACS_SITE_LISPDIR%%/org-timer.el
 %%EMACS_SITE_LISPDIR%%/org-vm.el
+%%EMACS_SITE_LISPDIR%%/org-w3m.el
 %%EMACS_SITE_LISPDIR%%/org-wl.el
+%%EMACS_SITE_LISPDIR%%/org-xoxo.el
 %%EMACS_SITE_LISPDIR%%/org-install.el
 %%EMACS_SITE_LISPDIR%%/org.elc
 %%EMACS_SITE_LISPDIR%%/org-agenda.elc
 %%EMACS_SITE_LISPDIR%%/org-archive.elc
+%%EMACS_SITE_LISPDIR%%/org-attach.elc
+%%EMACS_SITE_LISPDIR%%/org-ascii.elc
 %%EMACS_SITE_LISPDIR%%/org-bbdb.elc
 %%EMACS_SITE_LISPDIR%%/org-bibtex.elc
 %%EMACS_SITE_LISPDIR%%/org-clock.elc
 %%EMACS_SITE_LISPDIR%%/org-colview.elc
 %%EMACS_SITE_LISPDIR%%/org-colview-xemacs.elc
 %%EMACS_SITE_LISPDIR%%/org-compat.elc
+%%EMACS_SITE_LISPDIR%%/org-crypt.elc
+%%EMACS_SITE_LISPDIR%%/org-datetree.elc
+%%EMACS_SITE_LISPDIR%%/org-docbook.elc
 %%EMACS_SITE_LISPDIR%%/org-exp.elc
-%%EMACS_SITE_LISPDIR%%/org-export-latex.elc
+%%EMACS_SITE_LISPDIR%%/org-exp-blocks.elc
 %%EMACS_SITE_LISPDIR%%/org-faces.elc
+%%EMACS_SITE_LISPDIR%%/org-feed.elc
+%%EMACS_SITE_LISPDIR%%/org-footnote.elc
+%%EMACS_SITE_LISPDIR%%/org-freemind.elc
 %%EMACS_SITE_LISPDIR%%/org-gnus.elc
+%%EMACS_SITE_LISPDIR%%/org-habit.elc
+%%EMACS_SITE_LISPDIR%%/org-html.elc
+%%EMACS_SITE_LISPDIR%%/org-icalendar.elc
 %%EMACS_SITE_LISPDIR%%/org-id.elc
+%%EMACS_SITE_LISPDIR%%/org-indent.elc
 %%EMACS_SITE_LISPDIR%%/org-info.elc
+%%EMACS_SITE_LISPDIR%%/org-inlinetask.elc
 %%EMACS_SITE_LISPDIR%%/org-jsinfo.elc
 %%EMACS_SITE_LISPDIR%%/org-irc.elc
+%%EMACS_SITE_LISPDIR%%/org-latex.elc
+%%EMACS_SITE_LISPDIR%%/org-list.elc
 %%EMACS_SITE_LISPDIR%%/org-mac-message.elc
 %%EMACS_SITE_LISPDIR%%/org-macs.elc
 %%EMACS_SITE_LISPDIR%%/org-mew.elc
 %%EMACS_SITE_LISPDIR%%/org-mhe.elc
+%%EMACS_SITE_LISPDIR%%/org-mobile.elc
 %%EMACS_SITE_LISPDIR%%/org-mouse.elc
+%%EMACS_SITE_LISPDIR%%/org-plot.elc
+%%EMACS_SITE_LISPDIR%%/org-protocol.elc
 %%EMACS_SITE_LISPDIR%%/org-publish.elc
 %%EMACS_SITE_LISPDIR%%/org-remember.elc
 %%EMACS_SITE_LISPDIR%%/org-rmail.elc
+%%EMACS_SITE_LISPDIR%%/org-src.elc
 %%EMACS_SITE_LISPDIR%%/org-table.elc
+%%EMACS_SITE_LISPDIR%%/org-timer.elc
 %%EMACS_SITE_LISPDIR%%/org-vm.elc
+%%EMACS_SITE_LISPDIR%%/org-w3m.elc
 %%EMACS_SITE_LISPDIR%%/org-wl.elc
+%%EMACS_SITE_LISPDIR%%/org-xoxo.elc
 %%EMACS_SITE_LISPDIR%%/org-install.elc