- crux-commits - lists.crux.nu

r1859 - crux-2.2/ports/opt/ruby-gtk
by crux＠crux.nu 10 Sep '06

10 Sep '06

Author: tilman Date: 2006-09-10 13:34:43 +0200 (Sun, 10 Sep 2006) New Revision: 1859 Modified: crux-2.2/ports/opt/ruby-gtk/Pkgfile Log: ruby-gtk: added ruby-cairo to the nice-to-have list Modified: crux-2.2/ports/opt/ruby-gtk/Pkgfile =================================================================== --- crux-2.2/ports/opt/ruby-gtk/Pkgfile 2006-09-10 11:34:18 UTC (rev 1858) +++ crux-2.2/ports/opt/ruby-gtk/Pkgfile 2006-09-10 11:34:43 UTC (rev 1859) @@ -3,6 +3,7 @@ # Packager: H�vard Moen, vanilje at netcom dot no # Maintainer: Tilman Sauerbeck, tilman at crux dot nu # Depends on: ruby, gtk +# Nice to have: ruby-cairo name=ruby-gtk version=0.15.0

1 0

r1858 - in crux-2.2/ports/opt: . ruby-cairo
by crux＠crux.nu 10 Sep '06

10 Sep '06

Author: tilman Date: 2006-09-10 13:34:18 +0200 (Sun, 10 Sep 2006) New Revision: 1858 Added: crux-2.2/ports/opt/ruby-cairo/ crux-2.2/ports/opt/ruby-cairo/.footprint crux-2.2/ports/opt/ruby-cairo/.md5sum crux-2.2/ports/opt/ruby-cairo/Pkgfile crux-2.2/ports/opt/ruby-cairo/ruby-cairo.diff Log: ruby-cairo: initial release Added: crux-2.2/ports/opt/ruby-cairo/.footprint =================================================================== --- crux-2.2/ports/opt/ruby-cairo/.footprint (rev 0) +++ crux-2.2/ports/opt/ruby-cairo/.footprint 2006-09-10 11:34:18 UTC (rev 1858) @@ -0,0 +1,9 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/ruby/ +drwxr-xr-x root/root usr/lib/ruby/site_ruby/ +drwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/ +-rw-r--r-- root/root usr/lib/ruby/site_ruby/1.8/cairo.rb +drwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/ +-r-xr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/cairo.so +-r-xr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/rb_cairo.h Added: crux-2.2/ports/opt/ruby-cairo/.md5sum =================================================================== --- crux-2.2/ports/opt/ruby-cairo/.md5sum (rev 0) +++ crux-2.2/ports/opt/ruby-cairo/.md5sum 2006-09-10 11:34:18 UTC (rev 1858) @@ -0,0 +1,2 @@ +d5b4da3a6aafd28cf2a0dcbdafb82b04 rcairo-1.2.0.tar.gz +aa2e712c7818ee7cde3f3982e74af6f6 ruby-cairo.diff Added: crux-2.2/ports/opt/ruby-cairo/Pkgfile =================================================================== --- crux-2.2/ports/opt/ruby-cairo/Pkgfile (rev 0) +++ crux-2.2/ports/opt/ruby-cairo/Pkgfile 2006-09-10 11:34:18 UTC (rev 1858) @@ -0,0 +1,21 @@ +# Description: Ruby bindings for Cairo +# URL: http://cairographics.org/rcairo +# Maintainer: Tilman Sauerbeck, tilman at crux dot nu +# Depends on: ruby cairo + +name=ruby-cairo +version=1.2.0 +release=1 +source=(http://cairographics.org/releases/rcairo-$version.tar.gz \ + $name.diff) + +build () { + cd rcairo-$version + + patch -Np1 -i $SRC/$name.diff + + ruby setup.rb config + ruby setup.rb setup + + DESTDIR=$PKG ruby setup.rb install +} Property changes on: crux-2.2/ports/opt/ruby-cairo/Pkgfile ___________________________________________________________________ Name: svn:keywords + Id Added: crux-2.2/ports/opt/ruby-cairo/ruby-cairo.diff =================================================================== --- crux-2.2/ports/opt/ruby-cairo/ruby-cairo.diff (rev 0) +++ crux-2.2/ports/opt/ruby-cairo/ruby-cairo.diff 2006-09-10 11:34:18 UTC (rev 1858) @@ -0,0 +1,22 @@ +diff -aur rcairo-1.2.0.orig/setup.rb rcairo-1.2.0/setup.rb +--- rcairo-1.2.0.orig/setup.rb 2006-09-10 13:24:51.880828750 +0200 ++++ rcairo-1.2.0/setup.rb 2006-09-10 13:26:21.978459500 +0200 +@@ -537,7 +537,7 @@ + module FileOperations + + def mkdir_p(dirname, prefix = nil) +- dirname = prefix + File.expand_path(dirname) if prefix ++ dirname = ENV["DESTDIR"] + prefix + File.expand_path(dirname) if prefix + $stderr.puts "mkdir -p #{dirname}" if verbose? + return if no_harm? + +@@ -624,7 +624,8 @@ + $stderr.puts "install #{from} #{dest}" if verbose? + return if no_harm? + +- realdest = prefix ? prefix + File.expand_path(dest) : dest ++ realdest = ENV["DESTDIR"] ++ realdest += prefix ? prefix + File.expand_path(dest) : dest + realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest) + str = File.binread(from) + if diff?(str, realdest)

