From 524132a122a2b4e24c37dbd5e583636df2200c5c Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Tue, 21 Jan 2014 16:31:27 +0000
Subject: Support catpage.  Bump PKGREVISION.

---
 pkgtools/pkgin/Makefile                  | 15 ++++++++++++---
 pkgtools/pkgin/PLIST                     |  3 ++-
 pkgtools/pkgin/distinfo                  |  3 ++-
 pkgtools/pkgin/patches/patch-Makefile.in | 12 ++++++++++++
 4 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 pkgtools/pkgin/patches/patch-Makefile.in

(limited to 'pkgtools')

diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile
index 0d39dc76471..151c1f0d047 100644
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2013/10/19 09:07:11 adam Exp $
+# $NetBSD: Makefile,v 1.43 2014/01/21 16:31:27 jperkin Exp $
 
 GHCOMMIT=		3859170568fbe4fe21b5660dbaeca8d65ac10f1b
 DISTNAME=		${GHCOMMIT}
 PKGNAME=		pkgin-0.6.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		pkgtools
 MASTER_SITES=		https://github.com/NetBSDfr/pkgin/archive/
 FETCH_USING=		curl
@@ -18,7 +18,7 @@ CONF_FILES=		${EGDIR}/repositories.conf.example		\
 			${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
 
 OWN_DIRS+=		${PKG_SYSCONFDIR}/${PKGBASE}
-INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 ${EGDIR}
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 ${EGDIR}
 
 WRKSRC=			${WRKDIR}/pkgin-${GHCOMMIT}
 
@@ -63,6 +63,15 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/pkgin.1				\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.if !empty(MANINSTALL:Mcatinstall)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	${INSTALL_MAN} ${WRKSRC}/pkgin.cat1				\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgin.1
+.  else
+	${INSTALL_MAN} ${WRKSRC}/pkgin.cat1				\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgin.0
+.  endif
+.endif
 	${INSTALL_DATA} ${WRKSRC}/repositories.conf			\
 		${DESTDIR}${EGDIR}/repositories.conf.example
 
diff --git a/pkgtools/pkgin/PLIST b/pkgtools/pkgin/PLIST
index 3b6eb32b2e3..0329264a0f8 100644
--- a/pkgtools/pkgin/PLIST
+++ b/pkgtools/pkgin/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2011/06/20 15:16:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/01/21 16:31:27 jperkin Exp $
 bin/pkgin
+man/cat1/pkgin.0
 man/man1/pkgin.1
 share/examples/pkgin/repositories.conf.example
diff --git a/pkgtools/pkgin/distinfo b/pkgtools/pkgin/distinfo
index 085af2031ae..bdb78dd06b2 100644
--- a/pkgtools/pkgin/distinfo
+++ b/pkgtools/pkgin/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.31 2013/10/06 08:28:47 wiz Exp $
+$NetBSD: distinfo,v 1.32 2014/01/21 16:31:27 jperkin Exp $
 
 SHA1 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 58d06c5884dd490508f609c5320542c919afe0c7
 RMD160 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = e783457044af3b41a784012f4d0961ed87e8c4af
 Size (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 187873 bytes
+SHA1 (patch-Makefile.in) = 46f676a8e2bdb89f1d0f6f4e6c9cce55c56bb4bd
 SHA1 (patch-actions.c) = c7a630a2509ade9d913abb771a7bde4653a44e78
 SHA1 (patch-main.c) = 2faf9b225fdf30a997c5c0249cd40486d5d8d55c
diff --git a/pkgtools/pkgin/patches/patch-Makefile.in b/pkgtools/pkgin/patches/patch-Makefile.in
new file mode 100644
index 00000000000..3d3364b1bb1
--- /dev/null
+++ b/pkgtools/pkgin/patches/patch-Makefile.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-Makefile.in,v 1.3 2014/01/21 16:31:27 jperkin Exp $
+
+Support catpage.
+
+--- Makefile.in.orig	2013-06-16 14:00:45.000000000 +0000
++++ Makefile.in
+@@ -2,4 +2,5 @@
+ 
+ PROG=		pkgin
++MAN=		pkgin.1
+ VERSION=	@PACKAGE_VERSION@
+ SRCS=		main.c summary.c tools.c pkgindb.c depends.c actions.c \
-- 
cgit v1.2.3