Attachment #75314 for bug #108808

View | Details | Raw Unified | Return to bug 108808
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-1 / +1 lines)
7		7
8	PORTNAME= portmanager	8	PORTNAME= portmanager
9	PORTVERSION= 0.4.1	9	PORTVERSION= 0.4.1
10	PORTREVISION= 7	10	PORTREVISION= 8
11	CATEGORIES= ports-mgmt	11	CATEGORIES= ports-mgmt
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= portmanager	13	MASTER_SITE_SUBDIR= portmanager

Added Link Here

(-)files/patch-libMGPM__src__MGPMrController.c (+11 lines)
1	--- libMGPM/src/MGPMrController.c.orig Mon Feb 5 12:46:30 2007
2	+++ libMGPM/src/MGPMrController.c Mon Feb 5 12:47:49 2007
3	@@ -270,7 +270,7 @@
4	fprintf( stdout, "%s\n", "running in WITH_BUILD_DEPENDS_ARE_LEAVES mode" );
5	fprintf( stdout, "%s\n", "using this mode is not endorsed by author, if ports" );
6	fprintf( stdout, "%s\n", "fail building due to missing build dependencies" );
7	- fprintf( stdout, "%s\n", "in sysutils/portmanager run \"make config\" and shut this mode off" );
8	+ fprintf( stdout, "%s\n", "in ports-mgmt/portmanager run \"make config\" and shut this mode off" );
9	fprintf( stdout, "%s\n", "then rebuild/reinstall portmanager before contacting author/maintainer" );
10	fprintf( stdout, "%s\n", DOUBLE_LINES );
11	while( fflush( stdout ) );

Lines 1-5 Link Here

