March 2006 - crux-commits

r1014 - in crux-2.2/ports: attic attic/asunder attic/graveman attic/libcddb attic/sox opt
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 03:00:57 +0200 (Sun, 26 Mar 2006) New Revision: 1014 Added: crux-2.2/ports/attic/asunder/ crux-2.2/ports/attic/graveman/ crux-2.2/ports/attic/libcddb/ crux-2.2/ports/attic/sox/ Removed: crux-2.2/ports/opt/asunder/ crux-2.2/ports/opt/graveman/ crux-2.2/ports/opt/libcddb/ crux-2.2/ports/opt/sox/ Modified: crux-2.2/ports/attic/asunder/Pkgfile crux-2.2/ports/attic/graveman/Pkgfile crux-2.2/ports/attic/libcddb/Pkgfile crux-2.2/ports/attic/sox/Pkgfile Log: moved into attic: asunder, graveman, libcddb, sox Copied: crux-2.2/ports/attic/asunder (from rev 1008, crux-2.2/ports/opt/asunder) Modified: crux-2.2/ports/attic/asunder/Pkgfile =================================================================== --- crux-2.2/ports/opt/asunder/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/asunder/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014) @@ -1,7 +1,7 @@ # Description: CD Ripping frontend # URL: http://ericlathrop.com/asunder/ -# Maintainer: Simone Rota, sip at varlock dot com -# Packager: Simone Rota, sip at varlock dot com +# Maintainer: +# Packager: Simone Rota, sip at crux dot nu # Depends on: gtk, flac, lame, vorbis-tools, cdparanoia, libcddb name=asunder Copied: crux-2.2/ports/attic/graveman (from rev 1008, crux-2.2/ports/opt/graveman) Modified: crux-2.2/ports/attic/graveman/Pkgfile =================================================================== --- crux-2.2/ports/opt/graveman/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/graveman/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014) @@ -1,7 +1,7 @@ # Description: CD Burning program # URL: http://www.nongnu.org/graveman/ -# Maintainer: Simone Rota, sip at varlock dot com -# Packager: Simone Rota, sip at varlock dot com +# Maintainer: +# Packager: Simone Rota, sip at crux dot nu # Depends on: libglade, libid3tag, libmad, libvorbis, cdrtools, sox, cdrdao, p5-xml-parser, libmng name=graveman Copied: crux-2.2/ports/attic/libcddb (from rev 1008, crux-2.2/ports/opt/libcddb) Modified: crux-2.2/ports/attic/libcddb/Pkgfile =================================================================== --- crux-2.2/ports/opt/libcddb/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/libcddb/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014) @@ -1,6 +1,6 @@ # Description: C library to access and submit data on a CDDB server # URL: http://libcddb.sf.net -# Maintainer: Simone Rota, sip at varlock dot com +# Maintainer: # Packager: Han Boetes, han at mijncomputer dot nl # Depends on: Copied: crux-2.2/ports/attic/sox (from rev 1008, crux-2.2/ports/opt/sox) Modified: crux-2.2/ports/attic/sox/Pkgfile =================================================================== --- crux-2.2/ports/opt/sox/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/sox/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014) @@ -1,6 +1,6 @@ # Description: audio conversion tools, (c) copyright Lance Norskog # URL: http://sox.sourceforge.net/ -# Maintainer: Simone Rota, sip at varlock dot com +# Maintainer: # Packager: Martin Opel, mo at obbl-net dot de # Depends on:

1 0

r1013 - in crux-2.2/ports: attic attic/potrace opt
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 01:50:42 +0100 (Sun, 26 Mar 2006) New Revision: 1013 Added: crux-2.2/ports/attic/potrace/ Removed: crux-2.2/ports/opt/potrace/ Modified: crux-2.2/ports/attic/potrace/Pkgfile Log: potrace: moved into attic Copied: crux-2.2/ports/attic/potrace (from rev 1008, crux-2.2/ports/opt/potrace) Modified: crux-2.2/ports/attic/potrace/Pkgfile =================================================================== --- crux-2.2/ports/opt/potrace/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/potrace/Pkgfile 2006-03-26 00:50:42 UTC (rev 1013) @@ -1,7 +1,7 @@ # Description: Convert bitmap images into vector # URL: http://potrace.sourceforge.net -# Maintainer: Simone Rota, sip at varlock dot com -# Packager: Simone Rota, sip at varlock dot com +# Maintainer: +# Packager: Simone Rota, sip at crux dot nu # Depends on: name=potrace

