Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B3B0384EDC for ; Thu, 29 Jun 2023 20:57:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id O4TBFd1pHQRq for ; Thu, 29 Jun 2023 20:57:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C527F84ED7 for ; Thu, 29 Jun 2023 20:57:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B9978FA89; Thu, 29 Jun 2023 20:57:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168807226418290" MIME-Version: 1.0 Date: Thu, 29 Jun 2023 20:57:44 +0000 From: "Hauke Fath" Subject: CVS commit: pkgsrc/editors To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: hauke@netbsd.org X-Mailer: log_accum Message-Id: <20230629205744.B9978FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168807226418290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: hauke Date: Thu Jun 29 20:57:44 UTC 2023 Modified Files: pkgsrc/editors/xemacs-current: Makefile PLIST distinfo pkgsrc/editors/xemacs-current-nox11: Makefile pkgsrc/editors/xemacs-current/patches: patch-Makefile.in.in Log Message: Fix the man page install path, which should unbreak the packages for non-standard PKGMANDIR. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 pkgsrc/editors/xemacs-current/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/editors/xemacs-current/PLIST cvs rdiff -u -r1.43 -r1.44 pkgsrc/editors/xemacs-current/distinfo cvs rdiff -u -r1.17 -r1.18 pkgsrc/editors/xemacs-current-nox11/Makefile cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168807226418290 Content-Disposition: inline Content-Length: 4996 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/xemacs-current/Makefile diff -u pkgsrc/editors/xemacs-current/Makefile:1.117 pkgsrc/editors/xemacs-current/Makefile:1.118 --- pkgsrc/editors/xemacs-current/Makefile:1.117 Tue Jun 20 20:45:42 2023 +++ pkgsrc/editors/xemacs-current/Makefile Thu Jun 29 20:57:44 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.117 2023/06/20 20:45:42 hauke Exp $ +# $NetBSD: Makefile,v 1.118 2023/06/29 20:57:44 hauke Exp $ PKGNAME= ${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} .include "Makefile.common" Index: pkgsrc/editors/xemacs-current/PLIST diff -u pkgsrc/editors/xemacs-current/PLIST:1.27 pkgsrc/editors/xemacs-current/PLIST:1.28 --- pkgsrc/editors/xemacs-current/PLIST:1.27 Sun May 21 00:13:55 2023 +++ pkgsrc/editors/xemacs-current/PLIST Thu Jun 29 20:57:44 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.27 2023/05/21 00:13:55 hauke Exp $ +@comment $NetBSD: PLIST,v 1.28 2023/06/29 20:57:44 hauke Exp $ bin/ellcc bin/gnuattach bin/gnuclient @@ -1498,13 +1498,13 @@ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/ lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/rcs2log lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/sorted-doc lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/vcdiff -man/gnuattach.1 -man/gnuclient.1 -man/gnudoit.1 -man/gnuserv.1 -man/xemacs-ctags.1 -man/xemacs-etags.1 -man/xemacs.1 +man/man1/gnuattach.1 +man/man1/gnuclient.1 +man/man1/gnudoit.1 +man/man1/gnuserv.1 +man/man1/xemacs-ctags.1 +man/man1/xemacs-etags.1 +man/man1/xemacs.1 ${PLIST.x11}share/applications/xemacs.desktop @pkgdir lib/xemacs/site-modules @pkgdir lib/xemacs/site-lisp Index: pkgsrc/editors/xemacs-current/distinfo diff -u pkgsrc/editors/xemacs-current/distinfo:1.43 pkgsrc/editors/xemacs-current/distinfo:1.44 --- pkgsrc/editors/xemacs-current/distinfo:1.43 Wed May 24 11:40:11 2023 +++ pkgsrc/editors/xemacs-current/distinfo Thu Jun 29 20:57:44 2023 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.43 2023/05/24 11:40:11 hauke Exp $ +$NetBSD: distinfo,v 1.44 2023/06/29 20:57:44 hauke Exp $ BLAKE2s (xemacs-21.5.35.tar.gz) = 4b1b0fc5f7302180a16168bde9b85b05797e6ad883e1f0d72d77102cd5f36b11 SHA512 (xemacs-21.5.35.tar.gz) = e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019 Size (xemacs-21.5.35.tar.gz) = 16403617 bytes -SHA1 (patch-Makefile.in.in) = 8ac4bc8cb73529dbf58e9465f014dfd8164b1577 +SHA1 (patch-Makefile.in.in) = 2d73b52295a66183063ef8c243e20c7a9c5ea77c SHA1 (patch-configure) = 67c6d4e1114aba256156c3d1d286ac509bbba440 SHA1 (patch-lib-src_Makefile.in.in) = f09f99c363d988f356a3a49a1bf96136502d16aa SHA1 (patch-lib-src_fakemail.c) = d786ead6ccf1c640d7310b863202e7bde0e9e93a Index: pkgsrc/editors/xemacs-current-nox11/Makefile diff -u pkgsrc/editors/xemacs-current-nox11/Makefile:1.17 pkgsrc/editors/xemacs-current-nox11/Makefile:1.18 --- pkgsrc/editors/xemacs-current-nox11/Makefile:1.17 Tue Jun 20 20:45:42 2023 +++ pkgsrc/editors/xemacs-current-nox11/Makefile Thu Jun 29 20:57:44 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2023/06/20 20:45:42 hauke Exp $ +# $NetBSD: Makefile,v 1.18 2023/06/29 20:57:44 hauke Exp $ PKGNAME= ${DISTNAME:S/-/-nox11-/} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= *BETA* XEmacs text editor version 21.5 (no X11 support) .include "../../editors/xemacs-current/Makefile.common" Index: pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in diff -u pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in:1.4 pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in:1.5 --- pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in:1.4 Sun May 21 00:13:56 2023 +++ pkgsrc/editors/xemacs-current/patches/patch-Makefile.in.in Thu Jun 29 20:57:44 2023 @@ -1,4 +1,4 @@ -$NetBSD: patch-Makefile.in.in,v 1.4 2023/05/21 00:13:56 hauke Exp $ +$NetBSD: patch-Makefile.in.in,v 1.5 2023/06/29 20:57:44 hauke Exp $ Sprinkle DESTDIR dust. @@ -69,10 +69,19 @@ was patch-aa - chmod 0644 $(DESTDIR)${mandir}/$${page}${manext} ; \ + if [ $${page} = etags ] || [ $${page} = ctags ] ; \ + then \ -+ ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/xemacs-$${page}${manext} ; \ ++ ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/man1/xemacs-$${page}${manext} ; \ + else \ -+ ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \ ++ ${BSD_INSTALL_MAN} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/man1/$${page}${manext} ; \ + fi \ done @echo "If you would like to save approximately 4M of disk space, do" @echo "make gzip-el" +@@ -500,7 +506,7 @@ gzip-el: + mkdir: FRC.mkdir + for dir in \ + ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ +- ${mandir} ${bindir} ${datadir} ${libdir} \ ++ ${mandir}/man1 ${bindir} ${datadir} ${libdir} \ + #ifdef HAVE_SHLIB + ${moduledir} ${sitemoduledir} \ + #endif --_----------=_168807226418290--