diff options
author | pav <pav@FreeBSD.org> | 2005-02-10 00:01:41 +0000 |
---|---|---|
committer | pav <pav@FreeBSD.org> | 2005-02-10 00:01:41 +0000 |
commit | a386a3d76a0a8c0c72a3f37d6866a0a8019a6f57 (patch) | |
tree | a0cb6dd5139b68965009127af7d07582e0a19432 /sysutils | |
parent | 28c063d89d2e5de880dd8d97157bb5a3b0a0785e (diff) | |
download | FreeBSD-ports-a386a3d76a0a8c0c72a3f37d6866a0a8019a6f57.zip FreeBSD-ports-a386a3d76a0a8c0c72a3f37d6866a0a8019a6f57.tar.gz |
- Fix bug where configuration file would not get read
PR: ports/77319
Submitted by: Michael C. Shultz <reso3w83@verizon.net> (maintainer)
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/portmanager/Makefile | 5 | ||||
-rw-r--r-- | sysutils/portmanager/files/patch-0.2.6_3 | 42 | ||||
-rw-r--r-- | sysutils/portmanager/pkg-descr | 23 |
3 files changed, 62 insertions, 8 deletions
diff --git a/sysutils/portmanager/Makefile b/sysutils/portmanager/Makefile index 013f51e..37ad3e0 100644 --- a/sysutils/portmanager/Makefile +++ b/sysutils/portmanager/Makefile @@ -7,14 +7,15 @@ PORTNAME= portmanager PORTVERSION= 0.2.6 -PORTREVISION= 2 +PORTREVISION= 3 #----------------------------------------- #for local use, remove before submitting PR CATEGORIES= sysutils #CATEGORIES= local/sysutils #VALID_CATEGORIES+= ${CATEGORIES} # for FreeBSD to accept our local category #----------------------------------------- -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= http://portmanager.sunsite.dk/distfiles/ \ + ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= portmanager MAINTAINER= reso3w83@verizon.net diff --git a/sysutils/portmanager/files/patch-0.2.6_3 b/sysutils/portmanager/files/patch-0.2.6_3 new file mode 100644 index 0000000..a262568 --- /dev/null +++ b/sysutils/portmanager/files/patch-0.2.6_3 @@ -0,0 +1,42 @@ +--- libPMGR/src/PMGRrUpgrade.c (revision 4) ++++ libPMGR/src/PMGRrUpgrade.c (working copy) +@@ -324,10 +324,15 @@ + property->fieldInstalledPortName, + dependencyPortName, + property->fieldInstalledPortDir ); +-/* ++ if( !origDir ) ++ { ++ fprintf( stderr, ++ "%s is not located in property->installedPortsDb!\n", ++ dependencyPortName ); ++ assert(0); ++ } + fprintf( stdout, "\tin %s/+CONTENTS ORIG dir = %s \n\n", + dependencyPortName, origDir ); +-*/ + if( strcmp( dependencyPortDir, origDir ) ) + { + fprintf( stdout, "%s\n", SINGLE_LINES ); +Index: libPMGR/src/PMGRrReadConfigure.c +=================================================================== +--- libPMGR/src/PMGRrReadConfigure.c (revision 4) ++++ libPMGR/src/PMGRrReadConfigure.c (working copy) +@@ -148,7 +148,7 @@ + + strlen( property->fieldValue ) + + strlen( "zzNULLzz\" > " ) + + strlen( property->configDbFileName ) +- + strlen( ";awk 'BEGIN{ FS = \"|\" } NF == 3 && $1 !~ /#/ && $1 !~ /CATEGORY\\/PORT/ && $2 !~ /#/ {print $1 \"zzNULLzz\" $2 \"zzNULLzz\"}' " ) ++ + strlen( ";awk 'BEGIN{ FS = \"|\" } NF == 3 && $1 !~ /#/ && $1 !~ /CATEGORY\\/PORT/ && $2 !~ /#/ {print \"/\" $1 \"zzNULLzz\" $2 \"zzNULLzz\"}' " ) + + strlen( property->configConfFileName ) + + strlen( " >> " ) + + strlen( property->configDbFileName ); +@@ -164,7 +164,7 @@ + strcat( command, property->fieldValue ); + strcat( command, "zzNULLzz\" > " ); + strcat( command, property->configDbFileName ); +- strcat( command, ";awk 'BEGIN{ FS = \"|\" } NF == 3 && $1 !~ /#/ && $1 !~ /CATEGORY\\/PORT/ && $2 !~ /#/ {print $1 \"zzNULLzz\" $2 \"zzNULLzz\"}' " ); ++ strcat( command, ";awk 'BEGIN{ FS = \"|\" } NF == 3 && $1 !~ /#/ && $1 !~ /CATEGORY\\/PORT/ && $2 !~ /#/ {print \"/\" $1 \"zzNULLzz\" $2 \"zzNULLzz\"}' " ); + strcat( command, property->configConfFileName ); + strcat( command, " >> " ); + strcat( command, property->configDbFileName ); diff --git a/sysutils/portmanager/pkg-descr b/sysutils/portmanager/pkg-descr index 569e3de..c1a1cc7 100644 --- a/sysutils/portmanager/pkg-descr +++ b/sysutils/portmanager/pkg-descr @@ -1,10 +1,21 @@ -FreeBSD port collection management. Insures your ports are only built with -the most up to date sources. Great for users of KDE or GNOME who are always -concerned over the way their underlying ports are built. **New option** -leaf port report: Shows ports with no other ports depending on them, these are -ports that may be safely deinstalled. +FreeBSD port collection management. Update your ports easily. Great +for users of KDE or GNOME who need to be concerned about how +dependency ports are built. -WWW: http://portmanager.sourceforge.net/ +**New options** + +1) Leaf port report: Shows ports with no other ports depending on +them, these are ports that may be safely deinstalled. + +2) Remove leaf ports safley: Interactivly delete leaf ports. + +portmanager-questions archive may be found at: +http://www.mail-archive.com/portmanager-questions%40sunsite.dk/ + +to subscribe just send an empty message to: +portmanager-questions-subscribe@sunsite.dk + +WWW: http://portmanager.sunsite.dk/ Michael C. Shultz reso3w83@verizon.net |