From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 20 16:30:19 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66B1E16A4CF for ; Sun, 20 Feb 2005 16:30:19 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E17A743D1F for ; Sun, 20 Feb 2005 16:30:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j1KGUIQ9054352 for ; Sun, 20 Feb 2005 16:30:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j1KGUIuS054341; Sun, 20 Feb 2005 16:30:18 GMT (envelope-from gnats) Resent-Date: Sun, 20 Feb 2005 16:30:18 GMT Resent-Message-Id: <200502201630.j1KGUIuS054341@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Michael C.Shultz" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03B5916A4CE for ; Sun, 20 Feb 2005 16:28:14 +0000 (GMT) Received: from vms046pub.verizon.net (vms046pub.verizon.net [206.46.252.46]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75D9643D2F for ; Sun, 20 Feb 2005 16:28:13 +0000 (GMT) (envelope-from ringworm01@gmail.com) Received: from ringworm.mechee.com ([4.26.84.7])0.04 <0IC7002RWXQXDP40@vms046.mailsrvcs.net> for FreeBSD-gnats-submit@freebsd.org; Sun, 20 Feb 2005 10:28:13 -0600 (CST) Received: by ringworm.mechee.com (Postfix, from userid 1001) id 6F56C2CE740; Sun, 20 Feb 2005 08:23:41 -0800 (PST) Message-Id: <20050220162341.6F56C2CE740@ringworm.mechee.com> Date: Sun, 20 Feb 2005 08:23:41 -0800 (PST) From: ringworm01@gmail.com To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/77785: [MAINTAINER] sysutils/portmanager update to 0.2.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Michael C.Shultz" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2005 16:30:19 -0000 >Number: 77785 >Category: ports >Synopsis: [MAINTAINER] sysutils/portmanager update to 0.2.7 >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 Feb 20 16:30:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Michael C. Shultz >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD ringworm.mechee.com 5.3-STABLE FreeBSD 5.3-STABLE #1: Sat Feb 19 15:01:34 PST 2005 root@ringworm.mechee.com:/ROUTER/obj/usr/src/sys/RINGWORM i386 >Description: sysutils/portmanager update to 0.2.7 Note to committer: files/* are no longer needed, this is a new package >How-To-Repeat: N/A >Fix: --- portmanager-0.2.7.diff begins here --- diff -ruN portmanager/Makefile portmanager-0.2.7/Makefile --- portmanager/Makefile Thu Feb 17 11:38:00 2005 +++ portmanager-0.2.7/Makefile Thu Feb 17 13:45:31 2005 @@ -6,8 +6,8 @@ # PORTNAME= portmanager -PORTVERSION= 0.2.6 -PORTREVISION= 6 +PORTVERSION= 0.2.7 +PORTREVISION= 0 #----------------------------------------- #for local use, remove before submitting PR CATEGORIES= sysutils @@ -34,14 +34,6 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -#CONFIGURE_ARGS= -# -# WITH_DEBUG disbled in 0.2.6, intend to reinstate it -# in 0.2.7 -#.if defined(WITH_DEBUG) -#CONFIGURE_ARGS= --with-debug=yes -#.endif - # # if --with-bin=something then withvar=${PREFIX} + something # else defaults to withvar=${PREFIX} + /bin @@ -57,6 +49,10 @@ --with-sharedir=/share/portmanager \ --with-tempdir=/tmp +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --with-debug=yes +.endif + INSTALLS_SHLIB= yes USE_REINPLACE= yes # Need INSTALL_TARGET to install ${PREFIX}/etc/portmanager/pm-020.conf.SAMPLE @@ -72,6 +68,10 @@ @${ECHO} "* portmanager *" @${ECHO} "***********************************************************************" @${ECHO} "* *" +.if !defined(WITH_DEBUG) + @${ECHO} "* WITH_DEBUG=yes enables debug support and all compile warninings *" + @${ECHO} "* *" +.endif @${ECHO} "* upgrade ports example: *" @${ECHO} "* *" @${ECHO} "* portmanager -u -ip editors/nedit editors/openoffice *" @@ -82,10 +82,10 @@ @${ECHO} "* *" @${ECHO} "* portmanager -slid will let you safely remove leaf ports *" @${ECHO} "* *" - @${ECHO} "* see man portmanager(1) for more information *" + @${ECHO} "* see man portmanager(1) or http://portmanager.sunsite.dk *" @${ECHO} "* *" @${ECHO} "***********************************************************************" @${ECHO} "* all feedback is welcome, send to: *" - @${ECHO} "* Michael C. Shultz reso3w83@verizon.net *" + @${ECHO} "* Michael C. Shultz ringworm01@gmail.com *" @${ECHO} "***********************************************************************" .include diff -ruN portmanager/distinfo portmanager-0.2.7/distinfo --- portmanager/distinfo Thu Feb 17 11:38:00 2005 +++ portmanager-0.2.7/distinfo Thu Feb 17 13:45:41 2005 @@ -1,2 +1,2 @@ -MD5 (portmanager-0.2.6.tar.gz) = e57487c9d50e29c8e7c5a4e36606b00d -SIZE (portmanager-0.2.6.tar.gz) = 409033 +MD5 (portmanager-0.2.7.tar.gz) = 5c5b912afdde879a2d02d4d50855cf6b +SIZE (portmanager-0.2.7.tar.gz) = 410526 diff -ruN portmanager/files/patch-0.2.6_2 portmanager-0.2.7/files/patch-0.2.6_2 --- portmanager/files/patch-0.2.6_2 Wed Feb 9 04:48:10 2005 +++ portmanager-0.2.7/files/patch-0.2.6_2 Wed Dec 31 16:00:00 1969 @@ -1,65 +0,0 @@ -diff -ruN ./libPMGR/src/PMGRrUpgrade.c ../../branch/0.2.6_2/libPMGR/src/PMGRrUpgrade.c ---- ./libPMGR/src/PMGRrUpgrade.c Mon Feb 7 11:46:39 2005 -+++ ../../branch/0.2.6_2/libPMGR/src/PMGRrUpgrade.c Tue Feb 8 08:30:07 2005 -@@ -247,23 +247,56 @@ - MGdbGetRecno( property->strikesDb ) - 1 ); - MGdbAdd( property->strikesDb, oldPortDir, "2", NULL ); - -- /**********************************************************************/ -- /* look for mismatch between looping port's +CONTENTS file dependency */ -- /* directories and and the dependency's actual point of origin */ -- /**********************************************************************/ -- MGdbGoTop( property->dependencyPortsDb ); -+ /* -+ * look for mismatch between looping port's +CONTENTS file dependency -+ * directories and and the dependency's actual point of origin -+ * -+ * if dependency.db (looping port name) (dependency name) dependencyDir -+ * != installed.db ( dependency.name) dependency.dir -+ * -+ */ - -+ /* -+ * get looping port's +CONTENTS file dependency name -+ */ -+ MGdbGoTop( property->dependencyPortsDb ); - dependencyPortName = MGdbSeek( property->dependencyPortsDb, - property->fieldChildPortName, - oldPortName, property->fieldDependencyPortName ); -+ if( !dependencyPortName ) -+ { -+ fprintf( stderr, -+ "%s not found in dependencyPortsDb property->fieldChildPortName\n", -+ oldPortName ); -+ assert(0); -+ } -+printf( "%s %s DEBUG: get looping port's +CONTENTS file dependency name = %s\n", id, VERSION, dependencyPortName ); - -+ /* -+ * get looping port's +CONTENTS file dependency dir -+ */ - dependencyPortDir = MGdbGet( property->dependencyPortsDb, - MGdbGetRecno( property->dependencyPortsDb ) -1, - property->fieldDependencyPortDir ); - -+printf( "%s %s DEBUG: get looping port's +CONTENTS file dependency dir = %s\n", id, VERSION, dependencyPortDir ); -+ -+ /* -+ * get dependency's actual point of origin -+ */ - MGdbGoTop( property->installedPortsDb ); - origDir = MGdbSeek( property->installedPortsDb, property->fieldInstalledPortName, - dependencyPortName, property->fieldInstalledPortDir ); -+ if( !origDir ) -+ { -+ fprintf( stderr, -+ "%s not found in installedPortsDb property->fieldInstalledPortName\n", -+ dependencyPortName ); -+ assert(0); -+ } -+ -+printf( "%s %s DEBUG: get looping port's +CONTENTS file dependency actual point of ORIGIN dir = %s\n", -+ id, VERSION, origDir ); - - fprintf( stdout, "analysing problem:\n" ); - while( dependencyPortName ) diff -ruN portmanager/files/patch-0.2.6_3 portmanager-0.2.7/files/patch-0.2.6_3 --- portmanager/files/patch-0.2.6_3 Wed Feb 9 16:01:41 2005 +++ portmanager-0.2.7/files/patch-0.2.6_3 Wed Dec 31 16:00:00 1969 @@ -1,42 +0,0 @@ ---- libPMGR/src/PMGRrUpgrade.c (revision 4) -+++ libPMGR/src/PMGRrUpgrade.c (working copy) -@@ -324,10 +324,15 @@ - property->fieldInstalledPortName, - dependencyPortName, - property->fieldInstalledPortDir ); --/* -+ if( !origDir ) -+ { -+ fprintf( stderr, -+ "%s is not located in property->installedPortsDb!\n", -+ dependencyPortName ); -+ assert(0); -+ } - fprintf( stdout, "\tin %s/+CONTENTS ORIG dir = %s \n\n", - dependencyPortName, origDir ); --*/ - if( strcmp( dependencyPortDir, origDir ) ) - { - fprintf( stdout, "%s\n", SINGLE_LINES ); -Index: libPMGR/src/PMGRrReadConfigure.c -=================================================================== ---- libPMGR/src/PMGRrReadConfigure.c (revision 4) -+++ libPMGR/src/PMGRrReadConfigure.c (working copy) -@@ -148,7 +148,7 @@ - + strlen( property->fieldValue ) - + strlen( "zzNULLzz\" > " ) - + strlen( property->configDbFileName ) -- + strlen( ";awk 'BEGIN{ FS = \"|\" } NF == 3 && $1 !~ /#/ && $1 !~ /CATEGORY\\/PORT/ && $2 !~ /#/ {print $1 \"zzNULLzz\" $2 \"zzNULLzz\"}' " ) -+ + strlen( ";awk 'BEGIN{ FS = \"|\" } NF == 3 && $1 !~ /#/ && $1 !~ /CATEGORY\\/PORT/ && $2 !~ /#/ {print \"/\" $1 \"zzNULLzz\" $2 \"zzNULLzz\"}' " ) - + strlen( property->configConfFileName ) - + strlen( " >> " ) - + strlen( property->configDbFileName ); -@@ -164,7 +164,7 @@ - strcat( command, property->fieldValue ); - strcat( command, "zzNULLzz\" > " ); - strcat( command, property->configDbFileName ); -- strcat( command, ";awk 'BEGIN{ FS = \"|\" } NF == 3 && $1 !~ /#/ && $1 !~ /CATEGORY\\/PORT/ && $2 !~ /#/ {print $1 \"zzNULLzz\" $2 \"zzNULLzz\"}' " ); -+ strcat( command, ";awk 'BEGIN{ FS = \"|\" } NF == 3 && $1 !~ /#/ && $1 !~ /CATEGORY\\/PORT/ && $2 !~ /#/ {print \"/\" $1 \"zzNULLzz\" $2 \"zzNULLzz\"}' " ); - strcat( command, property->configConfFileName ); - strcat( command, " >> " ); - strcat( command, property->configDbFileName ); diff -ruN portmanager/files/patch-0.2.6_4 portmanager-0.2.7/files/patch-0.2.6_4 --- portmanager/files/patch-0.2.6_4 Sat Feb 12 13:20:29 2005 +++ portmanager-0.2.7/files/patch-0.2.6_4 Wed Dec 31 16:00:00 1969 @@ -1,310 +0,0 @@ -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/libMG/src/MGdbAdd.c libMG/src/MGdbAdd.c ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/libMG/src/MGdbAdd.c Tue Feb 8 21:40:10 2005 -+++ libMG/src/MGdbAdd.c Fri Feb 11 12:20:13 2005 -@@ -59,6 +59,12 @@ - break; - } - fprintf( dbFileStream, "%s%c", paramPtr, 0 ); -+ -+ /* -+ * prevents random LINEFEEDS!!! -+ */ -+ while( fflush( dbFileStream ) ); -+ - idx++; - if(idx > db->fieldQty) - { -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/libMG/src/MGdbRead.c libMG/src/MGdbRead.c ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/libMG/src/MGdbRead.c Tue Feb 8 21:40:10 2005 -+++ libMG/src/MGdbRead.c Fri Feb 11 01:10:15 2005 -@@ -73,14 +73,14 @@ - assert(0); - } - -- /***************************************************************/ -- /* set db->fieldQty */ -- /***************************************************************/ -+ /* -+ * set db->fieldQty -+ */ - dataBufferIdx = 0; -- db->fieldQty = 0; -- while( db->dataBuffer[dataBufferIdx] != LINEFEED ) -+ db->fieldQty = 1; -+ while( db->dataBuffer[dataBufferIdx] != 0 || db->dataBuffer[dataBufferIdx+1] != LINEFEED ) - { -- if( !db->dataBuffer[dataBufferIdx] ) -+ if( db->dataBuffer[dataBufferIdx] == 0 ) - { - db->fieldQty++; - } -@@ -95,23 +95,22 @@ - db->parent.recordQty = 0; - while( dataBufferIdx < dataBufferSize ) - { -- while( db->dataBuffer[dataBufferIdx] != LINEFEED ) -- { -- if( !db->dataBuffer[dataBufferIdx] ) -+ if( db->dataBuffer[dataBufferIdx] == 0 ) - { - db->fieldIdx++; -- } -- dataBufferIdx++; -- } -+ if( db->dataBuffer[dataBufferIdx+1] == LINEFEED ) -+ { -+ db->parent.recordQty++; - if( db->fieldIdx != db->fieldQty ) - { - fprintf( stderr, "%s error: inconsitant field count at record %d. field count is %d and should be %d\n", - id, db->parent.recordQty, db->fieldIdx, db->fieldQty ); - assert(0); - } -- dataBufferIdx++; -- db->parent.recordQty++; - db->fieldIdx = 0; -+ } -+ } -+ dataBufferIdx++; - } - - /***************************************************************/ -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/libMG/src/MGdbSeek.c libMG/src/MGdbSeek.c ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/libMG/src/MGdbSeek.c Tue Feb 8 21:40:10 2005 -+++ libMG/src/MGdbSeek.c Fri Feb 11 02:37:16 2005 -@@ -59,15 +59,23 @@ - assert(0); - } - -+ if( !db->record[0][0] ) -+ { -+ fprintf( stderr, "%s error: record 0 field 0 contains nothing!\n", -+ id ); -+ fprintf( stderr, "fieldName = %s\ndb->parent.recordQty = %d\ndb->fieldQty = %d\n", -+ fieldName, db->parent.recordQty, db->fieldQty ); -+ assert(0); -+ } -+ - db->fieldIdx = 0; - while( strcmp( fieldName, db->record[0][db->fieldIdx] ) ) - { - db->fieldIdx++; -- if(db->fieldIdx == db->fieldQty) -+ if( db->fieldIdx >= db->fieldQty ) - { - fprintf( stderr, "%s error: field \"%s\" not found in %s\n", - id, fieldName, db->parent.path ); -- fflush(stderr); - assert(0); - } - } -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrAddDependencies.c ./libPMGR/src/PMGRrAddDependencies.c ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrAddDependencies.c Tue Feb 8 21:40:10 2005 -+++ ./libPMGR/src/PMGRrAddDependencies.c Fri Feb 11 12:19:17 2005 -@@ -112,6 +112,17 @@ - - portDependencyDir--; - portDependencyDir[0] = '/'; -+/* -+ * -+ * Just a note: Turns out that I had to run while( fflush( dbFileStream ) ) in MGdbAdd to prevent -+ * random LINEFEEDS from being placed into the data base, that may pop up again somewhere so I'll -+ * leave this comment here in the hope it saves some aggravation in the future -+ * -+ */ -+/* -+printf( "%s %s DEBUG:\nportName-=>%s\nportDependency-=>%s\nportDependencyDir-=>%s\n%s\n", -+id, VERSION, portName, portDependency, portDependencyDir, "marker" ); -+*/ - MGdbAdd( property->dependencyPortsDb, portName, portDependency, portDependencyDir, NULL ); - } - -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrDbCreate.c ./libPMGR/src/PMGRrDbCreate.c ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrDbCreate.c Tue Feb 8 21:40:10 2005 -+++ ./libPMGR/src/PMGRrDbCreate.c Fri Feb 11 03:34:14 2005 -@@ -41,15 +41,6 @@ - property->objIdx = 0; - - /***************************************************************/ -- /* convert pm-020.conf to config.db */ -- /***************************************************************/ -- PMGRrReadConfigure( property ); -- -- /*zzzzzzzzzzzzzz*/ -- property->objIdx++; -- property->configDb = MGdbOpen( property->configDbFileName ); -- /*zzzzzzzzzzzzzz*/ -- /***************************************************************/ - /* add any ignored ports in config.db to ignore.db */ - /***************************************************************/ - IDX_configDb = 1; -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrDbDestroy.c ./libPMGR/src/PMGRrDbDestroy.c ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrDbDestroy.c Tue Feb 8 21:40:10 2005 -+++ ./libPMGR/src/PMGRrDbDestroy.c Fri Feb 11 03:36:08 2005 -@@ -27,9 +27,6 @@ - char id[] = "PMGRrDbDestroy"; - - property->objIdx--; -- MGdbDestroy( property->configDb ); -- -- property->objIdx--; - MGdbDestroy( property->installedPortsDb ); - - property->objIdx--; -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrShowLeavesDelete.c ./libPMGR/src/PMGRrShowLeavesDelete.c ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrShowLeavesDelete.c Tue Feb 8 21:40:10 2005 -+++ ./libPMGR/src/PMGRrShowLeavesDelete.c Fri Feb 11 04:09:26 2005 -@@ -22,6 +22,11 @@ - /************************************************************************/ - #include - #include -+ -+int nuke( char* leafPortDir, char* leafPortName ); -+int rebuildDb( structProperty* property, int* idx ); -+int removePort( char* leafPortName ); -+ - int PMGRrShowLeavesDelete( structProperty* property ) - { - char id[] = "PMGRrShowLeavesDelete"; -@@ -147,7 +152,7 @@ - { - /* nuke() */ - fprintf( stdout, " Nuking %s\n\n", leafPortName ); -- removePort( leafPortDir, leafPortName ); -+ removePort( leafPortName ); - nuke( leafPortDir, leafPortName ); - rebuildDb( property, &idx ); - break; -@@ -156,7 +161,7 @@ - { - /* nuke() */ - fprintf( stdout, " Nuking %s\n\n", leafPortName ); -- removePort( leafPortDir, leafPortName ); -+ removePort( leafPortName ); - nuke( leafPortDir, leafPortName ); - rebuildDb( property, &idx ); - break; -@@ -165,7 +170,7 @@ - { - /* delete() */ - fprintf( stdout, " Removing %s\n\n", leafPortName ); -- removePort( leafPortDir, leafPortName ); -+ removePort( leafPortName ); - rebuildDb( property, &idx ); - break; - } -@@ -173,7 +178,7 @@ - { - /* delete() */ - fprintf( stdout, " Removing %s\n\n", leafPortName ); -- removePort( leafPortDir, leafPortName ); -+ removePort( leafPortName ); - rebuildDb( property, &idx ); - break; - } -@@ -199,7 +204,7 @@ - } - - /***********************************************************************/ --int removePort( char* leafPortDir, char* leafPortName ) -+int removePort( char* leafPortName ) - { - char* command = NULL; - int stringSize = 0; -@@ -240,6 +245,7 @@ - return( 0 ); - } - -+/***********************************************************************/ - int rebuildDb( structProperty* property, int* idx ) - { - int errorCode = 0; -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrUpgrade.c ./libPMGR/src/PMGRrUpgrade.c ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/libPMGR/src/PMGRrUpgrade.c Wed Feb 9 07:27:45 2005 -+++ ./libPMGR/src/PMGRrUpgrade.c Fri Feb 11 03:44:54 2005 -@@ -56,11 +56,6 @@ - - /*zzzzzzzzzzzzzzzzz*/ - property->objIdx++; -- property->configDb = MGdbOpen( property->configDbFileName ); -- /*zzzzzzzzzzzzzzzzz*/ -- -- /*zzzzzzzzzzzzzzzzz*/ -- property->objIdx++; - property->installedPortsDb = MGdbOpen( property->installedPortsDbFileName ); - /*zzzzzzzzzzzzzzzzz*/ - -@@ -324,12 +319,16 @@ - property->fieldInstalledPortName, - dependencyPortName, - property->fieldInstalledPortDir ); -+ /* -+ * if !origDir then likely the dependency port has -+ * been updated????? Going to just skip this one... -+ */ - if( !origDir ) - { - fprintf( stderr, - "%s is not located in property->installedPortsDb!\n", - dependencyPortName ); -- assert(0); -+ continue; - } - fprintf( stdout, "\tin %s/+CONTENTS ORIG dir = %s \n\n", - dependencyPortName, origDir ); -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/portmanager/portmanager.1 ./portmanager/portmanager.1 ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/portmanager/portmanager.1 Tue Feb 8 21:40:08 2005 -+++ ./portmanager/portmanager.1 Wed Feb 9 21:00:11 2005 -@@ -61,6 +61,29 @@ - .It - \fB\&-v\fR portmanager version - .El -+.sp -+ \fBWeb site\fR -+.sp -+http://portmanager.sunsite.dk/ -+.sp -+ \fBMail lists\fR -+.sp -+portmanager-questions@sunsite.dk -+.sp -+To subscribe send an empty message to: -+ portmanager-questions-subscribe@sunsite.dk -+.sp -+ archive: http://www.mail-archive.com/portmanager-questions%40sunsite.dk/ -+.sp -+.sp -+If you would like to joint portmanager's developement team let us know at: -+portmanager-devel@sunsite.dk -+.sp -+To subscribe send an empty message to: -+ portmanager-devel-subscribe@sunsite.dk -+.sp -+ archive: http://www.mail-archive.com/portmanager-devel%40sunsite.dk/ -+.sp - .\"======================================================================= - .\".Sh IMPLEMENTATION NOTES - .\"======================================================================= -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac /usr/home/mike/work/portmanager/tags/0.2.6_3/portmanager/portmanager.c ./portmanager/portmanager.c ---- /usr/home/mike/work/portmanager/tags/0.2.6_3/portmanager/portmanager.c Tue Feb 8 21:40:08 2005 -+++ ./portmanager/portmanager.c Fri Feb 11 04:06:15 2005 -@@ -34,7 +34,6 @@ - void rHelp( char* id ); - int main( int argc, char** argv ) - { -- FILE* handle = NULL; - char h[] = "-h"; - char help[] = "--help"; - char id[] = "portmanager"; -@@ -113,6 +112,11 @@ - property.field3strikesPortDir, - property.fieldStrikes, - NULL ); -+ /* -+ * convert pm-020.conf to config.db -+ */ -+ PMGRrReadConfigure( &property ); -+ property.configDb = MGdbOpen( property.configDbFileName ); - - idx = 1; - while( idx < argc ) diff -ruN portmanager/files/patch-0.2.6_5 portmanager-0.2.7/files/patch-0.2.6_5 --- portmanager/files/patch-0.2.6_5 Mon Feb 14 15:21:39 2005 +++ portmanager-0.2.7/files/patch-0.2.6_5 Wed Dec 31 16:00:00 1969 @@ -1,582 +0,0 @@ -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac THANKS 0.2.6_5/THANKS ---- THANKS Wed Feb 9 11:25:58 2005 -+++ 0.2.6_5/THANKS Mon Feb 14 09:45:49 2005 -@@ -6,6 +6,9 @@ - - Date of entry - -+Feb 14, 2005 Third time Bart Silverstrim's feedback has led to a useful portmanager improvement, -+ he is now promoted to "official portmanager beta tester", congradulations! :) -+ - Feb 01, 2005 Bart Silverstrim for reporting "/usr/local/binportmanager -u" bug. - - Jan 26, 2005 Bart Silverstrim for identifying a looping problem -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac TeamMembers 0.2.6_5/TeamMembers ---- TeamMembers Wed Dec 31 16:00:00 1969 -+++ 0.2.6_5/TeamMembers Mon Feb 14 10:01:20 2005 -@@ -0,0 +1,5 @@ -+Beta tester: -+ Bart Silverstrim -+ -+Developer: -+ Michael C. Shultz -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac libMG/src/MGdbDestroy.c 0.2.6_5/libMG/src/MGdbDestroy.c ---- libMG/src/MGdbDestroy.c Wed Feb 9 11:25:57 2005 -+++ 0.2.6_5/libMG/src/MGdbDestroy.c Sun Feb 13 09:22:44 2005 -@@ -70,8 +70,6 @@ - - /*zzzzzzzzzzzzzz*/ - db->parent.mallocIdx--; -- free(db); -- /*zzzzzzzzzzzzzz*/ - - if(db->parent.fopenIdx || db->parent.mallocIdx) - { -@@ -79,5 +77,9 @@ - id, db->parent.fopenIdx, db->parent.mallocIdx ); - assert(0); - } -+ -+ free(db); -+ /*zzzzzzzzzzzzzz*/ -+ - return(errorCode); - } -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac libPMGR/src/PMGRrAddDependencies.c 0.2.6_5/libPMGR/src/PMGRrAddDependencies.c ---- libPMGR/src/PMGRrAddDependencies.c Fri Feb 11 12:19:17 2005 -+++ 0.2.6_5/libPMGR/src/PMGRrAddDependencies.c Mon Feb 14 03:39:37 2005 -@@ -46,7 +46,7 @@ - - /*zzzzzzzzzzzzzz*/ - mallocIdx++; -- contentsFileName = (char*)malloc(stringSize); -+ contentsFileName = malloc(stringSize); - /*zzzzzzzzzzzzzz*/ - - if(!contentsFileName) -@@ -55,7 +55,7 @@ - return(1); - } - contentsFileName[0] = 0; -- strcpy(contentsFileName, PKGDBDIR); -+ strcat(contentsFileName, PKGDBDIR); - strcat(contentsFileName, "/"); - strcat(contentsFileName, portName); - strcat(contentsFileName, "/"); -@@ -80,7 +80,7 @@ - - /*zzzzzzzzzzzzzz*/ - mallocIdx++; -- buffer = ( char* )malloc(bufferSize); -+ buffer = malloc( bufferSize + 1 ); - /*zzzzzzzzzzzzzz*/ - if(!buffer) - { -@@ -91,6 +91,7 @@ - buffer[0] = 0; - fread(buffer, 1, bufferSize, contentsFileStream ); - buffPtr = buffer; -+ portDependency = buffer; - while( ( portDependency = strnstr( buffPtr, "@pkgdep ", bufferSize - (buffPtr - buffer) ) ) ) - { - portDependency += strlen( "@pkgdep " ); -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac libPMGR/src/PMGRrDoUpgrade.c 0.2.6_5/libPMGR/src/PMGRrDoUpgrade.c ---- libPMGR/src/PMGRrDoUpgrade.c Wed Feb 9 11:25:58 2005 -+++ 0.2.6_5/libPMGR/src/PMGRrDoUpgrade.c Mon Feb 14 10:13:41 2005 -@@ -42,6 +42,7 @@ - property->portManagerUpdated = 1; - } - fprintf( stdout, "%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - - MGdbGoTop( property->outOfDatePortsDb ); - oldPortDir = MGdbSeek( property->outOfDatePortsDb, property->fieldOldPortName, oldPortName, -@@ -50,6 +51,7 @@ - { - fprintf( stderr, "%s %s error(52): oldPortName %s not found in outOfDatePortsDb\n", - id, VERSION, oldPortName ); -+ while( fflush( stderr ) ); - return(9); - } - -@@ -66,6 +68,7 @@ - - fprintf( stdout, "UPGRADING %s reason %s %s\n", oldPortName, reason, reasonPortName ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - /************************************************************************/ - /* Command "1" " make clean " */ - /************************************************************************/ -@@ -116,6 +119,7 @@ - fprintf( stdout, "intitial clean of work directories \n" ); - fprintf( stdout, "%s %s command: #1 of 8 %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - - errorCode = system(command); - -@@ -127,6 +131,8 @@ - if(errorCode) - { - fprintf( stderr, "%s %s error: make clean returned an error, cannot continue\n", id, VERSION ); -+ while( fflush( stderr ) ); -+ - return(1); - } - -@@ -178,14 +184,17 @@ - fprintf( stdout, "update %s \n", oldPortName ); - fprintf( stdout, "%s %s command: #2 of 8 %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - - errorCode = system(command); - mallocIdx--; - free( command ); - if(errorCode) - { -- fprintf( stderr, "%s %s error: make returned an error, adding %s to ignore.db\n", -+ fprintf( stdout, "%s %s error: make returned an error, adding %s to ignore.db\n", - id, VERSION, oldPortDir ); -+ while( fflush( stdout ) ); -+ - MGdbAdd( property->ignoreDb, oldPortDir, "failed during (2) make", NULL ); - - if( mallocIdx || fopenCount ) -@@ -218,6 +227,7 @@ - fprintf( stdout, "backing up installed %s before removing it \n", oldPortName ); - fprintf( stdout, "%s %s command: #3 of 8 %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - system(command); - /* - An error here is no big deal, if for example the port is not installed it will not be able -@@ -243,7 +253,7 @@ - fprintf( stdout, "removing old %s \n", oldPortName ); - fprintf( stdout, "%s %s command: #4 of 8 %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -- -+ while( fflush( stdout ) ); - errorCode = system(command); - /*zzzzzzzzzzzzz*/ - mallocIdx--; -@@ -273,7 +283,7 @@ - fprintf( stdout, "trying one more way to remove %s...\n", oldPortName ); - fprintf( stdout, "%s %s command: #4 of 8 %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -- -+ while( fflush( stdout ) ); - system(command); - - /*zzzzzzzzzzzzz*/ -@@ -330,7 +340,7 @@ - fprintf( stdout, "installing updated %s \n", oldPortDir ); - fprintf( stdout, "%s %s command: #5 of 8 %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -- -+ while( fflush( stdout ) ); - errorCode = system(command); - /*zzzzzzzzzzzzz*/ - mallocIdx--; -@@ -356,6 +366,7 @@ - fprintf( stderr, "restoring original port from backup \n" ); - fprintf( stderr, "%s %s command: #5!! ***Emergancy restore*** %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - errorCode = system(command); - /*zzzzzzzzzzzzz*/ - mallocIdx--; -@@ -363,9 +374,10 @@ - /*zzzzzzzzzzzzz*/ - if(errorCode) - { -- fprintf( stderr, "%s %s error: FAILED TO RESTORE BACKUP COPY, really sorry ! \n", -+ fprintf( stdout, "%s %s error: FAILED TO RESTORE BACKUP COPY, really sorry ! \n", - id, VERSION ); -- fprintf( stderr, "%s %s info: adding %s to ignore.db\n", id, VERSION, oldPortDir ); -+ fprintf( stdout, "%s %s info: adding %s to ignore.db\n", id, VERSION, oldPortDir ); -+ while( fflush( stdout ) ); - MGdbAdd( property->ignoreDb, oldPortDir, "failed during (5) emergancy restore", NULL ); - - if( mallocIdx || fopenCount ) -@@ -376,10 +388,11 @@ - } - - fprintf( stdout, "%s\n", SINGLE_LINES ); -- fprintf( stderr, "%s %s error: RESTORED BACKUP COPY\n", id, VERSION ); -- fprintf( stderr, "%s %s info: adding %s to ignore.db\n", id, VERSION, oldPortDir ); -+ fprintf( stdout, "%s %s error: RESTORED BACKUP COPY\n", id, VERSION ); -+ fprintf( stdout, "%s %s info: adding %s to ignore.db\n", id, VERSION, oldPortDir ); - MGdbAdd( property->ignoreDb, oldPortDir, "performed (5) emergancy restore", NULL ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - if( mallocIdx || fopenCount ) - { - assert(0); -@@ -408,6 +421,7 @@ - fprintf( stderr, "deleting backup copy, installation of updated %s successful\n", oldPortDir ); - fprintf( stdout, "%s %s command: #6 of 8 %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - system(command); - /* - error is no big deal here, if the backup package wasn't made it can't be deleted... -@@ -466,7 +480,7 @@ - fprintf( stderr, "making package of updated %s \n", oldPortDir ); - fprintf( stdout, "%s %s command: #7 of 8 %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -- -+ while( fflush( stdout ) ); - system(command); - /*zzzzzzzzzzzzz*/ - mallocIdx--; -@@ -520,7 +534,7 @@ - fprintf( stderr, "terminal clean of work directories\n" ); - fprintf( stdout, "%s %s command: #8 of 8 %s\n", id, VERSION, command ); - fprintf( stdout, "%s\n", SINGLE_LINES ); -- -+ while( fflush( stdout ) ); - errorCode = system(command); - - /*zzzzzzzzzzzzz*/ -@@ -535,6 +549,7 @@ - if(errorCode) - { - fprintf( stderr, "%s %s error: make clean returned an error, cannot continue\n", id, VERSION ); -+ while( fflush( stderr ) ); - assert(0); - } - return(0); -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac libPMGR/src/PMGRrInitialize.c 0.2.6_5/libPMGR/src/PMGRrInitialize.c ---- libPMGR/src/PMGRrInitialize.c Wed Feb 9 11:25:58 2005 -+++ 0.2.6_5/libPMGR/src/PMGRrInitialize.c Sun Feb 13 07:58:29 2005 -@@ -24,7 +24,6 @@ - - int PMGRrInitialize( structProperty* property, int argc, char** argv ) - { -- char id[] = "PMGRrInitialize"; - char* commandLineKey = NULL; - int errorCode = 0; - int idx = 0; -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac libPMGR/src/PMGRrMakeDescribe.c 0.2.6_5/libPMGR/src/PMGRrMakeDescribe.c ---- libPMGR/src/PMGRrMakeDescribe.c Wed Feb 9 11:25:58 2005 -+++ 0.2.6_5/libPMGR/src/PMGRrMakeDescribe.c Sun Feb 13 11:23:33 2005 -@@ -196,10 +196,8 @@ - - /*zzzzzzzzzzzzzz*/ - mallocIdx++; -- cacheRecord = (char* )malloc( cacheRecordSize ); -+ cacheRecord = calloc( cacheRecordSize, 1 ); - /*zzzzzzzzzzzzzz*/ -- -- cacheRecord[cacheRecordSize] = 0; - - while( idx < MGdbGetRecordQty( property->configDb ) ) - { -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac libPMGR/src/PMGRrReadConfigure.c 0.2.6_5/libPMGR/src/PMGRrReadConfigure.c ---- libPMGR/src/PMGRrReadConfigure.c Wed Feb 9 11:25:58 2005 -+++ 0.2.6_5/libPMGR/src/PMGRrReadConfigure.c Sun Feb 13 08:17:43 2005 -@@ -151,14 +151,15 @@ - + strlen( ";awk 'BEGIN{ FS = \"|\" } NF == 3 && $1 !~ /#/ && $1 !~ /CATEGORY\\/PORT/ && $2 !~ /#/ {print \"/\" $1 \"zzNULLzz\" $2 \"zzNULLzz\"}' " ) - + strlen( property->configConfFileName ) - + strlen( " >> " ) -- + strlen( property->configDbFileName ); -+ + strlen( property->configDbFileName ) -+ + 1; - - /*zzzzzzzzzzzzzz*/ - mallocIdx++; -- command = (char*)malloc( stringSize ); -+ command = malloc( stringSize ); - /*zzzzzzzzzzzzzz*/ - command[0] = 0; -- strcpy( command, "echo \"" ); -+ strcat( command, "echo \"" ); - strcat( command, property->fieldKey ); - strcat( command, "zzNULLzz" ); - strcat( command, property->fieldValue ); -@@ -179,7 +180,7 @@ - - /*zzzzzzzzzzzzzz*/ - mallocIdx++; -- buffer = (char*)malloc(configDbFileSize); -+ buffer = malloc( configDbFileSize + 1 ); - /*zzzzzzzzzzzzzz*/ - - /*zzzzzzzzzzzzzz*/ -@@ -200,7 +201,7 @@ - nullBase = strstr( buffer + bufferIdx, "zzNULLzz" ); - nullBase[0] = 0; - nullBase[1] = 0; -- strcpy( nullBase+1, nullBase+8 ); -+ strcat( nullBase+1, nullBase+8 ); - bufferIdx = (nullBase+1) - buffer; - configDbFileSize -= 7; - } -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac libPMGR/src/PMGRrStatus.c 0.2.6_5/libPMGR/src/PMGRrStatus.c ---- libPMGR/src/PMGRrStatus.c Wed Feb 9 11:25:58 2005 -+++ 0.2.6_5/libPMGR/src/PMGRrStatus.c Mon Feb 14 09:16:58 2005 -@@ -47,6 +47,7 @@ - fprintf( stdout,"%s\n", SINGLE_LINES ); - fprintf( stdout,"%s %s info: Creating inital data bases\n", id, VERSION ); - fprintf( stdout,"%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - - errorCode = PMGRrDbCreate(property); /* create/open initial databases */ - if(errorCode) -@@ -58,6 +59,8 @@ - fprintf( stdout,"%s %s info: looking for missing dependent ports\n", id, VERSION ); - fprintf( stdout,"%s\n", SINGLE_LINES ); - -+ while( fflush( stdout ) ); -+ - errorCode = PMGRrMissingDependencies( property ); - if(errorCode) - { -@@ -68,6 +71,8 @@ - fprintf( stdout,"%s %s info: looking for old installed ports\n", id, VERSION ); - fprintf( stdout,"%s\n", SINGLE_LINES ); - -+ while( fflush( stdout ) ); -+ - /* compare installedPortsDb records to "make describe" of each installed port */ - /* remove ports that no longer have a Makefile (deleted by CVSand in /usr/ports/MOVED hopefully ) */ - /* add ports whose installedPortsDb names do not match their "make describe" name to outOfDatePortsDb */ -@@ -100,6 +105,9 @@ - "%s is no longer in the ports collection, see /usr/ports/MOVED\nis it OK to remove %s from your system? [y/n]\n", - installedPortDir, installedPortName ); - answer = getc(stdin); -+ -+ while( fflush( stdout ) ); -+ - if( answer != 89 && answer != 121 ) - { - fprintf( stdout, "answer = %d\n", answer ); -@@ -122,6 +130,7 @@ - property->installedPortsDb = MGdbDelete( property->installedPortsDb, IDX_installedPortsDb ); - QTY_installedPortsDb = MGdbGetRecordQty( property->installedPortsDb ); - IDX_installedPortsDb = 1; -+ while( fflush( stdout ) ); - continue; - } - -@@ -135,11 +144,14 @@ - { - fprintf( stdout,"have:%-25s status: OLD available:%-25s %-25s\n", - installedPortName, available, installedPortDir ); -+ while( fflush( stdout ) ); -+ - MGdbAdd( property->outOfDatePortsDb, installedPortDir, installedPortName, "OLD", available, NULL ); - IDX_installedPortsDb++; - continue; - } - fprintf( stdout,"have:%-25s status: CURRENT: %-25s\n", installedPortName, installedPortDir ); -+ while( fflush( stdout ) ); - IDX_installedPortsDb++; - } - -@@ -147,12 +159,14 @@ - fprintf( stdout,"%s\n", SINGLE_LINES ); - fprintf( stdout,"%s %s info: looking for installed ports built with old dependencies\n", id, VERSION ); - fprintf( stdout,"%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - /****************************************************************************/ - /* add any DependencyDir == installedDir && dependencyName != installedName */ - /* to outOfDatePortsDb */ - /****************************************************************************/ - IDX_dependencyPortsDb = 1; - fprintf( stdout,"%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - QTY_dependencyPortsDb = MGdbGetRecordQty( property->dependencyPortsDb); - while( IDX_dependencyPortsDb < QTY_dependencyPortsDb ) - { -@@ -220,6 +234,7 @@ - - MGdbAdd( property->outOfDatePortsDb, oldPortDir, oldPortName, - "OLD dependency", dependencyPortName, NULL ); -+ while( fflush( stdout ) ); - } - } - } -@@ -229,10 +244,13 @@ - fprintf( stdout,"%s\n", SINGLE_LINES ); - fprintf( stdout,"status report finished\n" ); - fprintf( stdout,"%s\n", DOUBLE_LINES ); -+ while( fflush( stdout ) ); -+ - if( fopenIdx || mallocIdx != 0) - { - fprintf( stdout, "%s error: fopenIdx = %d mallocIdx = %d\n", - id, fopenIdx, mallocIdx ); -+ while( fflush( stdout ) ); - assert(0); - } - PMGRrDbDestroy( property ); -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac libPMGR/src/PMGRrUpgrade.c 0.2.6_5/libPMGR/src/PMGRrUpgrade.c ---- libPMGR/src/PMGRrUpgrade.c Fri Feb 11 03:44:54 2005 -+++ 0.2.6_5/libPMGR/src/PMGRrUpgrade.c Mon Feb 14 09:23:31 2005 -@@ -69,6 +69,7 @@ - if( QTY_outOfDatePortsDb < 2 ) - { - fprintf( stdout, "%s %s INFO: all ports are up to date\n", id, VERSION ); -+ while( fflush( stdout ) ); - return(0); - } - -@@ -86,7 +87,7 @@ - fprintf(stdout, "portmanager just updated itself, executing: portmanager -u \n"); - fprintf(stdout, "sorry:automatic restart is broken for now, restart manually please\n" ); - fprintf(stdout, "%s\n", SINGLE_LINES); -- fflush(stdout); -+ while( fflush( stdout ) ); - - /********************************/ - /* reconstruct the command line */ -@@ -147,6 +148,7 @@ - IDX_commandLineDb++; - } - fprintf( stdout, "executing: %s\n", command ); -+ while( fflush( stdout ) ); - system( command ); - exit(1); - } -@@ -208,6 +210,7 @@ - fprintf( stdout, "%s %s info: ignoring %s, reason: %s\n", - id, VERSION, oldPortName, ignoreReason ); - IDX_outOfDatePortsDb++; -+ while( fflush( stdout ) ); - continue; - } - if( !strcmp( oldPortName, "portmanager" ) ) -@@ -237,6 +240,7 @@ - fprintf( stdout, - "%s %s WARNING: This is the second time %s is being built,\none more attempt and it will be marked as ignore.\n\n", - id, VERSION, oldPortName ); -+ while( fflush( stdout ) ); - - property->strikesDb = MGdbDelete( property->strikesDb, - MGdbGetRecno( property->strikesDb ) - 1 ); -@@ -263,6 +267,7 @@ - fprintf( stderr, - "%s not found in dependencyPortsDb property->fieldChildPortName\n", - oldPortName ); -+ while( fflush( stdout ) ); - assert(0); - } - printf( "%s %s DEBUG: get looping port's +CONTENTS file dependency name = %s\n", id, VERSION, dependencyPortName ); -@@ -287,13 +292,16 @@ - fprintf( stderr, - "%s not found in installedPortsDb property->fieldInstalledPortName\n", - dependencyPortName ); -- assert(0); -+ while( fflush( stdout ) ); -+ break; -+ /* assert(0); */ - } - - printf( "%s %s DEBUG: get looping port's +CONTENTS file dependency actual point of ORIGIN dir = %s\n", - id, VERSION, origDir ); - - fprintf( stdout, "analysing problem:\n" ); -+ while( fflush( stdout ) ); - while( dependencyPortName ) - { - fprintf( stdout, -@@ -302,7 +310,7 @@ - - fprintf( stdout, "\tin %s/+CONTENTS ORIG dir = %s \n\n", - dependencyPortName, origDir ); -- -+ while( fflush( stdout ) ); - dependencyPortName = MGdbSeek( property->dependencyPortsDb, - property->fieldChildPortName, - oldPortName, -@@ -328,10 +336,12 @@ - fprintf( stderr, - "%s is not located in property->installedPortsDb!\n", - dependencyPortName ); -+ while( fflush( stdout ) ); - continue; - } - fprintf( stdout, "\tin %s/+CONTENTS ORIG dir = %s \n\n", - dependencyPortName, origDir ); -+ while( fflush( stdout ) ); - if( strcmp( dependencyPortDir, origDir ) ) - { - fprintf( stdout, "%s\n", SINGLE_LINES ); -@@ -351,6 +361,7 @@ - fprintf( stdout, - "\twill try to fix by doing the following:\n\n" ); - fprintf( stdout, "\t%s\n\n", command ); -+ while( fflush( stdout ) ); - system( command ); - free(command); - -@@ -371,6 +382,7 @@ - system( command ); - free(command); - fprintf( stdout, "%s\n", SINGLE_LINES ); -+ while( fflush( stdout ) ); - } - } - } -@@ -411,6 +423,7 @@ - fprintf( stdout, "%s\n", SINGLE_LINES ); - fprintf(stdout, "update of ports collection complete with either some errors, ignored ports or both\n" ); - fprintf( stdout, "%s\n", DOUBLE_LINES ); -+ while( fflush( stdout ) ); - exit(0); - } - return(0); -@@ -438,6 +451,7 @@ - { - fprintf( stdout, "%s %s skip: %s has a dependency %s that needs to be updated first\n", - id, VERSION, oldPortName, dependencyPortName ); -+ while( fflush( stdout ) ); - skip=1; - return(skip); - } -diff -bBdruN --exclude=.svn --exclude=.private --exclude=PRIVATE --exclude=HTML --exclude=Makefile --exclude=Makefile.in --exclude=Makefile.am --exclude=STABLE-sysutils::Makefile --exclude=aclocal.m4 --exclude=configure --exclude=configure.ac portmanager/portmanager.c 0.2.6_5/portmanager/portmanager.c ---- portmanager/portmanager.c Fri Feb 11 04:06:15 2005 -+++ 0.2.6_5/portmanager/portmanager.c Sun Feb 13 09:30:49 2005 -@@ -32,8 +32,16 @@ - - int rPkgAdd( char* port ); - void rHelp( char* id ); -+int portmanager( int argc, char** argv ); -+ - int main( int argc, char** argv ) - { -+ portmanager( argc, (char**)argv ); -+ exit(0); -+} -+ -+int portmanager( int argc, char** argv ) -+{ - char h[] = "-h"; - char help[] = "--help"; - char id[] = "portmanager"; -@@ -47,8 +55,6 @@ - char upgrade[] = "--upgrade"; - char v[] = "-v"; - char version[] = "--version"; -- char* buffer = NULL; -- char* bufferIdx = NULL; - char* command = NULL; - char ignorePortDir[80]; - int errorCode = 0; -@@ -180,10 +186,11 @@ - if( !strcmp( argv[idx], upgrade ) || !strcmp( argv[idx], u ) ) - { - stringSize = strlen( "rm -f " ) -- + strlen( property.cacheDbFileName ); -- command = (char*)malloc( stringSize ); -+ + strlen( property.cacheDbFileName ) -+ + 1; -+ command = malloc( stringSize ); - command[0] = 0; -- strcpy( command, "rm -f " ); -+ strcat( command, "rm -f " ); - strcat( command, property.cacheDbFileName ); - fprintf( stdout, "%s %s info: executing %s\n", id, VERSION, command ); - system( command ); diff -ruN portmanager/files/patch-0.2.6_6 portmanager-0.2.7/files/patch-0.2.6_6 --- portmanager/files/patch-0.2.6_6 Thu Feb 17 01:51:16 2005 +++ portmanager-0.2.7/files/patch-0.2.6_6 Wed Dec 31 16:00:00 1969 @@ -1,48 +0,0 @@ ---- libPMGR/src/PMGRrMissingDependencies.c Fri Feb 11 21:38:37 2005 -+++ ../0.2.7/libPMGR/src/PMGRrMissingDependencies.c Tue Feb 15 12:45:57 2005 -@@ -356,6 +356,7 @@ - - stringSize = strlen( "cd " ) - + strlen( PORTSDIR ) -+ + strlen( "/" ) - + strlen( unInstalledPortDir ) - + strlen( "; " ) - + strlen( "make " ) -@@ -368,8 +369,9 @@ - /*zzzzzzzzzzzzzz*/ - - command[0] = 0; -- strcpy( command, "cd " ); -+ strcat( command, "cd " ); - strcat( command, PORTSDIR ); -+ strcat( command, "/" ); - strcat( command, unInstalledPortDir ); - strcat( command, "; " ); - strcat( command, "make " ); -@@ -380,6 +382,7 @@ - { - stringSize = strlen( "cd " ) - + strlen( PORTSDIR ) -+ + strlen( "/" ) - + strlen( unInstalledPortDir ) - + strlen( "; " ) - + strlen( "make describe" ); -@@ -390,6 +393,7 @@ - command[0] = 0; - strcpy( command, "cd " ); - strcat( command, PORTSDIR ); -+ strcat( command, "/" ); - strcat( command, unInstalledPortDir ); - strcat( command, "; " ); - strcat( command, "make describe" ); -@@ -432,7 +436,9 @@ - unInstalledPortName = buffer02; - fprintf( stdout, " * * * *\n" ); - fprintf( stdout, "adding %s to list of things to be upgraded/added.\n", -- unInstalledPortName ); -+ unInstalledPortName ); -+ unInstalledPortDir--; -+ unInstalledPortDir[0] = '/'; - MGdbAdd( property->outOfDatePortsDb, unInstalledPortDir, unInstalledPortName, - "MISSING is a dependency of", dependencyPortName, NULL ); - diff -ruN portmanager/pkg-descr portmanager-0.2.7/pkg-descr --- portmanager/pkg-descr Thu Feb 17 11:38:02 2005 +++ portmanager-0.2.7/pkg-descr Thu Feb 17 13:45:31 2005 @@ -18,4 +18,4 @@ WWW: http://portmanager.sunsite.dk/ Michael C. Shultz -reso3w83@verizon.net +ringworm01@gmail.com --- portmanager-0.2.7.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: