ports/75507: pkg_version can't correctly open INDEX on 6-current

[Rong-En Fan]

>Number:         75507
>Category:       ports
>Synopsis:       pkg_version can't correctly open INDEX on 6-current
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 26 07:50:14 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Rong-En Fan
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
NTU CSIE
>Environment:
System: FreeBSD woodstock.csie.org 6.0-CURRENT FreeBSD 6.0-CURRENT #42: Tue Dec 14 04:41:54 CST 2004 root at woodstock.csie.org:/home/admin/usr/obj/home/admin/usr/src/sys/WOODSTOCK i386


	
>Description:
	bsd.port.mk has been changed to use INDEX-6 two weeks ago
	(rev 1.501). but system utility pkg_* does not follow this
	change. so, do pkg_version will result in can't open
	INDEX in pkg_do.
	
>How-To-Repeat:
	use recently 6-current, do pkg_version
	
>Fix:

--- usr.sbin/pkg_install/lib/lib.h.orig	Sun Dec 26 15:39:09 2004
+++ usr.sbin/pkg_install/lib/lib.h	Sun Dec 26 15:39:54 2004
@@ -77,7 +77,9 @@
 #define DISPLAY_FNAME		"+DISPLAY"
 #define MTREE_FNAME		"+MTREE_DIRS"
 
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 500036
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 600000
+#define INDEX_FNAME		"INDEX-6"
+#elif defined(__FreeBSD_version) && __FreeBSD_version >= 500036
 #define INDEX_FNAME		"INDEX-5"
 #else
 #define INDEX_FNAME		"INDEX"
	


>Release-Note:
>Audit-Trail:
>Unformatted: