- Fix after move to ports-mgmt category

PR:		ports/108808
Submitted by:	Robert Noland <rnoland@2hip.net> (maintainer)

4 files changed, 155 insertions, 6 deletions

diff --git a/ports-mgmt/portmanager/Makefile b/ports-mgmt/portmanager/Makefile
index 838283e76011..dc4fb01273ad 100644
--- a/ports-mgmt/portmanager/Makefile
+++ b/ports-mgmt/portmanager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	portmanager
 PORTVERSION=	0.4.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portmanager
diff --git a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrController.c b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrController.c
new file mode 100644
index 000000000000..97409d55d501
--- /dev/null
+++ b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrController.c
@@ -0,0 +1,11 @@
+--- 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__MGPMrUpdate.c b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrUpdate.c
index 82b4f323b069..0721f62dfd4a 100644
--- a/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrUpdate.c
+++ b/ports-mgmt/portmanager/files/patch-libMGPM__src__MGPMrUpdate.c
@@ -1,5 +1,5 @@
 --- libMGPM/src/MGPMrUpdate.c.orig	Wed Dec 14 13:23:59 2005
-+++ libMGPM/src/MGPMrUpdate.c	Fri Dec  8 17:24:30 2006
++++ libMGPM/src/MGPMrUpdate.c	Mon Feb  5 12:50:13 2007
 @@ -60,6 +60,7 @@
  	char*	stopPortDirPtr					= NULL;
  	char*	strikePtr					= NULL;
@@ -21,6 +21,15 @@
  	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 );
  	}
@@ -316,6 +325,30 @@
  	/************************************************************************/
  	/*			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, "/");
@@ -334,16 +367,61 @@
  			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 );
-@@ -1555,12 +1488,6 @@
- 	MGdbDestroy( property->ignoreDb );
+@@ -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-portmanager__portmanager.1 b/ports-mgmt/portmanager/files/patch-portmanager__portmanager.1
new file mode 100644
index 000000000000..5457cf95e5d2
--- /dev/null
+++ b/ports-mgmt/portmanager/files/patch-portmanager__portmanager.1
@@ -0,0 +1,60 @@
+--- 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
+  #