- crux-commits - lists.crux.nu

ports/opt (master): shared-mime-info: updated to 0.20
by crux＠crux.nu 19 May '07

19 May '07

commit e7307d530c7233fbf45e76b2a80ce338b955ab54 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Mon Feb 12 21:05:40 2007 +0100 shared-mime-info: updated to 0.20 diff --git a/shared-mime-info/.footprint b/shared-mime-info/.footprint index 905ed7d..702a314 100644 --- a/shared-mime-info/.footprint +++ b/shared-mime-info/.footprint @@ -29,16 +29,17 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/pgp-encrypted.xml -rw-r--r-- root/root usr/share/mime/application/pgp-keys.xml -rw-r--r-- root/root usr/share/mime/application/pgp-signature.xml --rw-r--r-- root/root usr/share/mime/application/pgp.xml -rw-r--r-- root/root usr/share/mime/application/pkcs7-mime.xml -rw-r--r-- root/root usr/share/mime/application/pkcs7-signature.xml -rw-r--r-- root/root usr/share/mime/application/postscript.xml +-rw-r--r-- root/root usr/share/mime/application/ram.xml -rw-r--r-- root/root usr/share/mime/application/rss+xml.xml -rw-r--r-- root/root usr/share/mime/application/rtf.xml -rw-r--r-- root/root usr/share/mime/application/sieve.xml -rw-r--r-- root/root usr/share/mime/application/smil.xml -rw-r--r-- root/root usr/share/mime/application/stuffit.xml -rw-r--r-- root/root usr/share/mime/application/vnd.corel-draw.xml +-rw-r--r-- root/root usr/share/mime/application/vnd.emusic-emusic_package.xml -rw-r--r-- root/root usr/share/mime/application/vnd.hp-hpgl.xml -rw-r--r-- root/root usr/share/mime/application/vnd.hp-pcl.xml -rw-r--r-- root/root usr/share/mime/application/vnd.lotus-1-2-3.xml @@ -60,7 +61,6 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/vnd.oasis.opendocument.text-template.xml -rw-r--r-- root/root usr/share/mime/application/vnd.oasis.opendocument.text-web.xml -rw-r--r-- root/root usr/share/mime/application/vnd.oasis.opendocument.text.xml --rw-r--r-- root/root usr/share/mime/application/vnd.palm.xml -rw-r--r-- root/root usr/share/mime/application/vnd.rn-realmedia.xml -rw-r--r-- root/root usr/share/mime/application/vnd.stardivision.calc.xml -rw-r--r-- root/root usr/share/mime/application/vnd.stardivision.chart.xml @@ -82,6 +82,7 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/vnd.wordperfect.xml -rw-r--r-- root/root usr/share/mime/application/x-7z-compressed.xml -rw-r--r-- root/root usr/share/mime/application/x-abiword.xml +-rw-r--r-- root/root usr/share/mime/application/x-ace.xml -rw-r--r-- root/root usr/share/mime/application/x-amipro.xml -rw-r--r-- root/root usr/share/mime/application/x-applix-spreadsheet.xml -rw-r--r-- root/root usr/share/mime/application/x-applix-word.xml @@ -93,8 +94,11 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/x-bcpio.xml -rw-r--r-- root/root usr/share/mime/application/x-bittorrent.xml -rw-r--r-- root/root usr/share/mime/application/x-blender.xml +-rw-r--r-- root/root usr/share/mime/application/x-bzdvi.xml -rw-r--r-- root/root usr/share/mime/application/x-bzip-compressed-tar.xml -rw-r--r-- root/root usr/share/mime/application/x-bzip.xml +-rw-r--r-- root/root usr/share/mime/application/x-bzpdf.xml +-rw-r--r-- root/root usr/share/mime/application/x-bzpostscript.xml -rw-r--r-- root/root usr/share/mime/application/x-cbr.xml -rw-r--r-- root/root usr/share/mime/application/x-cbz.xml -rw-r--r-- root/root usr/share/mime/application/x-cd-image.xml @@ -109,6 +113,7 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/x-cpio.xml -rw-r--r-- root/root usr/share/mime/application/x-csh.xml -rw-r--r-- root/root usr/share/mime/application/x-cue.xml +-rw-r--r-- root/root usr/share/mime/application/x-dar.xml -rw-r--r-- root/root usr/share/mime/application/x-dbf.xml -rw-r--r-- root/root usr/share/mime/application/x-dbm.xml -rw-r--r-- root/root usr/share/mime/application/x-dc-rom.xml @@ -152,9 +157,14 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/x-graphite.xml -rw-r--r-- root/root usr/share/mime/application/x-gtar.xml -rw-r--r-- root/root usr/share/mime/application/x-gtktalog.xml +-rw-r--r-- root/root usr/share/mime/application/x-gzdvi.xml -rw-r--r-- root/root usr/share/mime/application/x-gzip.xml +-rw-r--r-- root/root usr/share/mime/application/x-gzpdf.xml -rw-r--r-- root/root usr/share/mime/application/x-gzpostscript.xml -rw-r--r-- root/root usr/share/mime/application/x-hdf.xml +-rw-r--r-- root/root usr/share/mime/application/x-hwp.xml +-rw-r--r-- root/root usr/share/mime/application/x-hwt.xml +-rw-r--r-- root/root usr/share/mime/application/x-ica.xml -rw-r--r-- root/root usr/share/mime/application/x-ipod-firmware.xml -rw-r--r-- root/root usr/share/mime/application/x-java-archive.xml -rw-r--r-- root/root usr/share/mime/application/x-java-jnlp-file.xml @@ -183,7 +193,7 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/x-m4.xml -rw-r--r-- root/root usr/share/mime/application/x-macbinary.xml -rw-r--r-- root/root usr/share/mime/application/x-magicpoint.xml --rw-r--r-- root/root usr/share/mime/application/x-matroska.xml +-rw-r--r-- root/root usr/share/mime/application/x-markaby.xml -rw-r--r-- root/root usr/share/mime/application/x-mif.xml -rw-r--r-- root/root usr/share/mime/application/x-mozilla-bookmarks.xml -rw-r--r-- root/root usr/share/mime/application/x-ms-dos-executable.xml @@ -232,6 +242,7 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/x-stuffit.xml -rw-r--r-- root/root usr/share/mime/application/x-sv4cpio.xml -rw-r--r-- root/root usr/share/mime/application/x-sv4crc.xml +-rw-r--r-- root/root usr/share/mime/application/x-t602.xml -rw-r--r-- root/root usr/share/mime/application/x-tar.xml -rw-r--r-- root/root usr/share/mime/application/x-tarz.xml -rw-r--r-- root/root usr/share/mime/application/x-tex-gf.xml @@ -248,6 +259,7 @@ drwxr-xr-x root/root usr/share/mime/application/ -rw-r--r-- root/root usr/share/mime/application/x-wpg.xml -rw-r--r-- root/root usr/share/mime/application/x-x509-ca-cert.xml -rw-r--r-- root/root usr/share/mime/application/x-xbel.xml +-rw-r--r-- root/root usr/share/mime/application/x-xliff.xml -rw-r--r-- root/root usr/share/mime/application/x-zerosize.xml -rw-r--r-- root/root usr/share/mime/application/x-zoo.xml -rw-r--r-- root/root usr/share/mime/application/xhtml+xml.xml @@ -274,6 +286,7 @@ drwxr-xr-x root/root usr/share/mime/audio/ -rw-r--r-- root/root usr/share/mime/audio/x-flac+ogg.xml -rw-r--r-- root/root usr/share/mime/audio/x-flac.xml -rw-r--r-- root/root usr/share/mime/audio/x-it.xml +-rw-r--r-- root/root usr/share/mime/audio/x-matroska.xml -rw-r--r-- root/root usr/share/mime/audio/x-mod.xml -rw-r--r-- root/root usr/share/mime/audio/x-mp3-playlist.xml -rw-r--r-- root/root usr/share/mime/audio/x-mpeg.xml @@ -286,9 +299,12 @@ drwxr-xr-x root/root usr/share/mime/audio/ -rw-r--r-- root/root usr/share/mime/audio/x-scpls.xml -rw-r--r-- root/root usr/share/mime/audio/x-speex+ogg.xml -rw-r--r-- root/root usr/share/mime/audio/x-stm.xml +-rw-r--r-- root/root usr/share/mime/audio/x-tta.xml -rw-r--r-- root/root usr/share/mime/audio/x-voc.xml -rw-r--r-- root/root usr/share/mime/audio/x-vorbis+ogg.xml -rw-r--r-- root/root usr/share/mime/audio/x-wav.xml +-rw-r--r-- root/root usr/share/mime/audio/x-wavpack-correction.xml +-rw-r--r-- root/root usr/share/mime/audio/x-wavpack.xml -rw-r--r-- root/root usr/share/mime/audio/x-xi.xml -rw-r--r-- root/root usr/share/mime/audio/x-xm.xml -rw-r--r-- root/root usr/share/mime/globs @@ -304,14 +320,17 @@ drwxr-xr-x root/root usr/share/mime/image/ -rw-r--r-- root/root usr/share/mime/image/jpeg2000.xml -rw-r--r-- root/root usr/share/mime/image/png.xml -rw-r--r-- root/root usr/share/mime/image/rle.xml +-rw-r--r-- root/root usr/share/mime/image/svg+xml-compressed.xml -rw-r--r-- root/root usr/share/mime/image/svg+xml.xml -rw-r--r-- root/root usr/share/mime/image/tiff.xml -rw-r--r-- root/root usr/share/mime/image/vnd.djvu.xml -rw-r--r-- root/root usr/share/mime/image/vnd.dwg.xml -rw-r--r-- root/root usr/share/mime/image/vnd.dxf.xml -rw-r--r-- root/root usr/share/mime/image/vnd.rn-realpix.xml +-rw-r--r-- root/root usr/share/mime/image/vnd.wap.wbmp.xml -rw-r--r-- root/root usr/share/mime/image/x-3ds.xml -rw-r--r-- root/root usr/share/mime/image/x-applix-graphics.xml +-rw-r--r-- root/root usr/share/mime/image/x-bzeps.xml -rw-r--r-- root/root usr/share/mime/image/x-canon-crw.xml -rw-r--r-- root/root usr/share/mime/image/x-cmu-raster.xml -rw-r--r-- root/root usr/share/mime/image/x-compressed-xcf.xml @@ -320,6 +339,8 @@ drwxr-xr-x root/root usr/share/mime/image/ -rw-r--r-- root/root usr/share/mime/image/x-fits.xml -rw-r--r-- root/root usr/share/mime/image/x-fpx.xml -rw-r--r-- root/root usr/share/mime/image/x-fuji-raf.xml +-rw-r--r-- root/root usr/share/mime/image/x-gzeps.xml +-rw-r--r-- root/root usr/share/mime/image/x-icns.xml -rw-r--r-- root/root usr/share/mime/image/x-ico.xml -rw-r--r-- root/root usr/share/mime/image/x-iff.xml -rw-r--r-- root/root usr/share/mime/image/x-ilbm.xml @@ -328,6 +349,7 @@ drwxr-xr-x root/root usr/share/mime/image/ -rw-r--r-- root/root usr/share/mime/image/x-kodak-kdc.xml -rw-r--r-- root/root usr/share/mime/image/x-lwo.xml -rw-r--r-- root/root usr/share/mime/image/x-lws.xml +-rw-r--r-- root/root usr/share/mime/image/x-macpaint.xml -rw-r--r-- root/root usr/share/mime/image/x-minolta-mrw.xml -rw-r--r-- root/root usr/share/mime/image/x-msod.xml -rw-r--r-- root/root usr/share/mime/image/x-niff.xml @@ -423,24 +445,29 @@ drwxr-xr-x root/root usr/share/mime/text/ -rw-r--r-- root/root usr/share/mime/text/x-fortran.xml -rw-r--r-- root/root usr/share/mime/text/x-gettext-translation-template.xml -rw-r--r-- root/root usr/share/mime/text/x-gettext-translation.xml +-rw-r--r-- root/root usr/share/mime/text/x-google-video-pointer.xml -rw-r--r-- root/root usr/share/mime/text/x-gtkrc.xml -rw-r--r-- root/root usr/share/mime/text/x-haskell.xml -rw-r--r-- root/root usr/share/mime/text/x-idl.xml -rw-r--r-- root/root usr/share/mime/text/x-install.xml -rw-r--r-- root/root usr/share/mime/text/x-java.xml -rw-r--r-- root/root usr/share/mime/text/x-ksysv-log.xml +-rw-r--r-- root/root usr/share/mime/text/x-ldif.xml -rw-r--r-- root/root usr/share/mime/text/x-literate-haskell.xml -rw-r--r-- root/root usr/share/mime/text/x-log.xml +-rw-r--r-- root/root usr/share/mime/text/x-lua.xml -rw-r--r-- root/root usr/share/mime/text/x-makefile.xml -rw-r--r-- root/root usr/share/mime/text/x-matlab.xml -rw-r--r-- root/root usr/share/mime/text/x-moc.xml -rw-r--r-- root/root usr/share/mime/text/x-mup.xml -rw-r--r-- root/root usr/share/mime/text/x-objcsrc.xml -rw-r--r-- root/root usr/share/mime/text/x-ocaml.xml +-rw-r--r-- root/root usr/share/mime/text/x-ocl.xml -rw-r--r-- root/root usr/share/mime/text/x-pascal.xml -rw-r--r-- root/root usr/share/mime/text/x-patch.xml -rw-r--r-- root/root usr/share/mime/text/x-python.xml -rw-r--r-- root/root usr/share/mime/text/x-readme.xml +-rw-r--r-- root/root usr/share/mime/text/x-rpm-spec.xml -rw-r--r-- root/root usr/share/mime/text/x-scheme.xml -rw-r--r-- root/root usr/share/mime/text/x-setext.xml -rw-r--r-- root/root usr/share/mime/text/x-speech.xml @@ -469,6 +496,7 @@ drwxr-xr-x root/root usr/share/mime/video/ -rw-r--r-- root/root usr/share/mime/video/wavelet.xml -rw-r--r-- root/root usr/share/mime/video/x-anim.xml -rw-r--r-- root/root usr/share/mime/video/x-flic.xml +-rw-r--r-- root/root usr/share/mime/video/x-matroska.xml -rw-r--r-- root/root usr/share/mime/video/x-mng.xml -rw-r--r-- root/root usr/share/mime/video/x-ms-asf.xml -rw-r--r-- root/root usr/share/mime/video/x-ms-wmv.xml diff --git a/shared-mime-info/.md5sum b/shared-mime-info/.md5sum index d09ae53..4e77dda 100644 --- a/shared-mime-info/.md5sum +++ b/shared-mime-info/.md5sum @@ -1,2 +1,2 @@ -056a86a8245aecfd9c80740380c5265a shared-mime-info-0.19.tar.gz +62184241d497d34138285bc248b3fabc shared-mime-info-0.20.tar.bz2 bb48248d6e023ddbcf9d2bd4180ab3b7 shared-mime-info.patch diff --git a/shared-mime-info/Pkgfile b/shared-mime-info/Pkgfile index 06c7e07..9bc92e4 100644 --- a/shared-mime-info/Pkgfile +++ b/shared-mime-info/Pkgfile @@ -5,9 +5,9 @@ # Group: gnome name=shared-mime-info -version=0.19 +version=0.20 release=1 -source=(http://freedesktop.org/~hadess/$name-$version.tar.gz \ +source=(http://freedesktop.org/~hadess/$name-$version.tar.bz2 \ $name.patch) build() { @@ -16,4 +16,8 @@ build() { ./configure --prefix=/usr make make DESTDIR=$PKG install + + install -d -m 755 $PKG/usr/lib/pkgconfig + mv $PKG/usr/share/pkgconfig/shared-mime-info.pc $PKG/usr/lib/pkgconfig + rmdir $PKG/usr/share/pkgconfig }

