- crux-commits - lists.crux.nu

r1141 - in tools/prt-get/trunk: . src
by crux＠crux.nu 04 Apr '06

04 Apr '06

Author: jw Date: 2006-04-04 20:50:25 +0200 (Tue, 04 Apr 2006) New Revision: 1141 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/src/installtransaction.cpp Log: prt-get: print nice summary before running addcommand (-v for details) Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-04 16:30:54 UTC (rev 1140) +++ tools/prt-get/trunk/ChangeLog 2006-04-04 18:50:25 UTC (rev 1141) @@ -5,6 +5,8 @@ - unlock ports on remove - fix lock: previously locking would only work for ports in the ports tree - allow to remove log files of successful builds +- print update summary right before running the addcommand +- print full add command and PACKAGE_DIR info when using install/update -v * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls' Modified: tools/prt-get/trunk/src/installtransaction.cpp =================================================================== --- tools/prt-get/trunk/src/installtransaction.cpp 2006-04-04 16:30:54 UTC (rev 1140) +++ tools/prt-get/trunk/src/installtransaction.cpp 2006-04-04 18:50:25 UTC (rev 1141) @@ -268,8 +268,10 @@ if ( pkgdest != "" ) { // TODO: don't manipulate pkgdir pkgdir = pkgdest; - string message = "Using PKGMK_PACKAGE_DIR: " + pkgdir; - cout << message << endl; + string message = "prt-get: Using PKGMK_PACKAGE_DIR: " + pkgdir; + if (parser->verbose() > 0) { + cout << message << endl; + } if ( m_config->writeLog() ) { write( fdlog, message.c_str(), message.length() ); write( fdlog, "\n", 1 ); @@ -307,10 +309,27 @@ commandName = "prt-cache"; } - string message = commandName + ": " + cmd + " " + args; - cout << message << endl; + // - inform the user about what's happening + string fullCommand = commandName + ": " + cmd + " " + args; + string summary; + if (update) { + summary = commandName + ": " + "updating " + package->name() + + " from " + m_pkgDB->getPackageVersion(package->name()) + + " to " + package->version() + "-" + package->release(); + } else { + summary = commandName + ": " + "installing " + + package->name() + " " + + package->version() + "-" + package->release(); + } + + // - print and log + cout << summary << endl; + if (parser->verbose() > 0) { + cout << fullCommand << endl; + } if ( m_config->writeLog() ) { - write( fdlog, message.c_str(), message.length() ); + write( fdlog, summary.c_str(), summary.length() ); + write( fdlog, fullCommand.c_str(), fullCommand.length() ); write( fdlog, "\n", 1 ); }

1 0

r1140 - in tools/prt-get/trunk: . doc misc
by crux＠crux.nu 04 Apr '06

04 Apr '06

