Index: head/ports-mgmt/bpm/Makefile
===================================================================
--- head/ports-mgmt/bpm/Makefile	(revision 119091)
+++ head/ports-mgmt/bpm/Makefile	(revision 119092)
@@ -1,25 +1,25 @@
 # New ports collection makefile for:	bpm
 # Date created:				23 July 2004
 # Whom:					sethk
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bpm
 PORTVERSION=	0.4.1b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.meowfishies.com/code/bpm/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sethk@meowfishies.com
 COMMENT=	A graphical BSD ports collection manager
 
 RUN_DEPENDS=	portupgrade:${PORTSDIR}/sysutils/portupgrade
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
 MAKE_ENV+=	OSTYPE="${OPSYS}"
 
 .include <bsd.port.mk>

Property changes on: head/ports-mgmt/bpm/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/ports-mgmt/bpm/files/patch-src::refresh.c
===================================================================
--- head/ports-mgmt/bpm/files/patch-src::refresh.c	(revision 119091)
+++ head/ports-mgmt/bpm/files/patch-src::refresh.c	(revision 119092)
@@ -1,37 +1,53 @@
---- src/refresh.c.orig	Tue Aug 24 15:18:57 2004
-+++ src/refresh.c	Tue Aug 24 15:20:12 2004
+--- 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;
      }
-@@ -320,7 +326,6 @@
+@@ -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 */

Property changes on: head/ports-mgmt/bpm/files/patch-src::refresh.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/sysutils/bpm/Makefile
===================================================================
--- head/sysutils/bpm/Makefile	(revision 119091)
+++ head/sysutils/bpm/Makefile	(revision 119092)
@@ -1,25 +1,25 @@
 # New ports collection makefile for:	bpm
 # Date created:				23 July 2004
 # Whom:					sethk
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bpm
 PORTVERSION=	0.4.1b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.meowfishies.com/code/bpm/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sethk@meowfishies.com
 COMMENT=	A graphical BSD ports collection manager
 
 RUN_DEPENDS=	portupgrade:${PORTSDIR}/sysutils/portupgrade
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
 MAKE_ENV+=	OSTYPE="${OPSYS}"
 
 .include <bsd.port.mk>

Property changes on: head/sysutils/bpm/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/sysutils/bpm/files/patch-src::refresh.c
===================================================================
--- head/sysutils/bpm/files/patch-src::refresh.c	(revision 119091)
+++ head/sysutils/bpm/files/patch-src::refresh.c	(revision 119092)
@@ -1,37 +1,53 @@
---- src/refresh.c.orig	Tue Aug 24 15:18:57 2004
-+++ src/refresh.c	Tue Aug 24 15:20:12 2004
+--- 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;
      }
-@@ -320,7 +326,6 @@
+@@ -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 */

Property changes on: head/sysutils/bpm/files/patch-src::refresh.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property