1 0

r1857 - tools/webtools/timeline
by crux＠crux.nu 10 Sep '06

10 Sep '06

Author: sip Date: 2006-09-10 13:18:37 +0200 (Sun, 10 Sep 2006) New Revision: 1857 Modified: tools/webtools/timeline/timeline.php Log: timeline: fixed url Modified: tools/webtools/timeline/timeline.php =================================================================== --- tools/webtools/timeline/timeline.php 2006-09-10 11:11:46 UTC (rev 1856) +++ tools/webtools/timeline/timeline.php 2006-09-10 11:18:37 UTC (rev 1857) @@ -38,7 +38,7 @@ $currdate = $evt['event_date']; } $timeline .= "</table>\n"; -$timeline .= '<br><form method="post" action="pmwiki.php?n=Main.Test">Show the latest <input size="4" type="text" name="days" value="'.$days.'"> days <input type="submit" value="Show"></form>'."\n"; +$timeline .= '<br><form method="post" action="pmwiki.php?n=Main.Timeline">Show the latest <input size="4" type="text" name="days" value="'.$days.'"> days <input type="submit" value="Show"></form>'."\n"; return $timeline; }

1 0

r1856 - tools/webtools/timeline
by crux＠crux.nu 10 Sep '06

10 Sep '06

Author: sip Date: 2006-09-10 13:11:46 +0200 (Sun, 10 Sep 2006) New Revision: 1856 Modified: tools/webtools/timeline/tlcacher.php Log: timeline: added aon and falk to the username mapping Modified: tools/webtools/timeline/tlcacher.php =================================================================== --- tools/webtools/timeline/tlcacher.php 2006-09-09 21:14:29 UTC (rev 1855) +++ tools/webtools/timeline/tlcacher.php 2006-09-10 11:11:46 UTC (rev 1856) @@ -38,7 +38,9 @@ "jheino" => "JukkaHeino", "tilman" => "TilmanSauerbeck", "viper" => "SimonGlo�ner", - "sten" => "NickSteeves" + "sten" => "NickSteeves", + "falk" => "FalkHamann", + "aon" => "AnttiNyk�nen", ); // Event: cache_id, tstamp, type(icon), date, time, user, url, description, notes

1 0

r1855 - crux-2.2/ports/opt/antiword
by crux＠crux.nu 09 Sep '06

09 Sep '06

Author: aon Date: 2006-09-09 23:14:29 +0200 (Sat, 09 Sep 2006) New Revision: 1855 Modified: crux-2.2/ports/opt/antiword/Pkgfile Log: took over maintainership, use install instead of cp, chmod and mkdir, use CFLAGS Modified: crux-2.2/ports/opt/antiword/Pkgfile =================================================================== --- crux-2.2/ports/opt/antiword/Pkgfile 2006-09-09 21:11:35 UTC (rev 1854) +++ crux-2.2/ports/opt/antiword/Pkgfile 2006-09-09 21:14:29 UTC (rev 1855) @@ -1,7 +1,7 @@ # Description: Show the text and images of MS Word documents # URL: http://www.winfield.demon.nl -# Maintainer: sten, nick dot steeves at shaw dot ca -# Packager: +# Maintainer: Antti Nyk�nen, aon at iki dot fi +# Packager: sten, nick dot steeves at shaw dot ca name=antiword version=0.37 @@ -10,11 +10,10 @@ build() { cd $name-$version - make GLOBAL_INSTALL_DIR=/usr/bin - mkdir -p $PKG/usr/bin $PKG/usr/share/$name $PKG/usr/man/man1 + make GLOBAL_INSTALL_DIR=/usr/bin OPT="$CFLAGS" + install -d -m 0755 $PKG/usr/bin $PKG/usr/share/$name $PKG/usr/man/man1 make DESTDIR=$PKG GLOBAL_INSTALL_DIR=/usr/bin global_install - cp Docs/$name.1 $PKG/usr/man/man1 - chmod 644 $PKG/usr/man/man1/* + install -D -m 0644 Docs/$name.1 $PKG/usr/man/man1/$name.1 # kantiword is a shell wrapper to make d&d possible in KDE #rm $PKG/usr/bin/kantiword }

