From nobody Sat Mar 19 19:49:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 478341A2878F; Sat, 19 Mar 2022 19:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KLWfx5vxRz3H7C; Sat, 19 Mar 2022 19:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647719369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05CkXxVB5X0Y0rPCKcYAkePXOmr5hh/trImZfaqXsBI=; b=PV30l8PaCWcyI0CgwceR0jwLV8ZAkIrngAeHGVkSTcmpoq75ERPCjt85cVpIgfEnNEeKJj WD0PeKshO5xQeosmIvCGWbsGQZPv0VRJSkWaw0S7BVT00yqHtAsuTHot0QX/Ze+G7apQr4 aHWAufv5bce0QNTnViXqaY6hA598VTmgq6OIba8ufvaHpCOIoXKT+pSFPQTFqaosj3XDHS CBsYnyVmOkI8zJEnY0TA+/Ws9IGN4q6kExUFYWhFHayFIZgs9VvDZ/CFHu3726ZOy2EMrd 1R6JTSwCm7WLP69iTuFZ8uR/s8GEWKs8x7xq/TdS/6VW5teoBK5Nsbfv0LVvFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1852193D9; Sat, 19 Mar 2022 19:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22JJnTaG053666; Sat, 19 Mar 2022 19:49:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JJnTiI053665; Sat, 19 Mar 2022 19:49:29 GMT (envelope-from git) Date: Sat, 19 Mar 2022 19:49:29 GMT Message-Id: <202203191949.22JJnTiI053665@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 3f8a4349680c - main - devel/tclxml: Prepare for libxml2 update List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f8a4349680cd01439ce8846f8addc55723ff7de Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647719369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05CkXxVB5X0Y0rPCKcYAkePXOmr5hh/trImZfaqXsBI=; b=FM5SIdDZq8we+yDhLicBtvSNYI6oFhKFB5zCzZOe6cxOBMipq3yZfklwChf3i63LErFtpn oo48WukwqCepZWw50QUQJWnFgyRYB4S4oF7oRMyIcGo/x/TS2KMRhw3qWW9GpFP1nQtGhL p/aDQ94prClxc467jWGzQogPK2M30kfh1JO9Nou4m0cygNZ8e5Ij6u3D4oV+2IPa8AqTz2 +nK56yism+hd2CJdKGOzkbDDP4+NTJWTYU+c70H0MfEkN6z3CnxezEKMLywL3jD6QeEvSl CWwlSzivTKB19J/D6kbhrhedc9xYakEkAjUk34VjpExNRrrHuI6pv/AlWgvZAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647719369; a=rsa-sha256; cv=none; b=x2+y3kGtnhRyExe/4IOMz1H8G/OSC7Mn9LOl4oK+2pFjUxllSGhgw0dYCmuqsBkpjSCWb5 jUeZHAzzTqrFJkkp4tHLamH2caKBQ2SwGO4nTy/JjCmTT2WnkYb+W5YjzgGLA8ohaGPOuN RucQYo1KiZi6etgYcA5zjRwRSwiNlnbADQc4QAjmZxptXzfMEDUj38YZdYOWzdAcFTCFrD 6RKV1Z1fKGjVEP2+evkABE+MpkBvxBNF34CWXKHy3jhxJSgpyzSSzDu5fYJ/rV4wigR1ud AhjzItzEKoa9MYaCcvtdo7wc/g4Ngqiy5vfXx7vXjvf/vsQS4DDMHGAM/kRcMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f8a4349680cd01439ce8846f8addc55723ff7de commit 3f8a4349680cd01439ce8846f8addc55723ff7de Author: Matthias Andree AuthorDate: 2022-03-19 19:20:14 +0000 Commit: Daniel Engberg CommitDate: 2022-03-19 19:49:06 +0000 devel/tclxml: Prepare for libxml2 update The build passes CC arguments to LD. Convert to using CC for linking. Add missing library dependencies that get picked up automatically, to ensure a consistent build as a port (outside poudriere). Sort Makefile to canonical portlint/portclippy ordering. * This patch was submitted privately and I'd like to thank Matthias for guidance and fixing remaining issues * PR: 262288 Reported by: antoine (via exp-run) Approved by: portmgr (blanket) --- devel/tclxml/Makefile | 19 +++++++++++-------- devel/tclxml/files/patch-configure | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile index 19a4e2967ea5..86276132197a 100644 --- a/devel/tclxml/Makefile +++ b/devel/tclxml/Makefile @@ -2,7 +2,7 @@ PORTNAME= tclxml PORTVERSION= 3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel tcl MASTER_SITES= LOCAL/bf SF/tclxml/TclXML/${PORTVERSION} @@ -12,25 +12,28 @@ COMMENT= API for parsing XML documents using Tcl LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libxslt.so:textproc/libxslt +LIB_DEPENDS= libicui18n.so:devel/icu libxslt.so:textproc/libxslt RUN_DEPENDS?= dtplite:devel/tcllib -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= gnome tar:xz tcl:tea -USES= tcl:tea tar:xz TCL_PKG= Tclxml${PORTVERSION} -PLIST_SUB= PORTVERSION=${PORTVERSION} +USE_GNOME= libxml2 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 TEST_TARGET= test +PLIST_SUB= PORTVERSION=${PORTVERSION} +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 + +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e '/^TCLSH_ENV[[:blank:]]*=/,/[^\]$$/d' \ ${WRKSRC}/Makefile.in diff --git a/devel/tclxml/files/patch-configure b/devel/tclxml/files/patch-configure new file mode 100644 index 000000000000..c001f6a49e71 --- /dev/null +++ b/devel/tclxml/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig 2022-03-16 21:59:50 UTC ++++ configure +@@ -8580,14 +8580,14 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6; } + FreeBSD-*|DragonFly-*) + # FreeBSD 3.* and greater have ELF. + SHLIB_CFLAGS="-fPIC" +- SHLIB_LD="ld -Bshareable -x" ++ SHLIB_LD="${CC} -shared -Wl,-x" + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" +- LDFLAGS="$LDFLAGS -export-dynamic" ++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' +- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' ++ LD_SEARCH_FLAGS='-Wl,-rpath ${LIB_RUNTIME_DIR}' + if test "${TCL_THREADS}" = "1" ; then + # The -pthread needs to go in the CFLAGS, not LIBS + LIBS=`echo $LIBS | sed s/-pthread//`