[csw-devel] SF.net SVN: gar:[14341] csw/mgar/pkg/xmlstarlet/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14341
          http://gar.svn.sourceforge.net/gar/?rev=14341&view=rev
Author:   dmichelsen
Date:     2011-04-20 14:32:43 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
xmlstarlet: Update to 1.1.0

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

Added Paths:
-----------
    csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch

Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xmlstarlet/trunk/Makefile	2011-04-20 14:26:55 UTC (rev 14340)
+++ csw/mgar/pkg/xmlstarlet/trunk/Makefile	2011-04-20 14:32:43 UTC (rev 14341)
@@ -1,5 +1,5 @@
 NAME = xmlstarlet
-VERSION = 1.0.2
+VERSION = 1.1.0
 CATEGORIES = utils
 
 DESCRIPTION = XML transformation utility
@@ -16,31 +16,27 @@
 MASTER_SITES += http://xmlstar.sourceforge.net/downloads/
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
-RUNTIME_DEP_PKGS = CSWiconv CSWlibxml2 CSWlibxslt CSWzlib   
+VENDOR_URL = http://xmlstar.sourceforge.net/
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=66612
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
+RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxslt
 
 BUILD64 = 1
+ISAEXEC = 1
 
-CONFIGURE_ENV += LIBXML_PREFIX=$(prefix)
-CONFIGURE_ENV += LIBXML_CFLAGS="$(shell $(bindir)/xml2-config --cflags)"
-CONFIGURE_ENV += LIBXML_LIBS="$(shell $(bindir)/xml2-config --libs)"
-CONFIGURE_ENV += LIBXSLT_PREFIX=$(prefix)
-CONFIGURE_ENV += LIBXSLT_CFLAGS="$(shell $(bindir)/xslt-config --cflags)"
-CONFIGURE_ENV += LIBXSLT_LIBS="$(shell $(bindir)/xslt-config --libs) -lexslt"
+CONFIGURE_ENV += LIBXML_CONFIG=$(bindir)/xml2-config
+CONFIGURE_ENV += LIBXSLT_CONFIG=$(bindir)/xslt-config
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-static-libs
+CONFIGURE_ARGS += --with-libxml-include-prefix=$(includedir)/libxml2
+CONFIGURE_ARGS += --with-libxml-libs-prefix=$(libdir)
 
-TEST_TARGET = check
+BUILD_OVERRIDE_VARS = CFLAGS CPPFLAGS LDFLAGS
+BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS)
+BUILD_OVERRIDE_VAR_CPPFLAGS = $(CPPFLAGS)
+BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS)
 
-CHECKPKG_OVERRIDES_CSWxmlstarlet += soname-not-found|libm.so.2
+EXTRA_PAX_ARGS = -s ,$(bindir)/xml,$(bindir)/xmlstarlet,
 
 include gar/category.mk
-
-post-install-modulated:
-	@echo " ==> Renaming program to xmlstarlet"
-	@mv $(DESTDIR)$(bindir)/xml $(DESTDIR)$(bindir)/xmlstarlet
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums
===================================================================
--- csw/mgar/pkg/xmlstarlet/trunk/checksums	2011-04-20 14:26:55 UTC (rev 14340)
+++ csw/mgar/pkg/xmlstarlet/trunk/checksums	2011-04-20 14:32:43 UTC (rev 14341)
@@ -1 +1 @@
-cc6031201cb263ab364ee5bfbe503cb5  xmlstarlet-1.0.2.tar.gz
+1b864b16c1dc78ce87ffc8528f021ab0  xmlstarlet-1.1.0.tar.gz

Added: csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch
===================================================================
--- csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch	                        (rev 0)
+++ csw/mgar/pkg/xmlstarlet/trunk/files/0001-Do-not-use-Wall.patch	2011-04-20 14:32:43 UTC (rev 14341)
@@ -0,0 +1,25 @@
+From 722db871d1a24c3ceb7cc6a297dc2a3278534699 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 17 Jan 2011 20:32:12 +0100
+Subject: [PATCH] Do not use -Wall
+
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 33bdd06..272a5b1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -232,7 +232,7 @@ top_srcdir = @top_srcdir@
+ EXTRA_DIST = README TODO Copyright COPYING doc/xmlstarlet.txt
+ WIN32_DIST = $(EXTRA_DIST) AUTHORS ChangeLog INSTALL NEWS xml.exe doc
+ ACLOCAL_AMFLAGS = -I m4
+-AM_CFLAGS = -Wall
++AM_CFLAGS =
+ 
+ # testing
+ egdir = $(srcdir)/examples
+-- 
+1.7.3.2
+


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