September 2006 - crux-commits

r1845 - crux-2.2/ports/opt/gimp
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jaeger Date: 2006-09-08 17:57:09 +0200 (Fri, 08 Sep 2006) New Revision: 1845 Removed: crux-2.2/ports/opt/gimp/gimp-2.2.11-libpng.patch Modified: crux-2.2/ports/opt/gimp/.footprint crux-2.2/ports/opt/gimp/.md5sum crux-2.2/ports/opt/gimp/Pkgfile Log: gimp: updated to version 2.2.13 Modified: crux-2.2/ports/opt/gimp/.footprint =================================================================== --- crux-2.2/ports/opt/gimp/.footprint 2006-09-08 15:15:18 UTC (rev 1844) +++ crux-2.2/ports/opt/gimp/.footprint 2006-09-08 15:57:09 UTC (rev 1845) @@ -366,51 +366,41 @@ -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/xwd -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/zealouscrop -rwxr-xr-x root/root usr/lib/libgimp-2.0.la -lrwxrwxrwx root/root usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.200.11 -lrwxrwxrwx root/root usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.200.11 --rwxr-xr-x root/root usr/lib/libgimp-2.0.so.0.200.11 +lrwxrwxrwx root/root usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.200.13 +lrwxrwxrwx root/root usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.200.13 +-rwxr-xr-x root/root usr/lib/libgimp-2.0.so.0.200.13 -rwxr-xr-x root/root usr/lib/libgimpbase-2.0.la -lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.200.11 -lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.200.11 --rwxr-xr-x root/root usr/lib/libgimpbase-2.0.so.0.200.11 +lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.200.13 +lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.200.13 +-rwxr-xr-x root/root usr/lib/libgimpbase-2.0.so.0.200.13 -rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.la -lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.200.11 -lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.200.11 --rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.so.0.200.11 +lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.200.13 +lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.200.13 +-rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.so.0.200.13 -rwxr-xr-x root/root usr/lib/libgimpmath-2.0.la -lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.200.11 -lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.200.11 --rwxr-xr-x root/root usr/lib/libgimpmath-2.0.so.0.200.11 +lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.200.13 +lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.200.13 +-rwxr-xr-x root/root usr/lib/libgimpmath-2.0.so.0.200.13 -rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.la -lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.200.11 -lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.200.11 --rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.so.0.200.11 +lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.200.13 +lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.200.13 +-rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.so.0.200.13 -rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.la -lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.200.11 -lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.200.11 --rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.so.0.200.11 +lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.200.13 +lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.200.13 +-rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.so.0.200.13 -rwxr-xr-x root/root usr/lib/libgimpui-2.0.la -lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.200.11 -lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.200.11 --rwxr-xr-x root/root usr/lib/libgimpui-2.0.so.0.200.11 +lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.200.13 +lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.200.13 +-rwxr-xr-x root/root usr/lib/libgimpui-2.0.so.0.200.13 -rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.la -lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.200.11 -lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.200.11 --rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.so.0.200.11 +lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.200.13 +lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.200.13 +-rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.so.0.200.13 drwxr-xr-x root/root usr/lib/pkgconfig/ -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 @@ -1247,3 +1237,13 @@ -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/.md5sum =================================================================== --- crux-2.2/ports/opt/gimp/.md5sum 2006-09-08 15:15:18 UTC (rev 1844) +++ crux-2.2/ports/opt/gimp/.md5sum 2006-09-08 15:57:09 UTC (rev 1845) @@ -1,2 +1 @@ -c400a51d6433bdf5080b58db461745a6 gimp-2.2.11-libpng.patch -0403e9b4e0415c99cd27b137b9839212 gimp-2.2.11.tar.bz2 +d84a4a476a0c4fae24602db67f6fe49a gimp-2.2.13.tar.bz2 Modified: crux-2.2/ports/opt/gimp/Pkgfile =================================================================== --- crux-2.2/ports/opt/gimp/Pkgfile 2006-09-08 15:15:18 UTC (rev 1844) +++ crux-2.2/ports/opt/gimp/Pkgfile 2006-09-08 15:57:09 UTC (rev 1845) @@ -4,14 +4,12 @@ # Depends on: freetype, x11, gtk, gimp-print, libart_lgpl, p5-xml-parser name=gimp -version=2.2.11 +version=2.2.13 release=1 -source=(ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-$version.tar.bz2 \ - $name-$version-libpng.patch) +source=(ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-$version.tar.bz2) build() { cd gimp-$version - patch -p1 -i $SRC/$name-$version-libpng.patch sed -i -e '/$(helpbrowser)/d' plug-ins/Makefile.in ./configure --prefix=/usr \ --disable-static Deleted: crux-2.2/ports/opt/gimp/gimp-2.2.11-libpng.patch =================================================================== --- crux-2.2/ports/opt/gimp/gimp-2.2.11-libpng.patch 2006-09-08 15:15:18 UTC (rev 1844) +++ crux-2.2/ports/opt/gimp/gimp-2.2.11-libpng.patch 2006-09-08 15:57:09 UTC (rev 1845) @@ -1,36 +0,0 @@ -diff -puNr gimp-2.2.11.orig/plug-ins/common/png.c gimp-2.2.11/plug-ins/common/png.c ---- gimp-2.2.11.orig/plug-ins/common/png.c 2004-11-23 15:28:43.000000000 +0100 -+++ gimp-2.2.11/plug-ins/common/png.c 2006-04-15 12:15:58.000000000 +0200 -@@ -1012,12 +1012,10 @@ load_image (const gchar *filename, - * Done with the file... - */ - -- png_read_destroy (pp, info, NULL); -+ png_destroy_read_struct (&pp, &info, NULL); - - g_free (pixel); - g_free (pixels); -- free (pp); -- free (info); - - fclose (fp); - -@@ -1441,7 +1439,7 @@ save_image (const gchar *filename, - }; - - png_write_end (pp, info); -- png_write_destroy (pp); -+ png_destroy_write_struct (&pp, &info); - - g_free (pixel); - g_free (pixels); -@@ -1456,9 +1454,6 @@ save_image (const gchar *filename, - g_free (text); - } - -- free (pp); -- free (info); -- - fclose (fp); - - return (1);

1 0

