Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Nov 2005 18:10:18 GMT
From:      "Michael C. Shultz" <ringworm01@gmail.com>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/88551: [PORT AUTHOR UPDATE] update sysutils/portmanager to 0.3.2_1
Message-ID:  <200511071810.jA7IAIRN021143@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/88551; it has been noted by GNATS.

From: "Michael C. Shultz" <ringworm01@gmail.com>
To: bug-followup@freebsd.org,
 ringworm01@gmail.com
Cc:  
Subject: Re: ports/88551: [PORT AUTHOR UPDATE] update sysutils/portmanager to 0.3.2_1
Date: Mon, 7 Nov 2005 08:00:16 -0800

 --Boundary-00=_Ro3bDJu1hNPZoix
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 This patch fixes a problem with updating java. Please
 drop patch-0.3.2_3 into files and bump revision to 3, thank you.
 
 --Boundary-00=_Ro3bDJu1hNPZoix
 Content-Type: text/x-diff;
   charset="us-ascii";
   name="patch-0.3.2_3"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="patch-0.3.2_3"
 
 diff -ruN ../0.3.2_2/libMGPM/src/MGPMrBestOldPort.c ./libMGPM/src/MGPMrBestOldPort.c
 --- ../0.3.2_2/libMGPM/src/MGPMrBestOldPort.c	Sun Nov  6 10:02:17 2005
 +++ ./libMGPM/src/MGPMrBestOldPort.c	Sun Nov  6 19:02:54 2005
 @@ -114,8 +114,29 @@
  		}
  		else
  		{
 -			availablePortDirPtr	= MGdbSeek( property->availableDependenciesDb, property->fieldAvailableDependenciesDbPortDir,
 -							oldPortDirPtr, property->fieldAvailableDependenciesDbPortDir, exact );
 +			if( strcmp( oldPortDir, "/java" ) == 0 )	/* don't halt java port building on account of build depends */
 +			{
 +				/*
 +				 * Skip iif oldPortDirPtr == fieldAvailableDependenciesDbPortDir && BUILD_DEPENDS
 +				 * 	if it gets to a oldPortDirPtr == fieldAvailableDependenciesDbPortDir && RUN_DEPENDS
 +				 *      will fall out of loop with oldPortDirPtr still set
 +				 */
 +				while( ( availablePortDirPtr	= MGdbSeek( property->availableDependenciesDb,
 +									property->fieldAvailableDependenciesDbPortDir,
 +									oldPortDirPtr,
 +									property->fieldAvailableDependenciesDbPortDir,
 +									exact ) ) &&
 +					strcmp( "BUILD_DEPENDS", MGdbGet(  property->availableDependenciesDb,
 +									MGdbGetRecno( property->availableDependenciesDb ) - 1,
 +									property->fieldAvailableDependenciesDbDependType ) ) == 0 )
 +				{
 +				}									
 +			}
 +			else
 +			{
 +				availablePortDirPtr	= MGdbSeek( property->availableDependenciesDb, property->fieldAvailableDependenciesDbPortDir,
 +								oldPortDirPtr, property->fieldAvailableDependenciesDbPortDir, exact );
 +			}
  		}
  		if( availablePortDirPtr == NULL )
  		{
 diff -ruN ../0.3.2_2/libMGPM/src/MGPMrCreateAllUpdateStatusDb.c ./libMGPM/src/MGPMrCreateAllUpdateStatusDb.c
 --- ../0.3.2_2/libMGPM/src/MGPMrCreateAllUpdateStatusDb.c	Sun Nov  6 10:02:17 2005
 +++ ./libMGPM/src/MGPMrCreateAllUpdateStatusDb.c	Sun Nov  6 19:26:26 2005
 @@ -442,6 +442,9 @@
  	idx1		= 0;
  	idx2		= 0;
  
 +	/*
 +	 * displaying run dependencies ( every other record ) here....
 +	 */
  	if( strcmp( dependType, "RUN_DEPENDS" ) == 0 )
  	{
  		counterPtr[0]--;
 diff -ruN ../0.3.2_2/libMGPM/src/MGPMrSinglePortStatus.c ./libMGPM/src/MGPMrSinglePortStatus.c
 --- ../0.3.2_2/libMGPM/src/MGPMrSinglePortStatus.c	Sun Nov  6 10:02:17 2005
 +++ ./libMGPM/src/MGPMrSinglePortStatus.c	Sun Nov  6 18:41:44 2005
 @@ -131,7 +131,7 @@
  		 * if "is availablePortsDb fieldAvailablePortsDbPortName in installedPortsDb" = yes
  		 * a) test it's dependents:
  		 * 	1. If all RUN dependencies are in installedPortsDb then port may be current
 -		 *		a. Is all port's dependencies in dependencyPortsDb current?
 +		 *		a. Are all port's dependencies in dependencyPortsDb current?
  		 *			1. yes port is current
  		 *			2. No - port built with old dependencies
  		 *	2. If NOT all RUN dependencies are in installedPortsDb then port is built with old/missing dependencies
 @@ -213,8 +213,8 @@
  								counter,
  			 					installedPortsDbPortName,
  								MGdbGet( property->dependencyPortsDb,
 -								MGdbGetRecno( property->dependencyPortsDb ) - 1,
 -								property->fieldDependencyDbDependencyPortName ) ); 
 +									MGdbGetRecno( property->dependencyPortsDb ) - 1,
 +									property->fieldDependencyDbDependencyPortName ) ); 
  							while( fflush( stdout ) );
  
  							MGdbAdd( property->oldPortsDb,
 @@ -333,6 +333,7 @@
  		char*	oldDependencyDir,
  		int*	counterPtr )
  {
 +	char	id[]						= "rCheckForOldDependencies";
  	char	exact[]						= "exact";
  	char*	availableDependenciesDbDependencyNamePtr	= NULL;
  	char*	installedPortsDbPortNamePtr			= NULL;
 @@ -343,11 +344,29 @@
  	 * Are all dpendencies belonging to installedPortsDbPortName in installedPortsDb?
  	 */
  	MGdbGoTop( property->availableDependenciesDb );
 -	availableDependenciesDbDependencyNamePtr	= MGdbSeek( property->availableDependenciesDb,
 +
 +	/*
 +	 * seek through availableDependenciesDb while
 +	 *	installedPortsDbPortDir is in availableDependenciesDb and its type
 +	 * 	is not RUN_DEPENDS, LIB_DEPENDS or DEPENDS
 +	 */
 +	while( ( availableDependenciesDbDependencyNamePtr = MGdbSeek( property->availableDependenciesDb,
  								property->fieldAvailableDependenciesDbPortDir,
  								installedPortsDbPortDir,
  								property->fieldAvailableDependenciesDbDependencyName,
 -								exact );
 +								exact ) ) &&
 +		( strcmp( MGdbGet( property->availableDependenciesDb,
 +				MGdbGetRecno(  property->availableDependenciesDb ) -1,
 +				property->fieldAvailableDependenciesDbDependType ), "DEPENDS" )	&&
 +		strcmp( MGdbGet( property->availableDependenciesDb,
 +				MGdbGetRecno(  property->availableDependenciesDb ) -1,
 +				property->fieldAvailableDependenciesDbDependType ), "LIB_DEPENDS" )	&&
 +		strcmp( MGdbGet( property->availableDependenciesDb,
 +				MGdbGetRecno(  property->availableDependenciesDb ) -1,
 +				property->fieldAvailableDependenciesDbDependType ), "RUN_DEPENDS" ) ) )
 +	{
 +	}			
 +											 
  	/*
  	 * installedPortsDbPortName has no dependencies, were done here
  	 */
 @@ -359,8 +378,14 @@
  	}
  
  	/*
 -	 * installedPortsDbPortName has at least one dependency, is it to be found in installedPortsDb?
 +	 * installedPortsDbPortName has at least one dependency, and its ether a RUN_DEPENDS, LIB_DEPENDS or a DEPENDS
  	 */
 +/*
 +fprintf( stdout, "%s debug 01: installedPortsDbPortDir-=>%s availableDependenciesDbDependencyNamePtr-=>%s type-=>%s\n",
 +	id, installedPortsDbPortDir, availableDependenciesDbDependencyNamePtr, MGdbGet( property->availableDependenciesDb,
 +	MGdbGetRecno(  property->availableDependenciesDb ) -1, property->fieldAvailableDependenciesDbDependType ) );
 +while( fflush( stdout ) );
 +*/
  	while( availableDependenciesDbDependencyNamePtr )
  	{
  		MGdbGoTop( property->installedPortsDb );
 
 --Boundary-00=_Ro3bDJu1hNPZoix--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511071810.jA7IAIRN021143>