sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 2.6.12.

Browse source
This commit is contained in:
Joe Marcus Clarke 2004-08-23 01:32:01 +00:00
parent 3d8da79cd6
commit 05779e9cd3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=117080
6 changed files with 20 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
textproc/libxml2/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= libxml2
PORTVERSION= 2.6.11
PORTREVISION= 1
PORTVERSION= 2.6.12
CATEGORIES?= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
@ -19,7 +18,7 @@ COMMENT?= XML parser library for GNOME
USE_BZIP2= yes
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
USE_LIBTOOL_VER=15
USE_GNOME?= gnomehack gnometarget pkgconfig
INSTALLS_SHLIB= yes
USE_REINPLACE= yes

4
textproc/libxml2/distinfo
View file

@ -1,2 +1,2 @@
MD5 (gnome2/libxml2-2.6.11.tar.bz2) = 0a5439d172555472d4b3d8442eb2478f
SIZE (gnome2/libxml2-2.6.11.tar.bz2) = 2750851
MD5 (gnome2/libxml2-2.6.12.tar.bz2) = 16c29665a0b1eaa03b85ee8d21dc539f
SIZE (gnome2/libxml2-2.6.12.tar.bz2) = 2773187

18
textproc/libxml2/files/patch-aa
View file

@ -1,6 +1,6 @@
--- Makefile.in.orig Fri Jul 2 13:56:41 2004
+++ Makefile.in Fri Jul 2 13:59:27 2004
@@ -418,13 +418,13 @@
--- Makefile.in.orig Sun Aug 22 21:07:59 2004
+++ Makefile.in Sun Aug 22 21:09:14 2004
@@ -421,13 +421,13 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@ -11,12 +11,12 @@
bin_SCRIPTS = xml2-config
lib_LTLIBRARIES = libxml2.la
libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
-libxml2_la_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -version-info @LIBXML_VERSION_INFO@
+libxml2_la_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -version-info 5:0:0
-libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -version-info @LIBXML_VERSION_INFO@
+libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -version-info 5:0:0
@WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \
@WITH_TRIO_SOURCES_FALSE@ parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \
@WITH_TRIO_SOURCES_FALSE@ valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c \
@@ -501,7 +501,7 @@
@@ -504,7 +504,7 @@
testReader_DEPENDENCIES = $(DEPS)
testReader_LDADD = $(LDADDS)
CLEANFILES = xml2Conf.sh
@ -25,8 +25,8 @@
confexec_DATA = xml2Conf.sh
EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
libxml.m4 Copyright check-xml-test-suite.py \
@@ -521,8 +521,8 @@
# Instll the tests program sources as examples
@@ -525,8 +525,8 @@
# Install the tests program sources as examples
#
BASE_DIR = $(datadir)/doc
-DOC_MODULE = libxml2-$(VERSION)
@ -36,7 +36,7 @@
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -1209,7 +1209,7 @@
@@ -1213,7 +1213,7 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-recursive

51
textproc/libxml2/files/patch-ltmain.sh
View file

@ -1,51 +0,0 @@
--- ltmain.sh.orig Fri Sep 12 14:51:51 2003
+++ ltmain.sh Sun Sep 21 17:49:07 2003
@@ -1280,7 +1280,7 @@
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd4*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -1290,8 +1290,16 @@
continue
;;
+ -pthread)
+ compile_command="$compile_command -pthread"
+ finalize_command="$finalize_command -pthread"
+ compiler_flags="$compiler_flags -pthread"
+ continue
+ ;;
+
-module)
module=yes
+ build_old_libs=no
continue
;;
@@ -3000,6 +3008,9 @@
# problems, so we reset it completely
verstring=
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
verstring="0.0"
;;
@@ -5428,10 +5439,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

12
textproc/libxml2/files/patch-python::Makefile.in
View file

@ -1,5 +1,5 @@
--- python/Makefile.in.orig Fri Jul 2 10:54:27 2004
+++ python/Makefile.in Fri Jul 2 11:02:17 2004
--- python/Makefile.in.orig Sun Aug 22 21:09:41 2004
+++ python/Makefile.in Sun Aug 22 21:11:12 2004
@@ -51,7 +51,7 @@
am__installdirs = $(DESTDIR)$(pythondir)
pythonLTLIBRARIES_INSTALL = $(INSTALL)
@ -9,7 +9,7 @@
@WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__libxml2mod_la_SOURCES_DIST = libxml.c types.c libxml2-py.c
@WITH_PYTHON_TRUE@am_libxml2mod_la_OBJECTS = libxml.lo types.lo \
@@ -284,7 +284,7 @@
@@ -288,7 +288,7 @@
-I$(PYTHON_INCLUDES) \
-I$(top_srcdir)/include
@ -18,12 +18,12 @@
# libxml2class.txt is generated
DOCS = ${srcdir}/TODO
EXTRA_DIST = \
@@ -299,9 +299,9 @@
@@ -303,9 +303,9 @@
libxml2-python-api.xml \
$(DOCS)
-libxml2mod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/.libs
+libxml2mod_la_LDFLAGS = -module -avoid-version
-libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version -L$(top_builddir)/.libs
+libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version
@WITH_PYTHON_TRUE@mylibs = \
-@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la
+@WITH_PYTHON_TRUE@ -lxml2

1
textproc/py-libxml2/pkg-plist
View file

@ -30,6 +30,7 @@ lib/%%PYTHON_VERSION%%/site-packages/libxml2mod.so
%%EXAMPLESDIR%%/regexp.py
%%EXAMPLESDIR%%/relaxng.py
%%EXAMPLESDIR%%/resolver.py
%%EXAMPLESDIR%%/schema.py
%%EXAMPLESDIR%%/serialize.py
%%EXAMPLESDIR%%/sync.py
%%EXAMPLESDIR%%/thread2.py