Tue Jan 21 16:31:27 2014 UTC ()
Support catpage.  Bump PKGREVISION.


(jperkin)
diff -r1.42 -r1.43 pkgsrc/pkgtools/pkgin/Makefile
diff -r1.3 -r1.4 pkgsrc/pkgtools/pkgin/PLIST
diff -r1.31 -r1.32 pkgsrc/pkgtools/pkgin/distinfo
diff -r0 -r1.3 pkgsrc/pkgtools/pkgin/patches/patch-Makefile.in
cvs diff -r1.42 -r1.43 pkgsrc/pkgtools/pkgin/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/Makefile 2013/10/19 09:07:11 1.42
+++ pkgsrc/pkgtools/pkgin/Makefile 2014/01/21 16:31:27 1.43
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.42 2013/10/19 09:07:11 adam Exp $ 1# $NetBSD: Makefile,v 1.43 2014/01/21 16:31:27 jperkin Exp $
2 2
3GHCOMMIT= 3859170568fbe4fe21b5660dbaeca8d65ac10f1b 3GHCOMMIT= 3859170568fbe4fe21b5660dbaeca8d65ac10f1b
4DISTNAME= ${GHCOMMIT} 4DISTNAME= ${GHCOMMIT}
5PKGNAME= pkgin-0.6.4 5PKGNAME= pkgin-0.6.4
6PKGREVISION= 3 6PKGREVISION= 4
7CATEGORIES= pkgtools 7CATEGORIES= pkgtools
8MASTER_SITES= https://github.com/NetBSDfr/pkgin/archive/ 8MASTER_SITES= https://github.com/NetBSDfr/pkgin/archive/
9FETCH_USING= curl 9FETCH_USING= curl
10 10
11MAINTAINER= imil@NetBSD.org 11MAINTAINER= imil@NetBSD.org
12HOMEPAGE= http://pkgin.net/ 12HOMEPAGE= http://pkgin.net/
13COMMENT= Apt / yum like tool for managing pkgsrc binary packages 13COMMENT= Apt / yum like tool for managing pkgsrc binary packages
14LICENSE= modified-bsd 14LICENSE= modified-bsd
15 15
16EGDIR= ${PREFIX}/share/examples/${PKGBASE} 16EGDIR= ${PREFIX}/share/examples/${PKGBASE}
17CONF_FILES= ${EGDIR}/repositories.conf.example \ 17CONF_FILES= ${EGDIR}/repositories.conf.example \
18 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf 18 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
19 19
20OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE} 20OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE}
21INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${EGDIR} 21INSTALLATION_DIRS+= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 ${EGDIR}
22 22
23WRKSRC= ${WRKDIR}/pkgin-${GHCOMMIT} 23WRKSRC= ${WRKDIR}/pkgin-${GHCOMMIT}
24 24
25SUBST_CLASSES+= path 25SUBST_CLASSES+= path
26SUBST_STAGE.path= pre-configure 26SUBST_STAGE.path= pre-configure
27SUBST_MESSAGE.path= Adjusting path. 27SUBST_MESSAGE.path= Adjusting path.
28SUBST_FILES.path= Makefile.in actions.c pkgin.1 28SUBST_FILES.path= Makefile.in actions.c pkgin.1
29SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g" 29SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g"
30SUBST_SED.path+= -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g" 30SUBST_SED.path+= -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g"
31SUBST_SED.path+= -e "s|/var|${VARBASE}|g" 31SUBST_SED.path+= -e "s|/var|${VARBASE}|g"
32SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|g" 32SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|g"
33SUBST_SED.path+= -e "s|!=.*uname -p|= ${MACHINE_ARCH}|g" 33SUBST_SED.path+= -e "s|!=.*uname -p|= ${MACHINE_ARCH}|g"
34 34
@@ -53,26 +53,35 @@ MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} @@ -53,26 +53,35 @@ MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
53DEPENDS+= pkg_install>=20130901:../../pkgtools/pkg_install 53DEPENDS+= pkg_install>=20130901:../../pkgtools/pkg_install
54 54
55# those have official repositories 55# those have official repositories
56.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix" 56.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix"
57pre-install: 57pre-install:
58 ${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> \ 58 ${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> \
59 ${WRKSRC}/repositories.conf 59 ${WRKSRC}/repositories.conf
60.endif 60.endif
61 61
62do-install: 62do-install:
63 ${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin 63 ${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin
64 ${INSTALL_MAN} ${WRKSRC}/pkgin.1 \ 64 ${INSTALL_MAN} ${WRKSRC}/pkgin.1 \
65 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 65 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 66.if !empty(MANINSTALL:Mcatinstall)
 67. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
 68 ${INSTALL_MAN} ${WRKSRC}/pkgin.cat1 \
 69 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgin.1
 70. else
 71 ${INSTALL_MAN} ${WRKSRC}/pkgin.cat1 \
 72 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgin.0
 73. endif
 74.endif
66 ${INSTALL_DATA} ${WRKSRC}/repositories.conf \ 75 ${INSTALL_DATA} ${WRKSRC}/repositories.conf \
67 ${DESTDIR}${EGDIR}/repositories.conf.example 76 ${DESTDIR}${EGDIR}/repositories.conf.example
68 77
69# libfetch has no builtin.mk and is included in NetBSD>=5 78# libfetch has no builtin.mk and is included in NetBSD>=5
70.if ${OPSYS} != "NetBSD" || \ 79.if ${OPSYS} != "NetBSD" || \
71 (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-4].*)) 80 (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-4].*))
72. include "../../net/libfetch/buildlink3.mk" 81. include "../../net/libfetch/buildlink3.mk"
73.endif 82.endif
74 83
75.include "../../archivers/libarchive/buildlink3.mk" 84.include "../../archivers/libarchive/buildlink3.mk"
76.include "../../databases/sqlite3/buildlink3.mk" 85.include "../../databases/sqlite3/buildlink3.mk"
77.include "../../security/openssl/buildlink3.mk" 86.include "../../security/openssl/buildlink3.mk"
78.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/pkgin/PLIST (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/PLIST 2011/06/20 15:16:27 1.3
+++ pkgsrc/pkgtools/pkgin/PLIST 2014/01/21 16:31:27 1.4
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
1@comment $NetBSD: PLIST,v 1.3 2011/06/20 15:16:27 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.4 2014/01/21 16:31:27 jperkin Exp $
2bin/pkgin 2bin/pkgin
 3man/cat1/pkgin.0
3man/man1/pkgin.1 4man/man1/pkgin.1
4share/examples/pkgin/repositories.conf.example 5share/examples/pkgin/repositories.conf.example
cvs diff -r1.31 -r1.32 pkgsrc/pkgtools/pkgin/distinfo (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/distinfo 2013/10/06 08:28:47 1.31
+++ pkgsrc/pkgtools/pkgin/distinfo 2014/01/21 16:31:27 1.32
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.31 2013/10/06 08:28:47 wiz Exp $ 1$NetBSD: distinfo,v 1.32 2014/01/21 16:31:27 jperkin Exp $
2 2
3SHA1 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 58d06c5884dd490508f609c5320542c919afe0c7 3SHA1 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 58d06c5884dd490508f609c5320542c919afe0c7
4RMD160 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = e783457044af3b41a784012f4d0961ed87e8c4af 4RMD160 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = e783457044af3b41a784012f4d0961ed87e8c4af
5Size (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 187873 bytes 5Size (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 187873 bytes
 6SHA1 (patch-Makefile.in) = 46f676a8e2bdb89f1d0f6f4e6c9cce55c56bb4bd
6SHA1 (patch-actions.c) = c7a630a2509ade9d913abb771a7bde4653a44e78 7SHA1 (patch-actions.c) = c7a630a2509ade9d913abb771a7bde4653a44e78
7SHA1 (patch-main.c) = 2faf9b225fdf30a997c5c0249cd40486d5d8d55c 8SHA1 (patch-main.c) = 2faf9b225fdf30a997c5c0249cd40486d5d8d55c
File Added: pkgsrc/pkgtools/pkgin/patches/Attic/patch-Makefile.in
$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 \