- crux-commits - lists.crux.nu

r1241 - crux-2.1/ports/core/prt-get
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jw Date: 2006-04-12 22:07:28 +0200 (Wed, 12 Apr 2006) New Revision: 1241 Modified: crux-2.1/ports/core/prt-get/.md5sum crux-2.1/ports/core/prt-get/prt-get.conf Log: prt-get (2.1) Update prt-get.conf to contain rmlog_on_success Modified: crux-2.1/ports/core/prt-get/.md5sum =================================================================== --- crux-2.1/ports/core/prt-get/.md5sum 2006-04-12 20:05:21 UTC (rev 1240) +++ crux-2.1/ports/core/prt-get/.md5sum 2006-04-12 20:07:28 UTC (rev 1241) @@ -1,3 +1,3 @@ b4572d3b6adf85f1d5c2fa1fc47aac2f prt-get-5.12.tar.gz 9fefdc42a8a106f7d2c2036ba3b2f9fb prt-get.aliases -6e79b7ce2987c6ae4382c74e742cc7ac prt-get.conf +cac4a5f0545033bee15432956112cdfd prt-get.conf Modified: crux-2.1/ports/core/prt-get/prt-get.conf =================================================================== --- crux-2.1/ports/core/prt-get/prt-get.conf 2006-04-12 20:05:21 UTC (rev 1240) +++ crux-2.1/ports/core/prt-get/prt-get.conf 2006-04-12 20:07:28 UTC (rev 1241) @@ -15,6 +15,7 @@ ### log options: # writelog enabled # (enabled|disabled) # logmode overwrite # (append|overwrite) +# rmlog_on_success yes # (no|yes) logfile /var/log/pkgbuild/%n.log # path, %p=path to port dir, %n=port name # %v=version, %r=release

1 0

r1240 - crux-2.1/ports/core/prt-get
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jw Date: 2006-04-12 22:05:21 +0200 (Wed, 12 Apr 2006) New Revision: 1240 Added: crux-2.1/ports/core/prt-get/prt-get.aliases crux-2.1/ports/core/prt-get/prt-get.conf Log: prt-get (2.1): add missing files (thanks Jukka) Added: crux-2.1/ports/core/prt-get/prt-get.aliases =================================================================== --- crux-2.1/ports/core/prt-get/prt-get.aliases (rev 0) +++ crux-2.1/ports/core/prt-get/prt-get.aliases 2006-04-12 20:05:21 UTC (rev 1240) @@ -0,0 +1,7 @@ +j2sdk: j2re +openmotif: lesstif +postfix: sendmail +exim: sendmail +qmail: sendmail +masqmail: sendmail +xorg: x11 Added: crux-2.1/ports/core/prt-get/prt-get.conf =================================================================== --- crux-2.1/ports/core/prt-get/prt-get.conf (rev 0) +++ crux-2.1/ports/core/prt-get/prt-get.conf 2006-04-12 20:05:21 UTC (rev 1240) @@ -0,0 +1,46 @@ +### +### prt-get conf +### + +# note: the order matters: the package found first is used +prtdir /usr/ports/core +prtdir /usr/ports/opt + +# the following line enables the user maintained contrib collection +#prtdir /usr/ports/contrib + +### use mypackage form local directory +# prtdir /home/packages/build:mypackage + +### log options: +# writelog enabled # (enabled|disabled) +# logmode overwrite # (append|overwrite) +logfile /var/log/pkgbuild/%n.log + # path, %p=path to port dir, %n=port name + # %v=version, %r=release + +### use alternate cache file (default: /var/lib/pkg/prt-get.cache +# cachefile /mnt/nfs/cache + +### print README information: +# readme verbose # (verbose|compact|disabled) + +### prefer higher versions in sysup / diff +# preferhigher no # (yes|no) + +### use regexp search +# useregex no # (yes|no) + +### run pre- and post-installs scripts; yes is equivalent to the +### --install-scripts option +# runscripts no # (no|yes) + + +### EXPERT SECTION ### + +### alternative commands +# makecommand pkgmk +# addcommand pkgadd +# removecommand pkgrm +# runscriptcommand sh +

1 0

