Date: Fri, 12 Apr 2002 23:34:09 -0300 From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> To: Joe Marcus Clarke <marcus@FreeBSD.org> Cc: gnome@FreeBSD.org Subject: libxml2 issue? (was Re: Ogle patch) Message-ID: <20020413023431.79563.qmail@exxodus.fedaykin.here> In-Reply-To: <1018656675.272.10.camel@gyros.marcuscom.com>; from marcus@FreeBSD.org on Fri, Apr 12, 2002 at 09:10:53PM -0300 References: <1018656675.272.10.camel@gyros.marcuscom.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi,
On Fri, Apr 12, 2002 at 09:10:53PM -0300, Joe Marcus Clarke wrote:
> With the latest libxml2, ogle doesn't want to make configure very well.
> This patch seems to fix it. May I commit it?
Thanks for the heads up. I would prefer, though, a slightly
different version, a perl regexp.
From my point of view, this is an issue with libxml2 port.
A closer look at
libxml.m4 shipped with libxml2-2.4.19
has the same
#include <xmlversion.h>
instead of
#include <libxml/xmlversion.h>
However, I would advise against "patching" libxml.m4
because that would cause any configure scripts generated by FreeBSD
users to be FreeBSD specific which we should strongly discourage.
I am saying this but I do not follow discussions on libxml2
so it is possible that libxml2 developers will be changing their
standard in a new future. If they are not, we should "fix" our
libxml2 to so that we do not need to be patching several configure
scripts due to libxml2
My suggestion would be to patch xml2-config to include
the libxml as well. Check the attached patch.
Therefore, I would ask Marcus to wait a day or two
while gnome maintainers discuss what is the best way to handle this.
If they patch libxml2, nothing needs to be done regarding ogle. By
the way, I verified that ogle configures/builds just fine by patching
libxml2
Another portability issue: gtk.m4 installed by gtk12.
It is FreeBSD specific, configure scripts generated with it
do not work in other systems. I strongly urge the attached patch
to be added. It works with autoconf both 2.53 and 2.13. It should
be send back to gtk12 developers.
Regards,
--
Mario S F Ferreira - DF - Brazil - "I guess this is a signature."
Computer Science Undergraduate | FreeBSD Committer | CS Developer
flames to beloved devnull@someotherworldbeloworabove.org
feature, n: a documented bug | bug, n: an undocumented feature
--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-ogle:Makefile
--- ogle/Makefile.orig Fri Apr 12 22:52:26 2002
+++ ogle/Makefile Fri Apr 12 23:23:15 2002
@@ -49,6 +49,8 @@
${WRKSRC}/configure.in
.endif
@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|" ${WRKSRC}/scripts/ogle.in
+ @${PERL} -pi -e 's|(xmlversion.h>)|libxml/\1|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
pre-configure:
@${TOUCH} `find -E ${WRKSRC} -regex ".*Makefile\.(am|in)"`
--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-libxml2:Makefile
--- libxml2/Makefile.orig Fri Apr 12 23:22:27 2002
+++ libxml2/Makefile Fri Apr 12 23:24:16 2002
@@ -7,6 +7,7 @@
PORTNAME= libxml2
PORTVERSION= 2.4.19
+PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libxml
@@ -49,5 +50,9 @@
pre-patch:
@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
+
+post-patch:
+ ${PERL} -pi.orig -e 's|(\@XML_INCLUDEDIR\@)|\1\
+ -I\$${includedir}/libxml2/libxml|' ${WRKSRC}/xml2-config.in
.include <bsd.port.mk>
--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-gtk12:files:patch-gtk.m4"
diff -ruN gtk12.orig/files/patch-gtk.m4 gtk12/files/patch-gtk.m4
--- gtk12.orig/files/patch-gtk.m4 Fri Feb 9 13:10:45 2001
+++ gtk12/files/patch-gtk.m4 Fri Apr 12 23:30:05 2002
@@ -1,11 +1,11 @@
---- gtk.m4.orig Fri Feb 9 22:56:43 2001
-+++ gtk.m4 Fri Feb 9 22:57:20 2001
+--- gtk.m4.orig Thu Feb 18 14:43:13 1999
++++ gtk.m4 Fri Apr 12 23:29:51 2002
@@ -37,7 +37,7 @@
fi
fi
- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+ AC_PATH_PROG(GTK_CONFIG, gtk-config, gtk12-config, no)
++ AC_PATH_PROGS(GTK_CONFIG, [gtk-config gtk12-config], no)
min_gtk_version=ifelse([$1], ,0.99.7,$1)
AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
no_gtk=""
--ibTvN161/egqYuK8--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020413023431.79563.qmail>