Update to version 0.109.

Belatedly document pkgvi's '+command' option per zuntum@ request.

As textproc/groff now brings in a lot of dependencies
don't make it a build dependency for this package on Solaris.

XXX Hence do not install any man pages on Solaris. This is a temporary
stopgap measure.  Do people really want a somewhat important number of
dependencies installed just to be able to do 'man mkpatches'? I surely
don't... A better solution has to be devised.

But as added bonus this package now handles gracefully MANINSTALL setting.
See you have not lost everything!

2 files changed, 24 insertions, 13 deletions

diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index e45b3c87a19..c5b57ab6db4 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2003/04/09 15:01:18 seb Exp $
+# $NetBSD: Makefile,v 1.34 2003/05/28 14:53:51 seb Exp $
 #
 
-DISTNAME=	pkgdiff-0.108
+DISTNAME=	pkgdiff-0.109
 WRKSRC=		${WRKDIR}
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
@@ -25,9 +25,8 @@ MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR:Q}
 
 .if ${OPSYS} == "SunOS"
 DEPENDS+=	diffutils-[0-9]*:../../devel/diffutils
-BUILD_DEPENDS+=	groff-[0-9]*:../../textproc/groff
-NROFF=		gnroff
 DIFF?=		gdiff
+MANINSTALL=
 .else
 NROFF=		nroff
 DIFF?=		diff
@@ -44,18 +43,21 @@ do-build:
 		< ${FILESDIR}/pkgdiff			\
 		> ${WRKSRC}/pkgdiff
 	${CP} ${FILESDIR}/pkgvi ${WRKSRC}
-.for FILE in mkpatches patchdiff pkgdiff pkgvi
-	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
-		< ${FILESDIR}/${FILE}.1			\
-		> ${WRKSRC}/${FILE}.1
-	${NROFF} -mandoc ${WRKSRC}/${FILE}.1 >${WRKSRC}/${FILE}.0
-.endfor
+.if !empty(MANINSTALL:Mcatinstall)
+.  for FILE in mkpatches patchdiff pkgdiff pkgvi
+	${NROFF} -mandoc ${FILESDIR}/${FILE}.1 >${WRKSRC}/${FILE}.0
+.  endfor
+.endif
 
 do-install:
 .for FILE in mkpatches patchdiff pkgdiff pkgvi
 	${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/bin
+.   if !empty(MANINSTALL:Mcatinstall)
 	${INSTALL_MAN} ${WRKSRC}/${FILE}.0 ${PREFIX}/man/cat1
-	${INSTALL_MAN} ${WRKSRC}/${FILE}.1 ${PREFIX}/man/man1
+.   endif
+.   if !empty(MANINSTALL:Mmaninstall)
+	${INSTALL_MAN} ${FILESDIR}/${FILE}.1 ${PREFIX}/man/man1
+.   endif
 .endfor
 
 .include "../../lang/perl5/buildlink2.mk"
diff --git a/pkgtools/pkgdiff/files/pkgvi.1 b/pkgtools/pkgdiff/files/pkgvi.1
index 9100aa8f5a5..d3860b7bf30 100644
--- a/pkgtools/pkgdiff/files/pkgvi.1
+++ b/pkgtools/pkgdiff/files/pkgvi.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkgvi.1,v 1.6 2001/12/04 11:54:44 zuntum Exp $
+.\"	$NetBSD: pkgvi.1,v 1.7 2003/05/28 14:53:51 seb Exp $
 .\"
 .\" Copyright (c) 2001 Tomasz Luchowski. All rights reserved.
 .\"
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 17, 2001
+.Dd May 28, 2003
 .Dt PKGVI 1
 .Os
 .Sh NAME
@@ -37,6 +37,7 @@
 .Nd "run editor and make backup of given file if necessary"
 .Sh SYNOPSIS
 .Nm
+.Op +command
 .Ar file
 .Sh DESCRIPTION
 The
@@ -57,6 +58,14 @@ it behaves as normal editor and changes are only made to
 .Pa filename ,
 not affecting
 .Pa filename.orig .
+.Pp
+Available option:
+.Bl -tag -width indent
+.It Cm +command
+This option is passed unmodified as first argument to the editor.
+This is useful when the editor used is
+.Xr vi 1 .
+.El
 .Sh ENVIRONMENT
 .Nm
 uses $PKGEDITOR if defined, then it looks for $EDITOR,