mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 17:46:38 -04:00
af36765e17
Version 2.12 of libxml2 introduced a backwards incompatible change in the signature of some functions, notably the second argument to xmlStructuredErrorFunc has gained a const qualifier, changing from `xmlError *error` to `const xmlError *error`. To make the signatures compatible with both pre- and post-2.12, I have introduced a check on LIBXML_VERSION. PR: 279968 Reported by: dizzy
31 lines
1.4 KiB
Text
31 lines
1.4 KiB
Text
--- Makefile.in.orig 2013-03-30 17:17:07 UTC
|
|
+++ Makefile.in
|
|
@@ -136,10 +136,6 @@ TCLLIBPATH = $(top_builddir)
|
|
EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR)
|
|
#EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR)
|
|
TCLLIBPATH = $(top_builddir)
|
|
-TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \
|
|
- @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
|
|
- PATH="$(EXTRA_PATH):$(PATH)" \
|
|
- TCLLIBPATH="$(TCLLIBPATH)"
|
|
# TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library`
|
|
|
|
TCLSH_PROG = @TCLSH_PROG@
|
|
@@ -423,13 +419,15 @@ install-lib-binaries:
|
|
@mkdir -p $(DESTDIR)$(pkglibdir)
|
|
@list='$(lib_BINARIES)'; for p in $$list; do \
|
|
if test -f $$p; then \
|
|
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
|
stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
|
|
if test "x$$stub" = "xstub"; then \
|
|
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
+ $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
|
echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
|
|
else \
|
|
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
|
echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
|
|
fi; \
|