diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2005-03-04 09:29:37 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2005-03-04 09:29:37 +0000 |
| commit | 75b0eb08aba9c6cd27041b75c3b66edde37c825a (patch) | |
| tree | 1c1b25a6b5332931137fbffdaac699c35a8c8814 /ports-mgmt | |
| parent | 59fb18e80ecb177c99e698df0925a767d364130b (diff) | |
| download | ports-75b0eb08aba9c6cd27041b75c3b66edde37c825a.tar.gz ports-75b0eb08aba9c6cd27041b75c3b66edde37c825a.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmanager/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmanager/files/patch-0.2.9_2 | 80 |
2 files changed, 81 insertions, 1 deletions
diff --git a/ports-mgmt/portmanager/Makefile b/ports-mgmt/portmanager/Makefile index 3b6b9169b319..1d1d9d60dd6c 100644 --- a/ports-mgmt/portmanager/Makefile +++ b/ports-mgmt/portmanager/Makefile @@ -7,7 +7,7 @@ PORTNAME= portmanager PORTVERSION= 0.2.9 -PORTREVISION= 1 +PORTREVISION= 2 #----------------------------------------- #for local use, remove before submitting PR CATEGORIES= sysutils diff --git a/ports-mgmt/portmanager/files/patch-0.2.9_2 b/ports-mgmt/portmanager/files/patch-0.2.9_2 new file mode 100644 index 000000000000..891854dd4f8e --- /dev/null +++ b/ports-mgmt/portmanager/files/patch-0.2.9_2 @@ -0,0 +1,80 @@ +diff -ruN --exclude=Makefile.in --exclude=externVars.h.in --exclude=config.h.in --exclude=config.h.in~ --exclude=Makefile ./libPMGR/src/PMGRrDbCreate.c ../../0.2.9_2/portmanager/libPMGR/src/PMGRrDbCreate.c +--- ./libPMGR/src/PMGRrDbCreate.c Wed Mar 2 15:38:33 2005 ++++ ../../0.2.9_2/portmanager/libPMGR/src/PMGRrDbCreate.c Thu Mar 3 19:25:56 2005 +@@ -28,6 +28,7 @@ + char pkgDir[] = PKGDBDIR; + char* fieldKey = NULL; + char* fieldValue = NULL; ++ char* ignoredPortDir = NULL; + char* installedPortDir = NULL; + char* installedPortName = NULL; + classDir* dir = NULL; +@@ -35,39 +36,57 @@ + int QTY_configDb = 0; + int dirMode = 7; + int errorCode = 0; ++ int stringSize = 0; + signed int fopenIdx = 0; + signed int mallocIdx = 0; + + property->objIdx = 0; + +- /***************************************************************/ +- /* add any ignored ports in config.db to ignore.db */ +- /***************************************************************/ ++ /* ++ * add any ignored ports in config.db to ignore.db ++ */ + IDX_configDb = 1; + QTY_configDb = MGdbGetRecordQty( property->configDb ); + +- + while( IDX_configDb < QTY_configDb ) + { + fieldKey = MGdbGet( property->configDb, IDX_configDb, property->fieldKey ); +- if( !strcmp( fieldKey, "IGNORE" ) ) ++ if( strstr( fieldKey, "IGNORE" ) ) + { + fieldValue = MGdbGet( property->configDb, IDX_configDb, property->fieldValue ); ++ ++ if( fieldValue[0] != '/' ) ++ { ++ stringSize = 1 + strlen( fieldValue ) + 1; ++ ignoredPortDir = malloc( stringSize ); ++ ignoredPortDir[0] = 0; ++ strcat( ignoredPortDir, "/" ); ++ strcat( ignoredPortDir, fieldValue ); ++ } ++ else ++ { ++ stringSize = strlen( fieldValue ) + 1; ++ ignoredPortDir = malloc( stringSize ); ++ ignoredPortDir[0] = 0; ++ strcat( ignoredPortDir, fieldValue ); ++ } ++ + MGdbGoTop( property->ignoreDb ); +- if( !MGdbSeek( property->ignoreDb, property->fieldIgnorePortDir, fieldValue, ++ if( !MGdbSeek( property->ignoreDb, property->fieldIgnorePortDir, ignoredPortDir, + property->fieldIgnorePortDir ) ) + { + fprintf( stdout, "%s %s info: adding %s to ignore.db reason: pm-020.conf option\n", +- id, VERSION, fieldValue ); +- MGdbAdd( property->ignoreDb, fieldValue, "pm-020.conf option", NULL ); ++ id, VERSION, ignoredPortDir ); ++ MGdbAdd( property->ignoreDb, ignoredPortDir, "pm-020.conf option", NULL ); + } ++ free( ignoredPortDir ); + } + IDX_configDb++; + } + +- /***************************************************************/ +- /* create initial data bases */ +- /***************************************************************/ ++ /* ++ * create initial data bases ++ */ + + /*zzzzzzzzzzzzzz*/ + property->objIdx++; |