diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile index 19a4e2967ea5..924b151cebe9 100644 --- a/devel/tclxml/Makefile +++ b/devel/tclxml/Makefile @@ -19,12 +19,10 @@ PORTDOCS= README.xml html.xsl man.macros nroff.xsl tcldoc-1.0.dtd \ tcldom.html tcldom.xml tclxml.css tclxml.html tclxml.xml \ tclxslt.html tclxslt.xml transform.tcl txt.xsl -USES= tcl:tea tar:xz +USES= pkgconfig tcl:tea tar:xz TCL_PKG= Tclxml${PORTVERSION} PLIST_SUB= PORTVERSION=${PORTVERSION} -XML_CONFIG?= ${LOCALBASE}/bin/xml2-config USE_LDCONFIG= ${PREFIX}/lib/${TCL_PKG} -CONFIGURE_ARGS+=XML_CONFIG="${XML_CONFIG}" OPTIONS_DEFINE= DOCS MAKE_ENV+= TCLLIBPATH=${STAGEDIR}/${PREFIX}/lib diff --git a/devel/tclxml/distinfo b/devel/tclxml/distinfo index 93b32ae95e99..18d864c6ace5 100644 --- a/devel/tclxml/distinfo +++ b/devel/tclxml/distinfo @@ -1,2 +1,3 @@ +TIMESTAMP = 1646755623 SHA256 (tclxml-3.3.tar.xz) = 10744fdf2c77ab21b07ba5a3b8652a9545f5e5dbfd5addaad4a26d9dd3e76f87 SIZE (tclxml-3.3.tar.xz) = 498388 diff --git a/devel/tclxml/files/patch-configure b/devel/tclxml/files/patch-configure new file mode 100644 index 000000000000..12582e6d64ff --- /dev/null +++ b/devel/tclxml/files/patch-configure @@ -0,0 +1,120 @@ +--- configure.orig 2013-03-30 17:17:07 UTC ++++ configure +@@ -1332,8 +1332,6 @@ Optional Packages: + (tclConfig.sh) + --with-tclinclude directory containing the public Tcl header files + --with-celib=DIR use Windows/CE support library from DIR +- --with-xml2-config the xml2-config configuration script +- --with-xslt-config the xslt-config configuration script + --with-xml-static statically link the XML libraries + + Some influential environment variables: +@@ -10176,100 +10174,23 @@ fi + # Load libxml2 configuration + #-------------------------------------------------------------------- + +-{ echo "$as_me:$LINENO: checking for xml2-config script" >&5 +-echo $ECHO_N "checking for xml2-config script... $ECHO_C" >&6; } ++XML2_VERSION=`pkg-config libxml-2.0 --modversion` ++XML2_PREFIX=`pkg-config libxml-2.0 --variable=prefix` ++XML2_LIBS=`pkg-config libxml-2.0 --libs` ++XML2_CFLAGS=`pkg-config libxml-2.0 --cflags` + + +-# Check whether --with-xml2-config was given. +-if test "${with_xml2_config+set}" = set; then +- withval=$with_xml2_config; with_xml2_config=${withval} +-fi + + +-LIBXML2_CONFIG= +-if test "x${with_xml2_config}" = "x" ; then +- for c in \ +- /Library/Frameworks/libxml.framework/Resources/Scripts/xml2-config \ +- ${prefix}/bin/xml2-config \ +- /usr/bin/xml2-config \ +- /usr/local/bin/xml2-config +- do +- if test -x "$c" ; then +- LIBXML2_CONFIG="$c" +- break +- fi +- done +-else +- LIBXML2_CONFIG="${with_xml2_config}" +-fi +-if test "x$LIBXML2_CONFIG" = "x" ; then +- { { echo "$as_me:$LINENO: error: unable to find xml2-config" >&5 +-echo "$as_me: error: unable to find xml2-config" >&2;} +- { (exit 1); exit 1; }; } +-else +- { echo "$as_me:$LINENO: result: ${LIBXML2_CONFIG}" >&5 +-echo "${ECHO_T}${LIBXML2_CONFIG}" >&6; } +- XML2_VERSION=`${LIBXML2_CONFIG} --version` +- XML2_PREFIX=`${LIBXML2_CONFIG} --prefix` +- XML2_LIBS="`${LIBXML2_CONFIG} --libs`" +- XML2_CFLAGS=`${LIBXML2_CONFIG} --cflags` +-fi + +- +- +- +- + #-------------------------------------------------------------------- + # Load libxslt configuration + #-------------------------------------------------------------------- + +-{ echo "$as_me:$LINENO: checking for xslt-config script" >&5 +-echo $ECHO_N "checking for xslt-config script... $ECHO_C" >&6; } +- +- +-# Check whether --with-xslt-config was given. +-if test "${with_xslt_config+set}" = set; then +- withval=$with_xslt_config; with_xslt_config=${withval} +-fi +- +- +-LIBXSLT_CONFIG= +-if test "x${with_xslt_config}" = "x" ; then +- if test "x${with_xml2_config}" = "x" ; then +- : +- else +- if test -x "`dirname ${with_xml2_config}`/xslt-config" ; then +- LIBXSLT_CONFIG="`dirname ${with_xml2_config}`/xslt-config" +- fi +- fi +-else +- LIBXSLT_CONFIG="${with_xslt_config}" +-fi +-if test "x${LIBXSLT_CONFIG}" = "x" ; then +- for c in \ +- /Library/Frameworks/libxslt.framework/Resources/Scripts/xslt-config \ +- ${prefix}/bin/xslt-config \ +- /usr/bin/xslt-config \ +- /usr/local/bin/xslt-config +- do +- if test -x "$c" ; then +- LIBXSLT_CONFIG="$c" +- break +- fi +- done +-fi +-if test "x$LIBXSLT_CONFIG" = "x" ; then +- { { echo "$as_me:$LINENO: error: unable to find xslt-config script" >&5 +-echo "$as_me: error: unable to find xslt-config script" >&2;} +- { (exit 1); exit 1; }; } +-else +- { echo "$as_me:$LINENO: result: ${LIBXSLT_CONFIG}" >&5 +-echo "${ECHO_T}${LIBXSLT_CONFIG}" >&6; } +- XSLT_VERSION=`${LIBXSLT_CONFIG} --version` +- XSLT_PREFIX=`${LIBXSLT_CONFIG} --prefix` +- XSLT_CFLAGS=`${LIBXSLT_CONFIG} --cflags` +- XSLT_LIBS="`${LIBXSLT_CONFIG} --libs` -lexslt" +-fi ++XSLT_VERSION=`pkg-config libxslt --modversion` ++XSLT_PREFIX=`pkg-config libxslt --variable=prefix` ++XSLT_CFLAGS=`pkg-config libxslt --cflags` ++XSLT_LIBS="`pkg-config libxslt --libs` -lexslt" + + +