[csw-devel] SF.net SVN: gar:[20455] csw/mgar/pkg/org-mode/trunk
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Thu Mar 14 16:45:28 CET 2013
Revision: 20455
http://gar.svn.sourceforge.net/gar/?rev=20455&view=rev
Author: pfelecan
Date: 2013-03-14 15:45:27 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
org-mode/trunk:
- depends now on TeXLive for building
- version bump
Modified Paths:
--------------
csw/mgar/pkg/org-mode/trunk/Makefile
csw/mgar/pkg/org-mode/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/org-mode/trunk/files/local.mk
Removed Paths:
-------------
csw/mgar/pkg/org-mode/trunk/files/0001-Use-Open-CSW-prefix.patch
csw/mgar/pkg/org-mode/trunk/files/0002-Fix-documentation-build-target.patch
Modified: csw/mgar/pkg/org-mode/trunk/Makefile
===================================================================
--- csw/mgar/pkg/org-mode/trunk/Makefile 2013-03-13 23:10:40 UTC (rev 20454)
+++ csw/mgar/pkg/org-mode/trunk/Makefile 2013-03-14 15:45:27 UTC (rev 20455)
@@ -2,9 +2,8 @@
NAME_PREFIX = org
NAME = $(NAME_PREFIX)-mode
-VERSION = 7.8.11
+VERSION = 7.9.4
GARTYPE = v2
-CATEGORIES = apps
DESCRIPTION = An Emacs Mode for Notes, Planning, and Authoring
define BLURB
@@ -18,16 +17,14 @@
DISTFILES = $(NAME_PREFIX)-$(VERSION).tar.gz
DISTFILES += README.CSW
DISTFILES += COPYING
-PATCHFILES += 0001-Use-Open-CSW-prefix.patch
-PATCHFILES += 0002-Fix-documentation-build-target.patch
+DISTFILES += local.mk
BUILD_DEP_PKGS += CSWemacs
BUILD_DEP_PKGS += CSWgsed
-BUILD_DEP_PKGS += CSWtetex
+BUILD_DEP_PKGS += CSWtexlive
+BUILD_DEP_PKGS += CSWtexinfo
CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS = nominal
-BUILD_SCRIPTS += doc
TEST_SCRIPTS =
INSTALL_SCRIPTS = nominal
INSTALL_SCRIPTS += info
@@ -38,20 +35,14 @@
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
-EXTRA_TEXINFO = $(infodir)/.*
+# EXTRA_TEXINFO = $(infodir)/.*
include gar/category.mk
PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH)
-build-nominal:
- cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -C $(OBJDIR)
- $(MAKECOOKIE)
-
-build-doc:
- cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -C $(OBJDIR) doc
- $(MAKECOOKIE)
-
+pre-build-modulated:
+ cp $(WORKDIR)/local.mk $(WORKSRC)
install-nominal:
cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) && $(MAKE) -C $(OBJDIR) $(INSTALL_ARGS) DESTDIR=$(DESTDIR) install
$(MAKECOOKIE)
@@ -72,6 +63,4 @@
ginstall --preserve-timestamps --mode=u=rwx,go=r $(source)/orgguide.pdf $(DESTDIR)/$(pkgdoc)
mv $(DESTDIR)/$(infodir)/org $(DESTDIR)/$(infodir)/org-ocsw
gsed --in-place --expression='s/^[*] Org Mode: (org)[.] Outline-based notes management and organizer$$/* Org Mode (OCSW): (org-ocsw). Outline-based notes management and organizer as supplied by Open CSW/' $(DESTDIR)/$(infodir)/org-ocsw
- ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(contrib)
- gtar --directory=$(WORKSRC)/contrib --create --exclude-vcs --file=- . | gtar --directory $(DESTDIR)/$(contrib) --extract --file=-
$(MAKECOOKIE)
Modified: csw/mgar/pkg/org-mode/trunk/checksums
===================================================================
--- csw/mgar/pkg/org-mode/trunk/checksums 2013-03-13 23:10:40 UTC (rev 20454)
+++ csw/mgar/pkg/org-mode/trunk/checksums 2013-03-14 15:45:27 UTC (rev 20455)
@@ -1 +1 @@
-e95cd63aabe246b3261ff50be84288de org-7.8.11.tar.gz
+20b10d8848dd3ddd18b68fe1227796c8 org-7.9.4.tar.gz
Deleted: csw/mgar/pkg/org-mode/trunk/files/0001-Use-Open-CSW-prefix.patch
===================================================================
--- csw/mgar/pkg/org-mode/trunk/files/0001-Use-Open-CSW-prefix.patch 2013-03-13 23:10:40 UTC (rev 20454)
+++ csw/mgar/pkg/org-mode/trunk/files/0001-Use-Open-CSW-prefix.patch 2013-03-14 15:45:27 UTC (rev 20455)
@@ -1,25 +0,0 @@
-From 2b51aba657dc6ca5abdb14be60637c4936eedb1a Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 6 Aug 2012 11:22:48 +0200
-Subject: [PATCH] Use Open CSW prefix
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 8a7bde1..3783bf0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,7 +14,7 @@
- EMACS=emacs
-
- # Where local software is found
--prefix=/usr/local
-+prefix=/opt/csw
-
- # Where local lisp files go
- lispdir = $(prefix)/share/emacs/site-lisp
---
-1.7.11.3
-
Deleted: csw/mgar/pkg/org-mode/trunk/files/0002-Fix-documentation-build-target.patch
===================================================================
--- csw/mgar/pkg/org-mode/trunk/files/0002-Fix-documentation-build-target.patch 2013-03-13 23:10:40 UTC (rev 20454)
+++ csw/mgar/pkg/org-mode/trunk/files/0002-Fix-documentation-build-target.patch 2013-03-14 15:45:27 UTC (rev 20455)
@@ -1,40 +0,0 @@
-From 6be29d8424b2bedc775139d7b62d9e01b171d4be Mon Sep 17 00:00:00 2001
-From: Peter Felecan <pfelecan at opencsw.org>
-Date: Mon, 6 Aug 2012 11:32:29 +0200
-Subject: [PATCH] Fix documentation build target
-
----
- Makefile | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3783bf0..9cdfbfd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -240,7 +240,7 @@ compile: $(ELCFILES0) $(ELCBFILES)
-
- install: install-lisp install-data
-
--doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt
-+doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf
-
- p:
- ${MAKE} pdf && open doc/org.pdf
-@@ -295,14 +295,10 @@ doc/orgguide.pdf: doc/orgguide.texi
-
- doc/org.html: doc/org.texi
- (cd doc && $(TEXI2HTML) --no-split -o org.html org.texi)
-- UTILITIES/manfull.pl doc/org.html
-
- doc/orgcard.pdf: doc/orgcard.tex
- (cd doc && pdftex orgcard.tex)
-
--doc/orgcard.txt: doc/orgcard.tex
-- (cd doc && perl ../UTILITIES/orgcard2txt.pl orgcard.tex > orgcard.txt)
--
- doc/orgcard_letter.tex: doc/orgcard.tex
- perl -pe 's/\\pdflayout=\(0l\)/\\pdflayout=(1l)/' \
- doc/orgcard.tex > doc/orgcard_letter.tex
---
-1.7.11.3
-
Added: csw/mgar/pkg/org-mode/trunk/files/local.mk
===================================================================
--- csw/mgar/pkg/org-mode/trunk/files/local.mk (rev 0)
+++ csw/mgar/pkg/org-mode/trunk/files/local.mk 2013-03-14 15:45:27 UTC (rev 20455)
@@ -0,0 +1,6 @@
+# Where local software is found
+prefix = /opt/csw/share
+
+ORG_MAKE_DOC = info html pdf card
+
+ORG_ADD_CONTRIB = org-e-* org-md org-export
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list