devel/libinjection: Use WRKSRC_SUBDIR

freebsd · Oct 9, 2022 · 5785135 · 5785135
1 parent 2e682b2
commit 5785135
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git 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 <bsd.port.mk>
diff --git 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 """