[csw-devel] SF.net SVN: gar:[21190] csw/mgar/pkg/libxslt/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri May 24 16:37:13 CEST 2013 

Revision: 21190
          http://gar.svn.sourceforge.net/gar/?rev=21190&view=rev
Author:   dmichelsen
Date:     2013-05-24 14:37:12 +0000 (Fri, 24 May 2013)
Log Message:
-----------
libxslt/trunk: Update to 1.1.28

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

Added Paths:
-----------
    csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script.patch

Removed Paths:
-------------
    csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch

Modified: csw/mgar/pkg/libxslt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxslt/trunk/Makefile	2013-05-24 14:22:36 UTC (rev 21189)
+++ csw/mgar/pkg/libxslt/trunk/Makefile	2013-05-24 14:37:12 UTC (rev 21190)
@@ -1,5 +1,5 @@
 NAME = libxslt
-VERSION = 1.1.26
+VERSION = 1.1.28
 GARTYPE = v2
 
 DESCRIPTION = XSLT engine for the XML Toolkit
@@ -10,20 +10,17 @@
 
 MASTER_SITES = ftp://xmlsoft.org/libxslt/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PATCHFILES += 0001-Forcefully-disable-version-script-use.patch
+PATCHFILES += 0001-Forcefully-disable-version-script.patch
 
 BUILD_DEP_PKGS = CSWlibxml2-dev CSWlibgcrypt-dev
 
 PACKAGES = CSWlibxslt
 SPKG_DESC_CSWlibxslt =  XSLT engine runtime package
-CATALOGNAME_CSWlibxslt = libxslt
-RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibgcrypt11 CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWlibxslt += CSWiconv CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibxslt += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1 CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWlibxslt += CSWlibexslt0
 
 PACKAGES += CSWlibxslt-dev
-CATALOGNAME_CSWlibxslt-dev = libxslt_dev
 SPKG_DESC_CSWlibxslt-dev = XSLT engine development package
 OBSOLETED_BY_CSWlibxslt-dev = CSWlibxsltdevel
 RUNTIME_DEP_PKGS_CSWlibxslt-dev = CSWlibxslt
@@ -35,48 +32,40 @@
 PKGFILES_CSWlibxslt-dev += $(call isadirs,$(libdir),xsltConf.sh)
 
 PACKAGES += CSWpy-libxslt
-CATALOGNAME_CSWpy-libxslt = py_libxslt
 SPKG_DESC_CSWpy-libxslt = XSLT engine python package
 OBSOLETED_BY_CSWpy-libxslt = CSWpylibxslt
-RUNTIME_DEP_PKGS_CSWpy-libxslt  = CSWpython
+RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxslt1
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibexslt0
 RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWzlib
-RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWpy-libxslt += CSWiconv
 PKGFILES_CSWpy-libxslt = $(libdir)/python.*
 PKGFILES_CSWpy-libxslt += $(docdir)/libxslt-python-$(VERSION)/.*
 
+# Sadly, yes....
+CHECKPKG_OVERRIDES_CSWpy-libxslt += 64bits-binaries-missing
+
 PACKAGES += CSWlibexslt0
-CATALOGNAME_CSWlibexslt0 = libexslt0
-PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0\.8\.15)
-PKGFILES_CSWlibexslt0 += $(call baseisadirs,$(libdir),libexslt\.so\.0(\.\d+)*)
+PKGFILES_CSWlibexslt0 += $(call pkgfiles_lib,libexslt.so.0)
 SPKG_DESC_CSWlibexslt0 += XSLT engine runtime package, libexslt.so.0
-RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWiconv
 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWzlib
 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibxslt1
 RUNTIME_DEP_PKGS_CSWlibexslt0 += CSWlibgcrypt11
 
 PACKAGES += CSWlibxslt1
