Sun Jan 24 14:56:24 2010 UTC ()
pkgin 0.3.3 import from wip/pkgin-20100123

- Solaris 10 support
- Mac OS X support
- Added -l status flags
- autoconf support
- percentage redraw fix (jmcneill)
- variables cleanups (PKG_SYSCONFDIR, VARBASE) (sketch)
- auto-lookup for SUMEXTS, removed options.mk (sketch)
- opensolaris fixes (sketch)
- repositories.conf variables substitution (tuxillo)
- impact mutex (Johannes Hofmann)
- SunOS 5.8 support (Mikhail T.)

Plus many cleanups from stacktic@
- Replaced strstr's with str{n}cmp when possible
- #ifdef'ed PROVIDES
- Queries are now const chars
- Added -n (no-flag)
- Various memleaks fixed
- pkgname comparison fix
- Cleaned up trailing spaces
- Got rid of recursion !


(imil)
diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/pkgin/MESSAGE
diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/pkgin/distinfo
diff -r1.2 -r1.3 pkgsrc/pkgtools/pkgin/Makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/pkgin/Attic/MESSAGE (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/Attic/MESSAGE 2009/06/08 13:58:26 1.1.1.1
+++ pkgsrc/pkgtools/pkgin/Attic/MESSAGE 2010/01/24 14:56:24 1.2
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1.1.1 2009/06/08 13:58:26 imil Exp $ 2$NetBSD: MESSAGE,v 1.2 2010/01/24 14:56:24 imil Exp $
3 3
4First steps before using pkgin. 4First steps before using pkgin.
5 5
6. Modify ${PREFIX}/etc/pkgin/repositories.conf to suit your platform 6. Modify ${PKG_SYSCONFDIR}/pkgin/repositories.conf to suit your platform
7. Initialize the database : 7. Initialize the database :
8 8
9 # pkgin update 9 # pkgin update
10 10
11=========================================================================== 11===========================================================================
cvs diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/pkgin/distinfo (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/distinfo 2009/06/08 13:58:26 1.1.1.1
+++ pkgsrc/pkgtools/pkgin/distinfo 2010/01/24 14:56:24 1.2
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.1.1.1 2009/06/08 13:58:26 imil Exp $ 1$NetBSD: distinfo,v 1.2 2010/01/24 14:56:24 imil Exp $
2 2
3SHA1 (pkgin-0.2.5.tar.gz) = 27373fb35a142fdf5b097bd173cbc8453786b85e 3SHA1 (pkgin-0.3.3.tar.gz) = fa0320e18a9f44d094d4cf5f3757e7069bd401b0
4RMD160 (pkgin-0.2.5.tar.gz) = 70854b01e1d2c12ed6be09175eaf5e48c0aa15ef 4RMD160 (pkgin-0.3.3.tar.gz) = 02c5b2a7c428f6c1d73d1e12f32f651ad075c48f
5Size (pkgin-0.2.5.tar.gz) = 71392 bytes 5Size (pkgin-0.3.3.tar.gz) = 140679 bytes
cvs diff -r1.2 -r1.3 pkgsrc/pkgtools/pkgin/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkgin/Makefile 2010/01/17 12:02:37 1.2
+++ pkgsrc/pkgtools/pkgin/Makefile 2010/01/24 14:56:24 1.3
@@ -1,51 +1,50 @@ @@ -1,51 +1,50 @@
1# $NetBSD: Makefile,v 1.2 2010/01/17 12:02:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2010/01/24 14:56:24 imil Exp $
2# 2#
3 3
4DISTNAME= pkgin-0.2.5 4DISTNAME= pkgin-0.3.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@gcu.info 8MAINTAINER= imil@gcu.info
10HOMEPAGE= http://imil.net/pkgin/ 9HOMEPAGE= http://imil.net/pkgin/
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
19 18
20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${EGDIR} \ 19OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE}
21 ${PKG_SYSCONFDIR}/${PKGBASE} 20INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${EGDIR}
22 21
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 actions.c pkgin.1 27SUBST_FILES.path= Makefile.in actions.c pkgin.1
29SUBST_SED.path= -e "s|/usr/pkg|${PREFIX}|g" 28SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g"
 29SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|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"
31 32
32USE_BSD_MAKEFILE= yes 33GNU_CONFIGURE= yes
33USE_FEATURES= nbcompat 34USE_FEATURES= nbcompat
34 35
35NBCOMPAT_CONFIGURE_ARGS+= --enable-db 36NBCOMPAT_CONFIGURE_ARGS+= --enable-db
36 37
37.include "options.mk" 
38 
39do-install: 38do-install:
40 ${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin 39 ${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin
41 ${INSTALL_MAN} ${WRKSRC}/pkgin.1 \ 40 ${INSTALL_MAN} ${WRKSRC}/pkgin.1 \
42 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 41 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
43 ${INSTALL_DATA} ${WRKSRC}/repositories.conf \ 42 ${INSTALL_DATA} ${WRKSRC}/repositories.conf \
44 ${DESTDIR}${EGDIR}/repositories.conf.example 43 ${DESTDIR}${EGDIR}/repositories.conf.example
45 44
46 45
47.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
48 47
49# libfetch has no builtin.mk and is included in NetBSD>=5 48# libfetch has no builtin.mk and is included in NetBSD>=5
50.if ${OPSYS} != "NetBSD" || \ 49.if ${OPSYS} != "NetBSD" || \
51 (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-4].*)) 50 (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-4].*))