(-)files/patch-libMGPM__src__MGPMrUpdate.c (-5 / +83 lines)
1	--- libMGPM/src/MGPMrUpdate.c.orig Wed Dec 14 13:23:59 2005	1	--- libMGPM/src/MGPMrUpdate.c.orig Wed Dec 14 13:23:59 2005
2	+++ libMGPM/src/MGPMrUpdate.c Fri Dec 8 17:24:30 2006	2	+++ libMGPM/src/MGPMrUpdate.c Mon Feb 5 12:50:13 2007
3	@@ -60,6 +60,7 @@	3	@@ -60,6 +60,7 @@
4	char* stopPortDirPtr = NULL;	4	char* stopPortDirPtr = NULL;
5	char* strikePtr = NULL;	5	char* strikePtr = NULL;
Lines 21-26 Link Here
21	localProperty.CURDIR = calloc( MAXSTRINGSIZE, 1 );	21	localProperty.CURDIR = calloc( MAXSTRINGSIZE, 1 );
22	localProperty.afterOptionsFileSize = calloc( MAXSTRINGSIZE, 1 );	22	localProperty.afterOptionsFileSize = calloc( MAXSTRINGSIZE, 1 );
23	localProperty.afterOptionsFileTime = calloc( MAXSTRINGSIZE, 1 );	23	localProperty.afterOptionsFileTime = calloc( MAXSTRINGSIZE, 1 );
		24	@@ -110,7 +105,7 @@
		25	property->installedPortsDb = MGdbOpen( property->installedPortsDbFileName );
		26	property->strikesDb = MGdbOpen( property->strikesDbFileName );
		27
		28	- if( ( strcmp( "/sysutils/portmanager", oldPortDir ) == 0 \|\| strcmp( "/local/sysutils/portmanager", oldPortDir ) == 0 ) && property->forced )
		29	+ if( ( strcmp( "/ports-mgmt/portmanager", oldPortDir ) == 0 \|\| strcmp( "/local/ports-mgmt/portmanager", oldPortDir ) == 0 ) && property->forced )
		30	{
		31	fprintf( stdout, "ignoring portmanager, will not self update in forced mode by design\n" );
		32	while( fflush( stdout ) );
24	@@ -122,30 +117,6 @@	33	@@ -122,30 +117,6 @@
25	return( 0 );	34	return( 0 );
26	}	35	}
Lines 316-321 Link Here
316	/************************************************************************/	325	/************************************************************************/
317	/* Command "10" pkg_create -b */	326	/* Command "10" pkg_create -b */
318	/************************************************************************/	327	/************************************************************************/
		328	@@ -1113,12 +1046,12 @@
		329	/*
		330	* inforced mass update mode portmanager CANNOT loose its databases
		331	*/
		332	- if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 \|\| strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
		333	+ if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 \|\| strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
		334	property->pmMode == SINGLE )
		335	{
		336	MGmStrcpy( localProperty.command, "cd " );
		337	MGmStrcat( localProperty.command, PORTSDIR );
		338	- MGmStrcat( localProperty.command, "/sysutils/portmanager; " );
		339	+ MGmStrcat( localProperty.command, "/ports-mgmt/portmanager; " );
		340	MGmStrcat( localProperty.command, "make -V PKG_DBDIR" );
		341	pHandle = popen( localProperty.command, "r" );
		342	localProperty.buffer[0] = 0;
		343	@@ -1146,7 +1079,7 @@
		344	/*
		345	* have to do this here before db's are wacked
		346	*/
		347	- if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 \|\| strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
		348	+ if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 \|\| strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
		349	property->pmMode == MULTI )
		350	{
		351	/*
319	@@ -1266,7 +1199,7 @@	352	@@ -1266,7 +1199,7 @@
320	MGmStrcat(localProperty.command, TEMPDIR);	353	MGmStrcat(localProperty.command, TEMPDIR);
321	MGmStrcat(localProperty.command, "/");	354	MGmStrcat(localProperty.command, "/");
Lines 334-349 Link Here
334	fprintf( stdout, "%s\n", SINGLE_LINES );	367	fprintf( stdout, "%s\n", SINGLE_LINES );
335	fprintf( stderr, "deleting backup copy, installation of updated %s successful\n", oldPortDir );	368	fprintf( stderr, "deleting backup copy, installation of updated %s successful\n", oldPortDir );
336	fprintf( stdout, "%s %s localProperty.command: #12 of 14 %s\n", id, PACKAGE_VERSION, localProperty.command );	369	fprintf( stdout, "%s %s localProperty.command: #12 of 14 %s\n", id, PACKAGE_VERSION, localProperty.command );
337	@@ -1555,12 +1488,6 @@	370	@@ -1414,7 +1347,7 @@
338	MGdbDestroy( property->ignoreDb );	371	/*
		372	* if portmanager updated there won't be any databases, so need to clean the old fashoned way
		373	*/
		374	- if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 \|\| strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
		375	+ if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 \|\| strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
		376	property->pmMode == MULTI )
		377	{
		378	rCleanDir( oldPortDir, localProperty.workDir );
		379	@@ -1460,7 +1393,7 @@
		380	/*
		381	* portmanager auto restart after updating itself
		382	*/
		383	- if( ( strcmp( oldPortDir, "/sysutils/portmanager" ) == 0 \|\| strcmp( oldPortDir, "/local/sysutils/portmanager" ) == 0 ) &&
		384	+ if( ( strcmp( oldPortDir, "/ports-mgmt/portmanager" ) == 0 \|\| strcmp( oldPortDir, "/local/ports-mgmt/portmanager" ) == 0 ) &&
		385	property->pmMode == MULTI )
		386	{
		387	/*
		388	@@ -1556,12 +1489,6 @@
339	MGdbDestroy( property->installedPortsDb );	389	MGdbDestroy( property->installedPortsDb );
340	MGdbDestroy( property->strikesDb );	390	MGdbDestroy( property->strikesDb );
341	-	391
342	-	392	-
343	- free( localProperty->environment[0] );	393	- free( localProperty->environment[0] );
344	- free( localProperty->environment[1] );	394	- free( localProperty->environment[1] );
345	- free( localProperty->environment[2] );	395	- free( localProperty->environment[2] );
346	- free( localProperty->environment );	396	- free( localProperty->environment );
347		397	-
348	free( localProperty->CURDIR );	398	free( localProperty->CURDIR );
349	free( localProperty->afterOptionsFileSize );	399	free( localProperty->afterOptionsFileSize );
		400	free( localProperty->afterOptionsFileTime );
		401	@@ -1655,7 +1582,7 @@
		402	*/
		403	MGmStrcpy( localProperty->command, "cd " );
		404	MGmStrcat( localProperty->command, PORTSDIR );
		405	- MGmStrcat( localProperty->command, "/sysutils/portmanager; make -V PKGNAME" );
		406	+ MGmStrcat( localProperty->command, "/ports-mgmt/portmanager; make -V PKGNAME" );
		407	pHandle = popen( localProperty->command, "r" );
		408	localProperty->buffer[0] = 0;
		409	fread( localProperty->buffer, MAXBUFFERSIZE - 1, 1, pHandle );
		410	@@ -1693,7 +1620,7 @@
		411	*/
		412	MGmStrcpy( localProperty->command, "cd " );
		413	MGmStrcat( localProperty->command, PORTSDIR );
		414	- MGmStrcat( localProperty->command, "/sysutils/portmanager; make -V PKGNAME" );
		415	+ MGmStrcat( localProperty->command, "/ports-mgmt/portmanager; make -V PKGNAME" );
		416	pHandle = popen( localProperty->command, "r" );
		417	localProperty->buffer[0] = 0;
		418	fread( localProperty->buffer, MAXBUFFERSIZE - 1, 1, pHandle );
		419	@@ -1737,7 +1664,7 @@
		420	*/
		421	MGmStrcpy( localProperty->command, "cd " );
		422	MGmStrcat( localProperty->command, PORTSDIR );
		423	- MGmStrcat( localProperty->command, "/sysutils/portmanager; make -V PORTMANAGER" );
		424	+ MGmStrcat( localProperty->command, "/ports-mgmt/portmanager; make -V PORTMANAGER" );
		425	pHandle = popen( localProperty->command, "r" );
		426	localProperty->buffer[0] = 0;
		427	fread( localProperty->buffer, MAXBUFFERSIZE - 1, 1, pHandle );




--- 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
  #

Return to bug 108808

Added Link Here

(-)files/patch-portmanager__portmanager.1 (+60 lines)
1	--- portmanager/portmanager.1.orig Mon Feb 5 13:02:40 2007
2	+++ portmanager/portmanager.1 Mon Feb 5 13:06:46 2007
3	@@ -183,7 +183,7 @@
4	config". To determine if options is defined in the port's directory
5	run "grep OPTIONS Makefile". examples:
6	.sp
7	- cd /usr/ports/sysutils/portmanager
8	+ cd /usr/ports/ports-mgmt/portmanager
9	.sp
10	grep OPTIONS Makefile
11	.sp
12	@@ -276,8 +276,8 @@
13	.sp
14	WITH_DEBUG
15	.sp
16	- a) set with either make config from sysutils/portmanager or
17	-by adding \fBsysutils/portmanager\|WITH_DEBUG=1\|\fR to pm-020.conf
18	+ a) set with either make config from ports-mgmt/portmanager or
19	+by adding \fBports-mgmt/portmanager\|WITH_DEBUG=1\|\fR to pm-020.conf
20	.sp
21	b) effects: when portmanager is built all warnings are enabled
22	and is built with -ggdb option so symbols may be seen with gdb debugger.
23	@@ -363,16 +363,16 @@
24	of some of FreeBSD's port system features:
25	.sp
26	########################################################################
27	- # Makefile from /usr/ports/local/sysutils/somelocalportname/Makefile
28	+ # Makefile from /usr/ports/local/ports-mgmt/somelocalportname/Makefile
29	########################################################################
30	PORTNAME= somelocalportname
31	PORTVERSION= 0.1.0
32	- CATEGORIES= local/sysutils
33	+ CATEGORIES= local/ports-mgmt
34	VALID_CATEGORIES+= \&${CATEGORIES} # for FreeBSD to accept our
35	# local category
36	.sp
37	Simply add a "local" directory to /usr/ports and install your local ports under that directory. Where a normal FreeBSD
38	-port may be in "sysutils/{portname} the example above would reside in "local/sysutils/{portname}".
39	+port may be in "ports-mgmt/{portname} the example above would reside in "local/ports-mgmt/{portname}".
40	.sp
41	\fBcvsup hints\fR
42	.sp
43	@@ -411,7 +411,7 @@
44	You may set port configurations in \fB/etc/make.conf\fR instead of pm\&-020.conf.
45	The advantage to setting configuration in make.conf is they will apply when ever you
46	manually interact with the ports tree or if you also use another ports management
47	-program such as \fBsysutils/portupgrade\fR.
48	+program such as \fBports-mgmt/portupgrade\fR.
49	.sp
50	example /etc/makefile.conf entries:
51	.sp
52	@@ -437,7 +437,7 @@
53	#
54	#Because I don't want my development version of portmanager
55	#installing on top of the version in the ports tree
56	- \&.if ${\&.CURDIR:M*/local/sysutils/portmanager}
57	+ \&.if ${\&.CURDIR:M*/local/ports-mgmt/portmanager}
58	PREFIX=/home/mike/TEMP
59	\&.endif
60	#