1 0

ports/opt (master): rxvt-unicode: updated to 8.2
by crux＠crux.nu 19 May '07

19 May '07

commit f1cfc05d1bbf4829e42cf0a755631d1e84d61529 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Sun Feb 18 07:42:26 2007 +0100 rxvt-unicode: updated to 8.2 diff --git a/rxvt-unicode/.md5sum b/rxvt-unicode/.md5sum index b68955a..066eef7 100644 --- a/rxvt-unicode/.md5sum +++ b/rxvt-unicode/.md5sum @@ -1 +1 @@ -35b40231ea62b9ad4340080d34781927 rxvt-unicode-8.1.tar.bz2 +7876a1e2a82794c5ebbea8791561daba rxvt-unicode-8.2.tar.bz2 diff --git a/rxvt-unicode/Pkgfile b/rxvt-unicode/Pkgfile index b862b9b..9c9f507 100644 --- a/rxvt-unicode/Pkgfile +++ b/rxvt-unicode/Pkgfile @@ -4,7 +4,7 @@ # Depends on: x11, perl name=rxvt-unicode -version=8.1 +version=8.2 release=1 source=(http://dist.schmorp.de/$name/$name-$version.tar.bz2)

1 0

ports/opt (master): sqlite3: update to 3.3.13
by crux＠crux.nu 19 May '07

