diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2007-02-05 01:08:46 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-02-05 01:08:46 +0000 |
commit | 0d0d56457bb54d930410a5b55092e1624f3012e5 (patch) | |
tree | 6dc64f85ffb41f8710ebfdf60aa600dd824c2b2a /sysutils/bpm/files/patch-src::refresh.c | |
parent | - Update to 1.96.6 (diff) |
Populate a new ports-mgmt category. List of moved ports:
devel/portcheckout -> ports-mgmt/portcheckout
devel/portlint -> ports-mgmt/portlint
devel/portmk -> ports-mgmt/portmk
devel/porttools -> ports-mgmt/porttools
misc/instant-tinderbox -> ports-mgmt/instant-tinderbox
misc/porteasy -> ports-mgmt/porteasy
misc/portell -> ports-mgmt/portell
misc/portless -> ports-mgmt/portless
misc/tinderbox -> ports-mgmt/tinderbox
security/jailaudit -> ports-mgmt/jailaudit
security/portaudit -> ports-mgmt/portaudit
security/portaudit-db -> ports-mgmt/portaudit-db
security/vulnerability-test-port -> ports-mgmt/vulnerability-test-port
sysutils/barry -> ports-mgmt/barry
sysutils/bpm -> ports-mgmt/bpm
sysutils/kports -> ports-mgmt/kports
sysutils/managepkg -> ports-mgmt/managepkg
sysutils/newportsversioncheck -> ports-mgmt/newportsversioncheck
sysutils/pib -> ports-mgmt/pib
sysutils/pkgfe -> ports-mgmt/pkgfe
sysutils/pkg-orphan -> ports-mgmt/pkg-orphan
sysutils/pkg_cutleaves -> ports-mgmt/pkg_cutleaves
sysutils/pkg_install -> ports-mgmt/pkg_install
sysutils/pkg_install-devel -> ports-mgmt/pkg_install-devel
sysutils/pkg_remove -> ports-mgmt/pkg_remove
sysutils/pkg_rmleaves -> ports-mgmt/pkg_rmleaves
sysutils/pkg_trackinst -> ports-mgmt/pkg_trackinst
sysutils/pkg_tree -> ports-mgmt/pkg_tree
sysutils/portbrowser -> ports-mgmt/portbrowser
sysutils/portconf -> ports-mgmt/portconf
sysutils/portdowngrade -> ports-mgmt/portdowngrade
sysutils/portcheck -> ports-mgmt/portcheck
sysutils/portmanager -> ports-mgmt/portmanager
sysutils/portmaster -> ports-mgmt/portmaster
sysutils/portscout -> ports-mgmt/portscout
sysutils/portsearch -> ports-mgmt/portsearch
sysutils/portsman -> ports-mgmt/portsman
sysutils/portsnap -> ports-mgmt/portsnap
sysutils/portsopt -> ports-mgmt/portsopt
sysutils/portupgrade -> ports-mgmt/portupgrade
sysutils/portupgrade-devel -> ports-mgmt/portupgrade-devel
sysutils/port-authoring-tools -> ports-mgmt/port-authoring-tools
sysutils/port-maintenance-tools -> ports-mgmt/port-maintenance-tools
sysutils/psearch -> ports-mgmt/psearch
sysutils/p5-FreeBSD-Portindex -> ports-mgmt/p5-FreeBSD-Portindex
sysutils/qtpkg -> ports-mgmt/qtpkg
textproc/p5-FreeBSD-Ports -> ports-mgmt/p5-FreeBSD-Ports
Repocopies by: marcus
Notes
Notes:
svn path=/head/; revision=184211
Diffstat (limited to 'sysutils/bpm/files/patch-src::refresh.c')
-rw-r--r-- | sysutils/bpm/files/patch-src::refresh.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/sysutils/bpm/files/patch-src::refresh.c b/sysutils/bpm/files/patch-src::refresh.c deleted file mode 100644 index 619e8f024972..000000000000 --- a/sysutils/bpm/files/patch-src::refresh.c +++ /dev/null @@ -1,57 +0,0 @@ ---- src/refresh.c.orig Mon Aug 23 19:40:08 2004 -+++ src/refresh.c Thu Nov 24 15:11:48 2005 -@@ -62,8 +62,14 @@ - __RCSID("$Id: refresh.c,v 1.32 2004/08/24 02:40:08 sethk Exp $"); - - /* XXX use libinstall/lib.h */ -+#if __FreeBSD_version >= 600000 -+#define INDEX_FN PORTS_BASE "/INDEX-6" -+#elif __FreeBSD_version >= 500036 -+#define INDEX_FN PORTS_BASE "/INDEX-5" -+#else - #define INDEX_FN PORTS_BASE "/INDEX" --#define INDEX_MAXLN 4096 -+#endif -+#define INDEX_MAXLN 8192 - #define DB_DIR "/var/db/pkg" - #define ITER_BYTES (128 * 1024) - #define ITER_ENTS 32 -@@ -183,10 +189,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 +203,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 +325,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 */ |