r1844 - crux-2.2/ports/core/shadow
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jw Date: 2006-09-08 17:15:18 +0200 (Fri, 08 Sep 2006) New Revision: 1844 Added: crux-2.2/ports/core/shadow/shadow-4.0.16-fix-useradd-usergroups.patch Removed: crux-2.2/ports/core/shadow/shadow-4.0.15-nflg-conflict.diff crux-2.2/ports/core/shadow/shadow-fix-useradd-usergroups.patch crux-2.2/ports/core/shadow/useradd-usergroup.diff Modified: crux-2.2/ports/core/shadow/.md5sum crux-2.2/ports/core/shadow/Pkgfile Log: shadow: merge patches Modified: crux-2.2/ports/core/shadow/.md5sum =================================================================== --- crux-2.2/ports/core/shadow/.md5sum 2006-09-08 15:14:35 UTC (rev 1843) +++ crux-2.2/ports/core/shadow/.md5sum 2006-09-08 15:15:18 UTC (rev 1844) @@ -1,7 +1,5 @@ 2b8c303d972cf6fb2a4545dd17262f27 login.defs be8f69c2701118093af3d7f3bc02af16 pwck -9e2f566e29068dc98e42ea94ac788200 shadow-4.0.15-nflg-conflict.diff +d58a29c9fa227f18545d8c43997dbb7d shadow-4.0.16-fix-useradd-usergroups.patch aa1259020b925cd3088cb7a36fbe7753 shadow-4.0.18.1-useradd-usermod.diff e7751d46ecf219c07ae0b028ab3335c6 shadow-4.0.18.1.tar.bz2 -a588e277ff49988f0e3787c5b327d10c shadow-fix-useradd-usergroups.patch -75161be083592e2e4e7f9cdcb7369bab useradd-usergroup.diff Modified: crux-2.2/ports/core/shadow/Pkgfile =================================================================== --- crux-2.2/ports/core/shadow/Pkgfile 2006-09-08 15:14:35 UTC (rev 1843) +++ crux-2.2/ports/core/shadow/Pkgfile 2006-09-08 15:15:18 UTC (rev 1844) @@ -5,20 +5,15 @@ name=shadow version=4.0.18.1 -release=3 +release=4 source=(ftp://ftp.pld.org.pl/software/shadow/$name-$version.tar.bz2 pwck login.defs - shadow-fix-useradd-usergroups.patch - shadow-4.0.15-nflg-conflict.diff - useradd-usergroup.diff + shadow-4.0.16-fix-useradd-usergroups.patch shadow-4.0.18.1-useradd-usermod.diff) build() { cd $name-$version - patch src/useradd.c $SRC/shadow-fix-useradd-usergroups.patch - patch src/useradd.c $SRC/shadow-4.0.15-nflg-conflict.diff - patch src/useradd.c $SRC/useradd-usergroup.diff - + patch -p0 < $SRC/shadow-4.0.16-fix-useradd-usergroups.patch patch -p1 < $SRC/shadow-4.0.18.1-useradd-usermod.diff ./configure --prefix=/usr \ Deleted: crux-2.2/ports/core/shadow/shadow-4.0.15-nflg-conflict.diff =================================================================== --- crux-2.2/ports/core/shadow/shadow-4.0.15-nflg-conflict.diff 2006-09-08 15:14:35 UTC (rev 1843) +++ crux-2.2/ports/core/shadow/shadow-4.0.15-nflg-conflict.diff 2006-09-08 15:15:18 UTC (rev 1844) @@ -1,28 +0,0 @@ ---- useradd.c.orig 2006-04-08 10:47:03.016040384 +0200 -+++ useradd.c 2006-04-08 11:17:09.218455880 +0200 -@@ -1214,6 +1214,16 @@ - usage (); - - /* -+ * Using -g and -n doesn't make sense -+ */ -+ if (nflg && gflg) { -+ fprintf(stderr, -+ _("%s: options -n and -g conflict and can't be used together\n"), -+ Prog); -+ exit (E_BAD_ARG); -+ } -+ -+ /* - * Either -D or username is required. Defaults can be set with -D - * for the -b, -e, -f, -g, -s options only. - */ -@@ -1778,7 +1788,7 @@ - - /* do we have to add a group for that user? This is why we need to - * open the group files in the open_files() function --gafton */ -- if (nflg && !gflg) { -+ if (nflg) { - find_new_gid (); - grp_add (); - } Added: crux-2.2/ports/core/shadow/shadow-4.0.16-fix-useradd-usergroups.patch =================================================================== --- crux-2.2/ports/core/shadow/shadow-4.0.16-fix-useradd-usergroups.patch (rev 0) +++ crux-2.2/ports/core/shadow/shadow-4.0.16-fix-useradd-usergroups.patch 2006-09-08 15:15:18 UTC (rev 1844) @@ -0,0 +1,108 @@ +Taken from + http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/shadow/files/shado… + +http://bugs.gentoo.org/128715 + +exact implementation details are still in discussion upstream, but this fixes +the behavior to not suck like current code + +Index: src/useradd.c +=================================================================== +RCS file: /cvsroot/shadow/src/useradd.c,v +retrieving revision 1.96 +diff -u -p -r1.96 useradd.c +--- src/useradd.c 30 May 2006 18:28:45 -0000 1.96 ++++ src/useradd.c 10 Jun 2006 22:13:32 -0000 +@@ -114,7 +114,7 @@ static int do_grp_update = 0; /* group f + static char *Prog; + + static int +- bflg = 0, /* new default root of home directory */ ++ bflg = 0, /* new default root of home directory */ + cflg = 0, /* comment (GECOS) field for new account */ + dflg = 0, /* home directory for new account */ + Dflg = 0, /* set/show new user default values */ +@@ -253,6 +253,12 @@ static void get_defaults (void) + const struct group *grp; + + /* ++ * Pull relevant settings from login.defs first. ++ */ ++ if (getdef_bool ("USERGROUPS_ENAB")) ++ nflg = -1; ++ ++ /* + * Open the defaults file for reading. + */ + +@@ -628,6 +634,8 @@ static void usage (void) + " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" + " -m, --create-home create home directory for the new user\n" + " account\n" ++ " -n, --user-group create a new group with the same name as the\n" ++ " new user\n" + " -o, --non-unique allow create user with duplicate\n" + " (non-unique) UID\n" + " -p, --password PASSWORD use encrypted password for the new user\n" +@@ -1009,6 +1017,7 @@ static void process_flags (int argc, cha + {"skel", required_argument, NULL, 'k'}, + {"key", required_argument, NULL, 'K'}, + {"create-home", no_argument, NULL, 'm'}, ++ {"user-group", no_argument, NULL, 'n'}, + {"non-unique", no_argument, NULL, 'o'}, + {"password", required_argument, NULL, 'p'}, + {"shell", required_argument, NULL, 's'}, +@@ -1016,7 +1025,7 @@ static void process_flags (int argc, cha + {NULL, 0, NULL, '\0'} + }; + while ((c = +- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:", ++ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnop:s:u:", + long_options, NULL)) != -1) { + switch (c) { + case 'b': +@@ -1156,6 +1165,9 @@ static void process_flags (int argc, cha + case 'm': + mflg++; + break; ++ case 'n': ++ nflg = 1; ++ break; + case 'o': + oflg++; + break; +@@ -1203,6 +1215,16 @@ static void process_flags (int argc, cha + usage (); + + /* ++ * Using --gid and --user-group doesn't make sense. ++ */ ++ if (nflg == -1 && gflg) ++ nflg = 0; ++ if (nflg && gflg) { ++ fprintf (stderr, _("%s: options -g and -n conflict\n"), Prog); ++ exit (E_BAD_ARG); ++ } ++ ++ /* + * Either -D or username is required. Defaults can be set with -D + * for the -b, -e, -f, -g, -s options only. + */ +@@ -1725,7 +1747,7 @@ int main (int argc, char **argv) + * to that group, use useradd -g username username. + * --bero + */ +- if (!gflg) { ++ if (nflg) { + if (getgrnam (user_name)) { + fprintf (stderr, + _ +@@ -1759,7 +1781,7 @@ int main (int argc, char **argv) + + /* do we have to add a group for that user? This is why we need to + * open the group files in the open_files() function --gafton */ +- if (!(nflg || gflg)) { ++ if (nflg) { + find_new_gid (); + grp_add (); + } Deleted: crux-2.2/ports/core/shadow/shadow-fix-useradd-usergroups.patch =================================================================== --- crux-2.2/ports/core/shadow/shadow-fix-useradd-usergroups.patch 2006-09-08 15:14:35 UTC (rev 1843) +++ crux-2.2/ports/core/shadow/shadow-fix-useradd-usergroups.patch 2006-09-08 15:15:18 UTC (rev 1844) @@ -1,73 +0,0 @@ -2006-04-07 Mike Frysinger <vapier(a)gentoo.org> - - * src/useradd.c: Actually utilize the nflg by adding an -n option for the - user and by setting to USERGROUPS_ENAB from login.defs. Also fix the logic - for when the user group actually needs to be added. - ---- src/useradd.c -+++ src/useradd.c -@@ -114,7 +114,7 @@ static int do_grp_update = 0; /* group f - static char *Prog; - - static int -- bflg = 0, /* new default root of home directory */ -+ bflg = 0, /* new default root of home directory */ - cflg = 0, /* comment (GECOS) field for new account */ - dflg = 0, /* home directory for new account */ - Dflg = 0, /* set/show new user default values */ -@@ -253,6 +253,10 @@ static void get_defaults (void) - const struct group *grp; - - /* -+ * Pull relevant settings from login.defs first. -+ */ -+ nflg = getdef_bool ("USERGROUPS_ENAB"); -+ /* - * Open the defaults file for reading. - */ - -@@ -628,6 +633,8 @@ static void usage (void) - " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" - " -m, --create-home create home directory for the new user\n" - " account\n" -+ " -n, --user-group create a new group with the same name as the\n" -+ " new user\n" - " -o, --non-unique allow create user with duplicate\n" - " (non-unique) UID\n" - " -p, --password PASSWORD use encrypted password for the new user\n" -@@ -1009,6 +1016,7 @@ static void process_flags (int argc, cha - {"skel", required_argument, NULL, 'k'}, - {"key", required_argument, NULL, 'K'}, - {"create-home", no_argument, NULL, 'm'}, -+ {"user-group", no_argument, NULL, 'n'}, - {"non-unique", no_argument, NULL, 'o'}, - {"password", required_argument, NULL, 'p'}, - {"shell", required_argument, NULL, 's'}, -@@ -1016,7 +1024,7 @@ static void process_flags (int argc, cha - {NULL, 0, NULL, '\0'} - }; - while ((c = -- getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:", -+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnop:s:u:", - long_options, NULL)) != -1) { - switch (c) { - case 'b': -@@ -1156,6 +1164,9 @@ static void process_flags (int argc, cha - case 'm': - mflg++; - break; -+ case 'n': -+ nflg++; -+ break; - case 'o': - oflg++; - break; -@@ -1767,7 +1778,7 @@ int main (int argc, char **argv) - - /* do we have to add a group for that user? This is why we need to - * open the group files in the open_files() function --gafton */ -- if (!(nflg || gflg)) { -+ if (nflg && !gflg) { - find_new_gid (); - grp_add (); - } Deleted: crux-2.2/ports/core/shadow/useradd-usergroup.diff =================================================================== --- crux-2.2/ports/core/shadow/useradd-usergroup.diff 2006-09-08 15:14:35 UTC (rev 1843) +++ crux-2.2/ports/core/shadow/useradd-usergroup.diff 2006-09-08 15:15:18 UTC (rev 1844) @@ -1,11 +0,0 @@ ---- useradd.c-r1.92 2006-04-12 10:58:55.000000000 +0200 -+++ useradd.c 2006-04-12 11:05:03.000000000 +0200 -@@ -1733,7 +1733,7 @@ - * to that group, use useradd -g username username. - * --bero - */ -- if (!gflg) { -+ if (nflg) { - if (getgrnam (user_name)) { - fprintf (stderr, - _

1 0

r1843 - crux-2.2/ports/opt/gtk
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jaeger Date: 2006-09-08 17:14:35 +0200 (Fri, 08 Sep 2006) New Revision: 1843 Removed: crux-2.2/ports/opt/gtk/gtk+-2.10.1-stock-icon.diff Modified: crux-2.2/ports/opt/gtk/.footprint crux-2.2/ports/opt/gtk/.md5sum crux-2.2/ports/opt/gtk/Pkgfile crux-2.2/ports/opt/gtk/gdk-pixbuf.loaders crux-2.2/ports/opt/gtk/gtk.immodules Log: gtk: updated to version 2.10.3 Modified: crux-2.2/ports/opt/gtk/.footprint =================================================================== --- crux-2.2/ports/opt/gtk/.footprint 2006-09-08 15:14:13 UTC (rev 1842) +++ crux-2.2/ports/opt/gtk/.footprint 2006-09-08 15:14:35 UTC (rev 1843) @@ -324,21 +324,21 @@ drwxr-xr-x root/root usr/lib/gtk-2.0/include/ -rw-r--r-- root/root usr/lib/gtk-2.0/include/gdkconfig.h -rw-r--r-- root/root usr/lib/libgdk-x11-2.0.la -lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1000.1 -lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1000.1 --rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.1000.1 +lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1000.3 +lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1000.3 +-rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.1000.3 -rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.la -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1000.1 -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1000.1 --rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.1000.1 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1000.3 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1000.3 +-rwxr-xr-x root/root usr/lib/libgdk_pixbuf-2.0.so.0.1000.3 -rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.la -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1000.1 -lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1000.1 --rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1000.1 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1000.3 +lrwxrwxrwx root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1000.3 +-rwxr-xr-x root/root usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1000.3 -rw-r--r-- root/root usr/lib/libgtk-x11-2.0.la -lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1000.1 -lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1000.1 --rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.1000.1 +lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1000.3 +lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1000.3 +-rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.1000.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gdk-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gdk-pixbuf-2.0.pc Modified: crux-2.2/ports/opt/gtk/.md5sum =================================================================== --- crux-2.2/ports/opt/gtk/.md5sum 2006-09-08 15:14:13 UTC (rev 1842) +++ crux-2.2/ports/opt/gtk/.md5sum 2006-09-08 15:14:35 UTC (rev 1843) @@ -1,4 +1,3 @@ -501ae79b5b7a93a8338e999274f4dcbb gdk-pixbuf.loaders -17510dcd6cb2672d9e530beb9bee86a4 gtk+-2.10.1-stock-icon.diff -7f1d39031d50de8228211aa3230d4acd gtk+-2.10.1.tar.bz2 -a6ab21dcf3d52be4b2c002d6a74dddf9 gtk.immodules +ee4914619a3c81a81a2e0cdd65588c6f gdk-pixbuf.loaders +c662ca204e204edfd8b8b917b9a852aa gtk+-2.10.3.tar.bz2 +1d688ced93edd366e19ec8df47d20218 gtk.immodules Modified: crux-2.2/ports/opt/gtk/Pkgfile =================================================================== --- crux-2.2/ports/opt/gtk/Pkgfile 2006-09-08 15:14:13 UTC (rev 1842) +++ crux-2.2/ports/opt/gtk/Pkgfile 2006-09-08 15:14:35 UTC (rev 1843) @@ -4,14 +4,13 @@ # Depends on: atk, pango, libtiff, hicolor-icon-theme name=gtk -version=2.10.1 -release=2 +version=2.10.3 +release=1 source=(ftp://ftp.gtk.org/pub/gtk/v2.10/${name}+-$version.tar.bz2 \ - gdk-pixbuf.loaders gtk.immodules $name+-$version-stock-icon.diff) + gdk-pixbuf.loaders gtk.immodules) build () { cd gtk+-$version - patch -p1 -i $SRC/$name+-$version-stock-icon.diff ./configure --prefix=/usr make make DESTDIR=$PKG install Modified: crux-2.2/ports/opt/gtk/gdk-pixbuf.loaders =================================================================== --- crux-2.2/ports/opt/gtk/gdk-pixbuf.loaders 2006-09-08 15:14:13 UTC (rev 1842) +++ crux-2.2/ports/opt/gtk/gdk-pixbuf.loaders 2006-09-08 15:14:35 UTC (rev 1843) @@ -1,6 +1,6 @@ # GdkPixbuf Image Loader Modules file # Automatically generated file, do not edit -# Created by gdk-pixbuf-query-loaders from gtk+-2.10.1 +# Created by gdk-pixbuf-query-loaders from gtk+-2.10.3 # # LoaderDir = /usr/lib/gtk-2.0/2.10.0/loaders # Deleted: crux-2.2/ports/opt/gtk/gtk+-2.10.1-stock-icon.diff =================================================================== --- crux-2.2/ports/opt/gtk/gtk+-2.10.1-stock-icon.diff 2006-09-08 15:14:13 UTC (rev 1842) +++ crux-2.2/ports/opt/gtk/gtk+-2.10.1-stock-icon.diff 2006-09-08 15:14:35 UTC (rev 1843) @@ -1,65 +0,0 @@ ---- gtk+-2.10.1/gtk/gtkfilesystem.c.orig 2006-08-07 22:23:22.436475760 +0200 -+++ gtk+-2.10.1/gtk/gtkfilesystem.c 2006-08-07 22:25:38.673764544 +0200 -@@ -301,15 +301,21 @@ - GtkIconTheme *icon_theme; - - icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)); -- pixbuf = gtk_icon_theme_load_icon (icon_theme, info->icon_name, -- pixel_size, 0, NULL); -+ if (gtk_icon_theme_has_icon (icon_theme, info->icon_name)) -+ pixbuf = gtk_icon_theme_load_icon (icon_theme, info->icon_name, -+ pixel_size, 0, NULL); - } - } - - if (!pixbuf) - { - /* load a fallback icon */ -- pixbuf = gtk_widget_render_icon (widget, GTK_STOCK_FILE, GTK_ICON_SIZE_SMALL_TOOLBAR, NULL); -+ pixbuf = gtk_widget_render_icon (widget, -+ gtk_file_info_get_is_folder (info) -+ ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE, -+ GTK_ICON_SIZE_SMALL_TOOLBAR, -+ NULL); -+ - if (!pixbuf && error) - g_set_error (error, - GTK_FILE_SYSTEM_ERROR, -@@ -648,7 +654,7 @@ - GError **error) - { - gchar *icon_name; -- GdkPixbuf *pixbuf; -+ GdkPixbuf *pixbuf = NULL; - - g_return_val_if_fail (GTK_IS_FILE_SYSTEM (file_system), NULL); - g_return_val_if_fail (volume != NULL, NULL); -@@ -658,15 +664,22 @@ - - icon_name = gtk_file_system_volume_get_icon_name (file_system, volume, - error); -- if (!icon_name) -+ if (icon_name) - { -- return NULL; -+ GtkIconTheme *icon_theme; -+ -+ icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)); -+ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) -+ pixbuf = gtk_icon_theme_load_icon (icon_theme, -+ icon_name, pixel_size, 0, NULL); -+ g_free (icon_name); - } - -- pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)), -- icon_name, pixel_size, 0, NULL); -- g_free (icon_name); -- -+ if (!pixbuf) -+ pixbuf = gtk_widget_render_icon (widget, -+ GTK_STOCK_HARDDISK, -+ GTK_ICON_SIZE_SMALL_TOOLBAR, -+ NULL); - return pixbuf; - } - Modified: crux-2.2/ports/opt/gtk/gtk.immodules =================================================================== --- crux-2.2/ports/opt/gtk/gtk.immodules 2006-09-08 15:14:13 UTC (rev 1842) +++ crux-2.2/ports/opt/gtk/gtk.immodules 2006-09-08 15:14:35 UTC (rev 1843) @@ -1,6 +1,6 @@ # GTK+ Input Method Modules file # Automatically generated file, do not edit -# Created by gtk-query-immodules-2.0 from gtk+-2.10.1 +# Created by gtk-query-immodules-2.0 from gtk+-2.10.3 # # ModulesPath = /root/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib/gtk-2.0/2.10.0/immodules:/usr/lib/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib/gtk-2.0/immodules #

1 0

r1842 - crux-2.2/ports/opt/pango
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jaeger Date: 2006-09-08 17:14:13 +0200 (Fri, 08 Sep 2006) New Revision: 1842 Modified: crux-2.2/ports/opt/pango/.footprint crux-2.2/ports/opt/pango/.md5sum crux-2.2/ports/opt/pango/Pkgfile crux-2.2/ports/opt/pango/pango.modules Log: pango: updated to version 1.14.3 Modified: crux-2.2/ports/opt/pango/.footprint =================================================================== --- crux-2.2/ports/opt/pango/.footprint 2006-09-08 15:13:54 UTC (rev 1841) +++ crux-2.2/ports/opt/pango/.footprint 2006-09-08 15:14:13 UTC (rev 1842) @@ -40,25 +40,25 @@ -rw-r--r-- root/root usr/include/pango-1.0/pango/pangoxft.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libpango-1.0.la -lrwxrwxrwx root/root usr/lib/libpango-1.0.so -> libpango-1.0.so.0.1201.2 -lrwxrwxrwx root/root usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.1201.2 --rwxr-xr-x root/root usr/lib/libpango-1.0.so.0.1201.2 +lrwxrwxrwx root/root usr/lib/libpango-1.0.so -> libpango-1.0.so.0.1400.3 +lrwxrwxrwx root/root usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.1400.3 +-rwxr-xr-x root/root usr/lib/libpango-1.0.so.0.1400.3 -rwxr-xr-x root/root usr/lib/libpangocairo-1.0.la -lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.1201.2 -lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.1201.2 --rwxr-xr-x root/root usr/lib/libpangocairo-1.0.so.0.1201.2 +lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.1400.3 +lrwxrwxrwx root/root usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.1400.3 +-rwxr-xr-x root/root usr/lib/libpangocairo-1.0.so.0.1400.3 -rw-r--r-- root/root usr/lib/libpangoft2-1.0.la -lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.1201.2 -lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.1201.2 --rwxr-xr-x root/root usr/lib/libpangoft2-1.0.so.0.1201.2 +lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.1400.3 +lrwxrwxrwx root/root usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.1400.3 +-rwxr-xr-x root/root usr/lib/libpangoft2-1.0.so.0.1400.3 -rw-r--r-- root/root usr/lib/libpangox-1.0.la -lrwxrwxrwx root/root usr/lib/libpangox-1.0.so -> libpangox-1.0.so.0.1201.2 -lrwxrwxrwx root/root usr/lib/libpangox-1.0.so.0 -> libpangox-1.0.so.0.1201.2 --rwxr-xr-x root/root usr/lib/libpangox-1.0.so.0.1201.2 +lrwxrwxrwx root/root usr/lib/libpangox-1.0.so -> libpangox-1.0.so.0.1400.3 +lrwxrwxrwx root/root usr/lib/libpangox-1.0.so.0 -> libpangox-1.0.so.0.1400.3 +-rwxr-xr-x root/root usr/lib/libpangox-1.0.so.0.1400.3 -rw-r--r-- root/root usr/lib/libpangoxft-1.0.la -lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.1201.2 -lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.1201.2 --rwxr-xr-x root/root usr/lib/libpangoxft-1.0.so.0.1201.2 +lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.1400.3 +lrwxrwxrwx root/root usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.1400.3 +-rwxr-xr-x root/root usr/lib/libpangoxft-1.0.so.0.1400.3 drwxr-xr-x root/root usr/lib/pango/ drwxr-xr-x root/root usr/lib/pango/1.5.0/ drwxr-xr-x root/root usr/lib/pango/1.5.0/modules/ Modified: crux-2.2/ports/opt/pango/.md5sum =================================================================== --- crux-2.2/ports/opt/pango/.md5sum 2006-09-08 15:13:54 UTC (rev 1841) +++ crux-2.2/ports/opt/pango/.md5sum 2006-09-08 15:14:13 UTC (rev 1842) @@ -1,2 +1,2 @@ -c8178e11a895166d86990bb2c38d831b pango-1.12.3.tar.bz2 -37e2a6d23066ee8afd06532f4f668a3b pango.modules +afaf7128791f31b225079f73322eb67d pango-1.14.3.tar.bz2 +b170ae61d47c51f282a651fa2bc6ab1c pango.modules Modified: crux-2.2/ports/opt/pango/Pkgfile =================================================================== --- crux-2.2/ports/opt/pango/Pkgfile 2006-09-08 15:13:54 UTC (rev 1841) +++ crux-2.2/ports/opt/pango/Pkgfile 2006-09-08 15:14:13 UTC (rev 1842) @@ -1,12 +1,12 @@ # Description: A library for layout and rendering of text # URL: http://www.gtk.org/ -# Maintainer: Matt Housh, jaeger at morpheus dot net +# Maintainer: Matt Housh, jaeger at crux dot nu # Depends on: x11, freetype, fontconfig, cairo name=pango -version=1.12.3 +version=1.14.3 release=1 -source=(ftp://ftp.gtk.org/pub/$name/1.12/$name-$version.tar.bz2 \ +source=(ftp://ftp.gtk.org/pub/$name/1.14/$name-$version.tar.bz2 \ pango.modules) build () { Modified: crux-2.2/ports/opt/pango/pango.modules =================================================================== --- crux-2.2/ports/opt/pango/pango.modules 2006-09-08 15:13:54 UTC (rev 1841) +++ crux-2.2/ports/opt/pango/pango.modules 2006-09-08 15:14:13 UTC (rev 1842) @@ -19,6 +19,6 @@ /usr/lib/pango/1.5.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* /usr/lib/pango/1.5.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* /usr/lib/pango/1.5.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* -/usr/lib/pango/1.5.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc armenian:* bopomofo:* cherokee:* coptic:* cyrillic:* deseret:* ethiopic:* georgian:* gothic:* greek:* han:* hiragana:* katakana:* latin:* ogham:* old-italic:* runic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* common: +/usr/lib/pango/1.5.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc armenian:* bopomofo:* cherokee:* coptic:* cyrillic:* deseret:* ethiopic:* georgian:* gothic:* greek:* han:* hiragana:* katakana:* latin:* ogham:* old-italic:* runic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: /usr/lib/pango/1.5.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* /usr/lib/pango/1.5.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*

1 0

r1841 - crux-2.2/ports/opt/glib
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jaeger Date: 2006-09-08 17:13:54 +0200 (Fri, 08 Sep 2006) New Revision: 1841 Modified: crux-2.2/ports/opt/glib/.footprint crux-2.2/ports/opt/glib/.md5sum crux-2.2/ports/opt/glib/Pkgfile Log: glib: updated to version 2.12.3 Modified: crux-2.2/ports/opt/glib/.footprint =================================================================== --- crux-2.2/ports/opt/glib/.footprint 2006-09-08 14:42:36 UTC (rev 1840) +++ crux-2.2/ports/opt/glib/.footprint 2006-09-08 15:13:54 UTC (rev 1841) @@ -87,21 +87,21 @@ drwxr-xr-x root/root usr/lib/glib-2.0/include/ -rw-r--r-- root/root usr/lib/glib-2.0/include/glibconfig.h -rwxr-xr-x root/root usr/lib/libglib-2.0.la -lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.1200.1 -lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.1200.1 --rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.1200.1 +lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.1200.3 +lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.1200.3 +-rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.1200.3 -rwxr-xr-x root/root usr/lib/libgmodule-2.0.la -lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.1200.1 -lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.1200.1 --rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.1200.1 +lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.1200.3 +lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.1200.3 +-rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.1200.3 -rwxr-xr-x root/root usr/lib/libgobject-2.0.la -lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.1200.1 -lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.1200.1 --rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.1200.1 +lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.1200.3 +lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.1200.3 +-rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.1200.3 -rwxr-xr-x root/root usr/lib/libgthread-2.0.la -lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.1200.1 -lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.1200.1 --rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.1200.1 +lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.1200.3 +lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.1200.3 +-rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.1200.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/glib-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gmodule-2.0.pc Modified: crux-2.2/ports/opt/glib/.md5sum =================================================================== --- crux-2.2/ports/opt/glib/.md5sum 2006-09-08 14:42:36 UTC (rev 1840) +++ crux-2.2/ports/opt/glib/.md5sum 2006-09-08 15:13:54 UTC (rev 1841) @@ -1 +1 @@ -97786d2a03f0f190bd782749139dc10c glib-2.12.1.tar.bz2 +cbf663f8bc733e2f6c90599942f6616a glib-2.12.3.tar.bz2 Modified: crux-2.2/ports/opt/glib/Pkgfile =================================================================== --- crux-2.2/ports/opt/glib/Pkgfile 2006-09-08 14:42:36 UTC (rev 1840) +++ crux-2.2/ports/opt/glib/Pkgfile 2006-09-08 15:13:54 UTC (rev 1841) @@ -1,9 +1,9 @@ # Description: Low-level data structure handling, portability wrappers, and interfaces for runtime functionality # URL: http://www.gtk.org/ -# Maintainer: Matt Housh, jaeger at morpheus dot net +# Maintainer: Matt Housh, jaeger at crux dot nu name=glib -version=2.12.1 +version=2.12.3 release=1 source=(ftp://ftp.gtk.org/pub/$name/2.12/$name-$version.tar.bz2)

1 0

r1840 - in crux-2.2/ports/opt: alsa-driver alsa-lib alsa-oss alsa-utils
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jaeger Date: 2006-09-08 16:42:36 +0200 (Fri, 08 Sep 2006) New Revision: 1840 Modified: crux-2.2/ports/opt/alsa-driver/.footprint crux-2.2/ports/opt/alsa-driver/.md5sum crux-2.2/ports/opt/alsa-driver/Pkgfile crux-2.2/ports/opt/alsa-lib/.footprint crux-2.2/ports/opt/alsa-lib/.md5sum crux-2.2/ports/opt/alsa-lib/Pkgfile crux-2.2/ports/opt/alsa-oss/.md5sum crux-2.2/ports/opt/alsa-oss/Pkgfile crux-2.2/ports/opt/alsa-utils/.md5sum crux-2.2/ports/opt/alsa-utils/Pkgfile Log: alsa-driver/lib/oss/utils: updated to version 1.0.12 Modified: crux-2.2/ports/opt/alsa-driver/.footprint =================================================================== --- crux-2.2/ports/opt/alsa-driver/.footprint 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-driver/.footprint 2006-09-08 14:42:36 UTC (rev 1840) @@ -43,14 +43,16 @@ -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/drivers/snd-aloop.ko -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/drivers/snd-dummy.ko -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/drivers/snd-mtpav.ko +-rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/drivers/snd-mts64.ko +-rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/drivers/snd-portman2x4.ko -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/drivers/snd-serial-u16550.ko --rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/drivers/snd-serialmidi.ko -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/drivers/snd-virmidi.ko drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/drivers/vx/ -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/drivers/vx/snd-vx-lib.ko drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/i2c/ drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/i2c/other/ -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/i2c/other/snd-ak4114.ko +-rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/i2c/other/snd-ak4117.ko -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/i2c/other/snd-ak4xxx-adda.ko -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/i2c/snd-cs8427.ko -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/i2c/snd-i2c.ko @@ -114,7 +116,6 @@ drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/pci/ali5451/ -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/pci/ali5451/snd-ali5451.ko drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/pci/asihpi/ --rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/pci/asihpi/snd-asihpi-lib.ko -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/pci/asihpi/snd-asihpi.ko drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/pci/au88x0/ -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/pci/au88x0/snd-au8810.ko @@ -195,6 +196,11 @@ -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/pci/vx222/snd-vx222.ko drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/pci/ymfpci/ -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/pci/ymfpci/snd-ymfpci.ko +drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/pcmcia/ +drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/pcmcia/pdaudiocf/ +-rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/pcmcia/pdaudiocf/snd-pdaudiocf.ko +drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/pcmcia/vx/ +-rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/pcmcia/vx/snd-vxpocket.ko drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/synth/ drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/sound/synth/emux/ -rw-r--r-- root/root lib/modules/<kernel-version>/kernel/sound/synth/emux/snd-emux-synth.ko @@ -274,6 +280,7 @@ -rw-r--r-- root/root usr/include/sound/tea575x-tuner.h -rw-r--r-- root/root usr/include/sound/tea6330t.h -rw-r--r-- root/root usr/include/sound/timer.h +-rw-r--r-- root/root usr/include/sound/tlv.h -rw-r--r-- root/root usr/include/sound/trident.h -rw-r--r-- root/root usr/include/sound/typedefs.h -rw-r--r-- root/root usr/include/sound/uda1341.h Modified: crux-2.2/ports/opt/alsa-driver/.md5sum =================================================================== --- crux-2.2/ports/opt/alsa-driver/.md5sum 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-driver/.md5sum 2006-09-08 14:42:36 UTC (rev 1840) @@ -1 +1 @@ -57534e4297cd683371402220e3753885 alsa-driver-1.0.11.tar.bz2 +3af21876a3cb4de1e72d39adff0a145b alsa-driver-1.0.12.tar.bz2 Modified: crux-2.2/ports/opt/alsa-driver/Pkgfile =================================================================== --- crux-2.2/ports/opt/alsa-driver/Pkgfile 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-driver/Pkgfile 2006-09-08 14:42:36 UTC (rev 1840) @@ -3,7 +3,7 @@ # Maintainer: Matt Housh, jaeger at morpheus dot net name=alsa-driver -version=1.0.11 +version=1.0.12 release=1 source=(ftp://ftp.alsa-project.org/pub/driver/$name-$version.tar.bz2) Modified: crux-2.2/ports/opt/alsa-lib/.footprint =================================================================== --- crux-2.2/ports/opt/alsa-lib/.footprint 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-lib/.footprint 2006-09-08 14:42:36 UTC (rev 1840) @@ -41,6 +41,7 @@ -rw-r--r-- root/root usr/include/alsa/sound/hdsp.h -rw-r--r-- root/root usr/include/alsa/sound/sb16_csp.h -rw-r--r-- root/root usr/include/alsa/sound/sscape_ioctl.h +-rw-r--r-- root/root usr/include/alsa/sound/type_compat.h -rw-r--r-- root/root usr/include/alsa/timer.h -rw-r--r-- root/root usr/include/alsa/version.h drwxr-xr-x root/root usr/include/sys/ Modified: crux-2.2/ports/opt/alsa-lib/.md5sum =================================================================== --- crux-2.2/ports/opt/alsa-lib/.md5sum 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-lib/.md5sum 2006-09-08 14:42:36 UTC (rev 1840) @@ -1 +1 @@ -ef7ae78a0ef08cbeacb295f2518886ab alsa-lib-1.0.11.tar.bz2 +d351d46c5e415d4c8448487737939c72 alsa-lib-1.0.12.tar.bz2 Modified: crux-2.2/ports/opt/alsa-lib/Pkgfile =================================================================== --- crux-2.2/ports/opt/alsa-lib/Pkgfile 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-lib/Pkgfile 2006-09-08 14:42:36 UTC (rev 1840) @@ -3,7 +3,7 @@ # Maintainer: Matt Housh, jaeger at morpheus dot net name=alsa-lib -version=1.0.11 +version=1.0.12 release=1 source=(ftp://ftp.alsa-project.org/pub/lib/$name-$version.tar.bz2) Modified: crux-2.2/ports/opt/alsa-oss/.md5sum =================================================================== --- crux-2.2/ports/opt/alsa-oss/.md5sum 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-oss/.md5sum 2006-09-08 14:42:36 UTC (rev 1840) @@ -1 +1 @@ -3106c2d59a329263867fa3dd44133dda alsa-oss-1.0.11.tar.bz2 +d4d18bbf63a866d6e065b90e16acd676 alsa-oss-1.0.12.tar.bz2 Modified: crux-2.2/ports/opt/alsa-oss/Pkgfile =================================================================== --- crux-2.2/ports/opt/alsa-oss/Pkgfile 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-oss/Pkgfile 2006-09-08 14:42:36 UTC (rev 1840) @@ -4,7 +4,7 @@ # Depends on: alsa-lib name=alsa-oss -version=1.0.11 +version=1.0.12 release=1 source=(ftp://ftp.alsa-project.org/pub/oss-lib/$name-$version.tar.bz2) Modified: crux-2.2/ports/opt/alsa-utils/.md5sum =================================================================== --- crux-2.2/ports/opt/alsa-utils/.md5sum 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-utils/.md5sum 2006-09-08 14:42:36 UTC (rev 1840) @@ -1 +1 @@ -ba9b8010120701d0f6daf061d392cfa2 alsa-utils-1.0.11.tar.bz2 +a3b904040418f18d4276687388429907 alsa-utils-1.0.12.tar.bz2 Modified: crux-2.2/ports/opt/alsa-utils/Pkgfile =================================================================== --- crux-2.2/ports/opt/alsa-utils/Pkgfile 2006-09-08 14:00:35 UTC (rev 1839) +++ crux-2.2/ports/opt/alsa-utils/Pkgfile 2006-09-08 14:42:36 UTC (rev 1840) @@ -4,7 +4,7 @@ # Depends on: gettext, alsa-lib, dialog name=alsa-utils -version=1.0.11 +version=1.0.12 release=1 source=(ftp://ftp.alsa-project.org/pub/utils/$name-$version.tar.bz2)

1 0

r1839 - tools/prt-get/trunk/src
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jw Date: 2006-09-08 16:00:35 +0200 (Fri, 08 Sep 2006) New Revision: 1839 Modified: tools/prt-get/trunk/src/repository.cpp tools/prt-get/trunk/src/repository.h Log: prt-get: promote compareShadowPair Modified: tools/prt-get/trunk/src/repository.cpp =================================================================== --- tools/prt-get/trunk/src/repository.cpp 2006-09-08 13:53:58 UTC (rev 1838) +++ tools/prt-get/trunk/src/repository.cpp 2006-09-08 14:00:35 UTC (rev 1839) @@ -64,10 +64,10 @@ /*! - Returns a map of duplicate packages in the repository. The key is the name - of the package, the value a pair where \a first the shadowed port and + 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 map of duplicate packages in the repository + \return a list of duplicate packages in the repository */ const list< pair<Package*, Package*> >& Repository::shadowedPackages() const { @@ -140,7 +140,8 @@ } } -int compareShadowPair(pair<Package*, Package*>& p1, pair<Package*, Package*>& p2) +int Repository::compareShadowPair(pair<Package*, Package*>& p1, + pair<Package*, Package*>& p2) { return p1.second->name() < p2.second->name(); } @@ -231,7 +232,8 @@ // no such package found, add m_packageMap[name] = p; } else if ( listDuplicate ) { - m_shadowedPackages.push_back(make_pair( p, hidden->second )); + m_shadowedPackages.push_back( + make_pair( p, hidden->second )); } else { delete p; } Modified: tools/prt-get/trunk/src/repository.h =================================================================== --- tools/prt-get/trunk/src/repository.h 2006-09-08 13:53:58 UTC (rev 1838) +++ tools/prt-get/trunk/src/repository.h 2006-09-08 14:00:35 UTC (rev 1839) @@ -69,6 +69,9 @@ static const std::string EXTERNAL_DEPENDENCY_FILE; private: + static int compareShadowPair(pair<Package*, Package*>& p1, + pair<Package*, Package*>& p2); + static const std::string CACHE_VERSION; bool m_useRegex;

1 0

r1838 - tools/prt-get/trunk/src
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jw Date: 2006-09-08 15:53:58 +0200 (Fri, 08 Sep 2006) New Revision: 1838 Modified: tools/prt-get/trunk/src/prtget.cpp tools/prt-get/trunk/src/repository.cpp tools/prt-get/trunk/src/repository.h Log: prt-get: show multiple dups in 'dup' Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-09-08 12:17:12 UTC (rev 1837) +++ tools/prt-get/trunk/src/prtget.cpp 2006-09-08 13:53:58 UTC (rev 1838) @@ -277,12 +277,13 @@ string output; Package* p1; Package* p2; - map<string, pair<Package*, Package*> >::const_iterator it = + + list<pair<Package*, Package*> >::const_iterator it = m_repo->shadowedPackages().begin(); for ( ; it != m_repo->shadowedPackages().end(); ++it ) { output = format; - p1 = it->second.second; - p2 = it->second.first; + p1 = it->second; + p2 = it->first; StringHelper::replaceAll(output, "%n", p1->name()); StringHelper::replaceAll(output, "%p1", p1->path() + "/" + p1->name()); Modified: tools/prt-get/trunk/src/repository.cpp =================================================================== --- tools/prt-get/trunk/src/repository.cpp 2006-09-08 12:17:12 UTC (rev 1837) +++ tools/prt-get/trunk/src/repository.cpp 2006-09-08 13:53:58 UTC (rev 1838) @@ -69,7 +69,7 @@ \a second is the port which preceeds over \a first \return a map of duplicate packages in the repository */ -const map<string, pair<Package*, Package*> >& Repository::shadowedPackages() const +const list< pair<Package*, Package*> >& Repository::shadowedPackages() const { return m_shadowedPackages; } @@ -140,7 +140,12 @@ } } +int compareShadowPair(pair<Package*, Package*>& p1, pair<Package*, Package*>& p2) +{ + return p1.second->name() < p2.second->name(); +} + /*! init repository by reading the directories passed. Doesn't search recursively, so if you want /dir and /dir/subdir checked, you have to @@ -226,7 +231,7 @@ // no such package found, add m_packageMap[name] = p; } else if ( listDuplicate ) { - m_shadowedPackages[name] = make_pair( p, hidden->second ); + m_shadowedPackages.push_back(make_pair( p, hidden->second )); } else { delete p; } @@ -235,7 +240,8 @@ } closedir( d ); } - + + m_shadowedPackages.sort(compareShadowPair); parseDependencyList(); } Modified: tools/prt-get/trunk/src/repository.h =================================================================== --- tools/prt-get/trunk/src/repository.h 2006-09-08 12:17:12 UTC (rev 1837) +++ tools/prt-get/trunk/src/repository.h 2006-09-08 13:53:58 UTC (rev 1838) @@ -34,7 +34,7 @@ const Package* getPackage( const string& name ) const; const map<string, Package*>& packages() const; - const map<string, pair<Package*, Package*> >& shadowedPackages() const; + const list<pair<Package*, Package*> >& shadowedPackages() const; void searchMatchingPackages( const string& pattern, list<Package*>& target, @@ -74,7 +74,7 @@ void parseDependencyList(); - map<string, pair<Package*, Package*> > m_shadowedPackages; + list<pair<Package*, Package*> > m_shadowedPackages; map<string, Package*> m_packageMap; };

1 0

r1837 - tools/prt-get/trunk
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jw Date: 2006-09-08 14:17:12 +0200 (Fri, 08 Sep 2006) New Revision: 1837 Modified: tools/prt-get/trunk/TODO Log: prt-get: clean up TODO Modified: tools/prt-get/trunk/TODO =================================================================== --- tools/prt-get/trunk/TODO 2006-09-08 11:59:57 UTC (rev 1836) +++ tools/prt-get/trunk/TODO 2006-09-08 12:17:12 UTC (rev 1837) @@ -1,66 +1,38 @@ - 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) - allow dependency injection for sysup, with previews - prefer toolchain (patch in trac) - logging: check for non-root owned symlinks - logging: reject relative logfile names +- parallel build and upload +- download command +- rewrite arg parser -============================================================================== +CONSIDER: - - - - - - - -- add support to "prefer higher" for certain packages ? - - - - -next release: -- configuration override/extend - [20:01] <cptn> --config-add="prtdir /tmp" even - [20:01] <cptn> --config-set="logfile /tmp/%n.log" - [20:14] <cptn> prt-get --config-set="prtdir /tmp" \ - --config-add="prtdir /usr" - [20:14] <cptn> the 'set' would delete the config file's prtdir settings - -Don't bail out if no prt-get.conf is found if the user specified ---config-* options - -enum KindOfConfig {ADD, SET} -argparser: user addConfig(string, KindOfConfig); -config: go through additional configuration options; add and/or replace - - - -1.0.0 - +- default formats for printf and dup +- add update-footprint, update-md5sum commands (patch in trac) - sysup - allow injecting of new (uninstalled) dependencies - allow to prohibit recompilation of packages when a dependency failed to be updated in this sysup run +- big command consolidation -- better reports (installed/failed/not even tried to install) -[ ] message log for prt-get messages ? -[ ] --quiet mode; suppress output of pkgmk and pkgadd -[ ] prt-get diff stats: "100 Packages with differences" + prt-get dep|depends [--tree|-T] [--recursive|-R] [--quick|-Q] + so + depends -> dep + current depends -> dep -R + quickdep -> dep -Q + deptree -> dep -T ---------------------------- + Similar for other commands -later -- parallel download (mt) -- download only -- group support -- Actions/Commands - - Help per command -- Dynamic command binding +OLD NOTES: + +- --quiet mode; suppress output of pkgmk and pkgadd +- prt-get diff stats: "100 Packages with differences" - Make InstallTransaction a real install transaction: - rollback pre-install if package building failed - needs heavy refactoring to be easier to understand/maintain @@ -75,49 +47,14 @@ _lots_ of packages; maybe also think about forgeting not so important things like packages installed before etc -[ ] prt-get rm and cd -[ ] cache file class, help class -[ ] interrupt handler (ctrl-c) kill pkgmk/pkgadd, delete lock files, say +- interrupt handler (ctrl-c) kill pkgmk/pkgadd, delete lock files, say "prt-get: action cancelled"; warn when cancel during download -> STATE variable, separate download and build. -[ ] lock files for log, cache (lock file class) -[ ] move command name out of execTransaction (would be wrong for e.g. +- move command name out of execTransaction (would be wrong for e.g. sysup) +- symbolic exit codes -SHORT TERM ------------- - -* Answer FAQs - -* create a fileExists(), createDir() etc helper class - -* questions - - should the install/update result include the version/release? - -* cosmetic - - move all output messages to prtget.cpp (away from main.cpp) - - remove "using namespace std" from header file - -* test - - add asserts - -* functional - - check exit messages (strings). always add 'prt-get' - -* refactor - - check operations in prtget.cpp for common code - - make InstallTransaction more modular (download/build/install) - -LONG TERM ------------------------------- -* remove quickdiff -* move find command into list --filter="..." ??? - -* symbolic exit codes - -* new commands: - * questions: - should there be a install/update mixed to mode, to install and update, which ever method is needed? @@ -126,15 +63,3 @@ config file again. This could be done by creating another ports directories an creation symlinks there to. Could improve performance - might people like ansi colors? - -* new features - - list shadow packages (dup) for arguments - -* - rebuild all ports using dependency information - - -LONG LONG TERM --------------- -- parallel download for installing/updating multiple packages (at least - download of 2nd package while building first) -

1 0

r1836 - in tools/prt-get/trunk: doc src
by crux＠crux.nu 08 Sep '06

08 Sep '06

Author: jw Date: 2006-09-08 13:59:57 +0200 (Fri, 08 Sep 2006) New Revision: 1836 Modified: tools/prt-get/trunk/doc/prt-get.8 tools/prt-get/trunk/src/prtget.cpp tools/prt-get/trunk/src/repository.cpp tools/prt-get/trunk/src/repository.h Log: prt-get: allow accessing version and port path in dup format separately Modified: tools/prt-get/trunk/doc/prt-get.8 =================================================================== --- tools/prt-get/trunk/doc/prt-get.8 2006-09-08 11:35:06 UTC (rev 1835) +++ tools/prt-get/trunk/doc/prt-get.8 2006-09-08 11:59:57 UTC (rev 1836) @@ -236,13 +236,22 @@ .TP \ \ \ \(bu -%1 \-> Port which takes precedence +%p1 \-> Full path (including name) to port taking precendence .TP \ \ \ \(bu -%2 \-> Port which is hidden +%p2 \-> Full path (including name) to port being hidden .TP +\ \ \ \(bu +%v1 \-> Version of port taking precendence + +.TP +\ \ \ \(bu +%v2 \-> Version of port being hidden + + +.TP .B list [\-v|\-vv] [filter] [--path] [--regex] List ports available in the ports tree. It's basically the same as .B ports \-l Modified: tools/prt-get/trunk/src/prtget.cpp =================================================================== --- tools/prt-get/trunk/src/prtget.cpp 2006-09-08 11:35:06 UTC (rev 1835) +++ tools/prt-get/trunk/src/prtget.cpp 2006-09-08 11:59:57 UTC (rev 1836) @@ -268,21 +268,28 @@ initRepo( true ); - string format = "%1 > %2\n"; + string format = "%p1 %v1 > %p2 %v2\n"; if (m_parser->otherArgs().size() > 0) format = *(m_parser->otherArgs().begin()); else if (m_parser->verbose() > 0) - format = "* %n\n %1 preceeds over \n %2\n"; + format = "* %n\n %p1 %v1 preceeds over \n %p2 %v2\n"; string output; - map<string, pair<string, string> >::const_iterator it = + Package* p1; + Package* p2; + map<string, pair<Package*, Package*> >::const_iterator it = m_repo->shadowedPackages().begin(); for ( ; it != m_repo->shadowedPackages().end(); ++it ) { output = format; - StringHelper::replaceAll(output, "%n", it->first); - StringHelper::replaceAll(output, "%1", it->second.second); - StringHelper::replaceAll(output, "%2", it->second.first); - + p1 = it->second.second; + p2 = it->second.first; + + StringHelper::replaceAll(output, "%n", p1->name()); + StringHelper::replaceAll(output, "%p1", p1->path() + "/" + p1->name()); + StringHelper::replaceAll(output, "%p2", p2->path() + "/" + p2->name()); + StringHelper::replaceAll(output, "%v1", p1->versionReleaseString()); + StringHelper::replaceAll(output, "%v2", p2->versionReleaseString()); + StringHelper::replaceAll(output, "\\n", "\n"); cout << output; } Modified: tools/prt-get/trunk/src/repository.cpp =================================================================== --- tools/prt-get/trunk/src/repository.cpp 2006-09-08 11:35:06 UTC (rev 1835) +++ tools/prt-get/trunk/src/repository.cpp 2006-09-08 11:59:57 UTC (rev 1836) @@ -69,7 +69,7 @@ \a second is the port which preceeds over \a first \return a map of duplicate packages in the repository */ -const map<string, pair<string, string> >& Repository::shadowedPackages() const +const map<string, pair<Package*, Package*> >& Repository::shadowedPackages() const { return m_shadowedPackages; } @@ -226,12 +226,9 @@ // no such package found, add m_packageMap[name] = p; } else if ( listDuplicate ) { - Package* old = hidden->second; - string ps = p->path() + "/" + p->name() + - " " + p->versionReleaseString(); - string os = old->path() + "/" + old->name() + - " " + old->versionReleaseString(); - m_shadowedPackages[name] = make_pair( ps, os ); + m_shadowedPackages[name] = make_pair( p, hidden->second ); + } else { + delete p; } } } Modified: tools/prt-get/trunk/src/repository.h =================================================================== --- tools/prt-get/trunk/src/repository.h 2006-09-08 11:35:06 UTC (rev 1835) +++ tools/prt-get/trunk/src/repository.h 2006-09-08 11:59:57 UTC (rev 1836) @@ -34,7 +34,7 @@ const Package* getPackage( const string& name ) const; const map<string, Package*>& packages() const; - const map<string, pair<string, string> >& shadowedPackages() const; + const map<string, pair<Package*, Package*> >& shadowedPackages() const; void searchMatchingPackages( const string& pattern, list<Package*>& target, @@ -74,7 +74,7 @@ void parseDependencyList(); - map<string, pair<string, string> > m_shadowedPackages; + map<string, pair<Package*, Package*> > m_shadowedPackages; map<string, Package*> m_packageMap; };

1 0