22 files changed, 0 insertions, 1088 deletions

diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile
index 3c2939ecf066..d7e8d0920844 100644
--- a/ports-mgmt/Makefile
+++ b/ports-mgmt/Makefile
@@ -60,7 +60,6 @@
     SUBDIR += portell
     SUBDIR += portless
     SUBDIR += portlint
-    SUBDIR += portmanager
     SUBDIR += portmaster
     SUBDIR += portrac
     SUBDIR += portscout
diff --git a/ports-mgmt/portmanager/Makefile b/ports-mgmt/portmanager/Makefile
deleted file mode 100644
index 1efe82e671c0..000000000000
--- a/ports-mgmt/portmanager/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# New ports collection makefile for:	portmanager
-# Date created: 	April 23, 2004
-# Whom: 		Michael C. Shultz <reso3w83@verizon.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	portmanager
-PORTVERSION=	0.4.1
-PORTREVISION=	9
-CATEGORIES=	ports-mgmt
-MASTER_SITES=	SF
-
-MAINTAINER=	jsa@FreeBSD.org
-COMMENT=	FreeBSD installed ports status and safe update utility
-
-DEPRECATED=	Does not support modern ports features such as MOVED, is lacking upstream and active contributions, and does not support pkgng. \
-		Consider using ports-mgmt/portmaster, ports-mgmt/portupgrade or pkgng.
-EXPIRATION_DATE=2013-01-04
-
-MAN1=		portmanager.1
-MAN3=		libMG.3 MGdbAdd.3 MGdbCreate.3 MGdbDelete.3 \
-		MGdbGetRecordQty.3 MGdbGoTop.3 MGdbSeek.3
-
-GNU_CONFIGURE=		yes
-USE_LDCONFIG=	yes
-INSTALL_TARGET=		install info
-
-#
-# if --with-bin=something then withvar=${PREFIX} + something
-# else defaults to withvar=${PREFIX} + /bin
-#
-# so --with-bindir=/bin will become ${PREFIX}/bin at configure
-# time.
-#
-CONFIGURE_ARGS=	--with-prefix=${PREFIX} --with-bindir=/bin \
-		--with-etcdir=/etc --with-pkgdbdir=/var/db/pkg \
-		--with-portsdir=${PORTSDIR} --with-sharedir=/share/portmanager \
-		--with-tempdir=/tmp
-
-OPTIONS=	DEBUG "Enable debug support and warnings" off	\
-		BUILD_DEPENDS_ARE_LEAVES "Treat build dependencies as leaves" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--with-debug=yes
-.endif
-
-.if defined(WITH_BUILD_DEPENDS_ARE_LEAVES)
-CONFIGURE_ARGS+=	--with-treatBuildDependsAsLeaves=yes
-.endif
-
-# Keep this in post-configure. After run configure, this value is changed.
-post-configure:
-	@${REINPLACE_CMD} -e    \
-		's|PACKAGE_VERSION "${PORTVERSION}"|PACKAGE_VERSION "${PORTVERSION}_${PORTREVISION}"|g' \
-		${WRKSRC}/externVars.h
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/ports-mgmt/portmanager/distinfo b/ports-mgmt/portmanager/distinfo
deleted file mode 100644
index 293dc9215122..000000000000
--- a/ports-mgmt/portmanager/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (portmanager-0.4.1.tar.gz) = 7b387b5338575c4f328881f9b2d21ee4b36797b888b1c0ebdfe8697527ee7c37
-SIZE (portmanager-0.4.1.tar.gz) = 492297
diff --git a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrController.c b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrController.c
deleted file mode 100644
index 97409d55d501..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrController.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libMGPM/src/MGPMrController.c.orig	Mon Feb  5 12:46:30 2007
-+++ libMGPM/src/MGPMrController.c	Mon Feb  5 12:47:49 2007
-@@ -270,7 +270,7 @@
- 				fprintf( stdout, "%s\n", "running in WITH_BUILD_DEPENDS_ARE_LEAVES mode" );
- 				fprintf( stdout, "%s\n", "using this mode is not endorsed by author, if ports" );
- 				fprintf( stdout, "%s\n", "fail building due to missing build dependencies" );
--				fprintf( stdout, "%s\n", "in sysutils/portmanager run \"make config\" and shut this mode off" );
-+				fprintf( stdout, "%s\n", "in ports-mgmt/portmanager run \"make config\" and shut this mode off" );
- 				fprintf( stdout, "%s\n", "then rebuild/reinstall portmanager before contacting author/maintainer" );
- 				fprintf( stdout, "%s\n", DOUBLE_LINES );
- 				while( fflush( stdout ) );
diff --git a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrGetPortName.c b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrGetPortName.c
deleted file mode 100644
index e8cfc5c56b3e..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrGetPortName.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./libMGPM/src/MGPMrGetPortName.c.orig	Wed Dec 14 10:27:41 2005
-+++ ./libMGPM/src/MGPMrGetPortName.c	Fri Dec  8 17:13:00 2006
-@@ -180,7 +180,8 @@
- 			}
- 			else
- 			{
--				fclose( property->STDIN );
-+				if( property->autoMoved == 0 )
-+                                       fclose( property->STDIN );
- 				MGPMlogAdd( property, "installed ", portName,
- 					" removed from system:  no longer in ports tree:  see /usr/ports/MOVED", " ", " " );
- 			}
diff --git a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrInitialize.c b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrInitialize.c
deleted file mode 100644
index bb8f5552991e..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrInitialize.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libMGPM/src/MGPMrInitialize.c.orig	Mon Dec 12 15:32:34 2005
-+++ ./libMGPM/src/MGPMrInitialize.c	Fri Dec  8 17:13:00 2006
-@@ -47,7 +47,7 @@
- 	 */
- 	property->configConfFileName		= calloc( stringSize + 1, 1 );
- 	MGmStrcpy(property->configConfFileName, ETCDIR);
--	MGmStrcat(property->configConfFileName, "/portmanager/" );
-+	MGmStrcat(property->configConfFileName, "/portmanager" );
- 	MGmStrcat(property->configConfFileName, CONFIGURE_CONF);
- 
- 	/*
diff --git a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrPortBrokeCheck.c b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrPortBrokeCheck.c
deleted file mode 100644
index a59d29f8fd00..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrPortBrokeCheck.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libMGPM/src/MGPMrPortBrokeCheck.c.orig	Tue Dec 13 17:08:27 2005
-+++ ./libMGPM/src/MGPMrPortBrokeCheck.c	Fri Dec  8 17:13:00 2006
-@@ -78,7 +78,7 @@
- 	}
- 	buffer[0]	= 0;
- 	fread( buffer, MAXBUFFERSIZE, 1, pHandle );
--	if( ferror( pHandle ) == 0 && MGrStrlen( buffer ) > 1 )
-+	if( ferror( pHandle ) == 0 && MGrBufferlen( buffer, MAXBUFFERSIZE ) > 1 )
- 	{
- 		fprintf( stdout, "%s %s error: %s %s marked %s, adding to ignore.db\n", id, PACKAGE_VERSION, oldPortName, oldPortDir, brokeCheckType );
- 		while( fflush( stdout ) );
diff --git a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrReadConfigure.c b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrReadConfigure.c
deleted file mode 100644
index 46ec1afd3d10..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrReadConfigure.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libMGPM/src/MGPMrReadConfigure.c.orig	Wed Dec 14 00:12:40 2005
-+++ ./libMGPM/src/MGPMrReadConfigure.c	Fri Dec  8 17:13:00 2006
-@@ -156,7 +156,7 @@
- 
- 		MGmStrcpy( cmd[0], "/bin/cp" );
- 		MGmStrcpy( cmd[1], property->configConfFileName );
--		MGmStrcat( cmd[1], ".SAMPLE " );
-+		MGmStrcat( cmd[1], ".SAMPLE" );
- 		MGmStrcpy( cmd[2], property->configConfFileName );
- 
- 		MGmSystem( cmd, NULL );
diff --git a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrShowLeavesDelete.c b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrShowLeavesDelete.c
deleted file mode 100644
index a7edf22b41b9..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrShowLeavesDelete.c
+++ /dev/null
@@ -1,260 +0,0 @@
---- ./libMGPM/src/MGPMrShowLeavesDelete.c.orig	Mon Dec 12 15:32:34 2005
-+++ ./libMGPM/src/MGPMrShowLeavesDelete.c	Fri Dec  8 17:13:00 2006
-@@ -28,7 +28,6 @@
- */
- 
- #include	<libMGPM.h>
--#include	<sgtty.h>
- 
- int	nuke( char* leafPortDir );
- int	rebuildDb( structProperty* property );
-@@ -39,19 +39,21 @@
- 	char	exact[]			= "exact";
- 	char	id[]			= "MGPMrShowLeavesDelete";
- 	char*	command			= NULL;
--	char*	leafPortDir		= NULL;
-+	char*	leafPortDir;
- 	char*	leafPortName		= NULL;
- 	char*	pkgDescFile		= NULL;
-+	char**	cmd;
-+	char**	env;
- 	int	answer			= 1;
--	int	bufferSize		= 0xffff;
- 	int	doubleBreak		= 0;
- 	int	installedPortsDbIDX	= 0;
- 	int	installedPortsDbQTY	= 0;
- 	
--	command		= calloc( bufferSize, 1 );
--	leafPortDir	= calloc( bufferSize, 1 );
--	leafPortName	= calloc( bufferSize, 1 );
--	pkgDescFile	= calloc( bufferSize, 1 );
-+	leafPortDir	= calloc( MAXSTRINGSIZE, 1 );
-+	leafPortName	= calloc( MAXSTRINGSIZE, 1 );
-+	
-+	command		= calloc( MAXBUFFERSIZE, 1 );
-+	pkgDescFile	= calloc( MAXBUFFERSIZE, 1 );
- 
- 	if( ( property->ignoreDb = MGdbOpen( property->ignoreDbFileName ) ) == NULL )
- 	{
-@@ -108,50 +110,94 @@
- 			installedPortsDbIDX++;
- 			continue;
- 		}
--/*
--		if( answer != KEY_ENTER )
-+
-+		cmd	= malloc( sizeof( char* ) * 2 );
-+		cmd[0]	= malloc( MAXSTRINGSIZE );
-+		cmd[1]	= 0;
-+
-+		env	= malloc( sizeof( char* ) * 2 );
-+		env[0]	= malloc( MAXSTRINGSIZE );
-+		env[1]	= 0;
-+
-+		MGmStrcpy( env[0], "TERM=" );
-+		MGmStrcat( env[0], getenv( "TERM" ) );
-+
-+		MGmStrcpy( cmd[0], "/usr/bin/clear" );
-+
-+		MGmSystem( cmd, env );
-+
-+		free( env[0] );		
-+		free( env );
-+
-+		free( cmd[0] );		
-+		free( cmd );
-+
-+		fprintf( stdout,"%s\n", SINGLE_LINES );
-+		fprintf( stdout, "*** for safety run portmanager -u after using this feature for deletion ***\n" );
-+		fprintf( stdout,"%s\n", SINGLE_LINES );
-+		fprintf( stdout, "Ports with no ports depending on them AKA \"leaf ports.\"\n" );
-+		fprintf( stdout, "These ports may be deinstalled because no other ports rely on them to run;\"\n" );
-+		if( property->buildDependsAreLeaves )
- 		{
--*/
--			system( "clear" );
--			fprintf( stdout,"%s\n", SINGLE_LINES );
--			fprintf( stdout, "*** for safety run portmanager -u after using this feature for deletion ***\n" );
--			fprintf( stdout,"%s\n", SINGLE_LINES );
--			fprintf( stdout, "Ports with no ports depending on them AKA \"leaf ports.\"\n" );
--			fprintf( stdout, "These ports may be deinstalled because no other ports rely on them to run;\"\n" );
--			if( property->buildDependsAreLeaves )
--			{
--				fprintf( stdout, "however, other ports may rely on these to build.\"\n" );
--			}
--			fprintf( stdout, "%s\n", SINGLE_LINES );
-+			fprintf( stdout, "however, other ports may rely on these to build.\"\n" );
-+		}
-+		fprintf( stdout, "%s\n", SINGLE_LINES );
- 
--			fprintf( stdout, "%s dir -=> %s\n\n", leafPortName, leafPortDir );
--			while( fflush( stdout ) );
-+		fprintf( stdout, "%s dir -=> %s\n\n", leafPortName, leafPortDir );
-+		while( fflush( stdout ) );
- 
--			MGmStrcpy( pkgDescFile, PORTSDIR );
--			MGmStrcat( pkgDescFile, leafPortDir );
--			MGmStrcat( pkgDescFile, "/pkg-descr" );
-+		MGmStrcpy( pkgDescFile, PORTSDIR );
-+		MGmStrcat( pkgDescFile, leafPortDir );
-+		MGmStrcat( pkgDescFile, "/pkg-descr" );
- 
--			if( MGrIfFileExist( pkgDescFile ) )
--			{
--				MGmStrcpy( command, "cat " );
--				MGmStrcat( command, pkgDescFile );
--				system( command );
--				fprintf( stdout, "\n" );
--			}
--			else
--			{
--				MGmStrcpy( command, "grep COMMENT " );
--				MGmStrcat( command, PORTSDIR );
--				MGmStrcat( command, leafPortDir );
--				MGmStrcat( command, "/Makefile" );
--				system( command );
--			}
--			fprintf( stdout,"%s\n", SINGLE_LINES );
--			fprintf( stdout, "\n<ENTER> to skip\n<X><ENTER> removes port\n<N><ENTER> *Nuke it*, removes distribution files\n\n" ); 
--			fprintf( stdout,"%s\n", SINGLE_LINES );
--/*
-+		if( MGrIfFileExist( pkgDescFile ) )
-+		{
-+			cmd	= malloc( sizeof( char* ) * 3 );
-+			cmd[0]	= malloc( MAXSTRINGSIZE );
-+			cmd[1]	= malloc( MAXSTRINGSIZE );
-+			cmd[2]	= 0;
-+
-+			MGmStrcpy( cmd[0], "/bin/cat" );
-+			MGmStrcpy( cmd[1], pkgDescFile );
-+
-+			MGmSystem( cmd, NULL );
-+
-+			free( cmd[0] );		
-+			free( cmd[1] );
-+			free( cmd );
-+
-+			fprintf( stdout, "\n" );
-+			while( fflush( stdout ) );
-+		}
-+		else
-+		{
-+			cmd	= malloc( sizeof( char* ) * 4 );
-+			cmd[0]	= malloc( MAXSTRINGSIZE );
-+			cmd[1]	= malloc( MAXSTRINGSIZE );
-+			cmd[2]	= malloc( MAXSTRINGSIZE );
-+			cmd[3]	= 0;
-+
-+			MGmStrcpy( cmd[0], "/usr/bin/grep" );
-+			MGmStrcpy( cmd[1], "COMMENT" );
-+			MGmStrcpy( cmd[2], PORTSDIR );
-+			MGmStrcat( cmd[2], leafPortDir );
-+			MGmStrcat( cmd[2], "/Makefile" );
-+
-+			MGmSystem( cmd, NULL );
-+
-+			free( cmd[0] );		
-+			free( cmd[1] );
-+			free( cmd[2] );
-+			free( cmd );
-+
-+			fprintf( stdout, "\n" );
-+			while( fflush( stdout ) );
- 		}
--*/
-+		fprintf( stdout,"%s\n", SINGLE_LINES );
-+		fprintf( stdout, "\n<ENTER> to skip\n<X><ENTER> removes port\n<N><ENTER> *Nuke it*, removes distribution files\n\n" ); 
-+		fprintf( stdout,"%s\n", SINGLE_LINES );
-+		while( fflush( stdout ) );
-+
- 		property->STDIN	= fopen( "/dev/stdin", "r" );	/* Flawfinder: ignore */
- 		doubleBreak	= 0;
- 		while( 1 == 1 )
-@@ -243,9 +289,7 @@
- {
- 	char	id[]		= "removePort";
- 	char	exact[]		= "exact";
--	char*	command		= NULL;
--
--	command		= (char*)calloc( 0xffff, 1 );
-+	char**	cmd;
- 
- 	property->installedPortsDb	= MGdbDelete( property->installedPortsDb, installedPortsDbIDX );
- 
-@@ -261,12 +305,26 @@
- 		MGdbGoTop( property->availableDependenciesDb );
- 	}
- 
--	MGmStrcpy( command, "pkg_delete -f " );
--	MGmStrcat( command, leafPortNamePtr );
--	fprintf( stdout, "\nexecuting: %s\n", command );
-+	cmd	= malloc( sizeof( char* ) * 4 );
-+	cmd[0]	= malloc( MAXSTRINGSIZE );
-+	cmd[1]	= malloc( MAXSTRINGSIZE );
-+	cmd[2]	= malloc( MAXSTRINGSIZE );
-+	cmd[3]	= 0;
-+
-+	MGmStrcpy( cmd[0], "/usr/sbin/pkg_delete" );
-+	MGmStrcpy( cmd[1], "-f" );
-+	MGmStrcpy( cmd[2], leafPortNamePtr );
-+
-+	fprintf( stdout, "\nexecuting: %s %s %s\n", cmd[0], cmd[1], cmd[2] );
- 	while( fflush( stdout ) );
--	system( command );
--	free(command);
-+
-+	MGmSystem( cmd, NULL );
-+
-+	free( cmd[2] );
-+	free( cmd[1] );
-+	free( cmd[0] );		
-+	free( cmd );
-+
-  	return( 0 );
- }
- 
-@@ -274,18 +332,35 @@
- int	nuke( char* leafPortDir )
- {
- 	char	id[]		= "nuke";
--	char*	command		= NULL;
-+	char**	cmd;
- 
--	command		= (char*)calloc( 0xffff, 1 );
-+	cmd	= malloc( sizeof( char* ) * 4 );
-+	cmd[0]	= malloc( MAXSTRINGSIZE );
-+	cmd[1]	= malloc( MAXSTRINGSIZE );
-+	cmd[2]	= 0;
-+
-+	MGmStrcpy( cmd[0], PORTSDIR );
-+	MGmStrcat( cmd[0], leafPortDir );
-+	if( chdir( cmd[0] ) != 0 )
-+	{
-+		fprintf( stderr, "%s error: chdir %s failed\n", id, cmd[0] ); 
-+		perror( "chroot" );
-+		while( fflush( stderr ) );
-+		assert( 0 );
-+	}
- 
--	MGmStrcpy( command, "cd " );
--	MGmStrcat( command, PORTSDIR );
--	MGmStrcat( command, leafPortDir );
--	MGmStrcat( command, "; make distclean" );
--	fprintf( stdout, "\nexecuting: %s\n", command );
-+	MGmStrcpy( cmd[0], "/usr/bin/make" );
-+	MGmStrcpy( cmd[1], "distclean" );
-+
-+	fprintf( stdout, "\nexecuting: %s %s\n", cmd[0],  cmd[1] );
- 	while( fflush( stdout ) );
--	system( command );
--	free(command);
-+
-+	MGmSystem( cmd, NULL );
-+
-+	free( cmd[1] );
-+	free( cmd[0] );		
-+	free( cmd );
-+
-  	return( 0 );
- }
- 
diff --git a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrUpdate.c b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrUpdate.c
deleted file mode 100644
index 0721f62dfd4a..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrUpdate.c
+++ /dev/null
@@ -1,427 +0,0 @@
---- libMGPM/src/MGPMrUpdate.c.orig	Wed Dec 14 13:23:59 2005
-+++ libMGPM/src/MGPMrUpdate.c	Mon Feb  5 12:50:13 2007
-@@ -60,6 +60,7 @@
- 	char*	stopPortDirPtr					= NULL;
- 	char*	strikePtr					= NULL;
- 	char**	cmd;
-+	char**	env;
- 	int	answer						= 1;
- 	int	availableDependenciesDbIDX			= 0;
- 	int	availableDependenciesDbQTY			= 0;
-@@ -74,12 +75,6 @@
- 
- 	property->optionsChanged	= 0;
- 
--	localProperty.environment	= malloc( sizeof( char** ) * 4 );
--	localProperty.environment[0]	= malloc( MAXSTRINGSIZE );
--	localProperty.environment[1]	= malloc( MAXSTRINGSIZE );
--	localProperty.environment[2]	= malloc( MAXSTRINGSIZE );
--	localProperty.environment[3]	= 0;
--
- 	localProperty.CURDIR			= calloc( MAXSTRINGSIZE, 1 );
- 	localProperty.afterOptionsFileSize	= calloc( MAXSTRINGSIZE, 1 );
- 	localProperty.afterOptionsFileTime	= calloc( MAXSTRINGSIZE, 1 );
-@@ -110,7 +105,7 @@
- 	property->installedPortsDb		= MGdbOpen( property->installedPortsDbFileName );
- 	property->strikesDb			= MGdbOpen( property->strikesDbFileName );
- 
--	if( ( strcmp( "/sysutils/portmanager", oldPortDir ) == 0 || strcmp( "/local/sysutils/portmanager", oldPortDir ) == 0 ) && property->forced )
-+	if( ( strcmp( "/ports-mgmt/portmanager", oldPortDir ) == 0 || strcmp( "/local/ports-mgmt/portmanager", oldPortDir ) == 0 ) && property->forced )
- 	{
- 		fprintf( stdout, "ignoring portmanager, will not self update in forced mode by design\n" );
- 		while( fflush( stdout ) );
-@@ -122,30 +117,6 @@
- 		return( 0 );
- 	}
- 
--	/*
--	 * setup environment
--	 */
--	MGmStrcpy( localProperty.environment[0], "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/X11R6/bin" );
--
--	if( getenv( "CCACHE_DIR" ) != NULL )
--	{
--		MGmStrcpy( localProperty.environment[1], "CCACHE_DIR=" );
--		MGmStrcat( localProperty.environment[1], getenv( "CCACHE_DIR" ) );
--	}
--	else
--	{
--		localProperty.environment[1][0]	= 0;
--	}
--
--	if( getenv( "CCACHE_PATH" ) != NULL )
--	{
--		MGmStrcpy( localProperty.environment[2], "CCACHE_PATH=/usr/bin:/usr/local/bin" );
--	}
--	else
--	{
--		localProperty.environment[2][0]	= 0;
--	}
--
- 	/* 
- 	 * test for bsd.ports.mk patch
- 	 */
-@@ -466,25 +437,53 @@
- */
- 			/*
- 			 * If here we know OPTIONS is defined, need to run make config
--			 * if /var/db/ports/{package name}/options exists
-+			 * if /var/db/ports/{package name}/options does  not exist
- 			 */
- 			if( MGrIfFileExist( localProperty.optionsDir ) == 0 )
- 			{
--				MGmStrcpy( localProperty.command, "cd " );
--				MGmStrcat( localProperty.command, PORTSDIR );
--				MGmStrcat( localProperty.command, oldPortDir );
--				MGmStrcat( localProperty.command, " && make config " );
--				if( MGrStrlen( localProperty.options ) > 0 )
-+				cmd	= malloc( sizeof( char* ) * 3 );
-+				cmd[0]	= malloc( MAXSTRINGSIZE );
-+				cmd[1]	= malloc( MAXSTRINGSIZE );
-+				cmd[2]	= 0;
-+
-+				env	= malloc( sizeof( char* ) * 2 );
-+				env[0]	= malloc( MAXSTRINGSIZE );
-+				env[1]	= 0;
-+
-+				MGmStrcpy( env[0], "TERM=" );
-+				MGmStrcat( env[0], getenv( "TERM" ) );
-+
-+				MGmStrcpy( cmd[0], PORTSDIR );
-+				MGmStrcat( cmd[0], oldPortDir );
-+
-+				fprintf( stdout, "%s\n", SINGLE_LINES );
-+				fprintf( stdout, "config %s \n", cmd[0] );
-+				while( fflush( stdout ) );
-+
-+				if( chdir( cmd[0] ) != 0 )
- 				{
--					MGmStrcat( localProperty.command, localProperty.options );
-+					fprintf( stderr, "%s error: chdir %s failed\n", id, cmd[0] ); 
-+					perror( "chroot" );
-+					while( fflush( stderr ) );
-+					assert( 0 );
- 				}
- 
--				fprintf( stdout, "%s\n", SINGLE_LINES );
--				fprintf( stdout, "update %s \n", oldPortName );
--				fprintf( stdout, "%s %s command: #2 of 14  %s\n", id, PACKAGE_VERSION, localProperty.command );
--				fprintf( stdout, "%s\n", SINGLE_LINES );
-+				MGmStrcpy( cmd[0], "/usr/bin/make" );
-+				MGmStrcpy( cmd[1], "config" );
-+				fprintf( stdout, "%s %s command: #2 of 14  %s %s\n", id, PACKAGE_VERSION, cmd[0], cmd[1] );
- 				while( fflush( stdout ) );
--				system(localProperty.command);
-+
-+				MGmSystem( cmd, env );
-+
-+				free( env[0] );		
-+				free( env );
-+
-+				free( cmd[1] );
-+				free( cmd[0] );		
-+				free( cmd );
-+		
-+				fprintf( stdout, "%s\n", SINGLE_LINES );
-+
- 			}
- 			MGmStrcpy( localProperty.afterOptionsFileTime,
- 					MGrIntToString( (int)MGrFileTime( localProperty.optionsDir ) ) );
-@@ -567,17 +566,8 @@
- 		MGmStrcpy( strike, strikePtr );
- 		if( strike[0]	== '2' )
- 		{
-+			MGPMlogAdd( property, oldPortName, oldPortDir, "make Strike 3, marking port as ignore/looping ", " ", " " );
- 			MGdbAdd( property->ignoreDb, oldPortDir, "looping, 3rd attempt at make", NULL );
--			if( property->log )
--			{
--				MGmStrcpy( localProperty.command, "echo \"make Strike 3 " );
--				MGmStrcat( localProperty.command, oldPortName );
--				MGmStrcat( localProperty.command, " " );
--				MGmStrcat( localProperty.command, oldPortDir );
--				MGmStrcat( localProperty.command, " marking port as ignore/looping " );
--				MGmStrcat( localProperty.command, " \">> /var/log/portmanager.log" );
--				system( localProperty.command );
--			}
- 			rCleanUp( property, &localProperty );
- 			return( 0 );
- 		}
-@@ -593,16 +583,8 @@
- 							property->fieldStrikesIDX,
- 							exact );
- 			property->strikesDb	= MGdbDelete( property->strikesDb, MGdbGetRecno( property->strikesDb ) - 1 );
-+			MGPMlogAdd( property, oldPortName, oldPortDir, "make Strike 2", " ", " " );
- 			MGdbAdd( property->strikesDb, oldPortDir, "2", NULL );
--			if( property->log )
--			{
--				MGmStrcpy( localProperty.command, "echo \"make Strike 2 " );
--				MGmStrcat( localProperty.command, oldPortName );
--				MGmStrcat( localProperty.command, " " );
--				MGmStrcat( localProperty.command, oldPortDir );
--				MGmStrcat( localProperty.command, " \">> /var/log/portmanager.log" );
--				system( localProperty.command );
--			}
- /*
-  * dualOriginCheck( property, oldPortName ); used to be here in old portmanager ver < 0.3.1, seems to be no longer
-  * needed, keep this note just in case
-@@ -797,20 +779,28 @@
- 							MGPMlogAdd( property, "conflicting installed ", localProperty.installedPortName,
- 								" removed from system: conflicted with ", oldPortName, " " );
- 						}
-+						cmd	= malloc( sizeof( char* ) * 4 );
-+						cmd[0]	= malloc( MAXSTRINGSIZE );
-+						cmd[1]	= malloc( MAXSTRINGSIZE );
-+						cmd[2]	= malloc( MAXSTRINGSIZE );
-+						cmd[3]	= 0;
-+
-+						MGmStrcpy( cmd[0], "/usr/sbin/pkg_delete" );
-+						MGmStrcpy( cmd[1], "-f" );
-+						MGmStrcpy( cmd[2], localProperty.installedPortName );
- 
--						MGmStrcpy( localProperty.command, "pkg_delete -f " );
--						MGmStrcat( localProperty.command, localProperty.installedPortName );		
--						fprintf( stdout, "executing: %s\n", localProperty.command );
-+						fprintf( stdout, "\nexecuting: %s %s %s\n", cmd[0], cmd[1], cmd[2] );
- 						while( fflush( stdout ) );
--						errorCode	= system( localProperty.command );
--						if( property->log )
--						{
--							MGmStrcpy( localProperty.command, "echo \"removed conflicting port " );
--							MGmStrcat( localProperty.command, localProperty.installedPortName );
--							MGmStrcat( localProperty.command, " " );
--							MGmStrcat( localProperty.command, " \">> /var/log/portmanager.log" );
--							system( localProperty.command );
--						}
-+
-+						MGmSystem( cmd, NULL );
-+
-+						free( cmd[2] );
-+						free( cmd[1] );
-+						free( cmd[0] );		
-+						free( cmd );
-+
-+						MGPMlogAdd( property, "removed conflicting port", localProperty.installedPortName,
-+							" ", " ", " " );
- 					}
- 					installedPortsDbIDX++;
- 				}
-@@ -848,15 +838,7 @@
- 		fprintf( stderr, "marking %s as ignored\n", oldPortName );
- 		fprintf( stdout, "%s\n", DOUBLE_LINES );
- 		while( fflush( stderr ) );
--		if( property->log )
--		{
--			MGmStrcpy( localProperty.command, "echo \"      " );
--			MGmStrcat( localProperty.command, oldPortName );
--			MGmStrcat( localProperty.command, " " );
--			MGmStrcat( localProperty.command, oldPortDir );
--			MGmStrcat( localProperty.command, " conflicts with another installed port so marked ignore\" >> /var/log/portmanager.log" );
--			system( localProperty.command );
--		}
-+		MGPMlogAdd( property, oldPortName, oldPortDir, "conflicts with another installed port so marked ignore", " ", " " );
- 		MGdbAdd( property->ignoreDb, oldPortDir, "conflicts with another installed port", NULL );
- 		rCleanUp( property, &localProperty );
- 		return( 0 );
-@@ -986,15 +968,7 @@
- 	while( fflush( stdout ) );
- 	if( ( errorCode = system(localProperty.command) ) )
- 	{
--		if( property->log )
--		{
--			MGmStrcpy( localProperty.command, "echo \"      " );
--			MGmStrcat( localProperty.command, oldPortName );
--			MGmStrcat( localProperty.command, " " );
--			MGmStrcat( localProperty.command, oldPortDir );
--			MGmStrcat( localProperty.command, " failed to fetch\" >> /var/log/portmanager.log" );
--			system( localProperty.command );
--		}
-+		MGPMlogAdd( property, oldPortName, oldPortDir, "failed to fetch, adding to ignore.db", " ", " " );
- 		fprintf( stdout, "%s %s error: make fetch returned an error, adding %s to ignore.db\n", id, PACKAGE_VERSION, oldPortDir );
- 		while( fflush( stdout ) );
- 		MGdbAdd( property->ignoreDb, oldPortDir, "failed during make fetch", NULL );
-@@ -1005,70 +979,29 @@
- 	/************************************************************************/
- 	/*			Command "9" " make"				*/
- 	/************************************************************************/
-+	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, localProperty.environment );	
--		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, localProperty.environment );	
--		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 );
- 		return(0);
- 	}
--
- 	/************************************************************************/
- 	/*			Command "10" pkg_create -b			*/
- 	/************************************************************************/
-@@ -1113,12 +1046,12 @@
- 	/*
- 	 * inforced mass update mode portmanager  CANNOT loose its databases
- 	 */
--	if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 || strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
-+	if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 || strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
- 		property->pmMode == SINGLE )
- 	{
- 		MGmStrcpy( localProperty.command, "cd " );
- 		MGmStrcat( localProperty.command, PORTSDIR );
--		MGmStrcat( localProperty.command, "/sysutils/portmanager; " );
-+		MGmStrcat( localProperty.command, "/ports-mgmt/portmanager; " );
- 		MGmStrcat( localProperty.command, "make -V PKG_DBDIR" );
- 		pHandle	= popen( localProperty.command, "r" );
- 		localProperty.buffer[0]	= 0;
-@@ -1146,7 +1079,7 @@
- 		/*
- 		 * have to do this here before db's are wacked
- 		 */
--		if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 || strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
-+		if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 || strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
- 			property->pmMode == MULTI )
- 		{
- 			/*
-@@ -1266,7 +1199,7 @@
- 		MGmStrcat(localProperty.command, TEMPDIR);
- 		MGmStrcat(localProperty.command, "/");
- 		MGmStrcat(localProperty.command, oldPortName);
--		MGmStrcat(localProperty.command, ".tgz");
-+		MGmStrcat(localProperty.command, ".t[bg]z");
- 		fprintf( stdout, "%s\n", SINGLE_LINES );
- 		fprintf( stderr, "restoring original port from backup \n" );
- 		fprintf( stderr, "%s %s command: #12 of 14!! ***Emergancy restore***  %s\n", id, PACKAGE_VERSION, localProperty.command );
-@@ -1330,7 +1263,7 @@
- 			MGmStrcat( localProperty.command, TEMPDIR);
- 			MGmStrcat( localProperty.command, "; rm -f ");
- 			MGmStrcat( localProperty.command, oldPortName);
--			MGmStrcat( localProperty.command, ".tgz" );
-+			MGmStrcat( localProperty.command, ".t[bg]z" );
- 			fprintf( stdout, "%s\n", SINGLE_LINES );
- 			fprintf( stderr, "deleting backup copy, installation of updated %s successful\n", oldPortDir );
- 			fprintf( stdout, "%s %s localProperty.command: #12 of 14 %s\n", id, PACKAGE_VERSION, localProperty.command );
-@@ -1414,7 +1347,7 @@
- 	/*
- 	 * if portmanager updated there won't be any databases, so need to clean the old fashoned way
- 	 */
--	if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 || strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
-+	if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 || strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
- 		property->pmMode == MULTI )
- 	{
- 		rCleanDir( oldPortDir, localProperty.workDir );
-@@ -1460,7 +1393,7 @@
- 	/*
- 	 * portmanager auto restart after updating itself
- 	 */
--	if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 || strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
-+	if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 || strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
- 		property->pmMode == MULTI )
- 	{
- 		/*
-@@ -1556,12 +1489,6 @@
- 	MGdbDestroy( property->installedPortsDb );
- 	MGdbDestroy( property->strikesDb );
- 
--
--	free( localProperty->environment[0] );
--	free( localProperty->environment[1] );
--	free( localProperty->environment[2] );
--	free( localProperty->environment );
--
- 	free( localProperty->CURDIR );
- 	free( localProperty->afterOptionsFileSize );
- 	free( localProperty->afterOptionsFileTime );
-@@ -1655,7 +1582,7 @@
- 	 */
- 	MGmStrcpy( localProperty->command, "cd " );
- 	MGmStrcat( localProperty->command, PORTSDIR );
--	MGmStrcat( localProperty->command, "/sysutils/portmanager; make -V PKGNAME" );
-+	MGmStrcat( localProperty->command, "/ports-mgmt/portmanager; make -V PKGNAME" );
- 	pHandle	= popen( localProperty->command, "r" );
- 	localProperty->buffer[0]	= 0;
- 	fread( localProperty->buffer, MAXBUFFERSIZE - 1, 1, pHandle );
-@@ -1693,7 +1620,7 @@
- 			 */
- 			MGmStrcpy( localProperty->command, "cd " );
- 			MGmStrcat( localProperty->command, PORTSDIR );
--			MGmStrcat( localProperty->command, "/sysutils/portmanager; make -V PKGNAME" );
-+			MGmStrcat( localProperty->command, "/ports-mgmt/portmanager; make -V PKGNAME" );
- 			pHandle	= popen( localProperty->command, "r" );
- 			localProperty->buffer[0]	= 0;
- 			fread( localProperty->buffer, MAXBUFFERSIZE - 1, 1, pHandle );
-@@ -1737,7 +1664,7 @@
- 	 */
- 	MGmStrcpy( localProperty->command, "cd " );
- 	MGmStrcat( localProperty->command, PORTSDIR );
--	MGmStrcat( localProperty->command, "/sysutils/portmanager; make -V PORTMANAGER" );
-+	MGmStrcat( localProperty->command, "/ports-mgmt/portmanager; make -V PORTMANAGER" );
- 	pHandle	= popen( localProperty->command, "r" );
- 	localProperty->buffer[0]	= 0;
- 	fread( localProperty->buffer, MAXBUFFERSIZE - 1, 1, pHandle );
diff --git a/ports-mgmt/portmanager/files/patch-libMGPM__src__libMGPM.h b/ports-mgmt/portmanager/files/patch-libMGPM__src__libMGPM.h
deleted file mode 100644
index 43b53c6e1320..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMGPM__src__libMGPM.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./libMGPM/src/libMGPM.h.orig	Tue Dec 13 17:23:14 2005
-+++ ./libMGPM/src/libMGPM.h	Fri Dec  8 17:13:00 2006
-@@ -118,7 +118,6 @@
- 	char*	workDir;
- 	char*	workFullPath;
- 	char*	xtermTitle;
--	char**	environment;
- 	int	bufferSize;
- 	int	optionsBufferSize;
- } structLocalProperty;
diff --git a/ports-mgmt/portmanager/files/patch-libMG__src__MGdbAdd.c b/ports-mgmt/portmanager/files/patch-libMG__src__MGdbAdd.c
deleted file mode 100644
index 0824a2afbb31..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMG__src__MGdbAdd.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./libMG/src/MGdbAdd.c.orig	Mon Dec 12 15:32:34 2005
-+++ ./libMG/src/MGdbAdd.c	Fri Dec  8 17:13:00 2006
-@@ -39,7 +39,9 @@
- 	int	idx		= 0;
- 	va_list	paramList;
- 	
--	/* check if we have a valid object */
-+	/*
-+	 * check if we have a valid object
-+	 */
- 	if( db->parent.type != CLASS_TYPE_DB )
- 	{
- 		fprintf( stderr, "%s error: invalid object type\n", id);
-@@ -71,6 +73,8 @@
- 		 */ 
- 		if( MGrBufferlen( paramPtr, MAXBUFFERSIZE ) < 1 )
- 		{
-+			fprintf( stderr, "%s error: attempt to place null data into record halted\n", id );
-+			while( fflush( stderr ) );
- 			assert(0);
- 		}
- 		fprintf( dbFileStream, "%s%c", paramPtr, 0 );
-@@ -85,6 +89,7 @@
- 		{
- 			fprintf( stderr, "%s error: fields added (%d) exceed field quantity (%d)\n did you forget to terminate MGdbAdd with a NULL field?\n",
- 				id, idx, db->fieldQty );
-+			while( fflush( stderr ) );
- 			assert(0);
- 		}
- 	}
diff --git a/ports-mgmt/portmanager/files/patch-libMG__src__MGdbRead.c b/ports-mgmt/portmanager/files/patch-libMG__src__MGdbRead.c
deleted file mode 100644
index a5e70e5781a5..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMG__src__MGdbRead.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./libMG/src/MGdbRead.c.orig	Mon Dec 12 15:32:34 2005
-+++ ./libMG/src/MGdbRead.c	Fri Dec  8 17:13:00 2006
-@@ -58,6 +58,7 @@
- 		fprintf( stderr, "%s error: unable to allocate %d bytes memory for db->dataBuffer\n",
- 			id, dataBufferSize );
- 		perror( "system message" );
-+		while( fflush( stderr ) );
- 		assert(0);
- 	}
- 	/*zzzzzzzzzzzzzz*/
-@@ -70,6 +71,7 @@
- 	{
- 		fprintf( stderr, "%s error: reading file %s into db->dataBuffer\n", id, db->parent.path );
- 		perror( "system message" );	\
-+		while( fflush( stderr ) );
- 		assert(0);
- 	}
- 
diff --git a/ports-mgmt/portmanager/files/patch-libMG__src__Makefile.am b/ports-mgmt/portmanager/files/patch-libMG__src__Makefile.am
deleted file mode 100644
index 652af1c3ec85..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMG__src__Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libMG/src/Makefile.am.orig	Tue Dec 13 13:57:20 2005
-+++ ./libMG/src/Makefile.am	Fri Dec  8 17:13:00 2006
-@@ -32,7 +32,7 @@
- 			MGrStrlen.c		\
- 			MGxTermBarCreate.c	\
- 			MGxTermBarDestroy.c	\
--			MGxTermBarUpdate.c	
-+			MGxTermBarUpdate.c
- 
- include_HEADERS		= libMG.h
- 
diff --git a/ports-mgmt/portmanager/files/patch-libMG__src__libMG.h b/ports-mgmt/portmanager/files/patch-libMG__src__libMG.h
deleted file mode 100644
index f17ac98cc16a..000000000000
--- a/ports-mgmt/portmanager/files/patch-libMG__src__libMG.h
+++ /dev/null
@@ -1,44 +0,0 @@
---- ./libMG/src/libMG.h.orig	Tue Dec 13 13:56:16 2005
-+++ ./libMG/src/libMG.h	Fri Dec  8 17:13:00 2006
-@@ -57,6 +57,7 @@
- #define	KEY_a		97
- #define	CLASS_TYPE_DB	1
- #define	CLASS_TYPE_DIR	2
-+#define	CLASS_TYPE_MEM	3
- #define	CR		13
- #define	DEBUG_MGdb	0
- #define	DEBUG_MGdir	0
-@@ -77,15 +78,15 @@
- #define	SINGLE_LINES	"------------------------------------------------------------------------"
- #define	DOUBLE_LINES	"========================================================================"
- 
--		char**		MGm__command;
--		int		MGm__forkStatus;
--		pid_t		MGm__pid;
--struct		stat		fstatBuf;
--struct		stat		lstatBuf;
--typedef	struct 	classDb		classDb; 
--typedef	struct 	classDir	classDir; 
--unsigned	int		MGm__bufferSize;
--unsigned	int		MGm__stringSize;
-+			char**		MGm__command;
-+			int		MGm__forkStatus;
-+			pid_t		MGm__pid;
-+	struct		stat		fstatBuf;
-+	struct		stat		lstatBuf;
-+	unsigned	int		MGm__bufferSize;
-+	unsigned	int		MGm__stringSize;
-+typedef	struct 		classDb		classDb; 
-+typedef	struct 		classDir	classDir; 
- 
- #define	MAXSTRINGSIZE	0x1ff
- #define	MAXBUFFERSIZE	0xffff
-@@ -270,7 +271,7 @@
- int			MGrInStringSwap( char* originalString, char* oldString, char* newString );
- int			MGrStripComment( char*, char );
- unsigned	int	MGrBufferlen( char* buffer, unsigned int maxBufferSize );
--unsigned	int	MGrStrlen( char* string );
-+unsigned	int	MGrStrlen( char* String );
- unsigned long	int	MGrFileTime( char* );
- 
- #endif
diff --git a/ports-mgmt/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6 b/ports-mgmt/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6
deleted file mode 100644
index b02b03bc4ecb..000000000000
--- a/ports-mgmt/portmanager/files/patch-portmanager__patch-bsd.port.mk-0.3.6
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./portmanager/patch-bsd.port.mk-0.3.6.orig	Mon Dec 12 15:32:34 2005
-+++ ./portmanager/patch-bsd.port.mk-0.3.6	Fri Dec  8 17:13:00 2006
-@@ -5,7 +5,7 @@
-  .endif
-  .if !defined(PKG_ARGS)
- -PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
--+PORTMANAGER=	${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends
-++PORTMANAGER=	${LOCALBASE}/bin/portmanager /${PKGORIGIN} package-depends | ${GREP} -v -E "^MGPMr"
- +PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${PORTMANAGER} | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
- +###PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
-  .if !defined(NO_MTREE)
diff --git a/ports-mgmt/portmanager/files/patch-portmanager__pkgtools-to-portmanager.rb b/ports-mgmt/portmanager/files/patch-portmanager__pkgtools-to-portmanager.rb
deleted file mode 100644
index d1dd2fc8fecd..000000000000
--- a/ports-mgmt/portmanager/files/patch-portmanager__pkgtools-to-portmanager.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- portmanager/pkgtools-to-portmanager.rb.orig	Fri Mar  2 21:28:59 2007
-+++ portmanager/pkgtools-to-portmanager.rb	Fri Mar  2 21:30:46 2007
-@@ -38,6 +38,8 @@
- 
- puts "CATEGORY/PORT|OPTION=|          # do not delete this line!"
- 
-+init_pkgtools_global
-+
- load_config
- 
- # held packages
diff --git a/ports-mgmt/portmanager/files/patch-portmanager__portmanager.1 b/ports-mgmt/portmanager/files/patch-portmanager__portmanager.1
deleted file mode 100644
index 5457cf95e5d2..000000000000
--- a/ports-mgmt/portmanager/files/patch-portmanager__portmanager.1
+++ /dev/null
@@ -1,60 +0,0 @@
---- portmanager/portmanager.1.orig	Mon Feb  5 13:02:40 2007
-+++ portmanager/portmanager.1	Mon Feb  5 13:06:46 2007
-@@ -183,7 +183,7 @@
- config".  To determine if options is defined in the port's directory
- run "grep OPTIONS Makefile".  examples:
- .sp
-- cd /usr/ports/sysutils/portmanager
-+ cd /usr/ports/ports-mgmt/portmanager
- .sp
-  grep OPTIONS Makefile
- .sp
-@@ -276,8 +276,8 @@
- .sp
- WITH_DEBUG 
- .sp
-- a)  set with either make config from sysutils/portmanager or
--by adding \fBsysutils/portmanager|WITH_DEBUG=1|\fR to pm-020.conf
-+ a)  set with either make config from ports-mgmt/portmanager or
-+by adding \fBports-mgmt/portmanager|WITH_DEBUG=1|\fR to pm-020.conf
- .sp
-  b)  effects: when portmanager is built all warnings are enabled
- and is built with -ggdb option so symbols may be seen with gdb debugger.
-@@ -363,16 +363,16 @@
- of some of FreeBSD's port system features:
- .sp
-  ########################################################################
-- # Makefile from /usr/ports/local/sysutils/somelocalportname/Makefile
-+ # Makefile from /usr/ports/local/ports-mgmt/somelocalportname/Makefile
-  ########################################################################
-  PORTNAME=           somelocalportname
-  PORTVERSION=        0.1.0
-- CATEGORIES=         local/sysutils
-+ CATEGORIES=         local/ports-mgmt
-  VALID_CATEGORIES+=  \&${CATEGORIES}       # for FreeBSD to accept our
-                                          # local category
- .sp
- Simply add a "local" directory to /usr/ports and install your local ports under that directory. Where a normal FreeBSD
--port may be in "sysutils/{portname} the example above would reside in "local/sysutils/{portname}".
-+port may be in "ports-mgmt/{portname} the example above would reside in "local/ports-mgmt/{portname}".
- .sp
- \fBcvsup hints\fR
- .sp
-@@ -411,7 +411,7 @@
- You may set port configurations in \fB/etc/make.conf\fR instead of pm\&-020.conf.
- The advantage to setting configuration in make.conf is they will apply when ever you
- manually interact with the ports tree or if you also use another ports management
--program such as \fBsysutils/portupgrade\fR.   
-+program such as \fBports-mgmt/portupgrade\fR.   
- .sp
- example /etc/makefile.conf entries:
- .sp
-@@ -437,7 +437,7 @@
-  #
-  #Because I don't want my development version of portmanager
-  #installing on top of the version in the ports tree
-- \&.if ${\&.CURDIR:M*/local/sysutils/portmanager}
-+ \&.if ${\&.CURDIR:M*/local/ports-mgmt/portmanager}
-  PREFIX=/home/mike/TEMP
-  \&.endif
-  #
diff --git a/ports-mgmt/portmanager/files/patch-portmanager__portmanager.c b/ports-mgmt/portmanager/files/patch-portmanager__portmanager.c
deleted file mode 100644
index faa8db0be070..000000000000
--- a/ports-mgmt/portmanager/files/patch-portmanager__portmanager.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./portmanager/portmanager.c.orig	Mon Dec 12 19:20:58 2005
-+++ ./portmanager/portmanager.c	Fri Dec  8 17:13:00 2006
-@@ -34,7 +34,13 @@
- int	main( int argc, char** argv, char** argp)
- {
- 	int	errorCode	= 0;
--	
-+
-+	if ( getuid() != 0 )
-+	{
-+		fprintf( stderr, "%s must be run as root\n", argv[0] );
-+		exit( 1 );
-+	}
-+
- 	errorCode	= MGPMrCommandLine( argc, (char**)argv, (char**)argp ); 
- 	exit( errorCode );
- }
diff --git a/ports-mgmt/portmanager/pkg-descr b/ports-mgmt/portmanager/pkg-descr
deleted file mode 100644
index f5de7834b9bc..000000000000
--- a/ports-mgmt/portmanager/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-FreeBSD port collection management.  Update your ports easily. Great
-for users of KDE or GNOME who need to be concerned about how
-dependency ports are built.  
-
-**New options**
-
-1)  Single port update/add/rebuild examples:
-
-portmanager x11/gnome2	updates/adds gnome2 and dependencies 
-portmanager x11/gnome2	-f rebuilds gnome2 and dependencies 
-
-2) portmanager -u -f forces rebuild of everything
-
-3) -sl showleaves and -slid  delete leaves
-	now no longer list build dependencies
-
-Author: Michael C. Shultz <ringworm01@gmail.com>
-WWW: http://portmanager.sourceforge.net/
diff --git a/ports-mgmt/portmanager/pkg-message b/ports-mgmt/portmanager/pkg-message
deleted file mode 100644
index 22bf923cefcf..000000000000
--- a/ports-mgmt/portmanager/pkg-message
+++ /dev/null
@@ -1,21 +0,0 @@
-*
-* portmanager                                                         
-*
-* upgrade ports example:                                              
-*                                                                     
-* portmanager -u -ip editors/nedit editors/openoffice                 
-*                                                                     
-* upgrades everything except nedit,open office and their dependencies 
-*                                                                     
-* portmanager x11/gnome2 -l
-*
-*	upgrade gnome2 and its dependencies with logging enabled
-*
-* portmanager x11/gnome2 -l -f
-*
-*	rebuild gnome2 and its dependencies
-*                                                                     
-* portmanager -slid will let you safely remove leaf ports             
-*                                                                     
-* see man portmanager(1) or http://portmanager.sunsite.dk             
-*
diff --git a/ports-mgmt/portmanager/pkg-plist b/ports-mgmt/portmanager/pkg-plist
deleted file mode 100644
index dac7ae1fd888..000000000000
--- a/ports-mgmt/portmanager/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-@unexec rm -f %D/etc/portmanager/pm-039-pkg-tools.conf 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/pkgtools.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/3strikes.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/commandLine.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/configure.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/configure.db.temp 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/ignore.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/pkg.db || true
-@unexec rm -f %D/share/portmanager/portCache.tmp 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/ports_available.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/ports_available_dependencies.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/ports_cache.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/ports_dependencies.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/ports_installed.db 2>/dev/null || true
-@unexec rm -f %D/share/portmanager/ports_old.db 2>/dev/null || true
-%%DATADIR%%/help.txt
-%%DATADIR%%/patch-bsd.port.mk-0.3.6
-%%DATADIR%%/pkgtools-to-portmanager.rb
-%%DATADIR%%/bsd.port.mk-BACKUP
-bin/portmanager
-etc/portmanager/pm-020.conf.SAMPLE
-include/libMG.h
-lib/libMG.so
-lib/libMG.so.2
-lib/libMGPM.so
-lib/libMGPM.so.1
-@dirrmtry etc/portmanager
-@dirrmtry share/portmanager