19 May '07

commit 54e8bf8b81b2ddff588f33eeb4296df48d37cb76 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Feb 16 08:49:06 2007 +0100 sqlite3: update to 3.3.13 diff --git a/sqlite3/.md5sum b/sqlite3/.md5sum index e5ef483..1f7910e 100644 --- a/sqlite3/.md5sum +++ b/sqlite3/.md5sum @@ -1 +1 @@ -ae251cc7a4b54b80941d400ed5af01b7 sqlite-3.3.12.tar.gz +6b24d9c364215fba82242a86f54e0ad1 sqlite-3.3.13.tar.gz diff --git a/sqlite3/Pkgfile b/sqlite3/Pkgfile index 9f6e7de..9fbb2d7 100644 --- a/sqlite3/Pkgfile +++ b/sqlite3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses, readline name=sqlite3 -version=3.3.12 +version=3.3.13 release=1 source=(http://www.sqlite.org/sqlite-$version.tar.gz)

1 0

ports/opt (master): cups: update to 1.2.8
by crux＠crux.nu 19 May '07

19 May '07

commit fe9a2c171e97671a0ed953daefcec37577079712 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Feb 16 08:55:58 2007 +0100 cups: update to 1.2.8 diff --git a/cups/.md5sum b/cups/.md5sum index 676c432..5a4c2a2 100644 --- a/cups/.md5sum +++ b/cups/.md5sum @@ -1,3 +1,3 @@ 01b6a755c5b0fb7df2d2c94571f67e1d cups -bf44783d9b46130bee9f2995e6055470 cups-1.2.7-source.tar.bz2 +d2cc0604113d5300b7b3e823b660d04a cups-1.2.8-source.tar.bz2 2220f411940c4f7504ed4457c6304d4a cups-config.patch diff --git a/cups/Pkgfile b/cups/Pkgfile index 8e2eb74..782aa46 100644 --- a/cups/Pkgfile +++ b/cups/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpng, libtiff, openssl name=cups -version=1.2.7 +version=1.2.8 release=1 source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.b… \ cups-config.patch cups)

