4 files changed, 7 insertions, 99 deletions

diff --git a/ports-mgmt/portmanager/Makefile b/ports-mgmt/portmanager/Makefile
index 0ee48fa9a20a..70d09d74eb3d 100644
--- a/ports-mgmt/portmanager/Makefile
+++ b/ports-mgmt/portmanager/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portmanager
-PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTVERSION=	0.3.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://portmanager.sunsite.dk/distfiles/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -51,7 +50,7 @@ CONFIGURE_ARGS+=	--with-debug=yes
 CONFIGURE_ARGS+=	--with-treatBuildDependsAsLeaves=yes
 .endif
 
-# Keep this in post-configure. After run configure, he change this value.
+# 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' \
diff --git a/ports-mgmt/portmanager/distinfo b/ports-mgmt/portmanager/distinfo
index 8f9ecd69e6c6..ae3651f610aa 100644
--- a/ports-mgmt/portmanager/distinfo
+++ b/ports-mgmt/portmanager/distinfo
@@ -1,3 +1,3 @@
-MD5 (portmanager-0.3.5.tar.gz) = b19edf48625ba3565a2b60a0a3f681b0
-SHA256 (portmanager-0.3.5.tar.gz) = e9713a0fd223fb942dca06378f8199b6c5f1e58375201097e55c7ec38fdf2434
-SIZE (portmanager-0.3.5.tar.gz) = 437330
+MD5 (portmanager-0.3.7.tar.gz) = e666f4f8b2fdb8ae2ca480b64dc5c00c
+SHA256 (portmanager-0.3.7.tar.gz) = 6184bbaa78437cbbc0b828efdabf4666dfb858d94bde9d36d46e99531ba0287d
+SIZE (portmanager-0.3.7.tar.gz) = 439992
diff --git a/ports-mgmt/portmanager/files/patch-0.3.5_1 b/ports-mgmt/portmanager/files/patch-0.3.5_1
deleted file mode 100644
index 798876eb11ea..000000000000
--- a/ports-mgmt/portmanager/files/patch-0.3.5_1
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ruN ../0.3.5/libMGPM/src/MGPMlogAdd.c ./libMGPM/src/MGPMlogAdd.c
---- ../0.3.5/libMGPM/src/MGPMlogAdd.c	Mon Nov 14 13:55:34 2005
-+++ ./libMGPM/src/MGPMlogAdd.c	Mon Nov 14 23:17:47 2005
-@@ -48,7 +48,7 @@
- 	}
- 
- 	logFileStream	= fopen(  property->logFile->parent.path, "a" );
--	fprintf( logFileStream, "%-25s %-25s\n\t%-25s %-25s %-25s\n", victemName, victemDir, crime, suspectName, suspectDir );
-+	fprintf( logFileStream, "%-35s %-30s\n    %-35s %-35s %-30s\n\n", victemName, victemDir, crime, suspectName, suspectDir );
- 	fclose( logFileStream );
- 	return( 0 );
- }
-diff -ruN ../0.3.5/libMGPM/src/MGPMrController.c ./libMGPM/src/MGPMrController.c
---- ../0.3.5/libMGPM/src/MGPMrController.c	Mon Nov 14 14:46:52 2005
-+++ ./libMGPM/src/MGPMrController.c	Tue Nov 15 10:04:32 2005
-@@ -270,6 +270,46 @@
- 
- 	if( path && ( strcmp( path, "PMSTATUS" ) == 0 ) )
- 	{
-+		property->pmMode	= 1; /* fake like we are in single port update */
-+		if( property->resume == 0 )
-+		{
-+			property->cacheDb	= MGdbCreate(
-+							property->cacheDbFileName,
-+							property->fieldCacheDbPortDir,
-+							property->fieldCacheDbAvailablePortName,
-+							property->fieldCacheDbMakeFileSize,
-+							property->fieldCacheDbMakeFileTime,
-+							NULL );
-+			MGdbDestroy( property->cacheDb );
-+			if( ( errorCode	= MGPMrCreateInstalledDb( property ) ) )
-+			{
-+				fprintf( stdout, "%s %s error: %s returned errorCode %d\n", id, PACKAGE_VERSION,
-+					"MGPMrCreateInstalledDb", errorCode );
-+				return( 1 );
-+			}
-+			if( ( errorCode	= MGPMrCreateAllUpdateStatusDb( property ) ) )
-+			{
-+				fprintf( stdout, "%s %s error: %s returned errorCode %d\n", id, PACKAGE_VERSION,
-+					"MGPMrCreateAllUpdateStatusDb", errorCode );
-+				return( 1 );
-+			}
-+		}
-+		if( ( errorCode	= MGPMrCreateInstalledDb( property ) ) )
-+		{
-+			fprintf( stdout, "%s %s error: %s returned errorCode %d\n", id, PACKAGE_VERSION, "MGPMrCreateStatusDb", errorCode );
-+			return( 1 );
-+		}
-+
-+		if( ( errorCode	= MGPMrSinglePortStatus( property ) ) )
-+		{
-+			fprintf( stdout, "%s %s error: %s returned errorCode %d\n", id, PACKAGE_VERSION, "MGPMrSinglePortStatus", errorCode );
-+			return( 1 );
-+		}
-+		return( 0 );
-+	}
-+/*
-+ * old way of doing things
-+ *
- 		if( ( errorCode	= MGPMrCreateInstalledDb( property ) ) )
- 		{
- 			fprintf( stdout, "%s %s error: %s returned errorCode %d\n", id, PACKAGE_VERSION, "MGPMrCreateStatusDb", errorCode );
-@@ -308,7 +348,7 @@
- 		free( xtermTitle );
- 		MGPMlogDestroy( property );
- 		return(0);
--	}
-+*/
- 
- 	if( path && strcmp( path, "PMUPGRADE" ) == 0 )
- 	{
-diff -ruN ../0.3.5/libMGPM/src/MGPMrSinglePortStatus.c ./libMGPM/src/MGPMrSinglePortStatus.c
---- ../0.3.5/libMGPM/src/MGPMrSinglePortStatus.c	Mon Nov 14 14:54:02 2005
-+++ ./libMGPM/src/MGPMrSinglePortStatus.c	Mon Nov 14 19:10:08 2005
-@@ -159,7 +159,7 @@
- 				MGdbAdd( property->oldPortsDb,
- 					installedPortsDbPortDir,
- 					installedPortsDbPortName,
--					"1 built with OLD dependency",
-+					"built with OLD dependency",
- 					oldDependencyName,
- 					oldDependencyDir,
- 					NULL );
-@@ -226,7 +226,7 @@
- 							MGdbAdd( property->oldPortsDb,
- 								installedPortsDbPortDir,
- 								installedPortsDbPortName,
--								"2 built with OLD dependency",
-+								"built with OLD dependency",
- 								MGdbGet( property->dependencyPortsDb,
- 									MGdbGetRecno( property->dependencyPortsDb ) - 1,
- 									property->fieldDependencyDbDependencyPortName ),
-Binary files ../0.3.5/portmanager-0.3.6.tar.gz and ./portmanager-0.3.6.tar.gz differ
diff --git a/ports-mgmt/portmanager/pkg-plist b/ports-mgmt/portmanager/pkg-plist
index 0d9c2533d4d6..a70905f81978 100644
--- a/ports-mgmt/portmanager/pkg-plist
+++ b/ports-mgmt/portmanager/pkg-plist
@@ -3,6 +3,7 @@
 @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
@@ -11,6 +12,7 @@
 @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
 bin/portmanager
 etc/portmanager/pm-020.conf.SAMPLE
 include/libMG.h