CVS commit: pkgsrc/lang/mujs

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Sep 10 09:57:36 UTC 2023

Modified Files:
        pkgsrc/lang/mujs: Makefile distinfo
        pkgsrc/lang/mujs/patches: patch-Makefile

Log Message:
mujs: Restore PKGCONFIG_OVERRIDE fixes that were also quietly deleted in r1.3
to ensure that dependent users have the correct RPATH.

Set MAINTAINER to me as a hint that I understand the Makefile patches, and
hopefully I will waste less time being confused in the future, and not
be convinced that I dreamed that I fixed this package before. O.o


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/mujs/Makefile pkgsrc/lang/mujs/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/mujs/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/mujs/Makefile
diff -u pkgsrc/lang/mujs/Makefile:1.5 pkgsrc/lang/mujs/Makefile:1.6
--- pkgsrc/lang/mujs/Makefile:1.5       Sun Sep 10 09:36:38 2023
+++ pkgsrc/lang/mujs/Makefile   Sun Sep 10 09:57:36 2023
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2023/09/10 09:36:38 nia Exp $
+# $NetBSD: Makefile,v 1.6 2023/09/10 09:57:36 nia Exp $
 
 DISTNAME=      mujs-1.3.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  https://mujs.com/downloads/
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+# understands the libtool patches
+MAINTAINER=    nia%NetBSD.org@localhost
 HOMEPAGE=      https://mujs.com/
 COMMENT=       Lightweight embedded JavaScript interpreter
 LICENSE=       isc
@@ -17,5 +18,8 @@ MAKE_FLAGS+=  prefix=${PREFIX}
 BUILD_TARGET=  default
 INSTALL_TARGET=        install-shared
 
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           build/release/mujs.pc
+
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/lang/mujs/distinfo
diff -u pkgsrc/lang/mujs/distinfo:1.5 pkgsrc/lang/mujs/distinfo:1.6
--- pkgsrc/lang/mujs/distinfo:1.5       Sun Sep 10 09:36:38 2023
+++ pkgsrc/lang/mujs/distinfo   Sun Sep 10 09:57:36 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2023/09/10 09:36:38 nia Exp $
+$NetBSD: distinfo,v 1.6 2023/09/10 09:57:36 nia Exp $
 
 BLAKE2s (mujs-1.3.3.tar.gz) = b91373ed586938084ceaa6b90545fa580ea6f7efd9fecbd84ab50189b6fca943
 SHA512 (mujs-1.3.3.tar.gz) = 74288484185473a813c55e08dcc2fefba46f87651d3a1fcea6ac843bb09a4150e13e0d46b348a34380a0defdeaa388cc93b6f7f569a7886091a34b4951b9461b
 Size (mujs-1.3.3.tar.gz) = 128097 bytes
-SHA1 (patch-Makefile) = 6fb39d0ae1a3dd510e846bf29bbb4a6ffa44cf84
+SHA1 (patch-Makefile) = 158e5ce3da4202b81ef2483ce594697660ae4263

Index: pkgsrc/lang/mujs/patches/patch-Makefile
diff -u pkgsrc/lang/mujs/patches/patch-Makefile:1.5 pkgsrc/lang/mujs/patches/patch-Makefile:1.6
--- pkgsrc/lang/mujs/patches/patch-Makefile:1.5 Sun Sep 10 09:36:38 2023
+++ pkgsrc/lang/mujs/patches/patch-Makefile     Sun Sep 10 09:57:36 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.5 2023/09/10 09:36:38 nia Exp $
+$NetBSD: patch-Makefile,v 1.6 2023/09/10 09:57:36 nia Exp $
 
 - Build shared objects at build-time rather than install-time.
 - Honour CFLAGS and LDFLAGS.
@@ -6,12 +6,12 @@ $NetBSD: patch-Makefile,v 1.5 2023/09/10
 
 --- Makefile.orig      2023-01-10 11:11:11.000000000 +0000
 +++ Makefile
-@@ -2,11 +2,9 @@
+@@ -2,28 +2,18 @@
  #
  # Useful targets are: release, install, uninstall.
  
 -default: build/debug/mujs build/debug/mujs-pp
-+default: build/release/mujs build/release/mujs-pp build/release/libmujs.la
++default: build/release/mujs build/release/mujs-pp build/release/libmujs.la build/release/mujs.pc
  
 -CFLAGS = -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
 -
@@ -20,9 +20,15 @@ $NetBSD: patch-Makefile,v 1.5 2023/09/10
  
  prefix = /usr/local
  bindir = $(prefix)/bin
-@@ -19,11 +17,7 @@ else
-   VERSION = $(patsubst mujs-%,%,$(notdir $(CURDIR)))
- endif
+ incdir = $(prefix)/include
+ libdir = $(prefix)/lib
+ 
+-ifeq ($(wildcard .git),.git)
+-  VERSION = $(shell git describe --tags --always)
+-else
+-  VERSION = $(patsubst mujs-%,%,$(notdir $(CURDIR)))
+-endif
++VERSION = $(patsubst mujs-%,%,$(notdir $(CURDIR)))
  
 -ifeq ($(shell uname),Darwin)
 -  SO = dylib
@@ -33,7 +39,7 @@ $NetBSD: patch-Makefile,v 1.5 2023/09/10
  
  ifeq ($(shell uname),FreeBSD)
    CFLAGS += -I/usr/local/include -L/usr/local/lib
-@@ -90,18 +84,22 @@ build/debug/mujs: main.c build/debug/lib
+@@ -90,18 +80,22 @@ build/debug/mujs: main.c build/debug/lib
  build/debug/mujs-pp: pp.c build/debug/libmujs.o
        $(CC) $(CFLAGS) -g -o $@ $^ -lm
  
@@ -66,7 +72,7 @@ $NetBSD: patch-Makefile,v 1.5 2023/09/10
  
  build/release/mujs.pc:
        @mkdir -p $(@D)
-@@ -119,14 +117,14 @@ install-common: build/release/mujs build
+@@ -119,14 +113,14 @@ install-common: build/release/mujs build
        install -d $(DESTDIR)$(bindir)
        install -m 644 mujs.h $(DESTDIR)$(incdir)
        install -m 644 build/release/mujs.pc $(DESTDIR)$(libdir)/pkgconfig