Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Nov 2005 06:09:13 -0800 (PST)
From:      "Michael C. Shultz" <ringworm01@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/89230: [MAINTAINER] update sysutils/portmanager
Message-ID:  <20051118140913.DFEA4130C21@ringworm.mechee.com>
Resent-Message-ID: <200511181420.jAIEKWtT023819@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         89230
>Category:       ports
>Synopsis:       [MAINTAINER] update sysutils/portmanager
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 18 14:20:31 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Michael C. Shultz
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD ringworm.mechee.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Fri Nov 4 06:35:37 PST 2005 root@ringworm.mechee.com:/usr5/obj/usr5/src/sys/RINGWORM5 i386


>Description:

	update sysutils/portmanager to 0.3.6

	1. Modifies bsd.port.mk to use portmanager as data source when
	registering installed ports or creating backup packages, returns
	bsd.port.mk to original state after each port is rebuilt/updated

	Note to comitter: New tar ball, please remove files/ and any patches,
	thank you.

>How-To-Repeat:

	N/A

>Fix:


--- portmanager-0.3.6.diff begins here ---
diff -ruN portmanager/Makefile portmanager-0.3.6/Makefile
--- portmanager/Makefile	Tue Nov 15 19:17:13 2005
+++ portmanager-0.3.6/Makefile	Thu Nov 17 16:44:12 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portmanager
-PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTVERSION=	0.3.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://portmanager.sunsite.dk/distfiles/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -51,7 +50,7 @@
 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 -ruN portmanager/distinfo portmanager-0.3.6/distinfo
--- portmanager/distinfo	Tue Nov 15 06:06:08 2005
+++ portmanager-0.3.6/distinfo	Thu Nov 17 18:00:31 2005
@@ -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.6.tar.gz) = e36d7b9ba2cec07387f52063058d6ebd
+SHA256 (portmanager-0.3.6.tar.gz) = 0cddd30d22a65fda474df942de279393214c60e64014671110284063ceccd3d5
+SIZE (portmanager-0.3.6.tar.gz) = 439974
diff -ruN portmanager/files/patch-0.3.5_1 portmanager-0.3.6/files/patch-0.3.5_1
--- portmanager/files/patch-0.3.5_1	Tue Nov 15 19:17:13 2005
+++ portmanager-0.3.6/files/patch-0.3.5_1	Wed Dec 31 16:00:00 1969
@@ -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 -ruN portmanager/pkg-plist portmanager-0.3.6/pkg-plist
--- portmanager/pkg-plist	Sat Nov  5 05:49:10 2005
+++ portmanager-0.3.6/pkg-plist	Thu Nov 17 16:44:38 2005
@@ -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
--- portmanager-0.3.6.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



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