Date: Sat, 10 Jul 2004 13:53:47 +0200 From: Radim Kolar <hsn@netmag.cz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hsn@netmag.cz Subject: ports/68892: [PATCH] sysutils/portindex: update to 14 Message-ID: <E1BjGQN-0003Eq-LA@sanatana.dharma> Resent-Message-ID: <200407101210.i6ACANWo034618@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68892 >Category: ports >Synopsis: [PATCH] sysutils/portindex: update to 14 >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: Sat Jul 10 12:10:23 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: - Update to 14 - generate changelog for all previous versions - added etc/portindex.conf configuration file support - updateall updates pkghistory + portsdb also - system .mk includes can be ignored if there are changing too fast - do not save state when in known inconsistent state due to CTRL-C - database connection for pkghistory is read from configuration file - added portindexdb program - auto Ruby workarounder - do vacuum after pgsql database updates - added dbsetup.txt file. how to configure pgsql database for pkghistory - portindexdb can be optionally installed - misc tools option renamed to updateall script >How-To-Repeat: >Fix: --- portindex-14.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 Sat Jul 10 13:40:58 2004 @@ -6,7 +6,7 @@ # PORTNAME= portindex -PORTVERSION= 13 +PORTVERSION= 14 CATEGORIES= sysutils MASTER_SITES= http://people.tecnik93.com/~radim/distfiles/ DISTNAME= bsdportsutils-${PORTVERSION} @@ -20,9 +20,10 @@ PORTDOCS= *.TXT PLIST_DIRS= share/${PORTNAME} - -PORTINDEX= bsdpkg freebsdports indexer updatereadmes +PLIST_FILES= etc/portindex.conf.sample +PORTINDEX= bsdpkg freebsdports indexer updatereadmes config MINORUPDATES= minorupdates +INDEXDB= portindexdb MISCTOOLS= updateall PKGHISTORY= loadindex query updinst @@ -30,7 +31,8 @@ EXECUTABLES= portindex portreadmes OPTIONS= MINOR "Install minorupdates program" off \ - MISCTOOLS "Install misc. tools" off \ + INDEXDB "Install portindexdb program" on \ + MISCTOOLS "Install updateall script" off \ PKGHISTORY "Install pkghistory package" off .include <bsd.port.pre.mk> @@ -41,10 +43,26 @@ EXECUTABLES+= ${MINORUPDATES} .endif +.ifdef WITH_INDEXDB +RUN_DEPENDS+= ${LOCALBASE}/sbin/portsdb:${PORTSDIR}/sysutils/portupgrade \ + ${LOCALBASE}/bin/inplace:${PORTSDIR}/misc/inplace \ + ${LOCALBASE}/bin/rl:${PORTSDIR}/textproc/rl +SOURCES+= ${INDEXDB} +EXECUTABLES+= ${INDEXDB} +.endif + .ifdef WITH_MISCTOOLS +.ifndef WITH_PKGHISTORY +BROKEN= Updateall needs pkg history package +.else +.ifndef WITH_INDEXDB +BROKEN= Updateall needs portindexdb program +.else SOURCES+= ${MISCTOOLS} EXECUTABLES+= ${MISCTOOLS} .endif +.endif +.endif .ifdef WITH_PKGHISTORY SOURCES+= ${PKGHISTORY} @@ -64,11 +82,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 Sat Jul 10 13:40:32 2004 @@ -1,2 +1,2 @@ -MD5 (bsdportsutils-13.tar.gz) = 30b922b3fd47aab6d9c790f2ac62542a -SIZE (bsdportsutils-13.tar.gz) = 12951 +MD5 (bsdportsutils-14.tar.gz) = 4f47b973280c597ab49dc53e2df3905b +SIZE (bsdportsutils-14.tar.gz) = 18944 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 Sat Jul 10 12:54:40 2004 @@ -13,4 +13,6 @@ 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. +see README.TXT file for known workarounds or use portindexdb program. + +This package also contains FreeBSD port of 'package history'. --- portindex-14.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BjGQN-0003Eq-LA>