Mon Apr 9 19:02:37 2012 UTC ()
Pullup ticket #3726 - requested by imil
pkgtools/pkgin: bug fix

Revisions pulled up:
- pkgtools/pkgin/Makefile                                       1.21
- pkgtools/pkgin/distinfo                                       1.17

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	imil
   Date:		Mon Apr  9 08:58:19 UTC 2012

   Modified Files:
    	pkgsrc/pkgtools/pkgin: Makefile distinfo

   Log Message:
   20120409
            pkgin 0.5.2.3
            Fixed "upgrade too many packages" bug (thanks stacktic)

   To generate a diff of this commit:
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/pkgtools/pkgin/Makefile
   cvs rdiff -u -r1.16 -r1.17 pkgsrc/pkgtools/pkgin/distinfo


(spz)
diff -r1.20 -r1.20.4.1 pkgsrc/pkgtools/pkgin/Makefile
diff -r1.16 -r1.16.4.1 pkgsrc/pkgtools/pkgin/distinfo
cvs diff -r1.20 -r1.20.4.1 pkgsrc/pkgtools/pkgin/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/Makefile 2011/11/01 06:50:29 1.20
+++ pkgsrc/pkgtools/pkgin/Makefile 2012/04/09 19:02:37 1.20.4.1
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.20 2011/11/01 06:50:29 sbd Exp $ 1# $NetBSD: Makefile,v 1.20.4.1 2012/04/09 19:02:37 spz Exp $
2# 2#
3 3
4DISTNAME= pkgin-0.5.2.1 4DISTNAME= pkgin-0.5.2.3
5PKGREVISION= 1 
6CATEGORIES= pkgtools 5CATEGORIES= pkgtools
7MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/ 6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/
8 7
9MAINTAINER= imil@NetBSD.org 8MAINTAINER= imil@NetBSD.org
10HOMEPAGE= http://pkgin.net/ 9HOMEPAGE= http://pkgin.net/
11COMMENT= Apt / yum like tool for managing pkgsrc binary packages 10COMMENT= Apt / yum like tool for managing pkgsrc binary packages
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16EGDIR= ${PREFIX}/share/examples/${PKGBASE} 15EGDIR= ${PREFIX}/share/examples/${PKGBASE}
17CONF_FILES= ${EGDIR}/repositories.conf.example \ 16CONF_FILES= ${EGDIR}/repositories.conf.example \
18 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf 17 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
@@ -23,26 +22,27 @@ INSTALLATION_DIRS+= bin ${PKGMANDIR}/man @@ -23,26 +22,27 @@ INSTALLATION_DIRS+= bin ${PKGMANDIR}/man
23WRKSRC= ${WRKDIR}/pkgin 22WRKSRC= ${WRKDIR}/pkgin
24 23
25SUBST_CLASSES+= path 24SUBST_CLASSES+= path
26SUBST_STAGE.path= pre-configure 25SUBST_STAGE.path= pre-configure
27SUBST_MESSAGE.path= Adjusting path. 26SUBST_MESSAGE.path= Adjusting path.
28SUBST_FILES.path= Makefile.in actions.c pkgin.1 27SUBST_FILES.path= Makefile.in actions.c pkgin.1
29SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g" 28SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g"
30SUBST_SED.path+= -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g" 29SUBST_SED.path+= -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g"
31SUBST_SED.path+= -e "s|/var|${VARBASE}|g" 30SUBST_SED.path+= -e "s|/var|${VARBASE}|g"
32SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|g" 31SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|g"
33 32
34GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
35USE_FEATURES= nbcompat 34USE_FEATURES= nbcompat
 35USE_TOOLS+= nroff
36 36
37DEPENDS+= pkg_install>=20110215:../../pkgtools/pkg_install 37DEPENDS+= pkg_install>=20110215:../../pkgtools/pkg_install
38 38
39.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
40 40
41# those have official repositories 41# those have official repositories
42.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix" 42.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix"
43pre-install: 43pre-install:
44 ${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> \ 44 ${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> \
45 ${WRKSRC}/repositories.conf 45 ${WRKSRC}/repositories.conf
46.endif 46.endif
47 47
48do-install: 48do-install:
cvs diff -r1.16 -r1.16.4.1 pkgsrc/pkgtools/pkgin/distinfo (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/distinfo 2011/10/29 14:25:47 1.16
+++ pkgsrc/pkgtools/pkgin/distinfo 2012/04/09 19:02:37 1.16.4.1
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.16 2011/10/29 14:25:47 imil Exp $ 1$NetBSD: distinfo,v 1.16.4.1 2012/04/09 19:02:37 spz Exp $
2 2
3SHA1 (pkgin-0.5.2.1.tar.gz) = db8a6cf380c3b31ebbf18a2c79c30d024cb5a8fb 3SHA1 (pkgin-0.5.2.3.tar.gz) = c0915229913adb94ff608d2412ddcfd19fd9269d
4RMD160 (pkgin-0.5.2.1.tar.gz) = ec30d31c7b140e383ff96d4a4e4586b5e367f5a1 4RMD160 (pkgin-0.5.2.3.tar.gz) = b3ff60f8065e2d45b330f9a8d70b2adb01f4171b
5Size (pkgin-0.5.2.1.tar.gz) = 1458971 bytes 5Size (pkgin-0.5.2.3.tar.gz) = 1458840 bytes