r1239 - crux-2.1/ports/core/prt-get
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jw Date: 2006-04-12 21:57:58 +0200 (Wed, 12 Apr 2006) New Revision: 1239 Modified: crux-2.1/ports/core/prt-get/.footprint crux-2.1/ports/core/prt-get/.md5sum crux-2.1/ports/core/prt-get/Pkgfile Log: prt-get (2.1): update to 5.12 Modified: crux-2.1/ports/core/prt-get/.footprint =================================================================== --- crux-2.1/ports/core/prt-get/.footprint 2006-04-12 19:16:00 UTC (rev 1238) +++ crux-2.1/ports/core/prt-get/.footprint 2006-04-12 19:57:58 UTC (rev 1239) @@ -14,4 +14,3 @@ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/pkg/ -rw-r--r-- root/root var/lib/pkg/prt-get.aliases --rw-r--r-- root/root var/lib/pkg/prt-get.deplist Modified: crux-2.1/ports/core/prt-get/.md5sum =================================================================== --- crux-2.1/ports/core/prt-get/.md5sum 2006-04-12 19:16:00 UTC (rev 1238) +++ crux-2.1/ports/core/prt-get/.md5sum 2006-04-12 19:57:58 UTC (rev 1239) @@ -1 +1,3 @@ -a9297b69ec9eacd555b291bc9ef50ad5 prt-get-0.5.11.tar.gz +b4572d3b6adf85f1d5c2fa1fc47aac2f prt-get-5.12.tar.gz +9fefdc42a8a106f7d2c2036ba3b2f9fb prt-get.aliases +6e79b7ce2987c6ae4382c74e742cc7ac prt-get.conf Modified: crux-2.1/ports/core/prt-get/Pkgfile =================================================================== --- crux-2.1/ports/core/prt-get/Pkgfile 2006-04-12 19:16:00 UTC (rev 1238) +++ crux-2.1/ports/core/prt-get/Pkgfile 2006-04-12 19:57:58 UTC (rev 1239) @@ -3,13 +3,17 @@ # Maintainer: Johannes Winkelmann, jw at tks6 dot net name=prt-get -version=0.5.11 +version=5.12 release=1 -source=(http://jw.tks6.net/files/crux/prt-get-$version.tar.gz) +source=(http://jw.tks6.net/files/crux/prt-get-$version.tar.gz \ + prt-get.conf prt-get.aliases) build() { cd ${name}-${version} ./configure --prefix=/usr make make DESTDIR=$PKG install + + install -m 644 $SRC/prt-get.conf $PKG/etc/ + install -D -m 644 $SRC/prt-get.aliases $PKG/var/lib/pkg/prt-get.aliases }

1 0

r1238 - crux-2.2/ports/core/prt-get
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jw Date: 2006-04-12 21:16:00 +0200 (Wed, 12 Apr 2006) New Revision: 1238 Modified: crux-2.2/ports/core/prt-get/.md5sum crux-2.2/ports/core/prt-get/Pkgfile Log: prt-get (the port): update to 5.12 Modified: crux-2.2/ports/core/prt-get/.md5sum =================================================================== --- crux-2.2/ports/core/prt-get/.md5sum 2006-04-12 19:11:27 UTC (rev 1237) +++ crux-2.2/ports/core/prt-get/.md5sum 2006-04-12 19:16:00 UTC (rev 1238) @@ -1,4 +1,3 @@ -dc3d731bac68c9bda567a60063a85139 prt-get-0.5.11-deptree-alias.diff -a9297b69ec9eacd555b291bc9ef50ad5 prt-get-0.5.11.tar.gz +b4572d3b6adf85f1d5c2fa1fc47aac2f prt-get-5.12.tar.gz 9fefdc42a8a106f7d2c2036ba3b2f9fb prt-get.aliases 6e79b7ce2987c6ae4382c74e742cc7ac prt-get.conf Modified: crux-2.2/ports/core/prt-get/Pkgfile =================================================================== --- crux-2.2/ports/core/prt-get/Pkgfile 2006-04-12 19:11:27 UTC (rev 1237) +++ crux-2.2/ports/core/prt-get/Pkgfile 2006-04-12 19:16:00 UTC (rev 1238) @@ -3,22 +3,17 @@ # Maintainer: Johannes Winkelmann, jw at tks6 dot net name=prt-get -version=0.5.11 -release=5 +version=5.12 +release=1 source=(http://jw.tks6.net/files/crux/prt-get-$version.tar.gz \ - prt-get.conf prt-get.aliases \ - prt-get-0.5.11-deptree-alias.diff) + prt-get.conf prt-get.aliases) build() { cd ${name}-${version} - patch -p1 < $SRC/prt-get-0.5.11-deptree-alias.diff ./configure --prefix=/usr make make DESTDIR=$PKG install install -m 644 $SRC/prt-get.conf $PKG/etc/ - - # hacks - install -m 644 $SRC/prt-get.aliases $PKG/var/lib/pkg/prt-get.aliases - rm -r $PKG/var/lib/pkg/prt-get.deplist + install -D -m 644 $SRC/prt-get.aliases $PKG/var/lib/pkg/prt-get.aliases }