1 0

ports/opt (master): gl-select: updated to version 1.1 (ati support)
by crux＠crux.nu 19 May '07

19 May '07

commit 99263938495a7f16eb4894f9ec0fa44c0f89d09f Author: Matt Housh <jaeger(a)crux.nu> Date: Tue Feb 20 16:35:21 2007 -0600 gl-select: updated to version 1.1 (ati support) diff --git a/gl-select/Pkgfile b/gl-select/Pkgfile index fcd9224..db78edf 100644 --- a/gl-select/Pkgfile +++ b/gl-select/Pkgfile @@ -3,8 +3,8 @@ # Maintainer: Matt Housh, jaeger at morpheus dot net name=gl-select -version=1.0 -release=2 +version=1.1 +release=1 source=($name) build() { diff --git a/gl-select/gl-select b/gl-select/gl-select index c4461cf..91a4113 100755 --- a/gl-select/gl-select +++ b/gl-select/gl-select @@ -2,27 +2,50 @@ # # gl-select: select active gl/glx libraries/extensions # -# Matt Housh <jaeger(a)morpheus.net> +# Matt Housh, jaeger at morpheus dot net +# Jose V Beneyto, joberui at ei dot upv dot es # -usage() { +##### CHANGELOG ##### +Feb 20, 2007 - version 1.1 + changelog was not kept prior to this date + added abstractions and ati support contributed by Jose V Beneyto (sepen) +##################### + +infoUsage() { echo "Usage: $0 [x11|nvidia]" - exit +} + +infoMissing() { + echo "One or more of the non-x11 gl/glx backup files are missing. This means" + echo "either you're not using a non-x11 gl/glx setup, in which case nothing" + echo "needs to be changed, OR your x11 backups are missing, which can be" + echo "solved by reinstalling the x11 package from the CRUX CD or ports." +} + +infoRevert() { + echo "You appear to already be using a non-x11 gl/glx setup. If the" + echo "one selected isn't the correct one, revert to x11 and then select" + echo "the correct new setup using 'gl-select x11; gl-select <new gl/glx>'." +} + +checkInstalled() { + if [ -z "`pkginfo -i | awk '{ print $1 }' | grep -e ^$1$`" ] + then + echo "$1 isn't installed!" + exit 1 + fi } # if other than a single argument is passed, spit out some help if [ $# -ne 1 ] then - usage + infoUsage exit 1 fi # check for the x11 port; if it's not installed, why is this script even run? -if [ -z "`pkginfo -i | awk '{ print $1 }' | grep ^x11$`" ] -then - echo "x11 isn't installed!" - exit 1 -fi +checkInstalled x11 # perform the selection for the following supported gl/glx setups case "$1" in @@ -35,17 +58,16 @@ case "$1" in /usr/X11R6/lib/modules/extensions/libGLcore_so \ /usr/X11R6/lib/libGL_so_1_2 \ /usr/X11R6/lib/libGL_a" + for F in $BACKUPS do if [ ! -e $F ] then - echo "One or more of the non-x11 gl/glx backup files are missing. This means" - echo "either you're not using a non-x11 gl/glx setup, in which case nothing" - echo "needs to be changed, OR your x11 backups are missing, which can be" - echo "solved by reinstalling the x11 package from the CRUX CD or ports." + infoMissing exit 1 fi done + # move the x11 backups back into place echo -n "libglx " rm -f /usr/X11R6/lib/modules/extensions/libglx.so @@ -57,15 +79,12 @@ case "$1" in mv /usr/X11R6/lib/libGL{_so_1_2,.so.1.2} mv /usr/X11R6/lib/libGL{_a,.a} ;; + "nvidia") echo "* nvidia gl/glx selected" # is the nvidia port installed? - if [ -z "`pkginfo -i | awk '{ print $1 }' | grep ^nvidia$`" ] - then - echo "nvidia port isn't installed!" - exit 1 - fi + checkInstalled nvidia # get the .so version number NV_VER="`pkginfo -i | grep "^nvidia " | awk '{ print $2 }' | cut -d- -f2`" @@ -94,14 +113,46 @@ case "$1" in [ ! -L /usr/lib/libGLcore.so ] && \ ln -sf libGLcore.so.1.0.$NV_VER /usr/lib/libGLcore.so else - echo "You appear to already be using a non-x11 gl/glx setup. If the" - echo "one selected isn't the correct one, revert to x11 and then select" - echo "the correct new setup using 'gl-select x11; gl-select <new gl/glx>'." + infoRevert exit 1 fi ;; + + "ati") + echo "* ati gl/glx selected" + + # is the ati port installed? + checkInstalled ati + + # check for the existence of libGL_so_1_2 + # if none, copy/move the x11 stuff out of the way for ati's + if [ ! -e /usr/X11R6/lib/libGL_so_1_2 ] + then + # we only need to move one library because it's the unique + # that overwrites the x11 libGL, the other must be copied to be + # possible the revertion of the driver + echo -n "libglx " + cp /usr/X11R6/lib/modules/extensions/libglx{.so,_so} + echo -n "libGLcore " + cp /usr/X11R6/lib/modules/extensions/libGLcore{.so,_so} + echo -n "libGL " + cp /usr/X11R6/lib/libGL{.a,_a} + mv /usr/X11R6/lib/libGL{.so.1.2,_so_1_2} + # according to ati port + [ ! -L /usr/lib/libGL.so ] && \ + ln -sf libGL_so_1_2_ati /usr/X11R6/lib/libGL.so + [ ! -L /usr/X11R6/lib/libGL.so.1 ] && \ + ln -sf libGL_so_1_2_ati /usr/X11R6/lib/libGL.so.1 + [ ! -L /usr/X11R6/lib/libGL.so.1.2 ] && \ + ln -sf libGL_so_1_2_ati /usr/X11R6/lib/libGL.so.1.2 + else + infoRevert + exit 1 + fi + ;; + *) - usage + infoUsage ;; esac