1 0

r1012 - crux-2.2/ports
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 01:49:09 +0100 (Sun, 26 Mar 2006) New Revision: 1012 Added: crux-2.2/ports/attic/ Log: created attic

1 0

r1011 - crux-2.2/ports/opt/postgresql
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 01:46:42 +0100 (Sun, 26 Mar 2006) New Revision: 1011 Modified: crux-2.2/ports/opt/postgresql/.md5sum crux-2.2/ports/opt/postgresql/Pkgfile Log: postgresql: updated to 8.1.3 Modified: crux-2.2/ports/opt/postgresql/.md5sum =================================================================== --- crux-2.2/ports/opt/postgresql/.md5sum 2006-03-26 00:27:52 UTC (rev 1010) +++ crux-2.2/ports/opt/postgresql/.md5sum 2006-03-26 00:46:42 UTC (rev 1011) @@ -1,2 +1,2 @@ f5eeff17dd7117175794459f7097ad1a postgresql -12d54a11bc3a414477d37ef338bec161 postgresql-8.1.2.tar.bz2 +bb510edbb533962c0692e211b3bd8cfa postgresql-8.1.3.tar.bz2 Modified: crux-2.2/ports/opt/postgresql/Pkgfile =================================================================== --- crux-2.2/ports/opt/postgresql/Pkgfile 2006-03-26 00:27:52 UTC (rev 1010) +++ crux-2.2/ports/opt/postgresql/Pkgfile 2006-03-26 00:46:42 UTC (rev 1011) @@ -1,11 +1,11 @@ # Description: A sophisticated Object-Relational DBMS # URL: http://www.postgresql.org # Packager: Markus Heinz, su1690 at studserver.uni-dortmund dot de -# Maintainer: Simone Rota, sip at varlock dot com +# Maintainer: Simone Rota, sip at crux dot nu # Depends on: name=postgresql -version=8.1.2 +version=8.1.3 release=1 source=(ftp://ftp2.de.postgresql.org/pub/postgresql/v$version/$name-$versio… postgresql)

1 0

r1010 - crux-2.2/ports/opt/minicom
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 01:27:52 +0100 (Sun, 26 Mar 2006) New Revision: 1010 Added: crux-2.2/ports/opt/minicom/minicom-2.1-gcc4.patch Modified: crux-2.2/ports/opt/minicom/.md5sum crux-2.2/ports/opt/minicom/Pkgfile Log: minicom: added gcc4 patch Modified: crux-2.2/ports/opt/minicom/.md5sum =================================================================== --- crux-2.2/ports/opt/minicom/.md5sum 2006-03-25 23:54:28 UTC (rev 1009) +++ crux-2.2/ports/opt/minicom/.md5sum 2006-03-26 00:27:52 UTC (rev 1010) @@ -1 +1,2 @@ +e1a7644e6acfcf2a67f65c032167bcf6 minicom-2.1-gcc4.patch 1c8f3b247c38fb16c3c2170df9fc102a minicom-2.1.tar.gz Modified: crux-2.2/ports/opt/minicom/Pkgfile =================================================================== --- crux-2.2/ports/opt/minicom/Pkgfile 2006-03-25 23:54:28 UTC (rev 1009) +++ crux-2.2/ports/opt/minicom/Pkgfile 2006-03-26 00:27:52 UTC (rev 1010) @@ -1,16 +1,18 @@ # Description: A menu driven communications program # URL: http://alioth.debian.org/projects/minicom/ -# Maintainer: Simone Rota, sip at varlock dot com +# Maintainer: Simone Rota, sip at crux dot nu # Packager: sten, nick dot steeves at shaw dot ca # Depends on: name=minicom version=2.1 -release=1 -source=(http://alioth.debian.org/download.php/123/minicom-$version.tar.gz) +release=2 +source=(http://alioth.debian.org/download.php/123/minicom-$version.tar.gz \ + $name-$version-gcc4.patch) build() { cd $name-$version + patch -p1 < ../$name-$version-gcc4.patch ./configure --prefix=/usr --disable-nls make make DESTDIR=$PKG install Added: crux-2.2/ports/opt/minicom/minicom-2.1-gcc4.patch =================================================================== --- crux-2.2/ports/opt/minicom/minicom-2.1-gcc4.patch (rev 0) +++ crux-2.2/ports/opt/minicom/minicom-2.1-gcc4.patch 2006-03-26 00:27:52 UTC (rev 1010) @@ -0,0 +1,12 @@ +diff -ur minicom-2.1-orig/src/window.c minicom-2.1/src/window.c +--- minicom-2.1-orig/src/window.c 2005-05-28 19:59:42.000000000 -0400 ++++ minicom-2.1/src/window.c 2005-05-28 20:00:22.000000000 -0400 +@@ -62,7 +62,7 @@ + static char *CS, *SF, *SR, *VB, *BL; + static char *VE, *VI, *KS, *KE; + static char *CD, *CL, *IC, *DC; +-static char *BC, *CR, *NL; ++static char *CR, *NL; + #if ST_LINE + static char *TS, *FS, *DS; + #endif

