From nobody Sat Jul 22 11:26:07 2023 X-Original-To: dev-commits-ports-all@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 4R7PJ01sJxz4p7RZ; Sat, 22 Jul 2023 11:26:08 +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 4R7PHz2wDjz41Fw; Sat, 22 Jul 2023 11:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690025167; 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=oi08MZ8uoxqaL4rHrvS2nQf0m9fRuA7b8zSodbDUtq8=; b=oP1YrBykzek7kHJutGeFc4bhKKOaLaBEA4LdBGbB7skNHRtXFnQF20Wpy9A5sZ4SjLLUF5 qV7Lu4U1oqUasLTap28rLc9PxwcoaMv0JHwuhZ1LLfk3sIyuf0YGLzqxer8d1YCZR5Ptj5 CR1QuUvn8wI4m40JYTF83c+85rO0+wXc3RG2f4XCm1rqvY8OAZDUqoSH1Prqtm4x4KlgOL Z2R7N/6Uiv9zGJasZgV1+O+4rQ1P5jQH1CuTCGyqmEiPPBeuVxm7qiQKW6IUnUFnjJirvl KSbWaAAq4rQmUQB6wf0CgtceW+6sClGQzK5bj0NFpkXf/jHYd8VbAzfISD9W/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690025167; 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=oi08MZ8uoxqaL4rHrvS2nQf0m9fRuA7b8zSodbDUtq8=; b=rDBQTzvVomk+oCkHtFcVN8liSA+cMEC3BWeQKeGzLM5JddiSDqsVR7/ifprh3WKpNUJNgr LInkZWXr4QBEfYnm+sEhKTeh4tHORjjKEq6wLquX4dzC39tC9UT3aNb2qhJ6REDAKAdkvL OvFZXDcZI6RExVb38/LQz55rvNn+XMrECJvtYQ/fDb6Kw5awML2FErf7oVEKdjZKNyWYHL zD1EaInihD+sEHIEedTU8BHEH52wWHWKgeIyqF3O+EPALRFLr/R4Zzp/Jvdo/9Y+x4EGji eY4+DL/Tgk9ziCLrls1B2BulE0i4ug2VClt/mTmdDZ4c2oS67aJLjKAVI1/mCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690025167; a=rsa-sha256; cv=none; b=Q3s0qtC5eBZVzwnC4/vS5rg5qOph5WRTQQU/yGvM1iOQRIAzdnGwvV2oL3qA+Sui2Owkmo psn8rPCpdXdiGr8OGygN3pMkNVQADaqKPn1cIstZtuKxx6UjlxGxFmRIfy7fbiPKBko8XH ODzkA/D4kfMaPOgd0vmZ4j5qgf+0KJ4LghbXX4sHZdjBBd9/ewccDfaRxsH/OCjLRkKTYL wiiZOp3XViTkXwuTpdYly/ijxEhnr8SMe5kPCF0plWUQxy+yNwFaqqJIzC7fyM6SPGV838 Uggjh9c8Cp3vrA6c9FPN8qIiYojkpAtTaNoxRzs3e47rug2PyqlVUA1BZ79mUQ== 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 4R7PHz1tHZzsxh; Sat, 22 Jul 2023 11:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36MBQ77v081728; Sat, 22 Jul 2023 11:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36MBQ71b081727; Sat, 22 Jul 2023 11:26:07 GMT (envelope-from git) Date: Sat, 22 Jul 2023 11:26:07 GMT Message-Id: <202307221126.36MBQ71b081727@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 860aa846f7d9 - main - textproc/xincluder: Fix processing using JDOM List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 860aa846f7d9b756fc020b7efa4ed086d9675c21 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=860aa846f7d9b756fc020b7efa4ed086d9675c21 commit 860aa846f7d9b756fc020b7efa4ed086d9675c21 Author: Marcin Cieślak AuthorDate: 2023-07-21 14:59:58 +0000 Commit: Fernando Apesteguía CommitDate: 2023-07-22 11:25:48 +0000 textproc/xincluder: Fix processing using JDOM JDOM could not be used due to mismatch with the included JDOM. PR: 272559 Reported by: saper@saper.info --- textproc/xincluder/Makefile | 18 +++++++++++++--- ...-src_com_elharo_xml_xinclude_JDOMXIncluder.java | 24 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile index d882781a5a81..247ce5c9a7df 100644 --- a/textproc/xincluder/Makefile +++ b/textproc/xincluder/Makefile @@ -1,6 +1,6 @@ PORTNAME= xincluder PORTVERSION= 1.0.d11 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc java MASTER_SITES= ftp://ftp.ibiblio.org/pub/languages/java/javafaq/ DISTNAME= ${PORTNAME}-1.0d11 @@ -12,22 +12,34 @@ WWW= http://xincluder.sourceforge.net/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/lgpl.txt +BUILD_DEPENDS= ${JAVALIBDIR}/jdom.jar:java/jdom \ + ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:java/jdom \ ${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j USE_JAVA= yes -NO_BUILD= yes +USE_ANT= yes +ALL_TARGET= clean jar NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME} SUFFIXES= -sax -dom -jdom -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar bin/xincluder ${SUFFIXES:S,^,bin/xincluder,} +PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar bin/xincluder ${SUFFIXES:S,^,bin/xincluder,} PORTDOCS= apidoc index.html SUB_FILES= xincluder.sh OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} \ + -e "s,\./lib/jdom-1.0b9rc.jar,${JAVAJARDIR}/jdom.jar," \ + -e "s,\./lib/xercesImpl-2.0.2.jar,${JAVAJARDIR}/xercesImpl.jar," \ + -e "s,\./lib/xmlParserAPIs-2.0.2.jar,${JAVAJARDIR}/xml-apis.jar," \ + -e 's,