CVS commit: pkgsrc/textproc/gsed

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed May 10 20:40:47 UTC 2023

Modified Files:
        pkgsrc/textproc/gsed: Makefile distinfo
Added Files:
        pkgsrc/textproc/gsed/patches: patch-Makefile.in

Log Message:
Conditionalize more fully whether sed.1 is generated. Fixes regular
build on at least FreeBSD 13.x, and confirmed to build (both forks
of the conditional) on NetBSD and macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/textproc/gsed/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/textproc/gsed/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/textproc/gsed/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/textproc/gsed/Makefile
diff -u pkgsrc/textproc/gsed/Makefile:1.62 pkgsrc/textproc/gsed/Makefile:1.63
--- pkgsrc/textproc/gsed/Makefile:1.62  Wed Apr 12 20:31:36 2023
+++ pkgsrc/textproc/gsed/Makefile       Wed May 10 20:40:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2023/04/12 20:31:36 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2023/05/10 20:40:47 schmonz Exp $
 
 DISTNAME=      sed-4.9
 PKGNAME=       g${DISTNAME}
@@ -8,9 +8,8 @@ MASTER_SITES=   ${MASTER_SITE_GNU:=sed/}
 EXTRACT_SUFX=  .tar.xz
 
 # Building the proper man page needs perl, but perl needs sed to build
-# When updating, please build with the following line commented in
+# When updating, please build with _MAINTAINER_MANPAGE=yes
 # and upload the new man page (doc/sed.1).
-#USE_TOOLS+=   perl
 DISTFILES+=    ${DEFAULT_DISTFILES} g${DISTNAME}.1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -33,8 +32,21 @@ CONFIGURE_ARGS+=     --program-prefix=g
 
 .include "../../mk/bsd.prefs.mk"
 
+_MAINTAINER_MANPAGE?=  no
+.if !empty(_MAINTAINER_MANPAGE:M[Yy][Ee][Ss])
+MAKE_ENV+=             PKGSRC_MAINTAINER_MANPAGE=yes
+USE_TOOLS+=            perl
+.else
+pre-build: non-maintainer-manpage
+.PHONY: non-maintainer-manpage
+non-maintainer-manpage:
+       ${RM} -f ${WRKSRC}/doc/sed.1
+       ${MV} ${WRKDIR}/g${DISTNAME}.1 ${WRKSRC}/doc/sed.1
+       ${TOUCH} ${WRKSRC}/doc/sed.1
+.endif
+
 post-install:
-       ${INSTALL_DATA} ${DISTDIR}/g${DISTNAME}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gsed.1
+       ${INSTALL_MAN} ${WRKSRC}/doc/sed.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gsed.1
 .for g n in bin/gsed ${PKGGNUDIR}bin/sed ${PKGMANDIR}/man1/gsed.1 ${PKGGNUDIR}${PKGMANDIR}/man1/sed.1
        ${LN} -sf ${PREFIX}/${g} ${DESTDIR}${PREFIX}/${n}
 .endfor

Index: pkgsrc/textproc/gsed/distinfo
diff -u pkgsrc/textproc/gsed/distinfo:1.31 pkgsrc/textproc/gsed/distinfo:1.32
--- pkgsrc/textproc/gsed/distinfo:1.31  Wed Apr 12 11:20:40 2023
+++ pkgsrc/textproc/gsed/distinfo       Wed May 10 20:40:47 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2023/04/12 11:20:40 wiz Exp $
+$NetBSD: distinfo,v 1.32 2023/05/10 20:40:47 schmonz Exp $
 
 BLAKE2s (gsed-4.9.1) = da49be3990ff24471ce17cacc9174bac9defafc7561e06635988665e94367a76
 SHA512 (gsed-4.9.1) = 3194b79d852c9692e336892acf172be654123c63a6a03b36420c4515758ce4012d2c4aa0aa58b63c12b7eafbb0d17eac89ba1ff1aba4ce052026fab3a5c3de7b
@@ -6,3 +6,4 @@ Size (gsed-4.9.1) = 10478 bytes
 BLAKE2s (sed-4.9.tar.xz) = 106e94f33309ff895f952e9200ab27817004f10fae357ad3a6d952f44932b312
 SHA512 (sed-4.9.tar.xz) = 36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc
 Size (sed-4.9.tar.xz) = 1397092 bytes
+SHA1 (patch-Makefile.in) = fb8766d941af00f0f66d903ee7fa4016e987cce2

Added files:

Index: pkgsrc/textproc/gsed/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/textproc/gsed/patches/patch-Makefile.in:1.3
--- /dev/null   Wed May 10 20:40:48 2023
+++ pkgsrc/textproc/gsed/patches/patch-Makefile.in      Wed May 10 20:40:47 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-Makefile.in,v 1.3 2023/05/10 20:40:47 schmonz Exp $
+
+Avoid circular dependency (perl5->gsed->perl5) for regular builds.
+
+--- Makefile.in.orig   2022-11-06 19:19:08.000000000 +0000
++++ Makefile.in
+@@ -7513,6 +7513,7 @@ sed/version.h: Makefile
+       $(AM_V_at)mv $@t $@
+ 
+ doc/sed.1: sed/sed$(EXEEXT) .version $(srcdir)/doc/sed.x
++.ifdef PKGSRC_MAINTAINER_MANPAGE
+       $(AM_V_GEN)$(MKDIR_P) doc
+       $(AM_V_at)rm -rf $@ $@-t
+       $(AM_V_at)$(run_help2man)                                       \
+@@ -7522,6 +7523,7 @@ doc/sed.1: sed/sed$(EXEEXT) .version $(srcdir)/doc/sed
+           $(SEDBIN)                                                   \
+         && chmod a-w $@-t                                             \
+         && mv $@-t $@
++.endif
+ 
+ # automake makes `check' depend on $(TESTS).  Declare
+ # dummy targets for $(TESTS) so that make does not complain.