1 0

r1009 - crux-2.2/ports/opt/txt2man
by crux＠crux.nu 25 Mar '06

25 Mar '06

Author: sip Date: 2006-03-26 00:54:28 +0100 (Sun, 26 Mar 2006) New Revision: 1009 Modified: crux-2.2/ports/opt/txt2man/Pkgfile Log: txt2man: changed email address Modified: crux-2.2/ports/opt/txt2man/Pkgfile =================================================================== --- crux-2.2/ports/opt/txt2man/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/opt/txt2man/Pkgfile 2006-03-25 23:54:28 UTC (rev 1009) @@ -1,7 +1,7 @@ # Description: Convert flat text file to man page # URL: http://mvertes.free.fr/ -# Maintainer: Simone Rota, sip at varlock dot com -# Packager: Simone Rota, sip at varlock dot com +# Maintainer: Simone Rota, sip at crux dot nu +# Packager: Simone Rota, sip at crux dot nu # Depends on: name=txt2man

1 0

r1008 - crux-2.2/iso/bin
by crux＠crux.nu 25 Mar '06

25 Mar '06

Author: jw Date: 2006-03-25 16:54:58 +0100 (Sat, 25 Mar 2006) New Revision: 1008 Modified: crux-2.2/iso/bin/setup-helper Log: setup-helper: be smarter: only inject rsync if the user has ports and cvsup Modified: crux-2.2/iso/bin/setup-helper =================================================================== --- crux-2.2/iso/bin/setup-helper 2006-03-25 15:43:02 UTC (rev 1007) +++ crux-2.2/iso/bin/setup-helper 2006-03-25 15:54:58 UTC (rev 1008) @@ -93,6 +93,7 @@ inject_packages cairo glitz pango hicolor-icon-theme fi -if [ `pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^ports$` ]; then +if [ `pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^ports$` ] && + [ `pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^cvsup$` ]; then inject_packages rsync fi

1 0

r1007 - crux-2.2/iso/bin
by crux＠crux.nu 25 Mar '06

25 Mar '06

Author: jw Date: 2006-03-25 16:43:02 +0100 (Sat, 25 Mar 2006) New Revision: 1007 Modified: crux-2.2/iso/bin/setup-helper Log: setup-helper: keep 'ports' working after an update Modified: crux-2.2/iso/bin/setup-helper =================================================================== --- crux-2.2/iso/bin/setup-helper 2006-03-25 15:19:34 UTC (rev 1006) +++ crux-2.2/iso/bin/setup-helper 2006-03-25 15:43:02 UTC (rev 1007) @@ -92,3 +92,7 @@ if [ `pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^firefox$` ]; then inject_packages cairo glitz pango hicolor-icon-theme fi + +if [ `pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^ports$` ]; then + inject_packages rsync +fi

1 0

r1006 - crux-2.2/ports/core/kbd
by crux＠crux.nu 25 Mar '06

25 Mar '06