1 0

r1854 - in crux-2.2/ports/opt: emacs lsof
by crux＠crux.nu 09 Sep '06

09 Sep '06

Author: aon Date: 2006-09-09 23:11:35 +0200 (Sat, 09 Sep 2006) New Revision: 1854 Modified: crux-2.2/ports/opt/emacs/Pkgfile crux-2.2/ports/opt/lsof/Pkgfile Log: took over maintainership Modified: crux-2.2/ports/opt/emacs/Pkgfile =================================================================== --- crux-2.2/ports/opt/emacs/Pkgfile 2006-09-09 15:34:45 UTC (rev 1853) +++ crux-2.2/ports/opt/emacs/Pkgfile 2006-09-09 21:11:35 UTC (rev 1854) @@ -1,6 +1,6 @@ # Description: an extensible, customizable, self-documenting real-time display editor # URL: http://www.gnu.org/software/emacs/ -# Maintainer: sten, nick dot steeves at shaw dot ca +# Maintainer: Antti Nyk�nen, aon at iki dot fi # Packager: Per Lid�n, per at fukt dot bth dot se # Depends on: x11, libtiff Modified: crux-2.2/ports/opt/lsof/Pkgfile =================================================================== --- crux-2.2/ports/opt/lsof/Pkgfile 2006-09-09 15:34:45 UTC (rev 1853) +++ crux-2.2/ports/opt/lsof/Pkgfile 2006-09-09 21:11:35 UTC (rev 1854) @@ -1,7 +1,7 @@ # Description: list open files # URL: http://freshmeat.net/projects/lsof/ -# Maintainer: sten, nick dot steeves at shaw dot ca -# Packager: +# Maintainer: Antti Nyk�nen, aon at iki dot fi +# Packager: sten, nick dot steeves at shaw dot ca name=lsof version=4.77

1 0

r1853 - crux-2.2/ports/opt/gimp
by crux＠crux.nu 09 Sep '06

09 Sep '06

