mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-31 21:57:12 +00:00
5ab6c2fc42
libxml (cursing the author all the way for having two incompatible versions of their software do this). This is still not 100%, but a step in the right direction for those ports that need libxml2, but also have to co-exist with GNOME (which, for the moment, uses libxml exclusively). Max will be committing a port shortly to show exactly how to tell a port to use libxml2 under this new scheme of things. As and when GNOME (the primary consumer of libxml) moves over to libxml2, these hacks will be reverted, and similar hacks put in to libxml until it dies a quiet death. Submitted by: sobomax
117 lines
3.9 KiB
Plaintext
117 lines
3.9 KiB
Plaintext
--- Makefile.in.orig Mon Nov 13 20:28:42 2000
|
|
+++ Makefile.in Wed Nov 15 12:41:10 2000
|
|
@@ -119,20 +119,20 @@
|
|
|
|
bin_PROGRAMS = xmllint
|
|
|
|
-bin_SCRIPTS = xml-config
|
|
+bin_SCRIPTS = xml2-config
|
|
|
|
-lib_LTLIBRARIES = libxml.la
|
|
+lib_LTLIBRARIES = libxml2.la
|
|
libxml_la_LIBADD = @Z_LIBS@
|
|
|
|
-libxml_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
|
|
+libxml_la_LDFLAGS = -version-info 5:0:0
|
|
|
|
libxml_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c parser.c tree.c hash.c xmlIO.c xmlmemory.c uri.c valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c xpointer.c xinclude.c nanohttp.c nanoftp.c
|
|
|
|
|
|
-DEPS = $(top_builddir)/libxml.la
|
|
-LDADDS = $(top_builddir)/libxml.la @Z_LIBS@ @M_LIBS@
|
|
+DEPS = $(top_builddir)/libxml2.la
|
|
+LDADDS = $(top_builddir)/libxml2.la @Z_LIBS@ @M_LIBS@
|
|
|
|
-man_MANS = xmllint.1 xml-config.1 libxml.4
|
|
+man_MANS = xmllint.1 xml2-config.1 libxml.4
|
|
|
|
m4datadir = $(datadir)/aclocal m4data_DATA = libxml.m4
|
|
|
|
@@ -161,10 +161,10 @@
|
|
testURI_DEPENDENCIES = $(DEPS)
|
|
testURI_LDADD = $(LDADDS)
|
|
|
|
-confexecdir = $(libdir)
|
|
-confexec_DATA = xmlConf.sh
|
|
+confexecdir = $(sysconfdir)
|
|
+confexec_DATA = xml2Conf.sh
|
|
|
|
-CLEANFILES = xmlConf.sh
|
|
+CLEANFILES = xml2Conf.sh
|
|
EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4 example/Makefile.am example/gjobread.c example/gjobs.xml $(man_MANS) libxml-2.0.pc.in xmlversion.h.in win32/README.MSDev win32/Makefile.mingw win32/libxml2/libxml2.dsp
|
|
|
|
|
|
@@ -204,7 +204,7 @@
|
|
MANS = $(man_MANS)
|
|
|
|
NROFF = nroff
|
|
-DATA = $(confexec_DATA) $(pkgconfig_DATA)
|
|
+DATA = $(confexec_DATA)
|
|
|
|
DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \
|
|
INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \
|
|
@@ -270,6 +270,10 @@
|
|
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
libxml-2.0.pc: $(top_builddir)/config.status libxml-2.0.pc.in
|
|
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
+xml2-config: xml-config
|
|
+ cd $(top_builddir) && cp xml-config xml2-config
|
|
+xml2-config.1: xml-config.1
|
|
+ cd $(top_builddir) && cp xml-config.1 xml2-config.1
|
|
|
|
mostlyclean-libLTLIBRARIES:
|
|
|
|
@@ -334,7 +338,7 @@
|
|
|
|
maintainer-clean-libtool:
|
|
|
|
-libxml.la: $(libxml_la_OBJECTS) $(libxml_la_DEPENDENCIES)
|
|
+libxml2.la: $(libxml_la_OBJECTS) $(libxml_la_DEPENDENCIES)
|
|
$(LINK) -rpath $(libdir) $(libxml_la_LDFLAGS) $(libxml_la_OBJECTS) $(libxml_la_LIBADD) $(LIBS)
|
|
|
|
mostlyclean-binPROGRAMS:
|
|
@@ -805,7 +809,7 @@
|
|
install-binSCRIPTS install-confexecDATA
|
|
install-exec: install-exec-recursive
|
|
|
|
-install-data-am: install-man install-pkgconfigDATA
|
|
+install-data-am: install-man
|
|
install-data: install-data-recursive
|
|
|
|
install-am: all-am
|
|
@@ -815,7 +819,7 @@
|
|
uninstall-binSCRIPTS uninstall-man \
|
|
uninstall-confexecDATA uninstall-pkgconfigDATA
|
|
uninstall: uninstall-recursive
|
|
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
|
|
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
|
|
config.h
|
|
all-redirect: all-recursive-am
|
|
install-strip:
|
|
@@ -824,8 +828,7 @@
|
|
installdirs-am:
|
|
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
|
|
$(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \
|
|
- $(DESTDIR)$(mandir)/man4 $(DESTDIR)$(confexecdir) \
|
|
- $(DESTDIR)$(pkgconfigdir)
|
|
+ $(DESTDIR)$(mandir)/man4 $(DESTDIR)$(confexecdir)
|
|
|
|
|
|
mostlyclean-generic:
|
|
@@ -1196,13 +1199,13 @@
|
|
rpm: $(distdir).tar.gz
|
|
rpm -ta $(distdir).tar.gz
|
|
|
|
-xmlConf.sh: xmlConf.sh.in Makefile
|
|
+xml2Conf.sh: xmlConf.sh.in Makefile
|
|
sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
|
|
-e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
|
|
-e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
|
|
-e 's?\@VERSION\@?$(VERSION)?g' \
|
|
< $(srcdir)/xmlConf.sh.in > xmlConf.tmp \
|
|
- && mv xmlConf.tmp xmlConf.sh
|
|
+ && mv xmlConf.tmp xml2Conf.sh
|
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|