CVS commit: pkgsrc/lang/quickjs

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Feb  7 12:20:39 UTC 2025

Modified Files:
        pkgsrc/lang/quickjs: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/lang/quickjs/patches: patch-Makefile

Log Message:
lang/quickjs: Install libquickjs.a in the standard path

It installs the library in ${PREFIX}/lib/quickjs/ by default, which makes
its users hard to find it. Let's just move it to ${PREFIX}/lib to make our
lives easier.

quickjs didn't have buildlink3.mk until very recently so it should be safe
to move it now.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/quickjs/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/quickjs/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/quickjs/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/quickjs/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/quickjs/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/quickjs/Makefile
diff -u pkgsrc/lang/quickjs/Makefile:1.12 pkgsrc/lang/quickjs/Makefile:1.13
--- pkgsrc/lang/quickjs/Makefile:1.12   Wed Feb 21 10:54:36 2024
+++ pkgsrc/lang/quickjs/Makefile        Fri Feb  7 12:20:38 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2024/02/21 10:54:36 nia Exp $
+# $NetBSD: Makefile,v 1.13 2025/02/07 12:20:38 pho Exp $
 
 NAME=          quickjs
 QJS_DATE=      2021-03-27
 VERSION=       ${QJS_DATE:S/-//g}
 DISTNAME=      ${NAME}-${QJS_DATE}
 PKGNAME=       ${NAME}-${VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  https://bellard.org/quickjs/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/lang/quickjs/PLIST
diff -u pkgsrc/lang/quickjs/PLIST:1.5 pkgsrc/lang/quickjs/PLIST:1.6
--- pkgsrc/lang/quickjs/PLIST:1.5       Sun Jan 30 10:55:03 2022
+++ pkgsrc/lang/quickjs/PLIST   Fri Feb  7 12:20:38 2025
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2022/01/30 10:55:03 he Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/02/07 12:20:38 pho Exp $
 bin/qjs
 bin/qjsc
 bin/qjscalc
 include/quickjs/quickjs-libc.h
 include/quickjs/quickjs.h
-lib/quickjs/libquickjs.a
-${PLIST.lto}lib/quickjs/libquickjs.lto.a
+lib/libquickjs.a
+${PLIST.lto}lib/libquickjs.lto.a
 share/doc/quickjs/examples/fib.c
 share/doc/quickjs/examples/fib_module.js
 share/doc/quickjs/examples/hello.js

Index: pkgsrc/lang/quickjs/buildlink3.mk
diff -u pkgsrc/lang/quickjs/buildlink3.mk:1.1 pkgsrc/lang/quickjs/buildlink3.mk:1.2
--- pkgsrc/lang/quickjs/buildlink3.mk:1.1       Tue Feb  4 08:16:42 2025
+++ pkgsrc/lang/quickjs/buildlink3.mk   Fri Feb  7 12:20:38 2025
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2025/02/04 08:16:42 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2025/02/07 12:20:38 pho Exp $
 
 BUILDLINK_TREE+=       quickjs
 
 .if !defined(QUICKJS_BUILDLINK3_MK)
 QUICKJS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.quickjs+=        quickjs>=20210327nb2
+BUILDLINK_API_DEPENDS.quickjs+=        quickjs>=20210327nb3
 BUILDLINK_PKGSRCDIR.quickjs?=  ../../lang/quickjs
 .endif # QUICKJS_BUILDLINK3_MK
 

Index: pkgsrc/lang/quickjs/distinfo
diff -u pkgsrc/lang/quickjs/distinfo:1.10 pkgsrc/lang/quickjs/distinfo:1.11
--- pkgsrc/lang/quickjs/distinfo:1.10   Tue Mar  7 14:38:03 2023
+++ pkgsrc/lang/quickjs/distinfo        Fri Feb  7 12:20:39 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2023/03/07 14:38:03 he Exp $
+$NetBSD: distinfo,v 1.11 2025/02/07 12:20:39 pho Exp $
 
 BLAKE2s (quickjs-2021-03-27.tar.xz) = 840b2a3cb55944981b3c8c5e1797f59a25bc4199a6539173ffb49a31bb10a2bd
 SHA512 (quickjs-2021-03-27.tar.xz) = eeb810083484df213bc658a8703ca3ef094b7789c2b49eed86cb4068c9f9da401ad0300261d61a163c6ea82306f3ef50bf8e29a64920f704fd8958ef08a7286c
 Size (quickjs-2021-03-27.tar.xz) = 753556 bytes
-SHA1 (patch-Makefile) = 93c54ea3927caa449b6a14eb7ad9e96450ed7724
+SHA1 (patch-Makefile) = c000cbb62f7dde1e3dd2f759333c8f1174c77cf9
 SHA1 (patch-cutils.h) = db3fad2bd422d2886538819ef778d13a391d6935
 SHA1 (patch-qjs.c) = fde4ea9db2b6e02bad03ea8f2965b7c74eab239a
 SHA1 (patch-qjsc.c) = b67cd008e9f9081c7d1afdc5c286522e5854a511

Index: pkgsrc/lang/quickjs/patches/patch-Makefile
diff -u pkgsrc/lang/quickjs/patches/patch-Makefile:1.4 pkgsrc/lang/quickjs/patches/patch-Makefile:1.5
--- pkgsrc/lang/quickjs/patches/patch-Makefile:1.4      Sun Jan 30 10:55:03 2022
+++ pkgsrc/lang/quickjs/patches/patch-Makefile  Fri Feb  7 12:20:39 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.4 2022/01/30 10:55:03 he Exp $
+$NetBSD: patch-Makefile,v 1.5 2025/02/07 12:20:39 pho Exp $
 
 Portability patch for NetBSD.
 
@@ -78,3 +78,16 @@ Portability patch for NetBSD.
  QJSC_HOST_DEFINES:=-DCONFIG_CC=\"$(HOST_CC)\" -DCONFIG_PREFIX=\"$(prefix)\"
  
  $(OBJDIR)/qjsc.o: CFLAGS+=$(QJSC_DEFINES)
+@@ -302,10 +322,9 @@ install: all
+       $(STRIP) qjs qjsc
+       install -m755 qjs qjsc "$(DESTDIR)$(prefix)/bin"
+       ln -sf qjs "$(DESTDIR)$(prefix)/bin/qjscalc"
+-      mkdir -p "$(DESTDIR)$(prefix)/lib/quickjs"
+-      install -m644 libquickjs.a "$(DESTDIR)$(prefix)/lib/quickjs"
++      install -m644 libquickjs.a "$(DESTDIR)$(prefix)/lib"
+ ifdef CONFIG_LTO
+-      install -m644 libquickjs.lto.a "$(DESTDIR)$(prefix)/lib/quickjs"
++      install -m644 libquickjs.lto.a "$(DESTDIR)$(prefix)/lib"
+ endif
+       mkdir -p "$(DESTDIR)$(prefix)/include/quickjs"
+       install -m644 quickjs.h quickjs-libc.h "$(DESTDIR)$(prefix)/include/quickjs"