Author: jw Date: 2006-03-25 16:19:34 +0100 (Sat, 25 Mar 2006) New Revision: 1006 Added: crux-2.2/ports/core/kbd/kbd-1.12-alias.patch Modified: crux-2.2/ports/core/kbd/.md5sum crux-2.2/ports/core/kbd/Pkgfile Log: kbd: gcc4 fix Modified: crux-2.2/ports/core/kbd/.md5sum =================================================================== --- crux-2.2/ports/core/kbd/.md5sum 2006-03-25 14:40:16 UTC (rev 1005) +++ crux-2.2/ports/core/kbd/.md5sum 2006-03-25 15:19:34 UTC (rev 1006) @@ -1 +1,2 @@ +750a72dd27b6ba6ae428974ddd98565c kbd-1.12-alias.patch 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz Modified: crux-2.2/ports/core/kbd/Pkgfile =================================================================== --- crux-2.2/ports/core/kbd/Pkgfile 2006-03-25 14:40:16 UTC (rev 1005) +++ crux-2.2/ports/core/kbd/Pkgfile 2006-03-25 15:19:34 UTC (rev 1006) @@ -4,11 +4,13 @@ name=kbd version=1.12 -release=1 -source=(ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/$name-$version.tar.gz) +release=2 +source=(ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/$name-$version.tar.gz \ + kbd-1.12-alias.patch) build() { cd $name-$version + patch -p1 < $SRC/kbd-1.12-alias.patch ./configure --prefix=/usr \ --mandir=/usr/man \ --datadir=/usr/share/kbd \ Added: crux-2.2/ports/core/kbd/kbd-1.12-alias.patch =================================================================== --- crux-2.2/ports/core/kbd/kbd-1.12-alias.patch (rev 0) +++ crux-2.2/ports/core/kbd/kbd-1.12-alias.patch 2006-03-25 15:19:34 UTC (rev 1006) @@ -0,0 +1,51 @@ +gcc 4 fix; addresses "trailing garbage" output. + +Taken from gentoo's ebuild + +diff -u kbd-1.12/src/psffontop.c kbd-1.12/src/psffontop.c +--- kbd-1.12/src/psffontop.c 2005-03-12 00:48:30.075310872 +0100 ++++ kbd-1.12/src/psffontop.c 2005-05-14 10:49:59.000000000 +0900 +@@ -59,7 +59,6 @@ + + static unsigned int + assemble_ucs2(char **inptr, int cnt) { +- unsigned char **in = (unsigned char **) inptr; + unsigned int u1, u2; + + if (cnt < 2) { +@@ -68,8 +67,8 @@ + exit(EX_DATAERR); + } + +- u1 = *(*in)++; +- u2 = *(*in)++; ++ u1 = (unsigned char)*(*inptr)++; ++ u2 = (unsigned char)*(*inptr)++; + return (u1 | (u2 << 8)); + } + +@@ -110,7 +109,6 @@ + */ + static void + get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) { +- unsigned char **in = (unsigned char **) inptr; + unsigned char uc; + unicode unichar; + int inseq = 0; +@@ -126,14 +124,14 @@ + exit(EX_DATAERR); + } + if (utf8) { +- uc = *(*in)++; ++ uc = *(*inptr)++; + if (uc == PSF2_SEPARATOR) + break; + if (uc == PSF2_STARTSEQ) { + inseq = 1; + continue; + } +- --(*in); ++ --(*inptr); + unichar = assemble_utf8(inptr, *endptr - *inptr); + } else { + unichar = assemble_ucs2(inptr, *endptr - *inptr);

1 0

r1005 - crux-2.2/iso/bin
by crux＠crux.nu 25 Mar '06

25 Mar '06

Author: sip Date: 2006-03-25 15:40:16 +0100 (Sat, 25 Mar 2006) New Revision: 1005 Modified: crux-2.2/iso/bin/setup Log: setup: hide errors on non-existing helper log Modified: crux-2.2/iso/bin/setup =================================================================== --- crux-2.2/iso/bin/setup 2006-03-25 10:48:07 UTC (rev 1004) +++ crux-2.2/iso/bin/setup 2006-03-25 14:40:16 UTC (rev 1005) @@ -236,7 +236,7 @@ fi install_packages - cat $helperlogfile + cat $helperlogfile 2> /dev/null } tmpfile=/tmp/tmp.$$

1 0