Update to 2.6.32. As for the py-libxml2, get it able to find Python correct

when PREFIX is set other than LOCALBASE and will allowing the modules to build.
This commit is contained in:
Jeremy Messenger 2008-05-24 05:27:17 +00:00
parent 97dcc19e31
commit e39c0ec06b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=213579
6 changed files with 44 additions and 27 deletions

View File

@ -12,7 +12,7 @@
#
PORTNAME= libxml2
PORTVERSION= 2.6.31
PORTVERSION= 2.6.32
PORTREVISION?= 0
CATEGORIES?= textproc gnome
MASTER_SITES= ftp://fr.rpmfind.net/pub/libxml/ \

View File

@ -1,3 +1,3 @@
MD5 (gnome2/libxml2-2.6.31.tar.gz) = 714b0683b1ec4bdc63bc356d729f9b18
SHA256 (gnome2/libxml2-2.6.31.tar.gz) = 3e7982341bbb1f11d5df344177955769e16b4d271f1f5c271740b3d1fad9bac6
SIZE (gnome2/libxml2-2.6.31.tar.gz) = 4734599
MD5 (gnome2/libxml2-2.6.32.tar.gz) = 2621d322c16f0257e30f0ff2b13384de
SHA256 (gnome2/libxml2-2.6.32.tar.gz) = 1b4428b879afcaae3c2013b21283baad040661fbd502e893e83adc3d15c85d53
SIZE (gnome2/libxml2-2.6.32.tar.gz) = 4722227

View File

@ -0,0 +1,16 @@
--- configure.orig 2008-05-24 00:14:51.000000000 -0500
+++ configure 2008-05-24 00:17:51.000000000 -0500
@@ -27275,11 +27275,12 @@
fi
if test "$PYTHON_VERSION" != ""
then
+ with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
-d $with_python/lib/python$PYTHON_VERSION/site-packages
then
PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
+ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
else
if test -r $prefix/include/python$PYTHON_VERSION/Python.h
then

View File

@ -1,15 +1,15 @@
--- python/Makefile.in.orig 2008-01-22 15:50:22.000000000 -0500
+++ python/Makefile.in 2008-01-22 15:50:22.000000000 -0500
@@ -313,7 +313,7 @@ INCLUDES = \
--- python/Makefile.in.orig 2008-05-23 22:39:11.000000000 -0500
+++ python/Makefile.in 2008-05-23 22:40:42.000000000 -0500
@@ -322,7 +322,7 @@
-I$(top_builddir)/include \
-I$(top_builddir)/$(subdir)
-DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
+DOCS_DIR = $(datadir)/doc/py-libxml2
-docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
+docsdir = $(datadir)/doc/py-libxml2
# libxml2class.txt is generated
DOCS = ${srcdir}/TODO
dist_docs_DATA = TODO
EXTRA_DIST = \
@@ -330,7 +330,7 @@ EXTRA_DIST = \
@@ -335,7 +335,7 @@
libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version
@WITH_PYTHON_TRUE@mylibs = \
@ -17,4 +17,4 @@
+@WITH_PYTHON_TRUE@ -lxml2
@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
@WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c
@WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c types.c

View File

@ -1,11 +1,11 @@
--- python/tests/Makefile.in.orig 2008-01-22 15:51:51.000000000 -0500
+++ python/tests/Makefile.in 2008-01-22 15:52:12.000000000 -0500
@@ -259,7 +259,7 @@ sysconfdir = @sysconfdir@
--- python/tests/Makefile.in.orig 2008-05-23 22:41:49.000000000 -0500
+++ python/tests/Makefile.in 2008-05-23 22:42:12.000000000 -0500
@@ -270,7 +270,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXAMPLE_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
+EXAMPLE_DIR = $(datadir)/examples/py-libxml2
-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
+exampledir = $(datadir)/examples/py-libxml2
dist_example_DATA = $(PYTESTS) $(XMLS)
PYTESTS = \
build.py \
attribs.py \

View File

@ -1,12 +1,12 @@
lib/%%PYTHON_VERSION%%/site-packages/drv_libxml2.py
lib/%%PYTHON_VERSION%%/site-packages/drv_libxml2.pyc
lib/%%PYTHON_VERSION%%/site-packages/drv_libxml2.pyo
lib/%%PYTHON_VERSION%%/site-packages/libxml2.py
lib/%%PYTHON_VERSION%%/site-packages/libxml2.pyc
lib/%%PYTHON_VERSION%%/site-packages/libxml2.pyo
lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.a
lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.la
lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.so
%%PYTHON_SITELIBDIR%%/drv_libxml2.py
%%PYTHON_SITELIBDIR%%/drv_libxml2.pyc
%%PYTHON_SITELIBDIR%%/drv_libxml2.pyo
%%PYTHON_SITELIBDIR%%/libxml2.py
%%PYTHON_SITELIBDIR%%/libxml2.pyc
%%PYTHON_SITELIBDIR%%/libxml2.pyo
%%PYTHON_SITELIBDIR%%/libxml2mod.a
%%PYTHON_SITELIBDIR%%/libxml2mod.la
%%PYTHON_SITELIBDIR%%/libxml2mod.so
%%DOCSDIR%%/TODO
%%EXAMPLESDIR%%/attribs.py
%%EXAMPLESDIR%%/build.py
@ -55,6 +55,7 @@ lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.so
%%EXAMPLESDIR%%/walker.py
%%EXAMPLESDIR%%/xpath.py
%%EXAMPLESDIR%%/xpathext.py
%%EXAMPLESDIR%%/xpathns.py
%%EXAMPLESDIR%%/xpathret.py
@dirrm %%EXAMPLESDIR%%
@dirrm %%DOCSDIR%%