1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

Update to 2.3.8.

This commit is contained in:
Maxim Sobolev 2001-05-06 07:50:01 +00:00
parent 72cef1cd82
commit 4f626178f4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=42313
5 changed files with 45 additions and 36 deletions

View File

@ -6,14 +6,16 @@
#
PORTNAME= libxml2
PORTVERSION= 2.3.7
PORTVERSION= 2.3.8
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libxml
MAINTAINER= sobomax@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_GMAKE= yes
USE_LIBTOOL= yes
@ -27,4 +29,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAN1= xml2-config.1 xmllint.1
MAN4= libxml.4
pre-patch:
@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (libxml2-2.3.7.tar.gz) = 0ccad68751057ecba480d9e7bf8093bc
MD5 (libxml2-2.3.8.tar.gz) = 5b94809f8d5b0cc158c1407e3d798b85

View File

@ -21,24 +21,6 @@ $FreeBSD$
confexec_DATA = xml2Conf.sh
CLEANFILES = xml2Conf.sh
@@ -205,7 +205,7 @@
MANS = $(man_MANS)
NROFF = nroff
-DATA = $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
+DATA = $(confexec_DATA) $(m4data_DATA)
DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \
INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \
@@ -825,7 +825,7 @@
install-binSCRIPTS install-confexecDATA
install-exec: install-exec-recursive
-install-data-am: install-man install-m4dataDATA install-pkgconfigDATA
+install-data-am: install-man install-m4dataDATA
install-data: install-data-recursive
install-am: all-am
@@ -836,7 +836,7 @@
uninstall-confexecDATA uninstall-m4dataDATA \
uninstall-pkgconfigDATA
@ -48,12 +30,3 @@ $FreeBSD$
config.h
all-redirect: all-recursive-am
install-strip:
@@ -846,7 +846,7 @@
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \
$(DESTDIR)$(mandir)/man4 $(DESTDIR)$(confexecdir) \
- $(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir)
+ $(DESTDIR)$(m4datadir)
mostlyclean-generic:

View File

@ -1,21 +1,47 @@
--- configure.orig Thu Mar 1 11:00:11 2001
+++ configure Thu Mar 8 22:11:26 2001
@@ -3479,3 +3479,3 @@
$FreeBSD$
--- configure.orig Thu May 3 14:34:45 2001
+++ configure Sun May 6 10:40:20 2001
@@ -3536,7 +3536,7 @@
XML_LIBDIR='-L${libdir}'
-XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
+XML_INCLUDEDIR='-I${includedir}/libxml2 -I${includedir}/libxml2/libxml'
XML_LIBS="-lxml2 $Z_LIBS $M_LIBS $LIBS"
@@ -3875,3 +3875,3 @@
XML_LIBS="-lxml2 $Z_LIBS -lm $LIBS"
XML_CFLAGS=""
@@ -3819,7 +3819,7 @@
fi
-if "${NEED_TRIO}" = "1"; then
+if test "${NEED_TRIO}" = "1"; then
WITH_TRIO_SOURCES_TRUE=
WITH_TRIO_SOURCES_FALSE='#'
else
@@ -4003,7 +4003,7 @@
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char iconv();
+char libiconv();
@@ -3885,3 +3885,3 @@
int main() {
@@ -4013,7 +4013,7 @@
#if defined (__stub_iconv) || defined (__stub___iconv)
choke me
#else
-iconv();
+libiconv();
#endif
@@ -3921,6 +3921,6 @@
; return 0; }
@@ -4049,10 +4049,10 @@
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char iconv();
+char libiconv();
@ -24,3 +50,5 @@
-iconv()
+libiconv()
; return 0; }
EOF
if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

View File

@ -1,6 +1,7 @@
bin/xml2-config
bin/xmllint
etc/xml2Conf.sh
include/libxml2/libxml/DOCBparser.h
include/libxml2/libxml/HTMLparser.h
include/libxml2/libxml/HTMLtree.h
include/libxml2/libxml/SAX.h
@ -28,6 +29,7 @@ include/libxml2/libxml/xpointer.h
lib/libxml2.a
lib/libxml2.so
lib/libxml2.so.5
libdata/pkgconfig/libxml-2.0.pc
share/aclocal/libxml.m4
share/doc/libxml2/html/DOM.gif
share/doc/libxml2/html/FAQ.html