Tue Mar 27 22:29:38 2018 UTC ()
Switch from nroff to using mandoc for updating catalog file in the update-catpages
target. This results in closer resemblence to the actual mdoc manuals.

Reviewed by <wiz>


(sevan)
diff -r1.223 -r1.224 pkgsrc/pkgtools/pkg_install/Makefile
cvs diff -r1.223 -r1.224 pkgsrc/pkgtools/pkg_install/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/Makefile 2018/01/27 19:07:47 1.223
+++ pkgsrc/pkgtools/pkg_install/Makefile 2018/03/27 22:29:38 1.224
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.223 2018/01/27 19:07:47 rillig Exp $ 1# $NetBSD: Makefile,v 1.224 2018/03/27 22:29:38 sevan Exp $
2 2
3# Notes to package maintainers: 3# Notes to package maintainers:
4# 4#
5# Updating this package does not automatically necessitate bumping 5# Updating this package does not automatically necessitate bumping
6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical 6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
7# change in the pkg_* tools that pkgsrc relies on for proper operation. 7# change in the pkg_* tools that pkgsrc relies on for proper operation.
8 8
9PKGNAME= pkg_install-${VERSION} 9PKGNAME= pkg_install-${VERSION}
10CATEGORIES= pkgtools 10CATEGORIES= pkgtools
11 11
12MAINTAINER= agc@NetBSD.org 12MAINTAINER= agc@NetBSD.org
13HOMEPAGE= http://www.pkgsrc.org/ 13HOMEPAGE= http://www.pkgsrc.org/
14COMMENT= Package management and administration tools for pkgsrc 14COMMENT= Package management and administration tools for pkgsrc
@@ -220,20 +220,20 @@ pre-configure: @@ -220,20 +220,20 @@ pre-configure:
220# XXX Reverse the order that update does things since 220# XXX Reverse the order that update does things since
221# XXX we need pkg_delete built before we can deinstall. 221# XXX we need pkg_delete built before we can deinstall.
222# XXX This should probably be the default order for all packages. 222# XXX This should probably be the default order for all packages.
223update: 223update:
224 ${MAKE} 224 ${MAKE}
225 ${MAKE} deinstall _UPDATE_RUNNING=YES 225 ${MAKE} deinstall _UPDATE_RUNNING=YES
226 ${MAKE} ${UPDATE_TARGET} 226 ${MAKE} ${UPDATE_TARGET}
227 ${MAKE} clean 227 ${MAKE} clean
228 228
229update-catpages: 229update-catpages:
230 for f in lib/pkgsrc.7 add/pkg_add.1 admin/pkg_admin.1 \ 230 for f in lib/pkgsrc.7 add/pkg_add.1 admin/pkg_admin.1 \
231 create/pkg_create.1 delete/pkg_delete.1 info/pkg_info.1 \ 231 create/pkg_create.1 delete/pkg_delete.1 info/pkg_info.1 \
232 lib/pkg_summary.5 lib/pkgsrc.7; do \ 232 lib/pkg_summary.5 lib/pkgsrc.7; do \
233 nroff -mdoc ${FILESDIR}/$$f > \ 233 mandoc -I os=pkgsrc -Tascii ${FILESDIR}/$$f > \
234 ${FILESDIR}/$${f%%.[157]}.cat; \ 234 ${FILESDIR}/$${f%%.[157]}.cat; \
235 done 235 done
236 nroff -mdoc ${FILESDIR}/lib/pkg_install.conf.5.in > \ 236 mandoc -I os=pkgsrc -Tascii ${FILESDIR}/lib/pkg_install.conf.5.in > \
237 ${FILESDIR}/lib/pkg_install.conf.cat.in 237 ${FILESDIR}/lib/pkg_install.conf.cat.in
238 238
239.include "../../mk/bsd.pkg.mk" 239.include "../../mk/bsd.pkg.mk"