-CATALOGNAME_CSWlibxslt1 = libxslt1
-PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1\.1\.26)
-PKGFILES_CSWlibxslt1 += $(call baseisadirs,$(libdir),libxslt\.so\.1(\.\d+)*)
+PKGFILES_CSWlibxslt1 += $(call pkgfiles_lib,libxslt.so.1)
 SPKG_DESC_CSWlibxslt1 += XSLT engine runtime package, libxslt.so.1
 RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWzlib
 
 SPKG_SOURCEURL = http://xmlsoft.org/XSLT/
 CONFIGURE_ARGS_32 =
 CONFIGURE_ARGS_64 = --without-python
 CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
-BUILD64_LIBS_ONLY = 1
-STRIP_LIBTOOL = 1
+BUILD64 = 1
+ISAEXEC = 1
+
 PYCOMPILE = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libxslt/trunk/checksums
===================================================================
--- csw/mgar/pkg/libxslt/trunk/checksums	2013-05-24 14:22:36 UTC (rev 21189)
+++ csw/mgar/pkg/libxslt/trunk/checksums	2013-05-24 14:37:12 UTC (rev 21190)
@@ -1 +1 @@
-e61d0364a30146aaa3001296f853b2b9  libxslt-1.1.26.tar.gz
+9667bf6f9310b957254fdcf6596600b7  libxslt-1.1.28.tar.gz

Deleted: csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch
===================================================================
--- csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch	2013-05-24 14:22:36 UTC (rev 21189)
+++ csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch	2013-05-24 14:37:12 UTC (rev 21190)
@@ -1,28 +0,0 @@
-From ab7627feedff611e438f7a31fa27c7b0a8a3be96 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 9 Oct 2010 03:56:15 +0200
-Subject: [PATCH] Forcefully disable version script use.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- libxslt/Makefile.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libxslt/Makefile.in b/libxslt/Makefile.in
-index 8cba338..c163255 100644
---- a/libxslt/Makefile.in
-+++ b/libxslt/Makefile.in
-@@ -327,8 +327,8 @@ libxslt_la_SOURCES = \
- 	xsltwin32config.h.in		\
- 	libxslt.h
- 
-- at USE_VERSION_SCRIPT_FALSE@LIBXSLT_VERSION_SCRIPT = 
-- at USE_VERSION_SCRIPT_TRUE@LIBXSLT_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxslt.syms
-+LIBXSLT_VERSION_SCRIPT = 
-+
- libxslt_la_LIBADD = $(EXTRA_LIBS)
- libxslt_la_LDFLAGS = \
- 		$(WIN32_EXTRA_LDFLAGS)			\
--- 
-1.7.3
-

Copied: csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script.patch (from rev 20894, csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script-use.patch)
===================================================================
--- csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script.patch	                        (rev 0)
+++ csw/mgar/pkg/libxslt/trunk/files/0001-Forcefully-disable-version-script.patch	2013-05-24 14:37:12 UTC (rev 21190)
@@ -0,0 +1,26 @@
+From c82c1c5147f1d989b7967a4e9798b5457d7f1f28 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 24 May 2013 15:13:49 +0200
+Subject: [PATCH] Forcefully disable version script
+
+---
+ libxslt/Makefile.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libxslt/Makefile.in b/libxslt/Makefile.in
+index e0a998b..f070844 100644
+--- a/libxslt/Makefile.in
++++ b/libxslt/Makefile.in
+@@ -375,8 +375,7 @@ libxslt_la_SOURCES = \
+ 	xsltwin32config.h.in		\
+ 	libxslt.h
+ 
+- at USE_VERSION_SCRIPT_FALSE@LIBXSLT_VERSION_SCRIPT = 
+- at USE_VERSION_SCRIPT_TRUE@LIBXSLT_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxslt.syms
++LIBXSLT_VERSION_SCRIPT =
+ libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS)
+ libxslt_la_LDFLAGS = \
+ 		$(WIN32_EXTRA_LDFLAGS)			\
+-- 
+1.8.1.4
+

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