1 0

r1237 - tools/prt-get/trunk
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jw Date: 2006-04-12 21:11:27 +0200 (Wed, 12 Apr 2006) New Revision: 1237 Modified: tools/prt-get/trunk/configure tools/prt-get/trunk/configure.in Log: update prt-get to .12 Modified: tools/prt-get/trunk/configure =================================================================== --- tools/prt-get/trunk/configure 2006-04-12 18:35:00 UTC (rev 1236) +++ tools/prt-get/trunk/configure 2006-04-12 19:11:27 UTC (rev 1237) @@ -1614,7 +1614,7 @@ # Define the identity of the package. PACKAGE=prt-get - VERSION=0.5.12pre5 + VERSION=5.12 cat >>confdefs.h <<_ACEOF Modified: tools/prt-get/trunk/configure.in =================================================================== --- tools/prt-get/trunk/configure.in 2006-04-12 18:35:00 UTC (rev 1236) +++ tools/prt-get/trunk/configure.in 2006-04-12 19:11:27 UTC (rev 1237) @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([src/prtget.cpp]) -AM_INIT_AUTOMAKE(prt-get,0.5.12pre5) +AM_INIT_AUTOMAKE(prt-get,5.12) dnl Determine default prefix

1 0

r1236 - in tools/prt-get/trunk: . doc misc src
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jw Date: 2006-04-12 20:35:00 +0200 (Wed, 12 Apr 2006) New Revision: 1236 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/TODO tools/prt-get/trunk/configure tools/prt-get/trunk/configure.in tools/prt-get/trunk/doc/prt-get.8 tools/prt-get/trunk/misc/prt-get_complete tools/prt-get/trunk/src/argparser.cpp tools/prt-get/trunk/src/argparser.h tools/prt-get/trunk/src/main.cpp tools/prt-get/trunk/src/prtget.cpp tools/prt-get/trunk/src/prtget.h Log: prt-get: add 'listorphans' command Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/ChangeLog 2006-04-12 18:35:00 UTC (rev 1236) @@ -13,6 +13,7 @@ - add timestamps to log files - fix aliasing bug introduce earlier in the .12 session (thanks Mark) - add --recursive and --tree for dependent +- add listorphans command * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls' Modified: tools/prt-get/trunk/TODO =================================================================== --- tools/prt-get/trunk/TODO 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/TODO 2006-04-12 18:35:00 UTC (rev 1236) @@ -5,7 +5,6 @@ - add update-footprint, update-md5sum commands (patch in trac) - allow dependency injection for sysup, with previews - prefer toolchain (patch in trac) -- dependent --list-orphaned; should simplify pkgfoster - logging: check for non-root owned symlinks - logging: reject relative logfile names Modified: tools/prt-get/trunk/configure =================================================================== --- tools/prt-get/trunk/configure 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/configure 2006-04-12 18:35:00 UTC (rev 1236) @@ -1614,7 +1614,7 @@ # Define the identity of the package. PACKAGE=prt-get - VERSION=0.5.12pre4 + VERSION=0.5.12pre5 cat >>confdefs.h <<_ACEOF Modified: tools/prt-get/trunk/configure.in =================================================================== --- tools/prt-get/trunk/configure.in 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/configure.in 2006-04-12 18:35:00 UTC (rev 1236) @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([src/prtget.cpp]) -AM_INIT_AUTOMAKE(prt-get,0.5.12pre4) +AM_INIT_AUTOMAKE(prt-get,0.5.12pre5) dnl Determine default prefix Modified: tools/prt-get/trunk/doc/prt-get.8 =================================================================== --- tools/prt-get/trunk/doc/prt-get.8 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/doc/prt-get.8 2006-04-12 18:35:00 UTC (rev 1236) @@ -322,8 +322,12 @@ .B wildcards for the listinst command. Make sure you escape where needed +.TP +.B listorphans [\-v|\-vv] +List installed ports which have no dependent packages + .TP .B isinst <package> Check whether a package is installed. The same as Modified: tools/prt-get/trunk/misc/prt-get_complete =================================================================== --- tools/prt-get/trunk/misc/prt-get_complete 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/misc/prt-get_complete 2006-04-12 18:35:00 UTC (rev 1236) @@ -20,7 +20,7 @@ dependent sysup current lock unlock \ listlocked diff quickdiff depends quickdep \ dup isinst cat ls edit deptree \ - remove listinst' $cur )) + remove listinst dumpconfig listofphans' $cur )) fi Modified: tools/prt-get/trunk/src/argparser.cpp =================================================================== --- tools/prt-get/trunk/src/argparser.cpp 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/src/argparser.cpp 2006-04-12 18:35:00 UTC (rev 1236) @@ -121,7 +121,7 @@ */ bool ArgParser::parse() { - const int commandCount = 34; + const int commandCount = 35; string commands[commandCount] = { "list", "search", "dsearch", "info", "depends", "install", "depinst", @@ -132,7 +132,8 @@ "dependent", "sysup", "current", "fsearch", "lock", "unlock", "listlocked", "cat", "ls", "edit", - "remove", "deptree", "dumpconfig" }; + "remove", "deptree", "dumpconfig", + "listorphans" }; Type commandID[commandCount] = { LIST, SEARCH, DSEARCH, INFO, DEPENDS, INSTALL, DEPINST, @@ -143,7 +144,7 @@ DEPENDENT, SYSUP, CURRENT, FSEARCH, LOCK, UNLOCK, LISTLOCKED, CAT, LS, EDIT, REMOVE, DEPTREE, - DUMPCONFIG }; + DUMPCONFIG, LISTORPHANS }; if ( m_argc < 2 ) { return false; } Modified: tools/prt-get/trunk/src/argparser.h =================================================================== --- tools/prt-get/trunk/src/argparser.h 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/src/argparser.h 2006-04-12 18:35:00 UTC (rev 1236) @@ -37,7 +37,7 @@ LISTINST, PRINTF, README, DEPENDENT, SYSUP, CURRENT, FSEARCH, LOCK, UNLOCK, LISTLOCKED, CAT, LS, EDIT, REMOVE, - DEPTREE, DUMPCONFIG }; + DEPTREE, DUMPCONFIG, LISTORPHANS }; bool isCommandGiven() const; bool isForced() const; Modified: tools/prt-get/trunk/src/main.cpp =================================================================== --- tools/prt-get/trunk/src/main.cpp 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/src/main.cpp 2006-04-12 18:35:00 UTC (rev 1236) @@ -160,6 +160,9 @@ case ArgParser::DUMPCONFIG: prtGet.dumpConfig(); break; + case ArgParser::LISTORPHANS: + prtGet.listOrphans(); + break; default: cerr << "unknown command" << endl; break; Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/src/prtget.cpp 2006-04-12 18:35:00 UTC (rev 1236) @@ -107,6 +107,8 @@ << endl; cout << " listinst [<filter>] show a list of installed ports" << endl; + cout << " listorphans list of ports with no " + << "packages depending on them" << endl; cout << " info <port> show info about a port" << endl; cout << " path <port> show path of a port" << endl; cout << " readme <port> show a port's readme file " @@ -145,6 +147,9 @@ cout << " where opt can be:" << endl; cout << " --all list all dependent packages, not " << "only installed" << endl; + cout << " --recursive print recursive listing" << endl; + cout << " --true print recursive tree listing" + << endl; cout << "\nSEARCHING" << endl; cout << " search <expr> show port names containing 'expr'" << endl; @@ -1280,8 +1285,17 @@ } } } - - // prepared for recursive search + + // - there are two modes, tree and non-tree recursive mode; in + // tree mode, packages are shown multiple times, in non tree + // recursive mode they're only printed the first time; this is not + // necessarily optimal for rebuilding: + // + // a -> b -> d + // \ ^ + // > c / + // + // trying to rebuild 'd' before 'c' might possibly fail string indent = ""; if (m_parser->printTree()) { for (int i = 0; i < level; ++i) { @@ -1318,6 +1332,48 @@ } } +void PrtGet::listOrphans() +{ + initRepo(); + map<string, string> installed = m_pkgDB->installedPackages(); + map<string, bool> required; + map<string, string>::iterator it = installed.begin(); + + for (; it != installed.end(); ++it) { + list<string> tokens; + const Package* p = m_repo->getPackage(it->first); + if (p) { + StringHelper::split( p->dependencies(), ',', tokens ); + list<string>::iterator lit = tokens.begin(); + for (; lit != tokens.end(); ++lit) { + required[*lit] = true; + } + } + } + + // - we could store the package pointer in another map to avoid + // another getPackage lockup, but it seems better to optimized for + // memory since it's only used when called with -vv + + it = installed.begin(); + for (; it != installed.end(); ++it) { + if (!required[it->first]) { + cout << it->first; + if ( m_parser->verbose() > 0 ) { + cout << " " << it->second; + } + if ( m_parser->verbose() > 1 ) { + const Package* p = m_repo->getPackage(it->first); + if (p) { + cout << ": " << p->description(); + } + } + cout << endl; + } + } +} + + void PrtGet::warnPackageNotFound(InstallTransaction& transaction) { cerr << "The package '"; Modified: tools/prt-get/trunk/src/prtget.h =================================================================== --- tools/prt-get/trunk/src/prtget.h 2006-04-12 17:32:37 UTC (rev 1235) +++ tools/prt-get/trunk/src/prtget.h 2006-04-12 18:35:00 UTC (rev 1236) @@ -70,6 +70,7 @@ void printDependent(); void printDiff(); void printQuickDiff(); + void listOrphans(); void createCache();

