Date: Sat, 16 Feb 2002 22:11:12 +0300 (MSK) From: "Lev A. Serebryakov" <lev@serebryakov.spb.ru> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35003: [PATCH] Update for port textproc/libxslt to version 1.0.12 (latest vendor's version) Message-ID: <200202161911.g1GJBCA70855@ftp.translate.ru>
next in thread | raw e-mail | index | archive | help
>Number: 35003
>Category: ports
>Synopsis: [PATCH] Update for port textproc/libxslt to version 1.0.12 (latest vendor's version)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 16 11:20:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Lev A. Serebryakov <lev@serebryakov.spb.ru>
>Release: FreeBSD 4.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD freebsd.sereb.net 4.4-STABLE FreeBSD 4.4-STABLE #1: Sat Dec 8 13:48:40 MSK 2001 root@freebsd.sereb.net:/usr/obj/usr/src/sys/LEVMAIL i386
Ports collection: 15 Feb 2002
>Description:
It is latest version. This version includes experemental python support.
I add knob to makefile `WITH_PYTHON', and turn off python support by default.
ADDED FILES:
files/patch-python::Makefile.in
files/patch-python::tests::Makefile.in
>How-To-Repeat:
>Fix:
diff -ruN libxslt.orig/Makefile libxslt/Makefile
--- libxslt.orig/Makefile Sat Feb 16 00:31:01 2002
+++ libxslt/Makefile Sat Feb 16 21:57:05 2002
@@ -6,7 +6,7 @@
#
PORTNAME= libxslt
-PORTVERSION= 1.0.10
+PORTVERSION= 1.0.12
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libxslt
@@ -18,10 +18,31 @@
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
+
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+.if defined(WITH_PYTHON)
+USE_PYTHON= yes
+PLIST_SUB+= PYTHON=""
+.else
+PLIST_SUB+= PYTHON="@comment "
+CONFIGURE_ARGS+= --without-python
+.endif
+
MAN4= libexslt.4 libxslt.4
MAN1= xsltproc.1
+
+pre-everything:
+.if !defined(WITH_PYTHON)
+ @${ECHO} ""
+ @${ECHO} "If you wnat python support, add WITH_PYTHON=yes to command line"
+ @${ECHO} ""
+.endif
+
+post-patch:
+.if !defined(WITH_PYTHON)
+ @cd ${WRKSRC} && ${PERL} -pi -e 's-^\@WITH_DEBUGGER_(TRUE|FALSE)\@\s+python \\\s+$$--g' Makefile.in
+.endif
.include <bsd.port.mk>
diff -ruN libxslt.orig/distinfo libxslt/distinfo
--- libxslt.orig/distinfo Sat Feb 16 00:31:01 2002
+++ libxslt/distinfo Sat Feb 16 00:49:30 2002
@@ -1 +1 @@
-MD5 (libxslt-1.0.10.tar.gz) = e12da6708bb1fdd16faf47390cf39fe9
+MD5 (libxslt-1.0.12.tar.gz) = 9e995964bffbf8b5bb97737ebde1a11c
diff -ruN libxslt.orig/files/patch-aa libxslt/files/patch-aa
--- libxslt.orig/files/patch-aa Sat Feb 16 00:31:01 2002
+++ libxslt/files/patch-aa Sat Feb 16 04:03:32 2002
@@ -1,27 +1,24 @@
-
-$FreeBSD: ports/textproc/libxslt/files/patch-aa,v 1.5 2002/01/29 09:52:43 sobomax Exp $
-
---- Makefile.in.orig Mon Jan 14 20:19:35 2002
-+++ Makefile.in Tue Jan 29 11:49:57 2002
-@@ -115,16 +115,14 @@
- @WITH_DEBUGGER_TRUE@ libxslt \
- @WITH_DEBUGGER_TRUE@ libexslt \
+--- Makefile.in.orig Mon Feb 11 21:57:11 2002
++++ Makefile.in Sat Feb 16 04:02:38 2002
+@@ -123,16 +123,14 @@
@WITH_DEBUGGER_TRUE@ xsltproc \
--@WITH_DEBUGGER_TRUE@ tests \
- @WITH_DEBUGGER_TRUE@ doc
+ @WITH_DEBUGGER_TRUE@ doc \
+ @WITH_DEBUGGER_TRUE@ python \
+-@WITH_DEBUGGER_TRUE@ tests
@WITH_DEBUGGER_FALSE@SUBDIRS = @WITH_DEBUGGER_FALSE@\
@WITH_DEBUGGER_FALSE@ libxslt \
@WITH_DEBUGGER_FALSE@ libexslt \
@WITH_DEBUGGER_FALSE@ xsltproc \
--@WITH_DEBUGGER_FALSE@ tests \
- @WITH_DEBUGGER_FALSE@ doc
+ @WITH_DEBUGGER_FALSE@ doc \
+ @WITH_DEBUGGER_FALSE@ python \
+-@WITH_DEBUGGER_FALSE@ tests
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
confexec_DATA = xsltConf.sh
bin_SCRIPTS = xslt-config
-@@ -135,7 +133,7 @@
+@@ -143,7 +141,7 @@
win32/libxslt/libxslt_so.dsp win32/libxslt/xsltproc.dsp
diff -ruN libxslt.orig/files/patch-python::Makefile.in libxslt/files/patch-python::Makefile.in
--- libxslt.orig/files/patch-python::Makefile.in Thu Jan 1 03:00:00 1970
+++ libxslt/files/patch-python::Makefile.in Sat Feb 16 21:32:47 2002
@@ -0,0 +1,11 @@
+--- python/Makefile.in.orig Sat Feb 16 21:31:30 2002
++++ python/Makefile.in Sat Feb 16 21:31:47 2002
+@@ -129,7 +129,7 @@
+ -I$(top_srcdir)
+
+
+-DOCS_DIR = $(prefix)/share/doc/libxslt-python-$(LIBXML_VERSION)
++DOCS_DIR = $(prefix)/share/doc/libxslt/python
+ DOCS = TODO libxsltclass.txt
+
+ EXTRA_DIST = \
diff -ruN libxslt.orig/files/patch-python::tests::Makefile.in libxslt/files/patch-python::tests::Makefile.in
--- libxslt.orig/files/patch-python::tests::Makefile.in Thu Jan 1 03:00:00 1970
+++ libxslt/files/patch-python::tests::Makefile.in Sat Feb 16 21:32:37 2002
@@ -0,0 +1,11 @@
+--- python/tests/Makefile.in.orig Sat Feb 16 21:32:00 2002
++++ python/tests/Makefile.in Sat Feb 16 21:32:12 2002
+@@ -117,7 +117,7 @@
+ XSLT_LIBDIR = @XSLT_LIBDIR@
+ XSLT_LIBS = @XSLT_LIBS@
+
+-EXAMPLE_DIR = $(prefix)/share/doc/libxslt-python-$(LIBXSLT_VERSION)/examples
++EXAMPLE_DIR = $(prefix)/share/doc/libxslt/python/examples
+
+ TESTSPY = \
+ basic.py \
diff -ruN libxslt.orig/pkg-plist libxslt/pkg-plist
--- libxslt.orig/pkg-plist Sat Feb 16 00:31:01 2002
+++ libxslt/pkg-plist Sat Feb 16 21:41:50 2002
@@ -32,7 +32,9 @@
lib/libxsltbreakpoint.so.1
libdata/pkgconfig/libxslt.pc
share/doc/libxslt/html/book1.html
+share/doc/libxslt/html/index.sgml
share/doc/libxslt/html/libxslt-attributes.html
+share/doc/libxslt/html/libxslt-extensions.html
share/doc/libxslt/html/libxslt-functions.html
share/doc/libxslt/html/libxslt-imports.html
share/doc/libxslt/html/libxslt-keys.html
@@ -50,6 +52,17 @@
share/doc/libxslt/html/tutorial/libxslt_tutorial.c
share/doc/libxslt/html/tutorial/libxslttutorial.html
share/doc/libxslt/html/tutorial/libxslttutorial.xml
+%%PYTHON%%lib/python2.2/site-packages/libxslt.py
+%%PYTHON%%lib/python2.2/site-packages/libxsltmod.so
+%%PYTHON%%share/doc/libxslt/python/TODO
+%%PYTHON%%share/doc/libxslt/python/libxsltclass.txt
+%%PYTHON%%share/doc/libxslt/python/examples/basic.py
+%%PYTHON%%share/doc/libxslt/python/examples/extfunc.py
+%%PYTHON%%share/doc/libxslt/python/examples/pyxsltproc.py
+%%PYTHON%%share/doc/libxslt/python/examples/test.xml
+%%PYTHON%%share/doc/libxslt/python/examples/test.xsl
+%%PYTHON%%@dirrm share/doc/libxslt/python/examples
+%%PYTHON%%@dirrm share/doc/libxslt/python
@dirrm share/doc/libxslt/html/tutorial
@dirrm share/doc/libxslt/html
@dirrm share/doc/libxslt
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202161911.g1GJBCA70855>