From ringworm01@gmail.com  Thu Dec 22 08:51:30 2005
Return-Path: <ringworm01@gmail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C335116A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Dec 2005 08:51:30 +0000 (GMT)
	(envelope-from ringworm01@gmail.com)
Received: from vms044pub.verizon.net (vms044pub.verizon.net [206.46.252.44])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 660FD43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Dec 2005 08:51:30 +0000 (GMT)
	(envelope-from ringworm01@gmail.com)
Received: from FreeBSD70.mechee.com ([71.102.14.129])
 by vms044.mailsrvcs.net (Sun Java System Messaging Server 6.2-4.02 (built Sep
 9 2005)) with ESMTPA id <0IRW00IOR5XSGQ47@vms044.mailsrvcs.net> for
 FreeBSD-gnats-submit@freebsd.org; Thu, 22 Dec 2005 02:51:29 -0600 (CST)
Received: by FreeBSD70.mechee.com (Postfix, from userid 1001)
	id B8678B859; Thu, 22 Dec 2005 00:50:56 -0800 (PST)
Message-Id: <20051222085056.B8678B859@FreeBSD70.mechee.com>
Date: Thu, 22 Dec 2005 00:50:56 -0800 (PST)
From: Michael C. Shultz <ringworm01@gmail.com>
Reply-To: Michael C. Shultz <ringworm01@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Jiawei Ye <leafy7382@gmail.com>
Subject: [MAINTAINER] update sysutils/portmanager
X-Send-Pr-Version: 3.113
X-GNATS-Notify: ringworm01@gmail.com

>Number:         90790
>Category:       ports
>Synopsis:       [MAINTAINER] update sysutils/portmanager
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 22 09:00:13 GMT 2005
>Closed-Date:    Thu Dec 22 09:53:54 GMT 2005
>Last-Modified:  Tue Dec 27 16:11:47 GMT 2005
>Originator:     Michael C. Shultz
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD FreeBSD70.mechee.com 7.0-CURRENT FreeBSD 7.0-CURRENT #2: Sat Dec 17 10:16:14 PST 2005 mike@FreeBSD70.mechee.com:/usr/obj/usr/src/sys/FREEBSD70 i386


>Description:

	update sysutils/portmanager to 0.4.1_3

	1. Reverted execve command used when running make to system( "make" ) so entire environment
	may be passed when building apache22.  

>How-To-Repeat:

	N/A

>Fix:

--- portmanager-0.4.1_3.diff begins here ---
diff -ruN portmanager-ORIG/Makefile portmanager/Makefile
--- portmanager-ORIG/Makefile	Wed Dec 21 00:46:04 2005
+++ portmanager/Makefile	Thu Dec 22 00:44:06 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	portmanager
 PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://portmanager.sunsite.dk/distfiles/ \
 		${MASTER_SITE_SOURCEFORGE}