1 0

r1235 - tools/prt-get/trunk/src
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jw Date: 2006-04-12 19:32:37 +0200 (Wed, 12 Apr 2006) New Revision: 1235 Modified: tools/prt-get/trunk/src/prtget.cpp Log: prt-get: nicer output for dependent --tree Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-04-12 16:06:17 UTC (rev 1234) +++ tools/prt-get/trunk/src/prtget.cpp 2006-04-12 17:32:37 UTC (rev 1235) @@ -1250,7 +1250,13 @@ initRepo(); string arg = *(m_parser->otherArgs().begin()); - printDependent(arg, 0); + + if (m_parser) { + cout << arg << endl; + printDependent(arg, 2); + } else { + printDependent(arg, 0); + } } void PrtGet::printDependent(const string& dep, int level)

1 0

r1234 - in tools/prt-get/trunk: . doc src
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jw Date: 2006-04-12 18:06:17 +0200 (Wed, 12 Apr 2006) New Revision: 1234 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/TODO tools/prt-get/trunk/configure tools/prt-get/trunk/configure.in tools/prt-get/trunk/doc/prt-get.8 tools/prt-get/trunk/src/argparser.cpp tools/prt-get/trunk/src/argparser.h tools/prt-get/trunk/src/main.cpp tools/prt-get/trunk/src/prtget.cpp tools/prt-get/trunk/src/prtget.h Log: prt-get: support recursive dependent and a tree view Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/ChangeLog 2006-04-12 16:06:17 UTC (rev 1234) @@ -12,6 +12,7 @@ - update default prt-get.conf to reflect new port hierarchy (core/opt/contrib) - add timestamps to log files - fix aliasing bug introduce earlier in the .12 session (thanks Mark) +- add --recursive and --tree for dependent * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls' Modified: tools/prt-get/trunk/TODO =================================================================== --- tools/prt-get/trunk/TODO 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/TODO 2006-04-12 16:06:17 UTC (rev 1234) @@ -1,3 +1,5 @@ +- add --rebuild-set to dependent +--------------------------- - use `eval $(fgrep -h 'PKGMK_PACKAGE_DIR=' $(which pkgmk) /etc/pkgmk.conf) && echo $PKGMK_PACKAGE_DIR` to determine PACKAGE_DIR - add update-footprint, update-md5sum commands (patch in trac) Modified: tools/prt-get/trunk/configure =================================================================== --- tools/prt-get/trunk/configure 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/configure 2006-04-12 16:06:17 UTC (rev 1234) @@ -1614,7 +1614,7 @@ # Define the identity of the package. PACKAGE=prt-get - VERSION=0.5.12pre2 + VERSION=0.5.12pre4 cat >>confdefs.h <<_ACEOF Modified: tools/prt-get/trunk/configure.in =================================================================== --- tools/prt-get/trunk/configure.in 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/configure.in 2006-04-12 16:06:17 UTC (rev 1234) @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([src/prtget.cpp]) -AM_INIT_AUTOMAKE(prt-get,0.5.12pre2) +AM_INIT_AUTOMAKE(prt-get,0.5.12pre4) dnl Determine default prefix Modified: tools/prt-get/trunk/doc/prt-get.8 =================================================================== --- tools/prt-get/trunk/doc/prt-get.8 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/doc/prt-get.8 2006-04-12 16:06:17 UTC (rev 1234) @@ -209,9 +209,11 @@ .TP .B dependent <package> print a list of package which depend on -.B package. -Only list direct dependencies. Usually shows dependent packages which -are installed. To see all dependencies, add the --all switch +.B package. + +Usually shows dependent packages which are installed. To see all dependencies, +add the --all switch; use --recursive to get a recursive list (without +duplication), and --tree to get a nicely indented one .TP .B deptree <package> Modified: tools/prt-get/trunk/src/argparser.cpp =================================================================== --- tools/prt-get/trunk/src/argparser.cpp 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/src/argparser.cpp 2006-04-12 16:06:17 UTC (rev 1234) @@ -45,7 +45,9 @@ m_preferHigher( false ), m_strictDiff( false ), m_useRegex(false), - m_fullPath(false) + m_fullPath(false), + m_recursive(false), + m_printTree(false) { } @@ -196,6 +198,10 @@ m_useRegex = true; } else if ( s == "--full" ) { m_fullPath = true; + } else if ( s == "--recursive" ) { + m_recursive = true; + } else if ( s == "--tree" ) { + m_printTree = true; } else if ( s == "-f" ) { m_pkgaddArgs += " " + s; @@ -382,6 +388,16 @@ return m_printPath; } +bool ArgParser::recursive() const +{ + return m_recursive; +} + +bool ArgParser::printTree() const +{ + return m_printTree; +} + const string& ArgParser::commandName() const { return m_commandName; Modified: tools/prt-get/trunk/src/argparser.h =================================================================== --- tools/prt-get/trunk/src/argparser.h 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/src/argparser.h 2006-04-12 16:06:17 UTC (rev 1234) @@ -57,6 +57,8 @@ bool strictDiff() const; bool useRegex() const; bool fullPath() const; + bool recursive() const; + bool printTree() const; const string& alternateConfigFile() const; const string& pkgmkArgs() const; @@ -107,6 +109,9 @@ bool m_useRegex; bool m_fullPath; + bool m_recursive; + bool m_printTree; + string m_alternateConfigFile; string m_pkgmkArgs; string m_pkgaddArgs; Modified: tools/prt-get/trunk/src/main.cpp =================================================================== --- tools/prt-get/trunk/src/main.cpp 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/src/main.cpp 2006-04-12 16:06:17 UTC (rev 1234) @@ -26,7 +26,7 @@ << endl; } else if ( !argParser.isCommandGiven() ) { if (argParser.commandName() != "") { - cerr << "prt-get: Unknown command '" + cerr << "prt-get: Unknown command '" << argParser.commandName() << "'. " << "try prt-get help for more information" << endl; } else { @@ -122,7 +122,7 @@ prtGet.readme(); break; case ArgParser::DEPENDENT: - prtGet.printDependendent(); + prtGet.printDependent(); break; case ArgParser::SYSUP: prtGet.sysup(); Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/src/prtget.cpp 2006-04-12 16:06:17 UTC (rev 1234) @@ -1244,37 +1244,58 @@ return true; } -void PrtGet::printDependendent() +void PrtGet::printDependent() { assertExactArgCount(1); initRepo(); string arg = *(m_parser->otherArgs().begin()); + printDependent(arg, 0); +} + +void PrtGet::printDependent(const string& dep, int level) +{ map<string, Package*>::const_iterator it = m_repo->packages().begin(); + static map<string, bool> shownMap; set<const Package*> dependent; for ( ; it != m_repo->packages().end(); ++it ) { // TODO: is the following line needed? const Package* p = it->second; - if ( p && p->dependencies().find( arg ) != string::npos ) { + if ( p && p->dependencies().find( dep ) != string::npos ) { list<string> tokens; StringHelper::split( p->dependencies(), ',', tokens ); list<string>::iterator it = find( tokens.begin(), tokens.end(), - arg ); + dep ); if ( it != tokens.end() ) { dependent.insert( p ); } } } - + // prepared for recursive search + string indent = ""; + if (m_parser->printTree()) { + for (int i = 0; i < level; ++i) { + indent += " "; + } + } set<const Package*>::iterator it2 = dependent.begin(); for ( ; it2 != dependent.end(); ++it2 ) { const Package* p = *it2; + + if (m_parser->recursive() && !m_parser->printTree()) { + if (shownMap[p->name()]) { + continue; + } + shownMap[p->name()] = true; + } + if ( m_parser->all() || m_pkgDB->isInstalled( p->name() ) ) { - cout << p->name(); + + cout << indent << p->name(); if ( m_parser->verbose() > 0 ) { cout << " " << p->version() << "-" << p->release(); } @@ -1283,6 +1304,10 @@ } cout << endl; + + if (m_parser->recursive()) { + printDependent( p->name(), level+2 ); + } } } } Modified: tools/prt-get/trunk/src/prtget.h =================================================================== --- tools/prt-get/trunk/src/prtget.h 2006-04-12 14:44:21 UTC (rev 1233) +++ tools/prt-get/trunk/src/prtget.h 2006-04-12 16:06:17 UTC (rev 1234) @@ -67,7 +67,7 @@ void current(); void printDepends( bool simpleListing=false ); void printDependTree(); - void printDependendent(); + void printDependent(); void printDiff(); void printQuickDiff(); @@ -96,6 +96,8 @@ protected: void printDepsLevel(int indent, const Package* package); + + void printDependent(const std::string& dep, int level); void executeTransaction( InstallTransaction& transaction, bool update, bool group ); @@ -140,7 +142,7 @@ void assertMaxArgCount(int count); void assertExactArgCount(int count); void argCountFailure(int count, const string& specifier); - + bool greaterThan( const string& v1, const string& v2 ); static bool printFile(const string& file); };