Author: jw Date: 2006-04-04 18:30:54 +0200 (Tue, 04 Apr 2006) New Revision: 1140 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/doc/prt-get.conf.5 tools/prt-get/trunk/misc/prt-get.conf Log: prt-get: document rmlog_on_success Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-04 16:22:35 UTC (rev 1139) +++ tools/prt-get/trunk/ChangeLog 2006-04-04 16:30:54 UTC (rev 1140) @@ -4,6 +4,7 @@ - don't install alias file and deplist - unlock ports on remove - fix lock: previously locking would only work for ports in the ports tree +- allow to remove log files of successful builds * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls' Modified: tools/prt-get/trunk/doc/prt-get.conf.5 =================================================================== --- tools/prt-get/trunk/doc/prt-get.conf.5 2006-04-04 16:22:35 UTC (rev 1139) +++ tools/prt-get/trunk/doc/prt-get.conf.5 2006-04-04 16:30:54 UTC (rev 1140) @@ -110,6 +110,9 @@ which can be set to 'enabled' or 'disabled' .B logmode which can be set to 'append' or 'overwrite' +.B rmlog_on_success +which can be set to 'yes' or 'no'; when set to yes, log files of +successful builds will be removed .B logfile which represent the file path. All occurances of %n in logfile are replaced with the port name and all occurances of %p are @@ -117,7 +120,7 @@ .B /usr/base and %n .B gcc. -This allows you to have separate log files per port. +This allows you to have separate log files per port. .LP If the readme option is set to something different than 'disabled', Modified: tools/prt-get/trunk/misc/prt-get.conf =================================================================== --- tools/prt-get/trunk/misc/prt-get.conf 2006-04-04 16:22:35 UTC (rev 1139) +++ tools/prt-get/trunk/misc/prt-get.conf 2006-04-04 16:30:54 UTC (rev 1140) @@ -2,11 +2,11 @@ ### prt-get conf ### -prtdir /usr/ports/base +prtdir /usr/ports/core prtdir /usr/ports/opt -### clc ports -prtdir /usr/ports/contrib +### User contributed ports - check out http://crux.nu/Main/ContribRules +# prtdir /usr/ports/contrib ### use mypackage form local directory # prtdir /home/packages/build:mypackage @@ -17,6 +17,7 @@ ### log options: # writelog enabled # (enabled|disabled) # logmode overwrite # (append|overwrite) +# rm_on_success no # (yes|no) logfile /var/log/pkgbuild/%n.log # path, %p=path to port dir, %n=port name # %v=version, %r=release

1 0

r1139 - tools/prt-get/trunk/src
by crux＠crux.nu 04 Apr '06

04 Apr '06

