update Sun Jun 20 12:37:00 PDT 2010

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index 7c2ff1c..9515955 100644 (file)
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/08/27 15:26:41 hasso Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/20 16:23:56 tron Exp $
 
 DISTNAME=              binutils-2.19.1
 PKGNAME=               avr-binutils-2.19.1
@@ -16,7 +16,7 @@ GNU_CONFIGURE=                yes
 USE_PKGLOCALEDIR=      yes
 USE_GNU_CONFIGURE_HOST=        no
 
-CONFIGURE_ARGS+=       --target=avr
+CONFIGURE_ARGS+=       --disable-werror --target=avr
 
 # Prevent the need to run texi2pod.pl and pod2man hence
 # the need for perl as build dependency.

diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010
index b542eab..a7276eb 100644 (file)
--- a/doc/CHANGES-2010
+++ b/doc/CHANGES-2010
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.2295 2010/06/20 09:56:17 ghen Exp $
+$NetBSD: CHANGES-2010,v 1.2296 2010/06/20 19:30:01 wiz Exp $
 
 PKGSRC IS CURRENTLY FROZEN FOR NEW FUNCTIONALITY - PLEASE DO NOT ADD
 ANY NEW PACKAGES, AND PLEASE DO NOT MAKE INFRASTRUCTURE CHANGES, UNTIL
@@ -3049,3 +3049,4 @@ Changes to the packages collection and infrastructure in 2010:
        Updated net/samba to 3.0.37nb4 [taca 2010-06-19]
        Updated textproc/sub2srt to 0.5.3 [tonio 2010-06-20]
        Updated mail/dovecot to 1.2.12 [ghen 2010-06-20]
+       Updated pkgtools/revbump to 2.1 [wiz 2010-06-20]

diff --git a/doc/TODO b/doc/TODO
index db42def..b272396 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9424 2010/06/19 23:05:58 tron Exp $
+$NetBSD: TODO,v 1.9425 2010/06/20 15:10:22 wiz Exp $
 
 Suggested new packages
 ======================
@@ -345,15 +345,16 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o GMT-4.2.1
        o GUIlib-1.1.2
        o GutenMark-20090216
-       o ImageMagick-6.6.2.5
+       o ImageMagick-6.6.2.7
        o MAMEDiff-2.30
-       o Mesa-7.8.1
+       o Mesa-7.8.2
        o MesaLib-7.8.0
        o PAM-0.99.7.1
        o REminiscence-0.1.9
        o ROMBuild-2.14
        o RTx-Shredder-0.05
        o RealPlayer-11
+       o Sigil-0.2.1
        o SmartEiffel-2.3
        o TeXmacs-1.0.7.4
        o TiffIO-130e
@@ -421,7 +422,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o ast-ksh-20080624 [pkg/37854]
        o asterisk16-1.6.2.6
        o astyle-1.15.3
-       o asymptote-1.98
+       o asymptote-1.99
        o aterm-1.0.1
        o auctex-11.86
        o audacious-plugins-2.3
@@ -459,19 +460,21 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o c4-1.10 [schmonz]
        o cal3d-0.11.0
        o calamaris-2.59
