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

PR:		ports/68928
Submitted by:	Radim Kolar (maintainer)

4 files changed, 26 insertions, 16 deletions

diff --git a/sysutils/portindex/Makefile b/sysutils/portindex/Makefile
index e4fc1dabf34f..3c9f23083e0d 100644
--- a/sysutils/portindex/Makefile
+++ b/sysutils/portindex/Makefile
@@ -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 @@ USE_REINPLACE=	yes
 
 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 @@ PLIST_FILES+=	bin/${i}
 
 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 --git a/sysutils/portindex/distinfo b/sysutils/portindex/distinfo
index 3cc3be5718af..2c53f449a904 100644
--- a/sysutils/portindex/distinfo
+++ b/sysutils/portindex/distinfo
@@ -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 --git a/sysutils/portindex/files/portindexdb.sh b/sysutils/portindex/files/portindexdb.sh
new file mode 100644
index 000000000000..44a041401f93
--- /dev/null
+++ b/sysutils/portindex/files/portindexdb.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec /usr/bin/env python %%DATADIR%%/portindexdb.py $*
diff --git a/sysutils/portindex/pkg-descr b/sysutils/portindex/pkg-descr
index 2a65407964f7..c4a787fd8d84 100644
--- a/sysutils/portindex/pkg-descr
+++ b/sysutils/portindex/pkg-descr
@@ -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 @@ Features
 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'.