diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2005-01-21 15:36:45 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2005-01-21 15:36:45 +0000 |
| commit | 7011c19a8c96a2f8fb7c04d61cb28cdc507584a6 (patch) | |
| tree | 22c0efaf2b6bb5b461389f9bac9542c7e3a5909a /ports-mgmt/bpm/files/patch-src::refresh.c | |
| parent | Now buildable on 4.x, still broken on >= 5.x. (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_11_0'.release/4.11.0
Diffstat (limited to 'ports-mgmt/bpm/files/patch-src::refresh.c')
| -rw-r--r-- | ports-mgmt/bpm/files/patch-src::refresh.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/ports-mgmt/bpm/files/patch-src::refresh.c b/ports-mgmt/bpm/files/patch-src::refresh.c deleted file mode 100644 index be123be85578..000000000000 --- a/ports-mgmt/bpm/files/patch-src::refresh.c +++ /dev/null @@ -1,53 +0,0 @@ ---- src/refresh.c.orig Tue Aug 24 02:40:08 2004 -+++ src/refresh.c Tue Oct 12 12:31:32 2004 -@@ -62,7 +62,11 @@ - __RCSID("$Id: refresh.c,v 1.32 2004/08/24 02:40:08 sethk Exp $"); - - /* XXX use libinstall/lib.h */ -+#if __FreeBSD_version >= 500036 -+#define INDEX_FN PORTS_BASE "/INDEX-5" -+#else - #define INDEX_FN PORTS_BASE "/INDEX" -+#endif - #define INDEX_MAXLN 4096 - #define DB_DIR "/var/db/pkg" - #define ITER_BYTES (128 * 1024) -@@ -183,10 +187,12 @@ - if (*sp == '|') - ++i; - -- if (i != (PFIELD_NFIELD - 1)) -+ if (i < (PFIELD_NFIELD - 1)) - { - #ifdef DEBUG -- warnx("invalid number of fields"); -+ warnx("invalid number of fields (%d should be %d)", -+ i + 1, -+ PFIELD_NFIELD); - #endif /* DEBUG */ - return FALSE; - } -@@ -195,12 +201,9 @@ - - for (i = 0; i < PFIELD_NFIELD; ++i) - { -- if (i < PFIELD_NFIELD - 1) -- { -- if (!(sp = strchr(line, '|'))) -- break; -- *sp++ = '\0'; -- } -+ if (!(sp = strchr(line, '|')) && i < PFIELD_NFIELD - 1) -+ break; -+ *sp++ = '\0'; - - switch (i) - { -@@ -320,7 +323,6 @@ - - if (_refresh_index_parse(ln, portdp, rdp) != TRUE) - { -- _refresh_portfree(portdp); - #ifdef DEBUG - warnx("%s:%u: invalid format", INDEX_FN, rdp->rd_linec); - #endif /* DEBUG */ |