-       o calibre-0.7
+       o calibre-0.7.3
        o camlimages-3.0.2
        o cardboard-schedule-1.14c [at http://www.bright-green.com/downloads/]
        o cddbd-1.5.2
        o cdif-1.19
        o cdlabelgen-4.1.0
        o cdrkit-1.1.10
+       o celestia-1.6.0
        o cfengine2-2.2.10
        o cfitsio-3240
        o cgdb-0.6.5
        o cgicc-3.2.9
        o cheese-2.30.1 [GNOME 2.30]
        o cherokee-1.0.0
+       o chromium-0.9.14.1
        o cinepaint-0.23
        o cint-5.16
        o cjk-lyx-1.4.4
@@ -517,6 +520,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o denemo-0.8.12
        o deskbar-applet-2.30.1 [GNOME 2.30]
        o dhid-5.3
+       o digikam-1.3.0
        o dinotrace-9.3e
        o dinotrace-mode-9.3e
        o dmenu-4.1.1
@@ -566,6 +570,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o espeak-1.40
        o et-2.60
        o etach-1.4.1
+       o etm-623
        o eukleides-1.5.4
        o evince-2.30.1 [GNOME 2.30]
        o evolution-2.30.1.2 [GNOME 2.30]
@@ -590,6 +595,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o festival-1.96
        o felt-3.07
        o fetchyahoo-2.13.8
+       o ffmpeg-0.6
        o file-5.04
        o fillets-ng-0.7.4
        o fillets-ng-data-0.7.4
@@ -749,6 +755,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o gtranslator-1.9.6
        o gucharmap-2.30.0 [GNOME 2.30]
        o guile-gtk-2.0
+       o gupnp-0.13.4
        o gutenprint-5.2.5
        o gv-3.7.1
        o gvfs-1.6.2
@@ -822,7 +829,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o kdbg-2.2.2
        o kdrill-6.5
        o kid3-1.4
-       o kipi-plugins-1.2.0
+       o kipi-plugins-1.3.0
        o kismet-2010.01r1
        o kmess-1.5.1
        o kmp-0.5
@@ -887,7 +894,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o libnids-1.24
        o libntlm-1.1
        o liboobs-2.30.1 [GNOME 2.30]
-       o libproxy-0.4.3
+       o libproxy-0.4.4
        o librep-0.90.6
        o libssh-0.4.4
        o libssh2-1.2.6
@@ -916,7 +923,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o lwm-1.2.2
        o lyx-1.6.6.1
        o lzip-1.10
-       o mDNSResponder-214.3
+       o mDNSResponder-214.3.2
        o maelstrom-sdl-3.0.6
        o maelstrom-x11-2.0.7
        o mailgraph-1.14
@@ -929,6 +936,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o matchbox-panel-0.9.3
        o mathomatic-15.1.3
        o mc-4.7.0.5
+       o mdocml-1.10.2
        o mediatomb-0.12.1
        o memconf-2.9 [pkg/40201]
        o merb-1.0.8.1
@@ -1053,9 +1061,9 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o p5-MIME-tools-5.428
        o p5-Module-Build-0.36090
        o p5-Module-Install-0.99
-       o p5-Mouse-0.60
+       o p5-Mouse-0.61
        o p5-POE-1.289 [pkg/43115]
-       o p5-PerlMagick-6.6.2.5
+       o p5-PerlMagick-6.6.2.7
        o p5-Pod-Readme-0.10
        o p5-Search-Xapian-1.0.20.0
        o p5-Set-Infinite-0.65
@@ -1146,6 +1154,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o py-kenosis-0.96 [pkg/42561]
        o py-m2crypto-0.20.2
        o py-markdown-2.0.3 [pkg/43448]
+       o py-matplotlib-0.99.3
        o py-nevow-0.10.0
        o py-psycopg-2.2.1
        o py-psycopg2-2.0.14
@@ -1159,6 +1168,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o qbrew-0.3.9
        o qnetwalk-1.3
        o qpopper-4.0.14
+       o qrencode-3.1.1
        o qt3-qscintilla-2.4.3 [wip]
        o qvplay-0.95
        o radiance-3.7.2
@@ -1308,6 +1318,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o tds-1.6.2
        o tea-28.0.0
        o ted-en-us-2.17
+       o teem-1.10.0
        o tetrinetx-1.40c
        o tex-musixtex-113 [pkg/34758]
        o texmaker-1.9.9
@@ -1345,6 +1356,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o ucblogo-5.5
        o udunits-1.12.9
        o umefont-0.416
+       o unicap-0.9.8
        o unrealircd-3.2.8.1
        o ups-nut-2.2.1 [pkgsrc-wip]
        o upx-2.90
@@ -1359,6 +1371,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o viewres-1.0.2 [unpackaged]
        o viewvc-1.1.6
        o vifm-0.5
+       o vigra-1.7.0
        o vinagre-2.30.1 [GNOME 2.30]
        o visual-regexp-3.1
        o vlc-1.0.6
@@ -1388,13 +1401,14 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o wmnd-0.4.13
        o wmweather-2.4.4
        o wmx-7
+       o wordpress-3.0
        o worker-2.17.7
        o wormux-0.9.2
        o wpi-firmware-1.14.2
        o wwwoffle-2.9f
        o wxRemind-101
        o wyrd-1.4.4
-       o x264-devel-20100612
+       o x264-devel-20100619
        o xanalyser-1.30
        o xapian-1.0.20
        o xapian-omega-1.0.20
@@ -1412,7 +1426,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o xdm-1.1.10
        o xemacs-21.4.22
        o xemacs-current-21.5.28
-       o xerces-c-2.9.0
+       o xerces-c-2.10.0
        o xerces-j-2.4.0 [pkg/21725]
        o xerces-j-2.9.0
        o xeyes-1.1.0
@@ -1500,6 +1514,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o xz-4.999.9124
        o xzip-182
        o yafc-1.1
+       o yaz-4.0.10
        o yelp-2.30.0 [GNOME 2.30]
        o yodl-2.14.3
        o youtube-dl-20100606

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 829c0f0..9cb0e7a 100644 (file)
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.191 2010/06/13 22:44:32 wiz Exp $
+# $NetBSD: Makefile,v 1.192 2010/06/20 14:02:03 wiz Exp $
 
 DISTNAME=      gimp-2.6.8
 PKGREVISION=   3
@@ -11,6 +11,7 @@ EXTRACT_SUFX= .tar.bz2
 MAINTAINER=    adam@NetBSD.org
 HOMEPAGE=      http://www.gimp.org/
 COMMENT=       The GNU image manipulation program
+LICENSE=       gnu-lgpl-v2.1 AND gnu-gpl-v2
 
 BUILD_DEPENDS+=        p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
 

diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 3e0e62d..493de8b 100644 (file)
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.52 2010/06/13 22:44:32 wiz Exp $
+$NetBSD: distinfo,v 1.53 2010/06/20 14:01:59 wiz Exp $
 
 SHA1 (gimp-2.6.8.tar.bz2) = a550943f086abc9bf6b96d576741337b7186a4f4
 RMD160 (gimp-2.6.8.tar.bz2) = da02fedcc00ebaac04bfd21c153a7130d3ff5e08
 Size (gimp-2.6.8.tar.bz2) = 16342377 bytes
 SHA1 (patch-aa) = 52d9b1995e47b3ae34510fef074c7000f2527adb
-SHA1 (patch-ab) = 4f5ba210bc69db55f79b67f0238aafc13992c050
+SHA1 (patch-ab) = bdcb7d4608563d7fc698ff876910371dadf8fb76
 SHA1 (patch-ac) = b1f4b802eebbb2d2145e0e282e65d48a0409a6b8
-SHA1 (patch-ad) = c17936829fb90c6cf726caf10ac8d42c146ef0a7
+SHA1 (patch-ad) = ec43ee2379c3d632f8f64fe85bb93fb6b61c8f95

diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index ce47cfc..68b8085 100644 (file)
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.30 2009/08/21 19:46:27 adam Exp $
+$NetBSD: patch-ab,v 1.31 2010/06/20 14:01:59 wiz Exp $
+
+enable_print chunk sent upstream as https://bugzilla.gnome.org/show_bug.cgi?id=622196
 
 --- configure.orig     2009-08-13 21:37:15.000000000 +0200
 +++ configure

diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad
index 31ba313..7df9d66 100644 (file)
--- a/graphics/gimp/patches/patch-ad
+++ b/graphics/gimp/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.8 2010/06/13 22:44:32 wiz Exp $
+$NetBSD: patch-ad,v 1.9 2010/06/20 14:01:59 wiz Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=622198
 
 --- plug-ins/file-ico/ico-load.c.orig  2009-07-20 20:20:51.000000000 +0000
 +++ plug-ins/file-ico/ico-load.c

diff --git a/graphics/povray/distinfo b/graphics/povray/distinfo
index db9a163..77f8ebf 100644 (file)
--- a/graphics/povray/distinfo
+++ b/graphics/povray/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2010/06/18 06:55:43 wiz Exp $
+$NetBSD: distinfo,v 1.16 2010/06/20 19:05:10 wiz Exp $
 
 SHA1 (povray-3.6.1.tar.bz2) = 1fab3ccbdedafbf77e3a66087709bbdf60bc643d
 RMD160 (povray-3.6.1.tar.bz2) = 84ba679da66089f192cc1bfcf8bdd498e736a9a3
 Size (povray-3.6.1.tar.bz2) = 8200160 bytes
 SHA1 (patch-aa) = 351e2eb509cdb3e95c788de5f9ff41c993d4363d
 SHA1 (patch-ad) = fa4056ca956cb2872960fcb649e259aad1f065e4
-SHA1 (patch-af) = 92cdaf9261c0196b1404ba3dff32131cf250dee1
+SHA1 (patch-af) = 59889bbc4e126b645b45f45c026e9ecadc9ac76b
 SHA1 (patch-ag) = 67ad332366614e60b0842572d7d07debe8b6e8f2
 SHA1 (patch-ah) = b8184166d1641d5147f2d532a3e5433f2a686ede
 SHA1 (patch-ai) = 4d6d1f7fa38f5d2bf5511f54b1743f734753672d

diff --git a/graphics/povray/patches/patch-af b/graphics/povray/patches/patch-af
index 53cae66..1da4973 100644 (file)
--- a/graphics/povray/patches/patch-af
+++ b/graphics/povray/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.2 2010/06/18 06:55:44 wiz Exp $
+$NetBSD: patch-af,v 1.3 2010/06/20 19:05:11 wiz Exp $
+
+http://bugs.povray.org/task/144
 
 --- source/png_pov.cpp.orig    2004-08-02 23:11:37.000000000 +0000
 +++ source/png_pov.cpp

diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo
index 996c4b6..89eddae 100644 (file)
--- a/misc/celestia/distinfo
+++ b/misc/celestia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2010/06/13 22:44:58 wiz Exp $
+$NetBSD: distinfo,v 1.18 2010/06/20 15:05:43 wiz Exp $
 
 SHA1 (celestia-1.4.1.tar.gz) = 37863498c43d3078b41027706bfa033bccd949a9
 RMD160 (celestia-1.4.1.tar.gz) = c66c2540e329613dace12e5b12b2dae2a4c679e0
@@ -18,4 +18,4 @@ SHA1 (patch-al) = f998727c986145d3f298295bed1760221a686245
 SHA1 (patch-am) = 34a83573294e6ca41d817a19aef3e7d3e4f14945
 SHA1 (patch-an) = 80bd712a8ae3f4dee0d908882deadbe2ad319abf
 SHA1 (patch-ao) = ed7be1b0ac2d6a1bbf1c9ef8e66816124a7e8a99
-SHA1 (patch-ap) = 4ceb4c2df10821bf4ab02a3d76231df98101bbc9
+SHA1 (patch-ap) = 768ada9965afdbcfa8f797a9627ad90cb0b920b0

diff --git a/misc/celestia/patches/patch-ap b/misc/celestia/patches/patch-ap
index c7c56ce..4b74bb5 100644 (file)
--- a/misc/celestia/patches/patch-ap
+++ b/misc/celestia/patches/patch-ap
@@ -1,4 +1,6 @@
-$NetBSD: patch-ap,v 1.1 2010/06/13 22:44:58 wiz Exp $
+$NetBSD: patch-ap,v 1.2 2010/06/20 15:05:43 wiz Exp $
+
+https://sourceforge.net/tracker/?func=detail&aid=3018741&group_id=21302&atid=121302
 
 --- src/celengine/image.cpp.orig       2005-07-19 20:30:54.000000000 +0000
 +++ src/celengine/image.cpp

diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index e5cd5a3..ad7d4ff 100644 (file)
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2010/06/13 22:45:01 wiz Exp $
+$NetBSD: distinfo,v 1.47 2010/06/20 16:46:24 wiz Exp $
 
 SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
 RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
@@ -9,7 +9,7 @@ Size (koffice-1.6.3.tar.bz2) = 56829391 bytes
 SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59
 RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95
 Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes
-SHA1 (patch-aa) = dd97dc016c7de83f163f34bba6b8e5d91a604f89
+SHA1 (patch-aa) = 78efadde329158d1e41f8a0c899055e265485234
 SHA1 (patch-ab) = b7cb13d120764011b3b1d32cdc1ec805ddac59d8
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083

diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa
index 426291a..d42caef 100644 (file)
--- a/misc/koffice/patches/patch-aa
+++ b/misc/koffice/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.13 2010/06/13 22:45:01 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2010/06/20 16:46:24 wiz Exp $
 
 --- filters/krita/png/kis_png_converter.cc.orig        2007-05-30 21:39:37.000000000 +0000
 +++ filters/krita/png/kis_png_converter.cc
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.13 2010/06/13 22:45:01 wiz Exp $
  void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass)
  {
 -    if(png_ptr == NULL || row_number > PNG_MAX_UINT || pass > 7) return;
-+    if(png_ptr == NULL || row_number > PNG_UINT_32_MAX || pass > 7) return;
++    if(png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return;
  //     setProgress(row_number);
  }
  

diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 8f5b7f5..e39e029 100644 (file)
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.36 2010/06/13 22:45:07 wiz Exp $
+$NetBSD: distinfo,v 1.37 2010/06/20 15:58:06 wiz Exp $
 
 SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786
 RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1
 Size (vlc-1.0.6.tar.bz2) = 22149704 bytes
-SHA1 (patch-aa) = 76ef868076df4e423acfe5ca65999fbd26167bfe
-SHA1 (patch-ab) = c7d5cde0f0e4a678360adfb43d027d25bdc147e1
-SHA1 (patch-configure) = 508d9fc4ee8bc8526fb5cdf1b161c573216036c4
-SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211
+SHA1 (patch-aa) = 4d662c0e4e97ebfa6eccfa8df821c132441df58c
+SHA1 (patch-ab) = b17a4f0b5c9712d953ae45ff7d8c72ff8f323271
+SHA1 (patch-configure) = 44f3bc76668d9529ce35812d2c194199a0623a09
+SHA1 (patch-v4l2) = 578622c5233f7f5024ab5a3dca8719e1a258a407

diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa
index 47a64d4..24c32f3 100644 (file)
--- a/multimedia/vlc/patches/patch-aa
+++ b/multimedia/vlc/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2009/10/26 07:38:21 hasso Exp $
+$NetBSD: patch-aa,v 1.12 2010/06/20 15:58:06 wiz Exp $
+
+http://trac.videolan.org/vlc/ticket/3762
 
 --- modules/access/file.c.orig 2009-09-18 19:37:45 +0300
 +++ modules/access/file.c      2009-09-26 07:18:35 +0300

diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
index 4397e75..b9a7e84 100644 (file)
--- a/multimedia/vlc/patches/patch-ab
+++ b/multimedia/vlc/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2010/06/13 22:45:07 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2010/06/20 15:58:06 wiz Exp $
+
+Fixed in git version ffa6a2fa83452afe6a6ec67c4a3e8a5f1a6aaeef.
 
 --- modules/codec/png.c.orig   2010-03-07 18:38:01.000000000 +0000
 +++ modules/codec/png.c

diff --git a/multimedia/vlc/patches/patch-configure b/multimedia/vlc/patches/patch-configure
index 5af8723..2ee84c6 100644 (file)
--- a/multimedia/vlc/patches/patch-configure
+++ b/multimedia/vlc/patches/patch-configure
@@ -1,4 +1,7 @@
-$NetBSD: patch-configure,v 1.4 2009/09/24 22:14:57 ahoka Exp $
+$NetBSD: patch-configure,v 1.5 2010/06/20 15:58:06 wiz Exp $
+
+First chunk: http://trac.videolan.org/vlc/ticket/3762
+Second chunk: http://trac.videolan.org/vlc/ticket/3761
 
 --- configure.ac.orig  2009-09-19 21:30:21.000000000 +0200
 +++ configure.ac

diff --git a/multimedia/vlc/patches/patch-v4l2 b/multimedia/vlc/patches/patch-v4l2
index 038c316..9aae2ac 100644 (file)
--- a/multimedia/vlc/patches/patch-v4l2
+++ b/multimedia/vlc/patches/patch-v4l2
@@ -1,4 +1,6 @@
-$NetBSD: patch-v4l2,v 1.2 2009/07/07 16:17:47 tnn Exp $
+$NetBSD: patch-v4l2,v 1.3 2010/06/20 15:58:06 wiz Exp $
+
+http://trac.videolan.org/vlc/ticket/3761
 
 --- modules/access/v4l2.c.orig 2009-05-22 01:06:04.000000000 +0200
 +++ modules/access/v4l2.c

diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile
index 9eda063..76f36f4 100644 (file)
--- a/pkgtools/revbump/Makefile
+++ b/pkgtools/revbump/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 06:51:14 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/20 19:29:50 wiz Exp $
 
-DISTNAME=              revbump-2.0
+DISTNAME=              revbump-2.1
 CATEGORIES=            pkgtools
 MASTER_SITES=          # empty
 DISTFILES=             # empty

diff --git a/pkgtools/revbump/files/revbump.1 b/pkgtools/revbump/files/revbump.1
index dbef08a..f4beaf2 100644 (file)
--- a/pkgtools/revbump/files/revbump.1
+++ b/pkgtools/revbump/files/revbump.1
@@ -1,6 +1,6 @@
-.\"    $NetBSD: revbump.1,v 1.9 2010/01/18 06:51:14 wiz Exp $
+.\"    $NetBSD: revbump.1,v 1.10 2010/06/20 19:29:50 wiz Exp $
 .\"
-.\" Copyright (c) 2003, 2004, 2005, 2006 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2003, 2004, 2005, 2006, 2010 The NetBSD Foundation, Inc.
 .\"
 .\" This code was originally contributed to the NetBSD Foundation, Inc.
 .\" by Julio Merino <jmmv@NetBSD.org> and Thomas Klausner <wiz@NetBSD.org>.
@@ -31,7 +31,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 18, 2010
+.Dd June 20, 2010
 .Dt REVBUMP 1
 .Os
 .Sh NAME
@@ -87,23 +87,23 @@ would be:
 cd /usr/pkgsrc
 finddepends category/package \*[Gt] allbump
 grep buildlink3.mk allbump | sed 's/.buildlink3.mk//' \*[Gt] bl3bump
-grep -v buildlink3.mk allbump | sed 's/.Makefile$//' \*[Gt] makebump
+grep Makefile.common allbump > commonbump
+[read commonbump and replace entries with all packages including the
+ corresponding Makefile.common file]
+cat allbump commonbump | sed 's,/[^/]*$,,' | sort -u \*[Gt] makebump
 revbump \*[Lt] makebump \*[Gt] makebump.manual
-[handle the PKGREVISION bumps in makebump.manual manually;
- this will include any Makefile.common files - the files that include
- them will currently need to be found manually]
+[handle the PKGREVISION bumps in makebump.manual manually]
 blbump \*[Lt] bl3bump \*[Gt] bl3bump.manual
-[handle the *ABI_DEPENDS* bumps in bl3bump.manual manually]
-cvs diff `cat allbump`
-[look for PYPKGPREFIX -\*[Gt] py25 expansions
+[handle the *ABI_DEPENDS* bumps in bl3bump.manual manually, usually none]
+cvs diff `cat allbump commonbump`
+[look for PYPKGPREFIX -\*[Gt] py26 expansions
  in buildlink files and any unrelated diffs you have in your
  local tree, and fix them]
 lintpkgsrc -d
-[fix broken dependencies noted by this (usually meta-pkg/kde3,
-  subversion, nessus)]
-cvs diff `cat allbump`
-cvs commit `cat allbump`
-rm allbump bl3bump* makebump*
+[fix broken dependencies noted by this (usually subversion)]
+cvs diff `cat allbump commonbump`
+cvs commit `cat allbump commonbump`
+rm allbump bl3bump* makebump* commonbump
 .Ed
 .Sh SEE ALSO
 .Xr blbump 1 ,

diff --git a/wip/kacst-fonts/DESCR b/wip/kacst-fonts/DESCR
deleted file mode 100644 (file)
index 9f0730f..0000000
--- a/wip/kacst-fonts/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Truetype Arabic fonts created by KACST

diff --git a/wip/kacst-fonts/Makefile b/wip/kacst-fonts/Makefile
deleted file mode 100644 (file)
index 85c9324..0000000
--- a/wip/kacst-fonts/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD$
-#
-
-DISTNAME=      kacst_fonts_2.01
-PKGNAME=       kacst-fonts-2.01
-CATEGORIES=    fonts
-MASTER_SITES=  http://garr.dl.sourceforge.net/project/arabeyes/kacst_fonts/
-EXTRACT_SUFX=  .tar.bz2
-
-MAINTAINER=    kamelderouiche@yahoo.com
-HOMEPAGE=      http://sourceforge.net/projects/arabeyes/files/kacst_fonts/
-COMMENT=       Truetype Arabic fonts created by KACST
-LICENSE=       gnu-lgpl-v2.1
-
-PKG_DESTDIR_SUPPORT=   user-destdir
-
-WRKSRC=                ${WRKDIR}/KacstArabicFonts-2.01
-USE_LANGUAGES= # none
-USE_TOOLS+=    pax
-NO_CONFIGURE=  YES
-NO_BUILD=      YES
-
-FONTS_DIRS.ttf=                lib/X11/fonts/TTF
-
-INSTALLATION_DIRS=     ${FONTS_DIRS.ttf}
-
-do-install:
-       cd ${WRKSRC} && \
-               pax -rw Kacst*.ttf ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
-
-.include "../../mk/bsd.pkg.mk"

diff --git a/wip/kacst-fonts/PLIST b/wip/kacst-fonts/PLIST
deleted file mode 100644 (file)
index de3f049..0000000
--- a/wip/kacst-fonts/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD$
-lib/X11/fonts/TTF/KacstArt.ttf
-lib/X11/fonts/TTF/KacstBook.ttf
-lib/X11/fonts/TTF/KacstDecorative.ttf
-lib/X11/fonts/TTF/KacstDigital.ttf
-lib/X11/fonts/TTF/KacstFarsi.ttf
-lib/X11/fonts/TTF/KacstLetter.ttf
-lib/X11/fonts/TTF/KacstNaskh.ttf
-lib/X11/fonts/TTF/KacstOffice.ttf
-lib/X11/fonts/TTF/KacstPen.ttf
-lib/X11/fonts/TTF/KacstPoster.ttf
-lib/X11/fonts/TTF/KacstQurn.ttf
-lib/X11/fonts/TTF/KacstScreen.ttf
-lib/X11/fonts/TTF/KacstTitle.ttf
-lib/X11/fonts/TTF/KacstTitleL.ttf

diff --git a/wip/kacst-fonts/distinfo b/wip/kacst-fonts/distinfo
deleted file mode 100644 (file)
index 3b4be3a..0000000
--- a/wip/kacst-fonts/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-SHA1 (kacst_fonts_2.01.tar.bz2) = b2f645a7a72ad7170b67c44b20828429c9277242
-RMD160 (kacst_fonts_2.01.tar.bz2) = 847aa6afe2892461eabd21fa1accd99a68ac951f
-Size (kacst_fonts_2.01.tar.bz2) = 323467 bytes

diff --git a/wip/mothanna/DESCR b/wip/mothanna/DESCR
deleted file mode 100644 (file)
index a2938f3..0000000
--- a/wip/mothanna/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Mothanna (from Arabic ????; twisted, bended) is a sans-serif like Arabic
-OpenType font, Intented mainly for use in software UI. It is developed by
-Arabeyes.org as part of Khotot project.

diff --git a/wip/mothanna/Makefile b/wip/mothanna/Makefile
deleted file mode 100644 (file)
index a173939..0000000
--- a/wip/mothanna/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD$
-#
-
-DISTNAME=      Mothanna-0.02
-PKGNAME=       mothanna-0.02
-CATEGORIES=    fonts
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=arabeyes/}
-
-MAINTAINER=    kamelderouiche@yahoo.com
-HOMEPAGE=      http://www.arabeyes.org/project.php?proj=Khotot
-COMMENT=       Mothanna is a sans-serif like Arabic OpenType font
-#LICENSE=      LICENSE
-
-PKG_DESTDIR_SUPPORT=   user-destdir
-
-USE_LANGUAGES= # none
-
-NO_CONFIGURE=          yes
-NO_BUILD=              yes
-USE_LANGUAGES= # none
-
-FONTS_DIRS.ttf=                lib/X11/fonts/TTF
-
-INSTALLATION_DIRS+=    share/doc/thabit ${FONTS_DIRS.ttf}
-
-do-install:
-       ${INSTALL_DATA} ${WRKSRC}/README                 \
-                ${DESTDIR}${PREFIX}/share/doc/thabit
-       ${INSTALL_DATA} ${WRKSRC}/Mothanna.ttf           \
-                ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
-       ${INSTALL_DATA} ${WRKSRC}/Mothanna-Bold.ttf       \
-                ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
-       ${INSTALL_DATA} ${WRKSRC}/Mothanna-Oblique.ttf      \
-                ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
-       ${INSTALL_DATA} ${WRKSRC}/Mothanna-Bold-Oblique.ttf \
-                ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
-
-.include "../../mk/bsd.pkg.mk"

diff --git a/wip/mothanna/PLIST b/wip/mothanna/PLIST
deleted file mode 100644 (file)
index 6a383a0..0000000
--- a/wip/mothanna/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD$
-lib/X11/fonts/TTF/Mothanna-Bold-Oblique.ttf
-lib/X11/fonts/TTF/Mothanna-Bold.ttf
-lib/X11/fonts/TTF/Mothanna-Oblique.ttf
-lib/X11/fonts/TTF/Mothanna.ttf
-share/doc/thabit/README

diff --git a/wip/mothanna/distinfo b/wip/mothanna/distinfo
deleted file mode 100644 (file)
index 5287633..0000000
--- a/wip/mothanna/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-SHA1 (Mothanna-0.02.tar.gz) = c55b736c372c495b5b530466a3130765ff9a2038
-RMD160 (Mothanna-0.02.tar.gz) = c16dd37b1b073750ba42ba9b63ee45e4cf1df811
-Size (Mothanna-0.02.tar.gz) = 111104 bytes

diff --git a/wip/thabit/DESCR b/wip/thabit/DESCR
deleted file mode 100644 (file)
index ec0060e..0000000
--- a/wip/thabit/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Thabit (from Arabic:fixed) is a fixed width OpenType font family that
-is supports Arabic script

diff --git a/wip/thabit/Makefile b/wip/thabit/Makefile
deleted file mode 100644 (file)
index b6e35f1..0000000
--- a/wip/thabit/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD$
-#
-
-DISTNAME=      Thabit-0.02
-PKGNAME=       thabit-0.02
-CATEGORIES=    fonts
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=arabeyes/}
-
-MAINTAINER=    kamelderouiche@yahoo.com
-HOMEPAGE=      http://www.arabeyes.org/project.php?proj=Khotot
-COMMENT=       Thabit (from Arabic:fixed) is a fixed width OpenType font family
-#LICENSE=      LICENSE
-
-PKG_DESTDIR_SUPPORT=   user-destdir
-
-NO_CONFIGURE=          yes
-NO_BUILD=              yes
-USE_LANGUAGES= # none
-
-FONTS_DIRS.ttf=                lib/X11/fonts/TTF
-
-INSTALLATION_DIRS+=    share/doc/thabit ${FONTS_DIRS.ttf}
-
-do-install:
-       ${INSTALL_DATA} ${WRKSRC}/README                 \
-                ${DESTDIR}${PREFIX}/share/doc/thabit
-       ${INSTALL_DATA} ${WRKSRC}/Thabit.ttf             \
-                ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
-       ${INSTALL_DATA} ${WRKSRC}/Thabit-Bold.ttf         \
-                ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
-       ${INSTALL_DATA} ${WRKSRC}/Thabit-Oblique.ttf      \
-                ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
-       ${INSTALL_DATA} ${WRKSRC}/Thabit-Bold-Oblique.ttf \
-                ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
-
-.include "../../mk/bsd.pkg.mk"

diff --git a/wip/thabit/PLIST b/wip/thabit/PLIST
deleted file mode 100644 (file)
index f247a38..0000000
--- a/wip/thabit/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD$
-lib/X11/fonts/TTF/Thabit-Bold-Oblique.ttf
-lib/X11/fonts/TTF/Thabit-Bold.ttf
-lib/X11/fonts/TTF/Thabit-Oblique.ttf
-lib/X11/fonts/TTF/Thabit.ttf
-share/doc/thabit/README

diff --git a/wip/thabit/distinfo b/wip/thabit/distinfo
deleted file mode 100644 (file)
index b8ec250..0000000
--- a/wip/thabit/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-SHA1 (Thabit-0.02.tar.gz) = 479e64badcbf8b561d3205f2f135b4fdcff345c0
-RMD160 (Thabit-0.02.tar.gz) = 695c73ca7e772918c86efa3af3a6989d03caa403
-Size (Thabit-0.02.tar.gz) = 243818 bytes