[csw-devel] SF.net SVN: gar:[8913] csw/mgar/pkg/augeas/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Mar 1 13:50:22 CET 2010


Revision: 8913
          http://gar.svn.sourceforge.net/gar/?rev=8913&view=rev
Author:   dmichelsen
Date:     2010-03-01 12:50:22 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
augeas: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/augeas/trunk/Makefile
    csw/mgar/pkg/augeas/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/augeas/trunk/bin/
    csw/mgar/pkg/augeas/trunk/bin/readlink
    csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch
    csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch

Modified: csw/mgar/pkg/augeas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/augeas/trunk/Makefile	2010-03-01 12:38:32 UTC (rev 8912)
+++ csw/mgar/pkg/augeas/trunk/Makefile	2010-03-01 12:50:22 UTC (rev 8913)
@@ -11,12 +11,34 @@
 
 MASTER_SITES = http://augeas.net/download/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES  = 0001-Do-not-use-_N-already-taken-on-Solaris.patch
+PATCHFILES += 0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 VENDOR_URL = http://augeas.net
 
+RUNTIME_DEP_PKGS = CSWgcc4corert CSWlibgnugetopt CSWreadline
+
+GARCOMPILER = GCC4
+
+EXTRA_LDFLAGS = -lgnugetopt
+
 BUILD64 = 1
+NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
+TEST_TARGET = check
+
+EXTRA_MERGE_EXCLUDE_FILES = .*/charset.alias
+MERGE_DIRS_isa-extra = $(libdir)
+
 include gar/category.mk
+
+# Local bin/ for readlink, /opt/csw/gnu for GNU tail, diff
+PATH := $(abspath ./bin):/opt/csw/gnu:$(PATH)
+
+post-extract-modulated:
+	@# Tests are written in bash
+	-cd $(WORKSRC)/tests && perl -e 's,#! /bin/sh,#! /bin/bash,' -pi *.sh
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/augeas/trunk/bin/readlink
===================================================================
--- csw/mgar/pkg/augeas/trunk/bin/readlink	                        (rev 0)
+++ csw/mgar/pkg/augeas/trunk/bin/readlink	2010-03-01 12:50:22 UTC (rev 8913)
@@ -0,0 +1,3 @@
+#!/usr/bin/perl
+
+print readlink($ARGV[0]);


Property changes on: csw/mgar/pkg/augeas/trunk/bin/readlink
___________________________________________________________________
Added: svn:executable
   + *

Modified: csw/mgar/pkg/augeas/trunk/checksums
===================================================================
--- csw/mgar/pkg/augeas/trunk/checksums	2010-03-01 12:38:32 UTC (rev 8912)
+++ csw/mgar/pkg/augeas/trunk/checksums	2010-03-01 12:50:22 UTC (rev 8913)
@@ -1 +1,3 @@
+eed0e7f40f22e580ccf5d78884ebe1a0  0001-Do-not-use-_N-already-taken-on-Solaris.patch
+b9cbbe07e58bba1572838ec0cb1f6c49  0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch
 a6a6a5515d7bbebe61c1e90db12eef72  augeas-0.7.0.tar.gz

Added: csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/augeas/trunk/files/0001-Do-not-use-_N-already-taken-on-Solaris.patch	2010-03-01 12:50:22 UTC (rev 8913)
@@ -0,0 +1,43 @@
+From 7f2da212368aa6eb7d4e63afaa7e8a4ab3325214 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 1 Mar 2010 11:55:44 +0100
+Subject: [PATCH] Do not use _N already taken on Solaris
+
+---
+ src/fa.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/fa.c b/src/fa.c
+index b3f56d0..0c6f8b8 100644
+--- a/src/fa.c
++++ b/src/fa.c
+@@ -46,7 +46,7 @@ typedef unsigned char uchar;
+ 
+ #define _E(cond) if (cond) goto error
+ #define _F(expr) if ((expr) < 0) goto error
+-#define _N(expr) if ((expr) == NULL) goto error
++#define _NULL(expr) if ((expr) == NULL) goto error
+ 
+ /* Which algorithm to use in FA_MINIMIZE */
+ int fa_minimization_algorithm = FA_MIN_HOPCROFT;
+@@ -2241,7 +2241,7 @@ struct fa *fa_intersect(struct fa *fa1, struct fa *fa2) {
+                                                        t1[n1].to, t2[n2].to);
+                     if (r == NULL) {
+                         r = add_state(fa, 0);
+-                        _N(r);
++                        _NULL(r);
+                         _F(state_set_push(worklist, t1[n1].to));
+                         _F(state_set_push(worklist, t2[n2].to));
+                         _F(state_set_push(worklist, r));
+@@ -2601,7 +2601,7 @@ int fa_example(struct fa *fa, char **example, size_t *example_len) {
+             int toind = state_set_index(path, t->to);
+             if (toind == -1) {
+                 struct re_str *w = string_extend(NULL, ps, c);
+-                _N(w);
++                _NULL(w);
+                 _F(state_set_push(worklist, t->to));
+                 _F(state_set_push_data(path, t->to, w));
+             } else {
+-- 
+1.6.6
+

Added: csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch	                        (rev 0)
+++ csw/mgar/pkg/augeas/trunk/files/0002-Hack-in-isblank-as-gnutools-dont-seem-to-be-used.patch	2010-03-01 12:50:22 UTC (rev 8913)
@@ -0,0 +1,24 @@
+From 3c294e2e73c600d888329188b41adb7ed02577e7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 1 Mar 2010 12:12:02 +0100
+Subject: [PATCH] Hack in isblank as gnutools dont seem to be used
+
+---
+ src/augtool.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/augtool.c b/src/augtool.c
+index ab412fd..0539b64 100644
+--- a/src/augtool.c
++++ b/src/augtool.c
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <config.h>
++# define isblank(ch) ((ch) == ' ' || (ch) == '\t')
+ #include "augeas.h"
+ #include "internal.h"
+ #include "safe-alloc.h"
+-- 
+1.6.6
+


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