1 0

ports/opt (master): Merge branch '2.2' into 2.3
by crux＠crux.nu 19 May '07

19 May '07

commit e9b6640901eba57aa72dfc1154916d8734abdf65 Merge: 469f679... 51df147... Author: Juergen Daubert <jue(a)jue.li> Date: Mon Feb 19 15:21:05 2007 +0100 Merge branch '2.2' into 2.3

1 0

ports/opt (master): fetchmail: update to 6.3.7
by crux＠crux.nu 19 May '07

19 May '07

commit 51df147c474fd4a5d0a78f48aee87bdecc846237 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Feb 19 15:19:54 2007 +0100 fetchmail: update to 6.3.7 diff --git a/fetchmail/.md5sum b/fetchmail/.md5sum index 2f13b2b..cfa1711 100644 --- a/fetchmail/.md5sum +++ b/fetchmail/.md5sum @@ -1 +1 @@ -4fab7ca100ca36e41a2e8dbf5b32a3cf fetchmail-6.3.6.tar.bz2 +9ef60ab06661108c3c6605aad97e8325 fetchmail-6.3.7.tar.bz2 diff --git a/fetchmail/Pkgfile b/fetchmail/Pkgfile index ecd7535..d50c53a 100644 --- a/fetchmail/Pkgfile +++ b/fetchmail/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl name=fetchmail -version=6.3.6 +version=6.3.7 release=1 source=(http://download2.berlios.de/$name/$name-$version.tar.bz2)

1 0

ports/opt (master): wine: updated to 0.9.31
by crux＠crux.nu 19 May '07

19 May '07

commit ec063accf557de67e835c084aa620e5f910582eb Author: Antti Nykanen <aon(a)iki.fi> Date: Sat Feb 17 13:29:59 2007 +0200 wine: updated to 0.9.31 diff --git a/wine/.footprint b/wine/.footprint index 081399b..91dc055 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -138,6 +138,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ -rw-r--r-- root/root usr/include/wine/windows/ddeml.h drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/ddk/compstui.h +-rw-r--r-- root/root usr/include/wine/windows/ddk/hidsdi.h -rw-r--r-- root/root usr/include/wine/windows/ddk/ntddcdvd.h -rw-r--r-- root/root usr/include/wine/windows/ddk/ntddser.h -rw-r--r-- root/root usr/include/wine/windows/ddk/ntddtape.h @@ -461,6 +462,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/avicap32.dll.so -rwxr-xr-x root/root usr/lib/wine/avifil32.dll.so -rw-r--r-- root/root usr/lib/wine/avifile.dll16 +-rwxr-xr-x root/root usr/lib/wine/browseui.dll.so -rwxr-xr-x root/root usr/lib/wine/cabinet.dll.so -rwxr-xr-x root/root usr/lib/wine/capi2032.dll.so -rwxr-xr-x root/root usr/lib/wine/cards.dll.so diff --git a/wine/.md5sum b/wine/.md5sum index 387de68..68624ce 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1 +1 @@ -ac4e191d99386db1ed83723ac72e93ce wine-0.9.30.tar.bz2 +ec1aef4cbcbb9596cd79f43deb10dd65 wine-0.9.31.tar.bz2 diff --git a/wine/Pkgfile b/wine/Pkgfile index 0c9e567..9664a95 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,7 +5,7 @@ # Depends on: fontforge name=wine -version=0.9.30 +version=0.9.31 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/wine-$version.tar.bz2)

1 0

ports/opt (master): Merge branch '2.2' into 2.3
by crux＠crux.nu 19 May '07

19 May '07

commit 469f67948a5502aeb19b7e3a7433cf0545658dba Merge: d2a4cc4... fe9a2c1... Author: Juergen Daubert <jue(a)jue.li> Date: Fri Feb 16 08:59:46 2007 +0100 Merge branch '2.2' into 2.3

1 0

ports/opt (master): guile: added rational bugfix patch
by crux＠crux.nu 19 May '07

19 May '07

commit bf2f956ba3c4b949b6c18755c1827c450641dae7 Author: Matt Housh <jaeger(a)crux.nu> Date: Fri Feb 16 10:59:33 2007 -0600 guile: added rational bugfix patch diff --git a/guile/.md5sum b/guile/.md5sum index 25e9bde..6ce4b57 100644 --- a/guile/.md5sum +++ b/guile/.md5sum @@ -1 +1,2 @@ +4b4a84960dd301576be6303ba46ff3e1 guile-1.8-rational.patch be792074780d597208a8cdfed976f559 guile-1.8.1.tar.gz diff --git a/guile/Pkgfile b/guile/Pkgfile index 187c05c..25543fd 100644 --- a/guile/Pkgfile +++ b/guile/Pkgfile @@ -5,16 +5,18 @@ name=guile version=1.8.1 -release=1 -source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) +release=2 +source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz \ + $name-1.8-rational.patch) build() { - cd $name-$version - ./configure --prefix=/usr \ + cd $name-$version + patch -p0 -i $SRC/$name-1.8-rational.patch + ./configure --prefix=/usr \ --with-threads \ --with-modules \ --enable-deprecation=no - make - make DESTDIR=$PKG install - rm -rf $PKG/usr/share/info + make + make DESTDIR=$PKG install + rm -rf $PKG/usr/share/info } diff --git a/guile/guile-1.8-rational.patch b/guile/guile-1.8-rational.patch new file mode 100644 index 0000000..0f91593 --- /dev/null +++ b/guile/guile-1.8-rational.patch @@ -0,0 +1,135 @@ +2006-12-23 Han-Wen Nienhuys <hanwen(a)lilypond.org> + + * numbers.c (scm_i_fraction_reduce): move logic into + scm_i_make_ratio(), so fractions are only read. + scm_i_fraction_reduce() modifies a fraction when reading it. A + race condition might lead to fractions being corrupted by reading + them concurrently. + + Also, the REDUCED bit alters the SCM_CELL_TYPE(), making + comparisons between reduced and unreduced fractions go wrong. + + * numbers.h: remove SCM_FRACTION_SET_NUMERATOR, + SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT, + SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR, + SCM_FRACTION_REDUCED. + +Index: libguile/numbers.c +=================================================================== +RCS file: /cvsroot/guile/guile/guile-core/libguile/numbers.c,v +retrieving revision 1.285 +diff -p -u -u -r1.285 numbers.c +--- libguile/numbers.c 9 Oct 2006 23:17:30 -0000 1.285 ++++ libguile/numbers.c 23 Dec 2006 20:31:20 -0000 +@@ -452,28 +452,21 @@ scm_i_make_ratio (SCM numerator, SCM den + + /* No, it's a proper fraction. + */ +- return scm_double_cell (scm_tc16_fraction, +- SCM_UNPACK (numerator), +- SCM_UNPACK (denominator), 0); ++ { ++ SCM divisor = scm_gcd (numerator, denominator); ++ if (!(scm_is_eq (divisor, SCM_I_MAKINUM(1)))) ++ { ++ numerator = scm_divide (numerator, divisor); ++ denominator = scm_divide (denominator, divisor); ++ } ++ ++ return scm_double_cell (scm_tc16_fraction, ++ SCM_UNPACK (numerator), ++ SCM_UNPACK (denominator), 0); ++ } + } + #undef FUNC_NAME + +-static void scm_i_fraction_reduce (SCM z) +-{ +- if (!(SCM_FRACTION_REDUCED (z))) +- { +- SCM divisor; +- divisor = scm_gcd (SCM_FRACTION_NUMERATOR (z), SCM_FRACTION_DENOMINATOR (z)); +- if (!(scm_is_eq (divisor, SCM_I_MAKINUM(1)))) +- { +- /* is this safe? */ +- SCM_FRACTION_SET_NUMERATOR (z, scm_divide (SCM_FRACTION_NUMERATOR (z), divisor)); +- SCM_FRACTION_SET_DENOMINATOR (z, scm_divide (SCM_FRACTION_DENOMINATOR (z), divisor)); +- } +- SCM_FRACTION_REDUCED_SET (z); +- } +-} +- + double + scm_i_fraction2double (SCM z) + { +@@ -2387,7 +2380,6 @@ SCM_DEFINE (scm_number_to_string, "numbe + } + else if (SCM_FRACTIONP (n)) + { +- scm_i_fraction_reduce (n); + return scm_string_append (scm_list_3 (scm_number_to_string (SCM_FRACTION_NUMERATOR (n), radix), + scm_from_locale_string ("/"), + scm_number_to_string (SCM_FRACTION_DENOMINATOR (n), radix))); +@@ -2441,7 +2433,6 @@ int + scm_i_print_fraction (SCM sexp, SCM port, scm_print_state *pstate SCM_UNUSED) + { + SCM str; +- scm_i_fraction_reduce (sexp); + str = scm_number_to_string (sexp, SCM_UNDEFINED); + scm_lfwrite (scm_i_string_chars (str), scm_i_string_length (str), port); + scm_remember_upto_here_1 (str); +@@ -3109,8 +3100,6 @@ scm_complex_equalp (SCM x, SCM y) + SCM + scm_i_fraction_equalp (SCM x, SCM y) + { +- scm_i_fraction_reduce (x); +- scm_i_fraction_reduce (y); + if (scm_is_false (scm_equal_p (SCM_FRACTION_NUMERATOR (x), + SCM_FRACTION_NUMERATOR (y))) + || scm_is_false (scm_equal_p (SCM_FRACTION_DENOMINATOR (x), +@@ -5424,10 +5413,7 @@ scm_numerator (SCM z) + else if (SCM_BIGP (z)) + return z; + else if (SCM_FRACTIONP (z)) +- { +- scm_i_fraction_reduce (z); +- return SCM_FRACTION_NUMERATOR (z); +- } ++ return SCM_FRACTION_NUMERATOR (z); + else if (SCM_REALP (z)) + return scm_exact_to_inexact (scm_numerator (scm_inexact_to_exact (z))); + else +@@ -5446,10 +5432,7 @@ scm_denominator (SCM z) + else if (SCM_BIGP (z)) + return SCM_I_MAKINUM (1); + else if (SCM_FRACTIONP (z)) +- { +- scm_i_fraction_reduce (z); +- return SCM_FRACTION_DENOMINATOR (z); +- } ++ return SCM_FRACTION_DENOMINATOR (z); + else if (SCM_REALP (z)) + return scm_exact_to_inexact (scm_denominator (scm_inexact_to_exact (z))); + else +Index: libguile/numbers.h +=================================================================== +RCS file: /cvsroot/guile/guile/guile-core/libguile/numbers.h,v +retrieving revision 1.103 +diff -p -u -u -r1.103 numbers.h +--- libguile/numbers.h 9 Oct 2006 23:17:57 -0000 1.103 ++++ libguile/numbers.h 23 Dec 2006 20:31:21 -0000 +@@ -157,14 +157,6 @@ + #define SCM_FRACTIONP(x) (!SCM_IMP (x) && SCM_TYP16 (x) == scm_tc16_fraction) + #define SCM_FRACTION_NUMERATOR(x) (SCM_CELL_OBJECT_1 (x)) + #define SCM_FRACTION_DENOMINATOR(x) (SCM_CELL_OBJECT_2 (x)) +-#define SCM_FRACTION_SET_NUMERATOR(x, v) (SCM_SET_CELL_OBJECT_1 ((x), (v))) +-#define SCM_FRACTION_SET_DENOMINATOR(x, v) (SCM_SET_CELL_OBJECT_2 ((x), (v))) +- +- /* I think the left half word is free in the type, so I'll use bit 17 */ +-#define SCM_FRACTION_REDUCED_BIT 0x10000 +-#define SCM_FRACTION_REDUCED_SET(x) (SCM_SET_CELL_TYPE((x), (SCM_CELL_TYPE (x) | SCM_FRACTION_REDUCED_BIT))) +-#define SCM_FRACTION_REDUCED_CLEAR(x) (SCM_SET_CELL_TYPE((x), (SCM_CELL_TYPE (x) & ~SCM_FRACTION_REDUCED_BIT))) +-#define SCM_FRACTION_REDUCED(x) (0x10000 & SCM_CELL_TYPE (x)) + + +

1 0