CVS commit: pkgsrc/shells/yash

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sat Aug 26 19:05:31 UTC 2023

Modified Files:
        pkgsrc/shells/yash: Makefile distinfo
Added Files:
        pkgsrc/shells/yash/patches: patch-Makefile.in

Log Message:
shells/yash: do not require asciidoc

Fixes broken build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/shells/yash/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/shells/yash/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/yash/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/shells/yash/Makefile
diff -u pkgsrc/shells/yash/Makefile:1.8 pkgsrc/shells/yash/Makefile:1.9
--- pkgsrc/shells/yash/Makefile:1.8     Fri Aug 25 16:16:08 2023
+++ pkgsrc/shells/yash/Makefile Sat Aug 26 19:05:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/08/25 16:16:08 vins Exp $
+# $NetBSD: Makefile,v 1.9 2023/08/26 19:05:31 vins Exp $
 
 DISTNAME=      yash-2.55
 PKGREVISION=   1
@@ -15,12 +15,13 @@ FORCE_C_STD=                c99
 
 USE_TOOLS+=            msgfmt msgmerge
 USE_TOOLS+=            intltool xgettext
-USE_PKGLOCALEDIR=      yes
 
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 
+USE_PKGLOCALEDIR=      yes
+
 PKG_SHELL=     bin/yash
 
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/shells/yash/distinfo
diff -u pkgsrc/shells/yash/distinfo:1.3 pkgsrc/shells/yash/distinfo:1.4
--- pkgsrc/shells/yash/distinfo:1.3     Thu Aug 24 21:37:56 2023
+++ pkgsrc/shells/yash/distinfo Sat Aug 26 19:05:31 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2023/08/24 21:37:56 vins Exp $
+$NetBSD: distinfo,v 1.4 2023/08/26 19:05:31 vins Exp $
 
 BLAKE2s (yash-2.55.tar.xz) = 5d545dc5e6cd35545df915db24d4098121dfeb4b85b3fb0f666578e12dd6787d
 SHA512 (yash-2.55.tar.xz) = 9e92fc86884b0b315a98fcb5da0f319f431515185a970762946b919ccccc72aa8756e337dfa7cec763a7d8496bf4838eb9ef88664b35512180f13cc4146e9816
 Size (yash-2.55.tar.xz) = 761184 bytes
+SHA1 (patch-Makefile.in) = f9529b43db6f3775a5676b0f96f5cd5c4d60234e

Added files:

Index: pkgsrc/shells/yash/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/shells/yash/patches/patch-Makefile.in:1.1
--- /dev/null   Sat Aug 26 19:05:31 2023
+++ pkgsrc/shells/yash/patches/patch-Makefile.in        Sat Aug 26 19:05:31 2023
@@ -0,0 +1,38 @@
+$NetBSD: patch-Makefile.in,v 1.1 2023/08/26 19:05:31 vins Exp $
+
+Do not build documentation.
+
+--- Makefile.in.orig   2023-08-19 23:40:00.000000000 +0000
++++ Makefile.in
+@@ -63,7 +63,7 @@ htmldir = @htmldir@
+ default_loadpath = @default_loadpath@
+ enable_nls = @enable_nls@
+ 
+-all: $(TARGET) share/config tester mofiles docs
++all: $(TARGET) share/config tester mofiles
+ 
+ .c.o:
+       @rm -f $@
+@@ -125,8 +125,8 @@ man html:
+ 
+ INSTALLBINDIRS = $(DESTDIR)$(bindir)
+ INSTALLDATADIRS = $(DESTDIR)$(yashdatadir) $(DESTDIR)$(yashdatadir)/completion $(DESTDIR)$(yashdatadir)/initialization $(DESTDIR)$(mandir)
+-INSTALLDIRS = $(INSTALLBINDIRS) $(INSTALLDATADIRS) $(DESTDIR)$(htmldir)
+-install: install-binary install-data
++INSTALLDIRS = $(INSTALLBINDIRS) $(INSTALLDATADIRS)
++install: install-binary install-data install-man
+ install-strip: install-binary-strip install-data
+ install-binary: $(TARGET) installdirs-binary
+       $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
+@@ -138,7 +138,10 @@ install-data: share/config installdirs-d
+               $(INSTALL_DATA) share/$$file $(DESTDIR)$(yashdatadir)/$$file; \
+       done
+       @+if $(enable_nls); then (cd po && $(MAKE) $@); fi
+-      @+(cd doc && $(MAKE) install-rec)
++install-man:
++      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/ja/man1 $(DESTDIR)$(mandir)/man1
++      $(BSD_INSTALL_MAN) doc/$(TARGET:=.1) $(DESTDIR)$(mandir)/man1
++      $(BSD_INSTALL_MAN) doc/ja/$(TARGET:=.1) $(DESTDIR)$(mandir)/ja/man1
+ install-html:
+       @+(cd doc && $(MAKE) $@-rec)
+ installdirs: installdirs-binary installdirs-data