Author: jaeger Date: 2006-09-09 17:34:45 +0200 (Sat, 09 Sep 2006) New Revision: 1853 Modified: crux-2.2/ports/opt/gimp/.footprint crux-2.2/ports/opt/gimp/Pkgfile Log: gimp: fixed mandir Modified: crux-2.2/ports/opt/gimp/.footprint =================================================================== --- crux-2.2/ports/opt/gimp/.footprint 2006-09-09 13:44:43 UTC (rev 1852) +++ crux-2.2/ports/opt/gimp/.footprint 2006-09-09 15:34:45 UTC (rev 1853) @@ -401,6 +401,16 @@ -rw-r--r-- root/root usr/lib/pkgconfig/gimp-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gimpthumb-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gimpui-2.0.pc +drwxr-xr-x root/root usr/man/ +drwxr-xr-x root/root usr/man/man1/ +-rw-r--r-- root/root usr/man/man1/gimp-2.2.1.gz +-rw-r--r-- root/root usr/man/man1/gimp-remote-2.2.1.gz +lrwxrwxrwx root/root usr/man/man1/gimp-remote.1.gz -> gimp-remote-2.2.1.gz +lrwxrwxrwx root/root usr/man/man1/gimp.1.gz -> gimp-2.2.1.gz +-rw-r--r-- root/root usr/man/man1/gimptool-2.0.1.gz +drwxr-xr-x root/root usr/man/man5/ +-rw-r--r-- root/root usr/man/man5/gimprc-2.2.5.gz +lrwxrwxrwx root/root usr/man/man5/gimprc.5.gz -> gimprc-2.2.5.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/gimp-2.0.m4 @@ -1237,13 +1247,3 @@ -rw-r--r-- root/root usr/share/gimp/2.0/themes/Small/gtkrc drwxr-xr-x root/root usr/share/gimp/2.0/tips/ -rw-r--r-- root/root usr/share/gimp/2.0/tips/gimp-tips.xml -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/gimp-2.2.1.gz --rw-r--r-- root/root usr/share/man/man1/gimp-remote-2.2.1.gz -lrwxrwxrwx root/root usr/share/man/man1/gimp-remote.1.gz -> gimp-remote-2.2.1.gz -lrwxrwxrwx root/root usr/share/man/man1/gimp.1.gz -> gimp-2.2.1.gz --rw-r--r-- root/root usr/share/man/man1/gimptool-2.0.1.gz -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/gimprc-2.2.5.gz -lrwxrwxrwx root/root usr/share/man/man5/gimprc.5.gz -> gimprc-2.2.5.gz Modified: crux-2.2/ports/opt/gimp/Pkgfile =================================================================== --- crux-2.2/ports/opt/gimp/Pkgfile 2006-09-09 13:44:43 UTC (rev 1852) +++ crux-2.2/ports/opt/gimp/Pkgfile 2006-09-09 15:34:45 UTC (rev 1853) @@ -5,13 +5,14 @@ name=gimp version=2.2.13 -release=1 +release=2 source=(ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-$version.tar.bz2) build() { cd gimp-$version sed -i -e '/$(helpbrowser)/d' plug-ins/Makefile.in ./configure --prefix=/usr \ + --mandir=/usr/man \ --disable-static make make DESTDIR=$PKG install

1 0

r1852 - tools/webtools/timeline
by crux＠crux.nu 09 Sep '06

09 Sep '06

Author: sip Date: 2006-09-09 15:44:43 +0200 (Sat, 09 Sep 2006) New Revision: 1852 Modified: tools/webtools/timeline/timeline.php Log: test Modified: tools/webtools/timeline/timeline.php =================================================================== --- tools/webtools/timeline/timeline.php 2006-09-09 13:23:07 UTC (rev 1851) +++ tools/webtools/timeline/timeline.php 2006-09-09 13:44:43 UTC (rev 1852) @@ -1,4 +1,5 @@ <?php +// Useless comment require_once('DB.php'); Markup("timeline", "directives", "/\$:timeline(\\s+.*)?\\s*:\$/e", "'<:block>'.GetEvents()");

1 0

r1851 - in tools/prt-get/trunk: . src
by crux＠crux.nu 09 Sep '06

09 Sep '06

Author: jw Date: 2006-09-09 15:23:07 +0200 (Sat, 09 Sep 2006) New Revision: 1851 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/TODO tools/prt-get/trunk/configure tools/prt-get/trunk/src/prtget.cpp tools/prt-get/trunk/src/repository.cpp tools/prt-get/trunk/src/repository.h Log: prt-get: remove handling of external dependency list Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-09-09 12:47:30 UTC (rev 1850) +++ tools/prt-get/trunk/ChangeLog 2006-09-09 13:23:07 UTC (rev 1851) @@ -1,3 +1,6 @@ +* 0.5.14 00.00.200x Johannes Winkelmann +- Remove handling of external dependency list + * 0.5.13 08.09.2006 Johannes Winkelmann - Show undecided versions in diff and sysup when using "prefer higher" - fix display bug in "dependent" Modified: tools/prt-get/trunk/TODO =================================================================== --- tools/prt-get/trunk/TODO 2006-09-09 12:47:30 UTC (rev 1850) +++ tools/prt-get/trunk/TODO 2006-09-09 13:23:07 UTC (rev 1851) @@ -1,3 +1,4 @@ +- handle 27e < 28 in version comperator - 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 Modified: tools/prt-get/trunk/configure =================================================================== --- tools/prt-get/trunk/configure 2006-09-09 12:47:30 UTC (rev 1850) +++ tools/prt-get/trunk/configure 2006-09-09 13:23:07 UTC (rev 1851) @@ -2023,7 +2023,7 @@ # Define the identity of the package. PACKAGE=prt-get - VERSION=5.13pre + VERSION=5.13 cat >>confdefs.h <<_ACEOF Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-09-09 12:47:30 UTC (rev 1850) +++ tools/prt-get/trunk/src/prtget.cpp 2006-09-09 13:23:07 UTC (rev 1851) @@ -271,7 +271,7 @@ string format = "%p1 %v1 > %p2 %v2\n"; if (m_parser->otherArgs().size() > 0) format = *(m_parser->otherArgs().begin()); - else if (m_parser->verbose() > 0) + else if (m_parser->verbose() > 0) format = "* %n\n %p1 %v1 preceeds over \n %p2 %v2\n"; string output; @@ -2012,13 +2012,6 @@ cout.fill( ' ' ); cout << "Alias file: " << PkgDB::ALIAS_STORE << endl; - cout.setf( ios::left, ios::adjustfield ); - cout.width( 20 ); - cout.fill( ' ' ); - cout << "Ext. dep. file: " - << Repository::EXTERNAL_DEPENDENCY_FILE << endl; - - if (!m_parser->noStdConfig()) { string fName = CONF_FILE; if ( m_parser->isAlternateConfigGiven() ) { Modified: tools/prt-get/trunk/src/repository.cpp =================================================================== --- tools/prt-get/trunk/src/repository.cpp 2006-09-09 12:47:30 UTC (rev 1850) +++ tools/prt-get/trunk/src/repository.cpp 2006-09-09 13:23:07 UTC (rev 1851) @@ -31,8 +31,6 @@ const string Repository::CACHE_VERSION = "V5"; -const string Repository::EXTERNAL_DEPENDENCY_FILE = - LOCALSTATEDIR"/lib/pkg/prt-get.deplist"; /*! Create a repository @@ -64,7 +62,7 @@ /*! - Returns a sorted list of duplicate packages in the repository. + Returns a sorted list of duplicate packages in the repository. In the pairs \a first is the shadowed port and \a second is the port which preceeds over \a first \return a list of duplicate packages in the repository @@ -75,15 +73,6 @@ } -void Repository::parseDependencyList() -{ - map<string, string> depMap; - if (DataFileParser::parse(EXTERNAL_DEPENDENCY_FILE, depMap)) { - addDependencies(depMap); - } -} - - /*! \param name the package name to be returned \return a Package pointer for a package name or 0 if not found @@ -140,7 +129,7 @@ } } -int Repository::compareShadowPair(pair<Package*, Package*>& p1, +int Repository::compareShadowPair(pair<Package*, Package*>& p1, pair<Package*, Package*>& p2) { return p1.second->name() < p2.second->name(); @@ -244,7 +233,6 @@ } m_shadowedPackages.sort(compareShadowPair); - parseDependencyList(); } /*! @@ -299,8 +287,6 @@ } fclose( fp ); - parseDependencyList(); - return READ_OK; } Modified: tools/prt-get/trunk/src/repository.h =================================================================== --- tools/prt-get/trunk/src/repository.h 2006-09-09 12:47:30 UTC (rev 1850) +++ tools/prt-get/trunk/src/repository.h 2006-09-09 13:23:07 UTC (rev 1851) @@ -66,16 +66,12 @@ static bool createOutputDir( const string& path ); void addDependencies( std::map<string, string>& deps ); - static const std::string EXTERNAL_DEPENDENCY_FILE; - private: - static int compareShadowPair(pair<Package*, Package*>& p1, + static int compareShadowPair(pair<Package*, Package*>& p1, pair<Package*, Package*>& p2); static const std::string CACHE_VERSION; bool m_useRegex; - - void parseDependencyList(); list<pair<Package*, Package*> > m_shadowedPackages; map<string, Package*> m_packageMap;

1 0

r1850 - crux-2.2/ports/opt/git
by crux＠crux.nu 09 Sep '06

09 Sep '06

Author: tilman Date: 2006-09-09 14:47:30 +0200 (Sat, 09 Sep 2006) New Revision: 1850 Modified: crux-2.2/ports/opt/git/Pkgfile Log: git: depends on rcs (for 'merge'). the openssl dep is covered by curl Modified: crux-2.2/ports/opt/git/Pkgfile =================================================================== --- crux-2.2/ports/opt/git/Pkgfile 2006-09-08 18:05:30 UTC (rev 1849) +++ crux-2.2/ports/opt/git/Pkgfile 2006-09-09 12:47:30 UTC (rev 1850) @@ -1,12 +1,12 @@ # Description: Directory content manager # URL: http://www.kernel.org/pub/software/scm/git/ # Maintainer: Tilman Sauerbeck, tilman at crux dot nu -# Depends on: openssl, curl, perl, python +# Depends on: curl, rcs, perl, python # Nice to have: tk name=git version=1.4.2 -release=1 +release=2 source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$ver… build() {

1 0