1 0

r1233 - crux-2.2/ports/opt/openvpn
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jheino Date: 2006-04-12 16:44:21 +0200 (Wed, 12 Apr 2006) New Revision: 1233 Modified: crux-2.2/ports/opt/openvpn/.md5sum crux-2.2/ports/opt/openvpn/Pkgfile Log: openvpn: updated to version 2.0.7 Modified: crux-2.2/ports/opt/openvpn/.md5sum =================================================================== --- crux-2.2/ports/opt/openvpn/.md5sum 2006-04-12 14:10:41 UTC (rev 1232) +++ crux-2.2/ports/opt/openvpn/.md5sum 2006-04-12 14:44:21 UTC (rev 1233) @@ -1,3 +1,3 @@ -8d2f95fa825e58363a676b25d4815aa7 openvpn-2.0.6.tar.gz +93528233f1f6d02fc18e2c00f82e0aca openvpn-2.0.7.tar.gz 6b7f60b1758f10614fd8291947affceb openvpn.conf 546a0e4cd9129e2212df61c3d821cca7 openvpn.rc Modified: crux-2.2/ports/opt/openvpn/Pkgfile =================================================================== --- crux-2.2/ports/opt/openvpn/Pkgfile 2006-04-12 14:10:41 UTC (rev 1232) +++ crux-2.2/ports/opt/openvpn/Pkgfile 2006-04-12 14:44:21 UTC (rev 1233) @@ -5,7 +5,7 @@ # Depends on: openssl name=openvpn -version=2.0.6 +version=2.0.7 release=1 source=(http://$name.net/release/$name-$version.tar.gz \ $name.conf \

