ports/68928: [PATCH] sysutils/portindex: update to 15

[Radim Kolar]

>Number:         68928
>Category:       ports
>Synopsis:       [PATCH] sysutils/portindex: update to 15
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 11 18:00:36 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Radim Kolar
>Release:        FreeBSD 5.2.1-RELEASE-p6 i386
>Organization:
Sanatana
>Environment:
System: FreeBSD sanatana.dharma 5.2.1-RELEASE-p6 FreeBSD 5.2.1-RELEASE-p6 #7: Mon May 10 17:15:51 CEST 2004
>Description:
This PR closes  `ports/68892'.

Changes in version 15
- new native, non-crashing INDEX.db generation tool portindexdb
- fixed bug in 14 which causes to ignore .mk file change instead of delaying
it
- minorupdates do not needs portversion. Runs faster now.
- fixed on-screen counting of removed packages in updinst
>How-To-Repeat:
>Fix:

--- portindex-15.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/portindex/Makefile /home/hsn/myports/portindex/Makefile
--- /usr/ports/sysutils/portindex/Makefile	Wed Jul  7 18:41:31 2004
+++ /home/hsn/myports/portindex/Makefile	Sun Jul 11 19:29:38 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portindex
-PORTVERSION=	13
+PORTVERSION=	15
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.tecnik93.com/~radim/distfiles/
 DISTNAME=	bsdportsutils-${PORTVERSION}
@@ -20,31 +20,32 @@
 
 PORTDOCS=	*.TXT
 PLIST_DIRS=	share/${PORTNAME}
-
-PORTINDEX=	bsdpkg freebsdports indexer updatereadmes
+PLIST_FILES=	etc/portindex.conf.sample
+PORTINDEX=	bsdpkg freebsdports indexer updatereadmes config \
+		portindexdb
 MINORUPDATES=	minorupdates
 MISCTOOLS=	updateall
 PKGHISTORY=	loadindex query updinst
 
 SOURCES=	${PORTINDEX}
-EXECUTABLES=	portindex portreadmes
+EXECUTABLES=	portindex portreadmes portindexdb
 
-OPTIONS=	MINOR "Install minorupdates program" off \
-		MISCTOOLS "Install misc. tools" off \
-		PKGHISTORY "Install pkghistory package" off
+OPTIONS=	PKGHISTORY "Install pkghistory package" off \
+		MISCTOOLS "Install updateall script" off
 
 .include <bsd.port.pre.mk>
 
-.ifdef WITH_MINOR
-RUN_DEPENDS+=	${LOCALBASE}/sbin/portversion:${PORTSDIR}/sysutils/portupgrade
 SOURCES+=	${MINORUPDATES}
 EXECUTABLES+=	${MINORUPDATES}
-.endif
 
 .ifdef WITH_MISCTOOLS
+.ifndef WITH_PKGHISTORY
+BROKEN=		Updateall needs pkghistory package
+.else
 SOURCES+=	${MISCTOOLS}
 EXECUTABLES+=	${MISCTOOLS}
 .endif
+.endif
 
 .ifdef WITH_PKGHISTORY
 SOURCES+=	${PKGHISTORY}
@@ -64,11 +65,13 @@
 
 do-build:
 	${REINPLACE_CMD} -e "s,ports.pck,/var/db/portindex.pck," ${WRKSRC}/freebsdports.py
+	${REINPLACE_CMD} -e "s,portindex.conf,${PREFIX}/etc/portindex.conf," ${WRKSRC}/config.py
 .for i in ${EXECUTABLES}
 	${SED} -e "s,%%DATADIR%%,${DATADIR}," ${FILESDIR}/${i}.sh > ${WRKSRC}/${i}
 .endfor
 
 do-install:
+	${INSTALL_DATA} ${WRKSRC}/portindex.conf ${PREFIX}/etc/portindex.conf.sample
 	${MKDIR} ${DATADIR}
 .for i in ${SOURCES}
 	${INSTALL_DATA} ${WRKSRC}/${i}.py ${DATADIR}
diff -ruN --exclude=CVS /usr/ports/sysutils/portindex/distinfo /home/hsn/myports/portindex/distinfo
--- /usr/ports/sysutils/portindex/distinfo	Wed Jul  7 18:41:31 2004
+++ /home/hsn/myports/portindex/distinfo	Sun Jul 11 19:39:14 2004
@@ -1,2 +1,2 @@
-MD5 (bsdportsutils-13.tar.gz) = 30b922b3fd47aab6d9c790f2ac62542a
-SIZE (bsdportsutils-13.tar.gz) = 12951
+MD5 (bsdportsutils-15.tar.gz) = f37804609a030a37b910b9e93c009d2b
+SIZE (bsdportsutils-15.tar.gz) = 20004
diff -ruN --exclude=CVS /usr/ports/sysutils/portindex/files/portindexdb.sh /home/hsn/myports/portindex/files/portindexdb.sh
--- /usr/ports/sysutils/portindex/files/portindexdb.sh	Thu Jan  1 01:00:00 1970
+++ /home/hsn/myports/portindex/files/portindexdb.sh	Sat Jul 10 11:51:00 2004
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec /usr/bin/env python %%DATADIR%%/portindexdb.py $*
diff -ruN --exclude=CVS /usr/ports/sysutils/portindex/pkg-descr /home/hsn/myports/portindex/pkg-descr
--- /usr/ports/sysutils/portindex/pkg-descr	Fri Jul  9 19:03:37 2004
+++ /home/hsn/myports/portindex/pkg-descr	Sun Jul 11 19:30:44 2004
@@ -1,7 +1,6 @@
-Alternative /usr/ports/INDEX file builder.
+Portindex - Alternative /usr/ports/INDEX file builder.
 
 Features
-
 1. You do not need to wait 1 hour after every cvsup for make index to finish.
    This program supports incremental index builds.
 2. Supports indexing of incomplete ports trees.
@@ -12,5 +11,11 @@
 6. Dependences on Makefile.local are tracked
 7. No known difference between make index and this program
 
-If portsdb -u crashes while processing INDEX file generated by this program,
-see README.TXT file for known workarounds.
+Portindexdb - Alternative INDEX.db file builder.
+
+Features
+1. 2.5 times faster than portsdb
+2. Currently do not generates list of categories
+3. Unlike portsdb output database is in valid btree format
+
+This package also contains FreeBSD port of 'package history'.
--- portindex-15.patch ends here ---

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