CVS commit: pkgsrc/lang/mujs

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 23 15:42:08 UTC 2023

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

Log Message:
mujs: update to 1.3.2.

Changes not found.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/mujs/Makefile pkgsrc/lang/mujs/distinfo
cvs rdiff -u -r1.2 -r1.3 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.2 pkgsrc/lang/mujs/Makefile:1.3
--- pkgsrc/lang/mujs/Makefile:1.2       Mon Oct 31 01:57:44 2022
+++ pkgsrc/lang/mujs/Makefile   Mon Jan 23 15:42:08 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2022/10/31 01:57:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2023/01/23 15:42:08 wiz Exp $
 
-DISTNAME=      mujs-1.3.0
+DISTNAME=      mujs-1.3.2
 CATEGORIES=    lang
 MASTER_SITES=  https://mujs.com/downloads/
 
Index: pkgsrc/lang/mujs/distinfo
diff -u pkgsrc/lang/mujs/distinfo:1.2 pkgsrc/lang/mujs/distinfo:1.3
--- pkgsrc/lang/mujs/distinfo:1.2       Mon Oct 31 01:57:44 2022
+++ pkgsrc/lang/mujs/distinfo   Mon Jan 23 15:42:08 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2022/10/31 01:57:44 wiz Exp $
+$NetBSD: distinfo,v 1.3 2023/01/23 15:42:08 wiz Exp $
 
-BLAKE2s (mujs-1.3.0.tar.gz) = d987502cc1dc4c78c830af4f18d9f8b0556d5a9484ea50f29c36aca0fd56bf5f
-SHA512 (mujs-1.3.0.tar.gz) = 1e9590892b1a0b139f8959a64e4255f5695c8e2dca355858155275628345ac3bb4168779dc6115bd6ac62b8615932762d3f348a1c6d0ee8d56cb43a863c4e0c3
-Size (mujs-1.3.0.tar.gz) = 127929 bytes
-SHA1 (patch-Makefile) = 89229ec3fba2ebf1623966705b13cefb2ea7e2bc
+BLAKE2s (mujs-1.3.2.tar.gz) = 296cb4f45517ce8a9ab11de9beeff868dbf2776c23e22075736954047eca7dc4
+SHA512 (mujs-1.3.2.tar.gz) = ccffb04171f7ecec2cfa6f0e59859acc911836370a648e4c6703db174631ce316413a64ebf4b32eea3d3b09221ff01861cda91f4b1b9bebf495168f26f90daf5
+Size (mujs-1.3.2.tar.gz) = 127899 bytes
+SHA1 (patch-Makefile) = d750c6a9fbafc4d47efec514f37b6a85123337b8

Index: pkgsrc/lang/mujs/patches/patch-Makefile
diff -u pkgsrc/lang/mujs/patches/patch-Makefile:1.2 pkgsrc/lang/mujs/patches/patch-Makefile:1.3
--- pkgsrc/lang/mujs/patches/patch-Makefile:1.2 Mon Oct 31 01:57:44 2022
+++ pkgsrc/lang/mujs/patches/patch-Makefile     Mon Jan 23 15:42:08 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile,v 1.2 2022/10/31 01:57:44 wiz Exp $
+$NetBSD: patch-Makefile,v 1.3 2023/01/23 15:42:08 wiz Exp $
 
 - Don't invoke git.
 - Honor user's CFLAGS/LDFLAGS.
 - libtoolize shared object creation.
 - The PHONY target is removed to allow PKGCONFIG_OVERRIDE to work.
 
---- Makefile.orig      2022-10-11 16:18:55.000000000 +0000
+--- Makefile.orig      2022-11-07 15:24:56.000000000 +0000
 +++ Makefile
 @@ -9,21 +9,11 @@ bindir ?= $(prefix)/bin
  incdir ?= $(prefix)/include
@@ -14,7 +14,7 @@ $NetBSD: patch-Makefile,v 1.2 2022/10/31
 -ifeq "$(wildcard .git)" ".git"
 -  VERSION := $(shell git describe --tags --always)
 -else
--  VERSION := $(shell basename $$PWD | sed -e s,^mujs-,,)
+-  VERSION := $(patsubst mujs-%,%,$(notdir $(CURDIR)))
 -endif
 -
 -ifeq ($(shell uname),Darwin)
@@ -48,50 +48,52 @@ $NetBSD: patch-Makefile,v 1.2 2022/10/31
  ifeq "$(HAVE_READLINE)" "yes"
    CFLAGS += -DHAVE_READLINE
    LIBREADLINE += -lreadline
-@@ -74,31 +54,30 @@ one.c: $(SRCS)
+@@ -74,33 +54,32 @@ one.c: $(SRCS)
  
  jsdump.c: astnames.h opnames.h
  
 -$(OUT)/%.o: %.c $(HDRS)
 +$(OUT)/%.lo: %.c $(HDRS)
-       @ mkdir -p $(dir $@)
+       @ mkdir -p $(@D)
 -      $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 +      $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
  
 -$(OUT)/libmujs.o: one.c $(HDRS)
 +$(OUT)/libmujs.lo: one.c $(HDRS)
-       @ mkdir -p $(dir $@)
+       @ mkdir -p $(@D)
 -      $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 +      $(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
  
 -$(OUT)/libmujs.a: $(OUT)/libmujs.o
 +$(OUT)/libmujs.a: $(OUT)/libmujs.lo
-       @ mkdir -p $(dir $@)
+       @ mkdir -p $(@D)
        $(AR) cr $@ $^
  
 -$(OUT)/libmujs.$(SO_EXT): one.c $(HDRS)
-+$(OUT)/libmujs.$(SO_EXT): $(OUT)/libmujs.lo $(HDRS)
-       @ mkdir -p $(dir $@)
++$(OUT)/libmujs.$(SO_EXT): $(OUT)/libmujs.lo one.c $(HDRS)
+       @ mkdir -p $(@D)
 -      $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
 +      $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -rpath $(PREFIX)/lib -o $@ $< -lm
  
--$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
-+$(OUT)/mujs: $(OUT)/libmujs.lo $(OUT)/main.lo
-       @ mkdir -p $(dir $@)
--      $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
+ libmujs ?= libmujs.a
+ 
+-$(OUT)/mujs: $(OUT)/main.o $(OUT)/$(libmujs)
++$(OUT)/mujs: $(OUT)/main.lo $(OUT)/libmujs.$(SO_EXT)
+       @ mkdir -p $(@D)
+-      $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) $(LIBREADLINE) -lm
 +      $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
  
--$(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o
-+$(OUT)/mujs-pp: $(OUT)/libmujs.lo $(OUT)/pp.lo
-       @ mkdir -p $(dir $@)
--      $(CC) $(LDFLAGS) -o $@ $^ -lm
+-$(OUT)/mujs-pp: $(OUT)/pp.o $(OUT)/$(libmujs)
++$(OUT)/mujs-pp: $(OUT)/pp.lo $(OUT)/libmujs.$(SO_EXT)
+       @ mkdir -p $(@D)
+-      $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) -lm
 +      $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $^ -lm
  
 -.PHONY: $(OUT)/mujs.pc
  $(OUT)/mujs.pc:
        @ mkdir -p $(dir $@)
        @ echo Creating $@
-@@ -119,13 +98,13 @@ install-common: $(OUT)/mujs $(OUT)/mujs.
+@@ -121,13 +100,13 @@ install-common: $(OUT)/mujs $(OUT)/mujs.
        install -d $(DESTDIR)$(bindir)
        install -m 644 mujs.h $(DESTDIR)$(incdir)
        install -m 644 $(OUT)/mujs.pc $(DESTDIR)$(libdir)/pkgconfig