1 0

r1232 - crux-2.2/ports/opt/dovecot
by crux＠crux.nu 12 Apr '06

12 Apr '06

Author: jue Date: 2006-04-12 16:10:41 +0200 (Wed, 12 Apr 2006) New Revision: 1232 Modified: crux-2.2/ports/opt/dovecot/.md5sum crux-2.2/ports/opt/dovecot/Pkgfile crux-2.2/ports/opt/dovecot/dovecot-config.patch Log: dovecot: update to 1.0.beta7 Modified: crux-2.2/ports/opt/dovecot/.md5sum =================================================================== --- crux-2.2/ports/opt/dovecot/.md5sum 2006-04-12 13:15:22 UTC (rev 1231) +++ crux-2.2/ports/opt/dovecot/.md5sum 2006-04-12 14:10:41 UTC (rev 1232) @@ -1,3 +1,3 @@ 1c37d911bc42fb40f0ef5a3f5822b170 dovecot -7d3b57a1c8f0043ca768e532bd21e975 dovecot-1.0.beta5.tar.gz -3643ac2629e6e32e613a955a17fce97f dovecot-config.patch +bfbc4c3705f6e6e891934168cd26e9dd dovecot-1.0.beta7.tar.gz +5295ba4ffbc656c435cc2905657c7910 dovecot-config.patch Modified: crux-2.2/ports/opt/dovecot/Pkgfile =================================================================== --- crux-2.2/ports/opt/dovecot/Pkgfile 2006-04-12 13:15:22 UTC (rev 1231) +++ crux-2.2/ports/opt/dovecot/Pkgfile 2006-04-12 14:10:41 UTC (rev 1232) @@ -4,7 +4,7 @@ # Depends on: openssl name=dovecot -version=1.0.beta5 +version=1.0.beta7 release=1 source=(http://dovecot.procontrol.fi/releases/$name-$version.tar.gz \ dovecot-config.patch dovecot) Modified: crux-2.2/ports/opt/dovecot/dovecot-config.patch =================================================================== --- crux-2.2/ports/opt/dovecot/dovecot-config.patch 2006-04-12 13:15:22 UTC (rev 1231) +++ crux-2.2/ports/opt/dovecot/dovecot-config.patch 2006-04-12 14:10:41 UTC (rev 1232) @@ -1,6 +1,6 @@ -diff -Nru dovecot-1.0.beta4.orig/dovecot-example.conf dovecot-1.0.beta4/dovecot-example.conf ---- dovecot-1.0.beta4.orig/dovecot-example.conf 2006-04-02 19:58:59.000000000 +0200 -+++ dovecot-1.0.beta4/dovecot-example.conf 2006-04-02 20:04:15.000000000 +0200 +diff -Nru dovecot-1.0.beta7.orig/dovecot-example.conf dovecot-1.0.beta7/dovecot-example.conf +--- dovecot-1.0.beta7.orig/dovecot-example.conf 2006-04-12 15:32:54.000000000 +0200 ++++ dovecot-1.0.beta7/dovecot-example.conf 2006-04-12 15:33:04.000000000 +0200 @@ -13,11 +13,11 @@ # --with-ssldir=/etc/ssl @@ -26,7 +26,7 @@ # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. -@@ -100,7 +100,7 @@ +@@ -108,7 +108,7 @@ # which login needs to be able to connect to. The sockets are created when # running as root, so you don't have to worry about permissions. Note that # everything in this directory is deleted when Dovecot is started. @@ -35,7 +35,7 @@ # chroot login process to the login_dir. Only reason not to do this is if you # wish to run the whole Dovecot without roots. -@@ -112,7 +112,7 @@ +@@ -120,7 +120,7 @@ # only it has access, it's used to control access for authentication process. # Note that this user is NOT used to access mails. # http://wiki.dovecot.org/UserIds @@ -44,7 +44,7 @@ # Set max. process size in megabytes. If you don't use # login_process_per_connection you might need to grow this. -@@ -122,11 +122,11 @@ +@@ -130,11 +130,11 @@ # login process be allowed to process multiple connections (no)? Yes is more # secure, espcially with SSL/TLS enabled. No is faster since there's no need # to create processes all the time. @@ -58,7 +58,7 @@ # Maximum number of extra login processes to create. The extra process count # usually stays at login_processes_count, but when multiple users start logging -@@ -181,7 +181,7 @@ +@@ -189,7 +189,7 @@ # non-valid GID as primary group ID aren't allowed to log in. If user # belongs to supplementary groups with non-valid GIDs, those groups are # not set. @@ -67,7 +67,7 @@ #last_valid_gid = 0 # Grant access to these extra groups for mail processes. Typical use would be -@@ -222,7 +222,7 @@ +@@ -230,7 +230,7 @@ # default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u # default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n # @@ -76,7 +76,7 @@ # If you need to set multiple mailbox locations or want to change default # namespace settings, you can do it by defining namespace sections: -@@ -431,19 +431,19 @@ +@@ -439,19 +439,19 @@ protocol imap { # Login executable location. @@ -100,7 +100,7 @@ # Maximum IMAP command line length in bytes. Some clients generate very long # command lines with huge mailboxes, so you may need to raise this if you get -@@ -493,10 +493,10 @@ +@@ -501,10 +501,10 @@ protocol pop3 { # Login executable location. @@ -113,7 +113,7 @@ # Don't try to set mails non-recent or seen with POP3 sessions. This is # mostly intended to reduce disk I/O. With maildir it doesn't move files -@@ -533,7 +533,7 @@ +@@ -547,7 +547,7 @@ # installations. %08Xu%08Xv will be the new default, so use it for new # installations. # @@ -122,7 +122,7 @@ # POP3 logout format string: # %t - number of TOP commands -@@ -566,7 +566,7 @@ +@@ -580,7 +580,7 @@ ## # Executable location @@ -131,7 +131,7 @@ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -670,7 +670,7 @@ +@@ -685,7 +685,7 @@ # database (passwd usually), you can use static userdb. # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM # authentication to actually work. @@ -140,7 +140,7 @@ # [session=yes] [cache_key=<key>] [<service name>] # # session=yes makes Dovecot open and immediately close PAM session. Some -@@ -694,7 +694,7 @@ +@@ -709,7 +709,7 @@ # args = session=yes * # args = cache_key=%u dovecot #args = dovecot @@ -149,7 +149,7 @@ # /etc/passwd or similar, using getpwnam() # In many systems nowadays this uses Name Service Switch, which is -@@ -703,8 +703,8 @@ +@@ -718,8 +718,8 @@ #} # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.

1 0