Author: jw Date: 2006-04-04 18:22:35 +0200 (Tue, 04 Apr 2006) New Revision: 1139 Modified: tools/prt-get/trunk/src/configuration.cpp tools/prt-get/trunk/src/configuration.h tools/prt-get/trunk/src/installtransaction.cpp Log: prt-get: add option to remove log files of successful builds Modified: tools/prt-get/trunk/src/configuration.cpp =================================================================== --- tools/prt-get/trunk/src/configuration.cpp 2006-04-04 16:00:31 UTC (rev 1138) +++ tools/prt-get/trunk/src/configuration.cpp 2006-04-04 16:22:35 UTC (rev 1139) @@ -26,6 +26,7 @@ m_parser( parser ), m_writeLog( false ), m_appendLog( false ), + m_removeLogOnSuccess( false ), m_logFilePattern( "" ), m_cacheFile( "" ), m_readmeMode( VERBOSE_README ), @@ -76,6 +77,11 @@ return m_appendLog; } +bool Configuration::removeLogOnSuccess() const +{ + return m_removeLogOnSuccess; +} + string Configuration::logFilePattern() const { return m_logFilePattern; @@ -154,6 +160,11 @@ if ( s == "append" ) { m_appendLog = true; } + } else if ( startwith_nocase( s, "rmlog_on_success" ) ) { + s = stripWhiteSpace( s.replace( 0, 16, "" ) ); + if ( s == "yes" ) { + m_removeLogOnSuccess = true; + } } else if ( startwith_nocase( s, "readme" ) ) { s = stripWhiteSpace( s.replace( 0, 6, "" ) ); if ( s == "compact" ) { Modified: tools/prt-get/trunk/src/configuration.h =================================================================== --- tools/prt-get/trunk/src/configuration.h 2006-04-04 16:00:31 UTC (rev 1138) +++ tools/prt-get/trunk/src/configuration.h 2006-04-04 16:22:35 UTC (rev 1139) @@ -29,6 +29,7 @@ bool writeLog() const; bool appendLog() const; + bool removeLogOnSuccess() const; std::string logFilePattern() const; const std::list< std::pair<std::string, std::string> >& rootList() const; @@ -64,6 +65,7 @@ std::string m_logFilePattern; bool m_writeLog; bool m_appendLog; + bool m_removeLogOnSuccess; ReadmeMode m_readmeMode; Modified: tools/prt-get/trunk/src/installtransaction.cpp =================================================================== --- tools/prt-get/trunk/src/installtransaction.cpp 2006-04-04 16:00:31 UTC (rev 1138) +++ tools/prt-get/trunk/src/installtransaction.cpp 2006-04-04 16:22:35 UTC (rev 1139) @@ -109,21 +109,21 @@ if ( m_packages.empty() ) { return NO_PACKAGE_GIVEN; } - + list<string> ignoredPackages; StringHelper::split(parser->ignore(), ',', ignoredPackages); list< pair<string, const Package*> >::iterator it = m_packages.begin(); for ( ; it != m_packages.end(); ++it ) { const Package* package = it->second; - - if (find(ignoredPackages.begin(), - ignoredPackages.end(), + + if (find(ignoredPackages.begin(), + ignoredPackages.end(), it->first) != ignoredPackages.end() ) { m_ignoredPackages.push_back(it->first); continue; } - + if ( package == NULL ) { m_missingPackages.push_back( make_pair( it->first, string("") ) ); if ( group ) { @@ -190,8 +190,10 @@ #endif int fdlog = -1; + string logFile = ""; + if ( m_config->writeLog() ) { - string logFile = m_config->logFilePattern(); + logFile = m_config->logFilePattern(); if ( logFile == "" ) { return NO_LOG_FILE; } @@ -344,6 +346,11 @@ // Close logfile close ( fdlog ); + + if (m_config->removeLogOnSuccess() && !m_config->appendLog() && + result == SUCCESS) { + unlink(logFile.c_str()); + } } return result; }

1 0

r1138 - tools/prt-get/trunk
by crux＠crux.nu 04 Apr '06

04 Apr '06

Author: jw Date: 2006-04-04 18:00:31 +0200 (Tue, 04 Apr 2006) New Revision: 1138 Modified: tools/prt-get/trunk/ChangeLog Log: prt-get: add a note regarding a bugfix in lock Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-04 15:39:45 UTC (rev 1137) +++ tools/prt-get/trunk/ChangeLog 2006-04-04 16:00:31 UTC (rev 1138) @@ -3,6 +3,7 @@ - Show alias info in depends - don't install alias file and deplist - unlock ports on remove +- fix lock: previously locking would only work for ports in the ports tree * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls'

1 0

r1137 - in tools/prt-get/trunk: . src
by crux＠crux.nu 04 Apr '06

04 Apr '06

Author: jw Date: 2006-04-04 17:39:45 +0200 (Tue, 04 Apr 2006) New Revision: 1137 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/src/locker.h tools/prt-get/trunk/src/prtget.cpp Log: prt-get: remove lock on 'prt-get remove' Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-04 14:57:06 UTC (rev 1136) +++ tools/prt-get/trunk/ChangeLog 2006-04-04 15:39:45 UTC (rev 1137) @@ -2,6 +2,7 @@ - Fix compilation on OpenBSD - Show alias info in depends - don't install alias file and deplist +- unlock ports on remove * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls' Modified: tools/prt-get/trunk/src/locker.h =================================================================== --- tools/prt-get/trunk/src/locker.h 2006-04-04 14:57:06 UTC (rev 1136) +++ tools/prt-get/trunk/src/locker.h 2006-04-04 15:39:45 UTC (rev 1137) @@ -24,6 +24,8 @@ * - marked in prt-get diff * - not shown in prt-get quickdiff * - not updated in prt-get sysup + * + * remember to call store! */ class Locker { @@ -44,7 +46,7 @@ vector<string> m_packages; static const string LOCKER_FILE; static const string LOCKER_FILE_PATH; - + bool m_openFailed; }; Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-04-04 14:57:06 UTC (rev 1136) +++ tools/prt-get/trunk/src/prtget.cpp 2006-04-04 15:39:45 UTC (rev 1137) @@ -1467,8 +1467,7 @@ list<char*>::const_iterator it = args.begin(); for ( ; it != args.end(); ++it ) { if ( lock ) { - const Package* p = m_repo->getPackage( *it ); - if ( p ) { + if (m_pkgDB->isInstalled( *it )) { if (!m_locker.lock( *it )) { cerr << "Already locked: " << *it << endl; m_returnValue = PG_GENERAL_ERROR; @@ -1476,15 +1475,18 @@ } else { cerr << "Package '" << *it << "' not found" << endl; m_returnValue = PG_GENERAL_ERROR; + return; } } else { if ( !m_locker.unlock( *it ) ) { cerr << "Not locked previously: " << *it << endl; m_returnValue = PG_GENERAL_ERROR; + return; } } } + if (!m_locker.store()) { cerr << "Failed to write lock data" << endl; m_returnValue = PG_GENERAL_ERROR; @@ -1672,6 +1674,10 @@ Process proc(command, args); if (m_parser->isTest() || proc.executeShell() == 0) { removed.push_back(*it); + if (m_locker.isLocked(*it)) { + m_locker.unlock(*it); + m_locker.store(); + } } else { failed.push_back(*it); } @@ -1790,7 +1796,7 @@ list<string>::iterator it = deps.begin(); bool isAlias = false; string aliasName = ""; - + for (; it != deps.end(); ++it) { if ( m_pkgDB->isInstalled( *it, true, &isAlias, &aliasName ) ) { cout << "[i] "; @@ -1828,7 +1834,7 @@ void PrtGet::dumpConfig() { - + cout.setf( ios::left, ios::adjustfield ); cout.width( 20 ); cout.fill( ' ' ); @@ -1837,10 +1843,10 @@ cout.setf( ios::left, ios::adjustfield ); cout.width( 20 ); cout.fill( ' ' ); - cout << "Ext. dep. file: " + cout << "Ext. dep. file: " << Repository::EXTERNAL_DEPENDENCY_FILE << endl; - - + + if (!m_parser->noStdConfig()) { string fName = CONF_FILE; if ( m_parser->isAlternateConfigGiven() ) {

1 0

r1136 - crux-2.2/ports/opt/wxgtk
by crux＠crux.nu 04 Apr '06

04 Apr '06

Author: jaeger Date: 2006-04-04 16:57:06 +0200 (Tue, 04 Apr 2006) New Revision: 1136 Modified: crux-2.2/ports/opt/wxgtk/.footprint crux-2.2/ports/opt/wxgtk/.md5sum crux-2.2/ports/opt/wxgtk/Pkgfile Log: wxgtk: updated to version 2.6.3 Modified: crux-2.2/ports/opt/wxgtk/.footprint =================================================================== --- crux-2.2/ports/opt/wxgtk/.footprint 2006-04-04 14:20:38 UTC (rev 1135) +++ crux-2.2/ports/opt/wxgtk/.footprint 2006-04-04 14:57:06 UTC (rev 1136) @@ -473,35 +473,35 @@ -rw-r--r-- root/root usr/include/wx-2.6/wx/zstream.h drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libwx_base-2.6.so -> libwx_base-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_base-2.6.so.0 -> libwx_base-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_base-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_base-2.6.so.0 -> libwx_base-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_base-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_base_net-2.6.so -> libwx_base_net-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_base_net-2.6.so.0 -> libwx_base_net-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_base_net-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_base_net-2.6.so.0 -> libwx_base_net-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_base_net-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_base_xml-2.6.so -> libwx_base_xml-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_base_xml-2.6.so.0 -> libwx_base_xml-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_base_xml-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_base_xml-2.6.so.0 -> libwx_base_xml-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_base_xml-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_adv-2.6.so -> libwx_gtk2_adv-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_adv-2.6.so.0 -> libwx_gtk2_adv-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_adv-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_adv-2.6.so.0 -> libwx_gtk2_adv-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_adv-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_core-2.6.so -> libwx_gtk2_core-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_core-2.6.so.0 -> libwx_gtk2_core-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_core-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_core-2.6.so.0 -> libwx_gtk2_core-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_core-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_gl-2.6.so -> libwx_gtk2_gl-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_gl-2.6.so.0 -> libwx_gtk2_gl-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_gl-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_gl-2.6.so.0 -> libwx_gtk2_gl-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_gl-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_html-2.6.so -> libwx_gtk2_html-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_html-2.6.so.0 -> libwx_gtk2_html-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_html-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_html-2.6.so.0 -> libwx_gtk2_html-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_html-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_media-2.6.so -> libwx_gtk2_media-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_media-2.6.so.0 -> libwx_gtk2_media-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_media-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_media-2.6.so.0 -> libwx_gtk2_media-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_media-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_qa-2.6.so -> libwx_gtk2_qa-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_qa-2.6.so.0 -> libwx_gtk2_qa-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_qa-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_qa-2.6.so.0 -> libwx_gtk2_qa-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_qa-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_xrc-2.6.so -> libwx_gtk2_xrc-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_xrc-2.6.so.0 -> libwx_gtk2_xrc-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_xrc-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_xrc-2.6.so.0 -> libwx_gtk2_xrc-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_xrc-2.6.so.0.3.1 drwxr-xr-x root/root usr/lib/wx/ drwxr-xr-x root/root usr/lib/wx/config/ -rwxr-xr-x root/root usr/lib/wx/config/gtk2-ansi-release-2.6 Modified: crux-2.2/ports/opt/wxgtk/.md5sum =================================================================== --- crux-2.2/ports/opt/wxgtk/.md5sum 2006-04-04 14:20:38 UTC (rev 1135) +++ crux-2.2/ports/opt/wxgtk/.md5sum 2006-04-04 14:57:06 UTC (rev 1136) @@ -1 +1 @@ -ba2afe7bd028062c5fff6d5ef3249c67 wxGTK-2.6.2.tar.bz2 +3cd76c3c47913e52a3175dd47239c6ec wxGTK-2.6.3.tar.bz2 Modified: crux-2.2/ports/opt/wxgtk/Pkgfile =================================================================== --- crux-2.2/ports/opt/wxgtk/Pkgfile 2006-04-04 14:20:38 UTC (rev 1135) +++ crux-2.2/ports/opt/wxgtk/Pkgfile 2006-04-04 14:57:06 UTC (rev 1136) @@ -4,11 +4,11 @@ # Depends on: gtk name=wxgtk -version=2.6.2 +version=2.6.3 release=1 source=(http://dl.sourceforge.net/sourceforge/wxwindows/wxGTK-$version.tar.… # alternate mirror -# ftp://biolpc22.york.ac.uk/pub/2.6.2/wxGTK-$version.tar.bz2 +# ftp://biolpc22.york.ac.uk/pub/$version/wxGTK-$version.tar.bz2 build() { export LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"

1 0

r1135 - crux-2.1/ports/opt/wxgtk
by crux＠crux.nu 04 Apr '06

04 Apr '06

Author: jaeger Date: 2006-04-04 16:20:38 +0200 (Tue, 04 Apr 2006) New Revision: 1135 Modified: crux-2.1/ports/opt/wxgtk/.footprint crux-2.1/ports/opt/wxgtk/.md5sum crux-2.1/ports/opt/wxgtk/Pkgfile Log: wxgtk: updated to version 2.6.3 Modified: crux-2.1/ports/opt/wxgtk/.footprint =================================================================== --- crux-2.1/ports/opt/wxgtk/.footprint 2006-04-04 13:24:50 UTC (rev 1134) +++ crux-2.1/ports/opt/wxgtk/.footprint 2006-04-04 14:20:38 UTC (rev 1135) @@ -473,35 +473,35 @@ -rw-r--r-- root/root usr/include/wx-2.6/wx/zstream.h drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libwx_base-2.6.so -> libwx_base-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_base-2.6.so.0 -> libwx_base-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_base-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_base-2.6.so.0 -> libwx_base-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_base-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_base_net-2.6.so -> libwx_base_net-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_base_net-2.6.so.0 -> libwx_base_net-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_base_net-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_base_net-2.6.so.0 -> libwx_base_net-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_base_net-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_base_xml-2.6.so -> libwx_base_xml-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_base_xml-2.6.so.0 -> libwx_base_xml-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_base_xml-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_base_xml-2.6.so.0 -> libwx_base_xml-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_base_xml-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_adv-2.6.so -> libwx_gtk2_adv-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_adv-2.6.so.0 -> libwx_gtk2_adv-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_adv-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_adv-2.6.so.0 -> libwx_gtk2_adv-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_adv-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_core-2.6.so -> libwx_gtk2_core-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_core-2.6.so.0 -> libwx_gtk2_core-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_core-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_core-2.6.so.0 -> libwx_gtk2_core-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_core-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_gl-2.6.so -> libwx_gtk2_gl-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_gl-2.6.so.0 -> libwx_gtk2_gl-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_gl-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_gl-2.6.so.0 -> libwx_gtk2_gl-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_gl-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_html-2.6.so -> libwx_gtk2_html-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_html-2.6.so.0 -> libwx_gtk2_html-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_html-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_html-2.6.so.0 -> libwx_gtk2_html-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_html-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_media-2.6.so -> libwx_gtk2_media-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_media-2.6.so.0 -> libwx_gtk2_media-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_media-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_media-2.6.so.0 -> libwx_gtk2_media-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_media-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_qa-2.6.so -> libwx_gtk2_qa-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_qa-2.6.so.0 -> libwx_gtk2_qa-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_qa-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_qa-2.6.so.0 -> libwx_gtk2_qa-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_qa-2.6.so.0.3.1 lrwxrwxrwx root/root usr/lib/libwx_gtk2_xrc-2.6.so -> libwx_gtk2_xrc-2.6.so.0 -lrwxrwxrwx root/root usr/lib/libwx_gtk2_xrc-2.6.so.0 -> libwx_gtk2_xrc-2.6.so.0.2.0 --rwxr-xr-x root/root usr/lib/libwx_gtk2_xrc-2.6.so.0.2.0 +lrwxrwxrwx root/root usr/lib/libwx_gtk2_xrc-2.6.so.0 -> libwx_gtk2_xrc-2.6.so.0.3.1 +-rwxr-xr-x root/root usr/lib/libwx_gtk2_xrc-2.6.so.0.3.1 drwxr-xr-x root/root usr/lib/wx/ drwxr-xr-x root/root usr/lib/wx/config/ -rwxr-xr-x root/root usr/lib/wx/config/gtk2-ansi-release-2.6 Modified: crux-2.1/ports/opt/wxgtk/.md5sum =================================================================== --- crux-2.1/ports/opt/wxgtk/.md5sum 2006-04-04 13:24:50 UTC (rev 1134) +++ crux-2.1/ports/opt/wxgtk/.md5sum 2006-04-04 14:20:38 UTC (rev 1135) @@ -1 +1 @@ -ba2afe7bd028062c5fff6d5ef3249c67 wxGTK-2.6.2.tar.bz2 +3cd76c3c47913e52a3175dd47239c6ec wxGTK-2.6.3.tar.bz2 Modified: crux-2.1/ports/opt/wxgtk/Pkgfile =================================================================== --- crux-2.1/ports/opt/wxgtk/Pkgfile 2006-04-04 13:24:50 UTC (rev 1134) +++ crux-2.1/ports/opt/wxgtk/Pkgfile 2006-04-04 14:20:38 UTC (rev 1135) @@ -4,11 +4,11 @@ # Depends on: gtk name=wxgtk -version=2.6.2 +version=2.6.3 release=1 source=(http://dl.sourceforge.net/sourceforge/wxwindows/wxGTK-$version.tar.… # alternate mirror -# ftp://biolpc22.york.ac.uk/pub/2.6.2/wxGTK-$version.tar.bz2 +# ftp://biolpc22.york.ac.uk/pub/$version/wxGTK-$version.tar.bz2 build() { export LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"

1 0

r1134 - in tools/prt-get/trunk: . src
by crux＠crux.nu 04 Apr '06

04 Apr '06

Author: jw Date: 2006-04-04 15:24:50 +0200 (Tue, 04 Apr 2006) New Revision: 1134 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/src/prtget.cpp Log: prt-get: update ChangeLog; merge patch Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-04-04 13:20:58 UTC (rev 1133) +++ tools/prt-get/trunk/ChangeLog 2006-04-04 13:24:50 UTC (rev 1134) @@ -1,3 +1,8 @@ +* 0.5.12 00.04.2006 Johannes Winkelmann +- Fix compilation on OpenBSD +- Show alias info in depends +- don't install alias file and deplist + * 0.5.11 29.05.2005 Johannes Winkelmann - add --path to 'ls' - initial regex support Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-04-04 13:20:58 UTC (rev 1133) +++ tools/prt-get/trunk/src/prtget.cpp 2006-04-04 13:24:50 UTC (rev 1134) @@ -1788,8 +1788,11 @@ list<string> deps; StringHelper::split(package->dependencies(), ',', deps); list<string>::iterator it = deps.begin(); + bool isAlias = false; + string aliasName = ""; + for (; it != deps.end(); ++it) { - if ( m_pkgDB->isInstalled( *it ) ) { + if ( m_pkgDB->isInstalled( *it, true, &isAlias, &aliasName ) ) { cout << "[i] "; } else { cout << "[ ] "; @@ -1798,6 +1801,9 @@ cout << " "; } cout << *it; + if (isAlias) { + cout << " (provided by " << aliasName << ")"; + } const Package* p = m_repo->getPackage( *it ); if (p) { if (p->dependencies().length() > 0) {

1 0

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

04 Apr '06

Author: jw Date: 2006-04-04 15:20:58 +0200 (Tue, 04 Apr 2006) New Revision: 1133 Modified: tools/prt-get/trunk/Makefile.in tools/prt-get/trunk/aclocal.m4 tools/prt-get/trunk/configure tools/prt-get/trunk/configure.in tools/prt-get/trunk/doc/Makefile.in tools/prt-get/trunk/misc/Makefile.am tools/prt-get/trunk/misc/Makefile.in tools/prt-get/trunk/src/Makefile.in Log: don't install deplist and alias file Modified: tools/prt-get/trunk/Makefile.in =================================================================== --- tools/prt-get/trunk/Makefile.in 2006-04-04 12:21:41 UTC (rev 1132) +++ tools/prt-get/trunk/Makefile.in 2006-04-04 13:20:58 UTC (rev 1133) @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, Modified: tools/prt-get/trunk/aclocal.m4 =================================================================== --- tools/prt-get/trunk/aclocal.m4 2006-04-04 12:21:41 UTC (rev 1132) +++ tools/prt-get/trunk/aclocal.m4 2006-04-04 13:20:58 UTC (rev 1133) @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -28,7 +28,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- Modified: tools/prt-get/trunk/configure =================================================================== --- tools/prt-get/trunk/configure 2006-04-04 12:21:41 UTC (rev 1132) +++ tools/prt-get/trunk/configure 2006-04-04 13:20:58 UTC (rev 1133) @@ -1614,7 +1614,7 @@ # Define the identity of the package. PACKAGE=prt-get - VERSION=0.5.11 + VERSION=0.5.12pre cat >>confdefs.h <<_ACEOF Modified: tools/prt-get/trunk/configure.in =================================================================== --- tools/prt-get/trunk/configure.in 2006-04-04 12:21:41 UTC (rev 1132) +++ tools/prt-get/trunk/configure.in 2006-04-04 13:20:58 UTC (rev 1133) @@ -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.11) +AM_INIT_AUTOMAKE(prt-get,0.5.12pre) dnl Determine default prefix Modified: tools/prt-get/trunk/doc/Makefile.in =================================================================== --- tools/prt-get/trunk/doc/Makefile.in 2006-04-04 12:21:41 UTC (rev 1132) +++ tools/prt-get/trunk/doc/Makefile.in 2006-04-04 13:20:58 UTC (rev 1133) @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, Modified: tools/prt-get/trunk/misc/Makefile.am =================================================================== --- tools/prt-get/trunk/misc/Makefile.am 2006-04-04 12:21:41 UTC (rev 1132) +++ tools/prt-get/trunk/misc/Makefile.am 2006-04-04 13:20:58 UTC (rev 1133) @@ -2,15 +2,3 @@ sysconf_DATA = prt-get.conf -install-data-local: - $(INSTALL) -D -m 644 $(srcdir)/prt-get.deplist \ - $(DESTDIR)$(localstatedir)/lib/pkg/prt-get.deplist - $(INSTALL) -D -m 644 $(srcdir)/prt-get.aliases \ - $(DESTDIR)$(localstatedir)/lib/pkg/prt-get.aliases -# $(INSTALL) -D -m 644 $(srcdir)/prt-get.conf \ -# $(DESTDIR)$(sysconfdir)/prt-get.conf - -uninstall-local: - rm $(DESTDIR)$(localstatedir)/lib/pkg/prt-get.deplist - rm $(DESTDIR)$(localstatedir)/lib/pkg/prt-get.aliases -# rm $(DESTDIR)$(sysconfigdir)/etc/prt-get.conf Modified: tools/prt-get/trunk/misc/Makefile.in =================================================================== --- tools/prt-get/trunk/misc/Makefile.in 2006-04-04 12:21:41 UTC (rev 1132) +++ tools/prt-get/trunk/misc/Makefile.in 2006-04-04 13:20:58 UTC (rev 1133) @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -267,7 +267,7 @@ info-am: -install-data-am: install-data-local +install-data-am: install-exec-am: install-sysconfDATA @@ -293,31 +293,17 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-local uninstall-sysconfDATA +uninstall-am: uninstall-info-am uninstall-sysconfDATA .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-sysconfDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-local uninstall-sysconfDATA + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip install-sysconfDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ + uninstall-am uninstall-info-am uninstall-sysconfDATA - -install-data-local: - $(INSTALL) -D -m 644 $(srcdir)/prt-get.deplist \ - $(DESTDIR)$(localstatedir)/lib/pkg/prt-get.deplist - $(INSTALL) -D -m 644 $(srcdir)/prt-get.aliases \ - $(DESTDIR)$(localstatedir)/lib/pkg/prt-get.aliases -# $(INSTALL) -D -m 644 $(srcdir)/prt-get.conf \ -# $(DESTDIR)$(sysconfdir)/prt-get.conf - -uninstall-local: - rm $(DESTDIR)$(localstatedir)/lib/pkg/prt-get.deplist - rm $(DESTDIR)$(localstatedir)/lib/pkg/prt-get.aliases -# rm $(DESTDIR)$(sysconfigdir)/etc/prt-get.conf # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Modified: tools/prt-get/trunk/src/Makefile.in =================================================================== --- tools/prt-get/trunk/src/Makefile.in 2006-04-04 12:21:41 UTC (rev 1132) +++ tools/prt-get/trunk/src/Makefile.in 2006-04-04 13:20:58 UTC (rev 1133) @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,8 +16,6 @@ # Makefile.am for prt-get by Johannes Winkelmann -SOURCES = $(prt_get_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@

1 0

r1132 - tools/prt-get/trunk/src
by crux＠crux.nu 04 Apr '06

04 Apr '06

Author: jw Date: 2006-04-04 14:21:41 +0200 (Tue, 04 Apr 2006) New Revision: 1132 Modified: tools/prt-get/trunk/src/pg_regex.h Log: prt-get: fix compilation on openbsd Modified: tools/prt-get/trunk/src/pg_regex.h =================================================================== --- tools/prt-get/trunk/src/pg_regex.h 2006-04-04 10:16:52 UTC (rev 1131) +++ tools/prt-get/trunk/src/pg_regex.h 2006-04-04 12:21:41 UTC (rev 1132) @@ -10,8 +10,8 @@ //////////////////////////////////////////////////////////////////////// -#ifndef _REGEX_H_ -#define _REGEX_H_ +#ifndef _PG_REGEX_H_ +#define _PG_REGEX_H_ #include <sys/types.h> #include <regex.h> @@ -36,4 +36,4 @@ }; -#endif /* _REGEX_H_ */ +#endif /* _PG_REGEX_H_ */

1 0