diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-09-02 10:38:04 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-09-02 10:38:04 +0000 |
| commit | 2e09fe1a4607e4c0f524849868e715edd99c27cf (patch) | |
| tree | b92204db60235edf5547054e3a40502b14e3c4e1 /pkgtools | |
| parent | 1e551025e58f4aac6e10d6567ed731849bb1c619 (diff) | |
| download | pkgsrc-2e09fe1a4607e4c0f524849868e715edd99c27cf.tar.gz | |
Remove workaround for 'pkg_add -f' bug, now that it is fixed in pkg_install.
Bump PKGREVISION.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkgin/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/pkgin/distinfo | 3 | ||||
| -rw-r--r-- | pkgtools/pkgin/patches/patch-actions.c | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile index 32e951daa2b..95994d17c14 100644 --- a/pkgtools/pkgin/Makefile +++ b/pkgtools/pkgin/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.38 2013/06/16 14:37:33 imil Exp $ +# $NetBSD: Makefile,v 1.39 2013/09/02 10:38:04 jperkin Exp $ # GHCOMMIT= 3859170568fbe4fe21b5660dbaeca8d65ac10f1b DISTNAME= ${GHCOMMIT} PKGNAME= pkgin-0.6.4 +PKGREVISION= 1 CATEGORIES= pkgtools MASTER_SITES= https://github.com/NetBSDfr/pkgin/archive/ FETCH_USING= curl diff --git a/pkgtools/pkgin/distinfo b/pkgtools/pkgin/distinfo index 1acd74cf678..e24eca8a069 100644 --- a/pkgtools/pkgin/distinfo +++ b/pkgtools/pkgin/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.28 2013/06/16 14:37:33 imil Exp $ +$NetBSD: distinfo,v 1.29 2013/09/02 10:38:04 jperkin Exp $ SHA1 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 58d06c5884dd490508f609c5320542c919afe0c7 RMD160 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = e783457044af3b41a784012f4d0961ed87e8c4af Size (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 187873 bytes +SHA1 (patch-actions.c) = 5ce6ac2051c0f9e7048926b3b5f41d8c17d98252 diff --git a/pkgtools/pkgin/patches/patch-actions.c b/pkgtools/pkgin/patches/patch-actions.c new file mode 100644 index 00000000000..902fd410a14 --- /dev/null +++ b/pkgtools/pkgin/patches/patch-actions.c @@ -0,0 +1,16 @@ +$NetBSD: patch-actions.c,v 1.1 2013/09/02 10:38:04 jperkin Exp $ + +No need to work-around 'pkg_add -f' bug any more. + +--- actions.c.orig 2013-09-02 10:32:50.000000000 +0000 ++++ actions.c +@@ -139,9 +139,6 @@ analyse_pkglog(long int filepos) + /* Warning: [...] was built for a platform */ + if (strstr(err_line, "Warning") != NULL) + warn_count++; +- /* A different version [...] is already installed */ +- if (strstr(err_line, "already installed") != NULL) +- err_count--; + /* 1 package addition failed */ + if (strstr(err_line, "addition failed") != NULL) + err_count++; |