SF.net SVN: gar:[22444] csw/mgar/pkg/org-mode/trunk

[pfelecan at users.sourceforge.net]

Revision: 22444
          http://gar.svn.sourceforge.net/gar/?rev=22444&view=rev
Author:   pfelecan
Date:     2013-11-07 15:25:54 +0000 (Thu, 07 Nov 2013)
Log Message:
-----------
org-mode/trunk: upgrade to the last stable upstream version

Modified Paths:
--------------
    csw/mgar/pkg/org-mode/trunk/Makefile
    csw/mgar/pkg/org-mode/trunk/checksums
    csw/mgar/pkg/org-mode/trunk/files/local.mk

Modified: csw/mgar/pkg/org-mode/trunk/Makefile
===================================================================
--- csw/mgar/pkg/org-mode/trunk/Makefile	2013-11-07 14:49:36 UTC (rev 22443)
+++ csw/mgar/pkg/org-mode/trunk/Makefile	2013-11-07 15:25:54 UTC (rev 22444)
@@ -2,7 +2,7 @@
 
 NAME_PREFIX	=	org
 NAME		=	$(NAME_PREFIX)-mode
-VERSION		=	7.9.4
+VERSION		=	8.2.1
 GARTYPE		=	v2
 
 DESCRIPTION = An Emacs Mode for Notes, Planning, and Authoring
@@ -29,21 +29,31 @@
 TEST_SCRIPTS		=
 
 ARCHALL							=	1
+CATALOGNAME_CSWorg-mode			=	org_mode
 RUNTIME_DEP_PKGS				+=	CSWemacs
 CHECKPKG_OVERRIDES_CSWorg-mode	+=	surplus-dependency|CSWemacs
-CHECKPKG_OVERRIDES_CSWorg-mode	+=	missing-dependency|CSWemacscommon
-CHECKPKG_OVERRIDES_CSWorg-mode	+=	file-with-bad-content|/usr/local|root/opt/csw/share/org-mode/lisp/htmlize.el
+CHECKPKG_OVERRIDES_CSWorg-mode	+=	missing-dependency|CSWemacs-common
+CHECKPKG_OVERRIDES_CSWorg-mode	+=	file-with-bad-content|/usr/local|root/opt/csw/share/org/lisp/htmlize.el
 
 EXTRA_TEXINFO						=	$(infodir)/.*
 
 include gar/category.mk
 
-PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH)
+PATH := /opt/csw/gnu:$(PATH)
 
+# remove not supported contributions (this is the easiest way to do it)
+post-extract:
+	cd $(WORKSRC)/contrib/lisp && \
+	rm -f \
+		ob-oz.el \
+		org-jira.el
+	$(MAKECOOKIE)
+
 pre-build-modulated:
 	cp $(WORKDIR)/local.mk $(WORKSRC)
+	$(MAKECOOKIE)
 
-post-install-modulated: pkgdoc = $(docdir)/$(NAME)
+post-install-modulated: pkgdoc = $(docdir)/$(CATALOGNAME_CSWorg-mode)
 post-install-modulated: source = $(WORKSRC)/doc
 post-install-modulated: contrib = $(sharedstatedir)/$(NAME)
 post-install-modulated:

Modified: csw/mgar/pkg/org-mode/trunk/checksums
===================================================================
--- csw/mgar/pkg/org-mode/trunk/checksums	2013-11-07 14:49:36 UTC (rev 22443)
+++ csw/mgar/pkg/org-mode/trunk/checksums	2013-11-07 15:25:54 UTC (rev 22444)
@@ -1 +1 @@
-20b10d8848dd3ddd18b68fe1227796c8  org-7.9.4.tar.gz
+43fe315ad9fa48afedb8c93b2b6e84c0  org-8.2.1.tar.gz

Modified: csw/mgar/pkg/org-mode/trunk/files/local.mk
===================================================================
--- csw/mgar/pkg/org-mode/trunk/files/local.mk	2013-11-07 14:49:36 UTC (rev 22443)
+++ csw/mgar/pkg/org-mode/trunk/files/local.mk	2013-11-07 15:25:54 UTC (rev 22444)
@@ -3,4 +3,4 @@
 
 ORG_MAKE_DOC = info html pdf card
 
-ORG_ADD_CONTRIB = org-e-* org-md org-export
+ORG_ADD_CONTRIB = org* ox* ob* htmlize*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.