diff -ruN portmanager-ORIG/files/patch-0.4.1_3 portmanager/files/patch-0.4.1_3
--- portmanager-ORIG/files/patch-0.4.1_3	Wed Dec 31 16:00:00 1969
+++ portmanager/files/patch-0.4.1_3	Wed Dec 21 22:37:06 2005
@@ -0,0 +1,133 @@
+diff -ruN ../0.4.1_2/libMGPM/src/MGPMrUpdate.c ./libMGPM/src/MGPMrUpdate.c
+--- ../0.4.1_2/libMGPM/src/MGPMrUpdate.c	Mon Dec 19 11:45:50 2005
++++ ./libMGPM/src/MGPMrUpdate.c	Wed Dec 21 22:16:31 2005
+@@ -979,114 +979,29 @@
+ 	/************************************************************************/
+ 	/*			Command "9" " make"				*/
+ 	/************************************************************************/
+-	env	= malloc( sizeof( char** ) * 4 );
+-	env[0]	= malloc( MAXSTRINGSIZE );
+-	env[1]	= malloc( MAXSTRINGSIZE );
+-	env[2]	= malloc( MAXSTRINGSIZE );
+-	env[3]	= malloc( MAXSTRINGSIZE );
+-	env[4]	= 0;
+-
+-	/*
+-	 * setup environment
+-	 */
+-	MGmStrcpy( env[0], "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/X11R6/bin" );
+-
+-	MGmStrcpy( env[1], "TERM=" );
+-	MGmStrcat( env[1], getenv( "TERM" ) );
+-
+-	if( getenv( "CCACHE_DIR" ) != NULL )
+-	{
+-		MGmStrcpy( env[2], "CCACHE_DIR=" );
+-		MGmStrcat( env[2], getenv( "CCACHE_DIR" ) );
+-	}
+-	else
+-	{
+-		env[2][0]	= 0;
+-	}
+-
+-	if( getenv( "CCACHE_PATH" ) != NULL )
+-	{
+-		MGmStrcpy( env[3], "CCACHE_PATH=/usr/bin:/usr/local/bin" );
+-	}
+-	else
+-	{
+-		env[3][0]	= 0;
+-	}
+-
++	MGmStrcpy( localProperty.command, "cd " );
++	MGmStrcat( localProperty.command, PORTSDIR );
++	MGmStrcat( localProperty.command, oldPortDir );
++	MGmStrcat( localProperty.command, " && make " );
+ 	if( MGrStrlen( localProperty.options ) > 0 )
+ 	{
+-		cmd	= malloc( sizeof( char** ) * 3 );
+-		cmd[0]	= malloc( MAXSTRINGSIZE );
+-		cmd[1]	= malloc( MAXBUFFERSIZE );
+-		cmd[2]	= 0;
+-		MGmStrcpy( cmd[0], PORTSDIR );
+-		MGmStrcat( cmd[0], oldPortDir );
+-		if( chdir( cmd[0] ) != 0 )
+-		{
+-			fprintf( stderr, "%s error: chdir %s failed\n", id, cmd[0] ); 
+-			perror( "chroot" );
+-			while( fflush( stderr ) );
+-			assert( 0 );
+-		}
+-		MGmStrcpy( cmd[0], "/usr/bin/make" );
+-		MGmBuffercpy( cmd[1], localProperty.options, MAXBUFFERSIZE );
+-		fprintf( stdout, "%s\n", SINGLE_LINES );
+-		fprintf( stdout, "update %s \n", oldPortName );
+-		fprintf( stdout, "%s %s command: #9 of 14  %s\nOPTIONS-=>%s\n", id, PACKAGE_VERSION, cmd[0], cmd[1] );
+-		fprintf( stdout, "%s\n", SINGLE_LINES );
+-		while( fflush( stdout ) );
+-		MGmSystem( cmd, env );	
+-		free( cmd[0] );
+-		free( cmd[1] );
+-		free( cmd );
+-	}
+-	else
+-	{
+-		cmd	= malloc( sizeof( char** ) * 2 );
+-		cmd[0]	= malloc( MAXSTRINGSIZE );
+-		cmd[1]	= 0;
+-		MGmStrcpy( cmd[0], PORTSDIR );
+-		MGmStrcat( cmd[0], oldPortDir );
+-		if( chdir( cmd[0] ) != 0 )
+-		{
+-			fprintf( stderr, "%s error: chdir %s failed\n", id, cmd[0] ); 
+-			perror( "chroot" );
+-			while( fflush( stderr ) );
+-			assert( 0 );
+-		}
+-		MGmStrcpy( cmd[0], "/usr/bin/make" );
+-		fprintf( stdout, "%s\n", SINGLE_LINES );
+-		fprintf( stdout, "update %s \n", oldPortName );
+-		fprintf( stdout, "%s %s command: #9 of 14  %s\n", id, PACKAGE_VERSION, cmd[0] );
+-		fprintf( stdout, "%s\n", SINGLE_LINES );
+-		while( fflush( stdout ) );
+-		MGmSystem( cmd, env );	
+-		free( cmd[0] );
+-		free( cmd );
++		MGmStrcat( localProperty.command, localProperty.options );
+ 	}
+ 
+-	if( MGrIfDirEntry( localProperty.workFullPath, ".build_done" ) == 0 )
++	fprintf( stdout, "%s\n", SINGLE_LINES );
++	fprintf( stdout, "update %s \n", oldPortName );
++	fprintf( stdout, "%s %s command: #9 of 14  %s\n", id, PACKAGE_VERSION, localProperty.command );
++	fprintf( stdout, "%s\n", SINGLE_LINES );
++	while( fflush( stdout ) );
++	if( ( errorCode = system(localProperty.command) ) )
+ 	{
+-		fprintf( stderr, "%s\n", SINGLE_LINES );
+-		fprintf( stderr, "%s error:  %s %s failed during make, adding to ignore.db\n", id, oldPortName, oldPortDir );
+-		fprintf( stderr, "%s\n", SINGLE_LINES );
+-		while( fflush( stderr ) );
+-		MGPMlogAdd( property, oldPortName, oldPortDir, "port failed to build during make, adding to ignore.db", " ",  " " );
+-		MGdbAdd( property->ignoreDb, oldPortDir, "port failed to build during make\n", NULL );
++		MGPMlogAdd( property, oldPortName, oldPortDir, "failed during make, adding to ignore.db", " ", " " );
++		fprintf( stdout, "%s %s error: make returned an error, adding %s to ignore.db\n", id, PACKAGE_VERSION, oldPortDir );
++		while( fflush( stdout ) );
++		MGdbAdd( property->ignoreDb, oldPortDir, "failed during make", NULL );
+ 		rCleanUp( property, &localProperty );
+-		free( env[0] );
+-		free( env[1] );
+-		free( env[2] );
+-		free( env );
+ 		return(0);
+ 	}
+-
+-	free( env[0] );
+-	free( env[1] );
+-	free( env[2] );
+-	free( env[3] );
+-	free( env );
+-
+ 	/************************************************************************/
+ 	/*			Command "10" pkg_create -b			*/
+ 	/************************************************************************/
--- portmanager-0.4.1_3.diff ends here ---


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Thu Dec 22 09:01:42 UTC 2005 
Class-Changed-Why:  
Fix category (submitter is not maintainer) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90790 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Dec 22 09:01:51 UTC 2005 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90790 
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Thu Dec 22 09:25:36 UTC 2005 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90790 
State-Changed-From-To: feedback->closed 
State-Changed-By: garga 
State-Changed-When: Thu Dec 22 09:53:52 UTC 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90790 
>Unformatted:
