From nobody Thu Jul 07 12:38:26 2022 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 7490812AAE70; Thu, 7 Jul 2022 12:38:26 +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 4Ldwtp2qF3z3mcT; Thu, 7 Jul 2022 12:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657197506; 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=KZ2oF/dfvE06Q1Hwxn//z31Ca4bZGrbm0M8gxAfXycQ=; b=Huec4TYuexmSODYqSutLv0fvm3FIk3sPlNbBHeukQKw/j+y3dBAlqPG8qH2Dxq8mj8k3pM zO08aYHl7HluC8X4hymeR9nw2AYlAGeTkytT1tLGDI61szdJ/VRgPG8iilfm6oS9ibGqfG GlVbZDlQJTS5YA1fsiNHgZofgzi5eetRKHf2Yq2NiGo03p2Sup+VlLGXhb0Ebzus62Sus7 YpPcNhd9kbYrCkO4RVwGNNViMwX4ngT8Wdq/Kp9OSsKckRh0kYwimYamgF1O2oEmI76FAx SJBYeQZhDP5mLiIJMqUyXGLqjToafZzkR1Ca5aXpvkix+/BPVLYAmOEG7wmq/w== 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 4Ldwtp1tFWzk2N; Thu, 7 Jul 2022 12:38:26 +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 267CcQmO075763; Thu, 7 Jul 2022 12:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 267CcQtZ075762; Thu, 7 Jul 2022 12:38:26 GMT (envelope-from git) Date: Thu, 7 Jul 2022 12:38:26 GMT Message-Id: <202207071238.267CcQtZ075762@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 68286c8108b0 - main - textproc/p5-XML-Parser: Convert XMLPARSER_EUCJP and XMLPARSER_SJIS to option framework 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68286c8108b0ad92535134516d05ffb778532363 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657197506; 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=KZ2oF/dfvE06Q1Hwxn//z31Ca4bZGrbm0M8gxAfXycQ=; b=gBz/et8EI8lHH3zoCIrH/djhcZnDmJL1MI0crTjjAznWxc4xJO5KKt0h1Wmc2jtOBRwcUV 2KmaHAFJ0PYKfdhp++2F+Nz8CNMQU11iATXtgXjfLUEjRBXac8Gf57ap4pU9XCPkMO4pbw uuxdgvKEc4OaIYPhyHrZFna/l+A3e1uRa3kxZGrFpEjHy9Ma8M/L4Z1afVVgTV88bwrI5g 1k7rG3+4ow5A4ZdMFc+zHafT5J0EqMFD+UwZ2TJftTm5X4P6R+WBVzROPgUmWmPiVqFwp8 ufWfJgUZJOUpIo2oGQOxgf75mFtXJf/uDkBs3VhmiRY8L5qb+K0rpIh4KGq2qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657197506; a=rsa-sha256; cv=none; b=bw/eZK3qSwV9dUi9WcB1N/MdPQZ22sgUFMv3iK8Mwv5zB3xD4OUwPxRz6NJ1pYtuKYRK+I rsgE8Z6+45bLSLL1+zGa/jJiyca7TIBifkdndkROWWY/zY9etmkR6/fv65EiNUIp+qVD2s iVwPl6cfAzpULQLZ2n8L0hkH8Cvs3X6kZ4mQLYL5rfpP1TYhWvXNxqHH/r0QdaEmigfzse AGhBN9LQ6Lm8o+WIQs4EXASToIXHRv2G8s+QxRU0+1IjSK8qPXvP33EyRyJZKh5vYH32Bk L6W37Pvz9BcezvfiE05NRYyjxOswHdeCLQBBL3PP9aOd+FpGlVpivP32lB4Hyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=68286c8108b0ad92535134516d05ffb778532363 commit 68286c8108b0ad92535134516d05ffb778532363 Author: Po-Chuan Hsieh AuthorDate: 2022-07-07 12:23:38 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-07-07 12:36:27 +0000 textproc/p5-XML-Parser: Convert XMLPARSER_EUCJP and XMLPARSER_SJIS to option framework --- textproc/p5-XML-Parser/Makefile | 60 ++++++++++++++++++++++++++-------------- textproc/p5-XML-Parser/pkg-plist | 8 ++++-- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile index 93e197978f94..edcdd809a5b4 100644 --- a/textproc/p5-XML-Parser/Makefile +++ b/textproc/p5-XML-Parser/Makefile @@ -17,31 +17,51 @@ USE_PERL5= configure CONFIGURE_ARGS= EXPATINCPATH=${LOCALBASE}/include EXPATLIBPATH=${LOCALBASE}/lib -PLIST_SUB= EUCJP=${EUCJP} SJIS=${SJIS} - CONV_ENC= ${PERL} -e '$$e=shift @ARGV; undef $$/; $$_=<>; substr($$_,4,40)=pack("a40","$$e"); print' -# XMLPARSER_EUCJP= x-euc-jp-(jisx0221|unicode) -# XMLPARSER_SJIS= x-sjis-(cp932|jdk117|jisx0221|unicode) -.if !defined(XMLPARSER_EUCJP) -EUCJP= "@comment " -.endif -.if !defined(XMLPARSER_SJIS) -SJIS= "@comment " -.endif -.if defined(XMLPARSER_EUCJP) || defined(XMLPARSER_SJIS) -USE_PERL5+= patch -.endif +OPTIONS_RADIO= EUCJP SJIS +OPTIONS_RADIO_EUCJP= EUCJP_JISX0221 EUCJP_UNICODE +OPTIONS_RADIO_SJIS= SJIS_CP932 SJIS_JDK117 SJIS_JISX0221 SJIS_UNICODE +OPTIONS_SUB= yes +EUCJP_JISX0221_DESC= Install euc-jp.enc (generated from x-euc-jp-jisx0221.enc) +EUCJP_UNICODE_DESC= Install euc-jp.enc (generated from x-euc-jp-unicode.enc) +SJIS_CP932_DESC= Install shift_jis.enc (generated from x-sjis-cp932.enc) +SJIS_JDK117_DESC= Install shift_jis.enc (generated from x-sjis-jdk117.enc) +SJIS_JISX0221_DESC= Install shift_jis.enc (generated from x-sjis-jisx0221.enc) +SJIS_UNICODE_DESC= Install shift_jis.enc (generated from x-sjis-unicode.enc) -post-patch: -.if defined(XMLPARSER_EUCJP) - @cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} euc-jp ${XMLPARSER_EUCJP}.enc > euc-jp.enc +EUCJP_JISX0221_USE= PERL5=patch +EUCJP_UNICODE_USE= PERL5=patch +SJIS_CP932_USE= PERL5=patch +SJIS_JDK117_USE= PERL5=patch +SJIS_JISX0221_USE= PERL5=patch +SJIS_UNICODE_USE= PERL5=patch + +pre-patch-EUCJP_JISX0221-on: + @cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} euc-jp x-euc-jp-jisx0221.enc > euc-jp.enc @${ECHO_CMD} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST -.endif -.if defined(XMLPARSER_SJIS) - @cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} shift_jis ${XMLPARSER_SJIS}.enc > shift_jis.enc + +pre-patch-EUCJP_UNICODE-on: + @cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} euc-jp x-euc-jp-unicode.enc > euc-jp.enc + @${ECHO_CMD} Parser/Encodings/euc-jp.enc >> ${WRKSRC}/MANIFEST + +pre-patch-SJIS_CP932-on: + @cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} shift_jis x-sjis-cp932.enc > shift_jis.enc + @${ECHO_CMD} Parser/Encodings/shift_jis.enc >> ${WRKSRC}/MANIFEST + +pre-patch-SJIS_JDK117-on: + @cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} shift_jis x-sjis-jdk117.enc > shift_jis.enc + @${ECHO_CMD} Parser/Encodings/shift_jis.enc >> ${WRKSRC}/MANIFEST + +pre-patch-SJIS_JISX0221-on: + @cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} shift_jis x-sjis-jisx0221.enc > shift_jis.enc @${ECHO_CMD} Parser/Encodings/shift_jis.enc >> ${WRKSRC}/MANIFEST -.endif + +pre-patch-SJIS_UNICODE-on: + @cd ${WRKSRC}/Parser/Encodings && ${CONV_ENC} shift_jis x-sjis-unicode.enc > shift_jis.enc + @${ECHO_CMD} Parser/Encodings/shift_jis.enc >> ${WRKSRC}/MANIFEST + +post-patch: @${CP} ${FILESDIR}/*.enc ${WRKSRC}/Parser/Encodings/ .for e in 1 6 10 11 13 14 15 @${ECHO_CMD} Parser/Encodings/iso-8859-${e}.enc >> ${WRKSRC}/MANIFEST diff --git a/textproc/p5-XML-Parser/pkg-plist b/textproc/p5-XML-Parser/pkg-plist index 92559b641384..faceadcb5b59 100644 --- a/textproc/p5-XML-Parser/pkg-plist +++ b/textproc/p5-XML-Parser/pkg-plist @@ -3,7 +3,8 @@ %%SITE_ARCH%%/XML/Parser/Encodings/README %%SITE_ARCH%%/XML/Parser/Encodings/big5.enc %%SITE_ARCH%%/XML/Parser/Encodings/euc-kr.enc -%%EUCJP%%%%SITE_ARCH%%/XML/Parser/Encodings/euc-jp.enc +%%EUCJP_JISX0221%%%%SITE_ARCH%%/XML/Parser/Encodings/euc-jp.enc +%%EUCJP_UNICODE%%%%SITE_ARCH%%/XML/Parser/Encodings/euc-jp.enc %%SITE_ARCH%%/XML/Parser/Encodings/ibm866.enc %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-1.enc %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-10.enc @@ -20,7 +21,10 @@ %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-8.enc %%SITE_ARCH%%/XML/Parser/Encodings/iso-8859-9.enc %%SITE_ARCH%%/XML/Parser/Encodings/koi8-r.enc -%%SJIS%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc +%%SJIS_CP932%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc +%%SJIS_JDK117%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc +%%SJIS_JISX0221%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc +%%SJIS_UNICODE%%%%SITE_ARCH%%/XML/Parser/Encodings/shift_jis.enc %%SITE_ARCH%%/XML/Parser/Encodings/windows-1250.enc %%SITE_ARCH%%/XML/Parser/Encodings/windows-1251.enc %%SITE_ARCH%%/XML/Parser/Encodings/windows-1252.enc