From nobody Sun Oct 09 15:39:25 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 4MlmSF5Xj3z4dw76; Sun, 9 Oct 2022 15:39:25 +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 4MlmSF4wswz3dSD; Sun, 9 Oct 2022 15:39:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665329965; 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=h11FgDgWzv7eOYyiV3vye838CsYBLHyb6WqEkNsU38g=; b=M19miGYxjbgtg9aw93tszGF4O7PM12PUPWO6RV1R0x1EttxS+cBN/dRmGUFdJGVtPq/05L 0V0EYL1fbk9tCFSLzygxGUFTxgbsDahi4xIQE/MMa29RbQPdi4QL6FWXlMhdFeiiUsqxU5 bxhHLoO5OHHYy+14RK0MqFPgpMw1O/9xhE+6QE0NrjlUJmaiWauLBk0ymYShlOaj78Hm0V cya/18HLG7umR/HBw2KdOknrDBEyeHC8nevNOqCRFGS4daxjpf48/vdudrsQG0lCx8lnKg or4Kl+RohsrrZ9aCRGSXBVx0nLuMEAVYm6FawsLfiCKPEX1EqyhyXSJHM+cL8w== 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 4MlmSF42MRzKhm; Sun, 9 Oct 2022 15:39:25 +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 299FdPAS042313; Sun, 9 Oct 2022 15:39:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 299FdPJK042312; Sun, 9 Oct 2022 15:39:25 GMT (envelope-from git) Date: Sun, 9 Oct 2022 15:39:25 GMT Message-Id: <202210091539.299FdPJK042312@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: 5785135e734e - main - devel/libinjection: Use WRKSRC_SUBDIR 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5785135e734ef18acfcb9f9bc763d42ee45e850c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665329965; 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=h11FgDgWzv7eOYyiV3vye838CsYBLHyb6WqEkNsU38g=; b=S5dkBzs5vsYhrRJ5adJ+QhV3Obtk5b43DY/5K3sR7GL0nWkfSQb88ik6lo0+jfXfRKNRTB ZfyQL4pE6GaVXwHQxfyK+k1wszzV9ilurn5pfvIIZgco2PadIsIv6wPVjEIybvwvi7Nf8C tqID8FYzc0Mb9YpNhCEpnIoJbr9m+zbI4zR/rBdFpxFFP453ldmnT/JymgSN/BoxAeEcbd l2OHV12+xqTG3O9swAReE5Fb1K+cp1udnCMm7/A5ljLTOIx7NXzBc3uubCwoudzJ1JuB5+ 7qrgef7fs20OcF9ruDxy4/yV5oKqm8K8aEePBEb5EaMs8SksgUY/d7M0t1eJQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665329965; a=rsa-sha256; cv=none; b=Jtop/toTloWLzEuOB94NIBBd5QXcsNhD1tg/XuAmQoDuVOOy8ifFWHqkhs8y5SsfuRsTZ2 8FTB8CGkWLLPQVMJ+Ypq9elxggmcy2khE17ECUUeInIAHt1qg4TeEtu61+H+ynSpnT10gJ 1xFa5uOMeL/qc2u71Tidzp0tvTqF6WJeEDjxceDACfTQNefG4W+NwyRcvUlfb455v7uPOh eXOPnDGAUFp6w/ftdz1MtJrN8L7ptFB6lPb34XfEp5bxgEmxYvCGnYGoNVRPcZsl4Tq6nn 4poZHkEM6AF0jx6afirdExgGjuicp0NriCPoB8GxKHJx4qFEyp4wYV5/qqqeHQ== 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=5785135e734ef18acfcb9f9bc763d42ee45e850c commit 5785135e734ef18acfcb9f9bc763d42ee45e850c Author: Po-Chuan Hsieh AuthorDate: 2022-10-09 15:31:35 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-10-09 15:37:49 +0000 devel/libinjection: Use WRKSRC_SUBDIR --- devel/libinjection/Makefile | 10 ++++++---- devel/libinjection/files/patch-2to3 | 12 ++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/devel/libinjection/Makefile b/devel/libinjection/Makefile index 4824a67bb678..750b3e0424f3 100644 --- a/devel/libinjection/Makefile +++ b/devel/libinjection/Makefile @@ -8,17 +8,19 @@ COMMENT= SQL / SQLI tokenizer parser analyzer WWW= https://github.com/libinjection/libinjection LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/../COPYING USES= python:build shebangfix +WRKSRC_SUBDIR= src + USE_GITHUB= yes SHEBANG_GLOB= *.py do-install: - ${INSTALL_DATA} ${WRKSRC}/src/libinjection*.h ${STAGEDIR}${PREFIX}/include/ - ${INSTALL_DATA} ${WRKSRC}/src/libinjection.a ${STAGEDIR}${PREFIX}/lib/libinjection.a - ${INSTALL_LIB} ${WRKSRC}/src/libinjection.so ${STAGEDIR}${PREFIX}/lib/libinjection.so + ${INSTALL_DATA} ${WRKSRC}/libinjection*.h ${STAGEDIR}${PREFIX}/include/ + ${INSTALL_DATA} ${WRKSRC}/libinjection.a ${STAGEDIR}${PREFIX}/lib/libinjection.a + ${INSTALL_LIB} ${WRKSRC}/libinjection.so ${STAGEDIR}${PREFIX}/lib/libinjection.so .include diff --git a/devel/libinjection/files/patch-2to3 b/devel/libinjection/files/patch-2to3 index 857d0d4de3c2..cb6dad219a49 100644 --- a/devel/libinjection/files/patch-2to3 +++ b/devel/libinjection/files/patch-2to3 @@ -1,5 +1,5 @@ ---- src/make_parens.py.orig 2022-03-04 21:37:55 UTC -+++ src/make_parens.py +--- make_parens.py.orig 2022-03-04 21:37:55 UTC ++++ make_parens.py @@ -412,7 +412,7 @@ def main(): mutator.permute(line.strip()) @@ -9,8 +9,8 @@ if __name__ == '__main__': ---- src/sqlparse_map.py.orig 2022-03-04 21:37:55 UTC -+++ src/sqlparse_map.py +--- sqlparse_map.py.orig 2022-03-04 21:37:55 UTC ++++ sqlparse_map.py @@ -1564,6 +1564,6 @@ if __name__ == '__main__': if len(CHARMAP) != 256: sys.stderr.write("Assert failed: charmap is %d characters\n" % len(CHARMAP)) @@ -19,8 +19,8 @@ + print(dump()) # pylint: disable=C0301,C0302 ---- src/sqlparse2c.py.orig 2022-03-04 21:38:43 UTC -+++ src/sqlparse2c.py +--- sqlparse2c.py.orig 2022-03-04 21:38:43 UTC ++++ sqlparse2c.py @@ -14,7 +14,7 @@ import sys def toc(obj): """ main routine """