summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/file-roller/Makefile3
-rw-r--r--audio/albumplayer/Makefile5
-rw-r--r--audio/amarok-kde3/Makefile4
-rw-r--r--audio/amarok/Makefile4
-rw-r--r--audio/ario/Makefile4
-rw-r--r--audio/audacious-plugins/Makefile4
-rw-r--r--audio/audacious/Makefile4
-rw-r--r--audio/audacious/buildlink3.mk4
-rw-r--r--audio/audacity/Makefile4
-rw-r--r--audio/aumix-gtk/Makefile4
-rw-r--r--audio/bmp-flac/Makefile3
-rw-r--r--audio/bmp-mac/Makefile4
-rw-r--r--audio/bmp-musepack/Makefile4
-rw-r--r--audio/bmp-pulse/Makefile4
-rw-r--r--audio/bmp-scrobbler/Makefile4
-rw-r--r--audio/bmp/Makefile5
-rw-r--r--audio/bmp/buildlink3.mk4
-rw-r--r--audio/bmpx/Makefile4
-rw-r--r--audio/bsl/Makefile3
-rw-r--r--audio/buzztard/Makefile3
-rw-r--r--audio/csound5/Makefile4
-rw-r--r--audio/easytag-current/Makefile4
-rw-r--r--audio/easytag/Makefile4
-rw-r--r--audio/exaile/Makefile4
-rw-r--r--audio/gbemol/Makefile4
-rw-r--r--audio/gimmix/Makefile4
-rw-r--r--audio/gkrellm-volume/Makefile4
-rw-r--r--audio/gkrellm-xmms/Makefile4
-rw-r--r--audio/glurp/Makefile4
-rw-r--r--audio/gmp3info/Makefile4
-rw-r--r--audio/gmpc/Makefile4
-rw-r--r--audio/gmpc/buildlink3.mk3
-rw-r--r--audio/gqmpeg-devel/Makefile4
-rw-r--r--audio/gqmpeg/Makefile4
-rw-r--r--audio/gtick/Makefile4
-rw-r--r--audio/gtkpod/Makefile4
-rw-r--r--audio/hydrogen/Makefile4
-rw-r--r--audio/jack-rack/Makefile4
-rw-r--r--audio/kid3/Makefile4
-rw-r--r--audio/kmp/Makefile4
-rw-r--r--audio/libcanberra/Makefile4
-rw-r--r--audio/libcanberra/buildlink3.mk4
-rw-r--r--audio/libgpod/Makefile4
-rw-r--r--audio/libgpod/buildlink3.mk4
-rw-r--r--audio/liblastfm/Makefile4
-rw-r--r--audio/liblastfm/buildlink3.mk4
-rw-r--r--audio/libvisual-bmp/Makefile4
-rw-r--r--audio/libvisual-plugins/Makefile4
-rw-r--r--audio/libvisual0.2-plugins/Makefile4
-rw-r--r--audio/liteamp/Makefile4
-rw-r--r--audio/lmms/Makefile4
-rw-r--r--audio/madman/Makefile4
-rw-r--r--audio/mp3diags/Makefile3
-rw-r--r--audio/muse/Makefile4
-rw-r--r--audio/padevchooser/Makefile4
-rw-r--r--audio/paman/Makefile4
-rw-r--r--audio/paprefs/Makefile4
-rw-r--r--audio/pavucontrol/Makefile4
-rw-r--r--audio/pavumeter/Makefile4
-rw-r--r--audio/py-karaoke/Makefile3
-rw-r--r--audio/py-musique/Makefile4
-rw-r--r--audio/qjackctl/Makefile4
-rw-r--r--audio/qsynth/Makefile4
-rw-r--r--audio/rhythmbox/Makefile4
-rw-r--r--audio/sfxr/Makefile3
-rw-r--r--audio/solfege/Makefile4
-rw-r--r--audio/sonata/Makefile4
-rw-r--r--audio/sound-juicer/Makefile3
-rw-r--r--audio/spiralloops/Makefile4
-rw-r--r--audio/spiralsynth/Makefile4
-rw-r--r--audio/streamtuner/Makefile4
-rw-r--r--audio/streamtuner/buildlink3.mk4
-rw-r--r--audio/sweep/Makefile4
-rw-r--r--audio/terminatorx/Makefile4
-rw-r--r--audio/timidity/Makefile4
-rw-r--r--audio/tunapie/Makefile4
-rw-r--r--audio/wsoundprefs/Makefile4
-rw-r--r--audio/wsoundserver/Makefile4
-rw-r--r--audio/wsoundserver/buildlink3.mk4
-rw-r--r--audio/xfce4-mixer/Makefile3
-rw-r--r--audio/xfce4-xmms-plugin/Makefile4
-rw-r--r--audio/xfce4-xmms-plugin/buildlink3.mk4
-rw-r--r--audio/xsidplay/Makefile4
-rw-r--r--benchmarks/zelibm/Makefile4
-rw-r--r--biology/py-mol/Makefile6
-rw-r--r--cad/boolean/Makefile4
-rw-r--r--cad/geda/Makefile4
-rw-r--r--cad/gerbv/Makefile3
-rw-r--r--cad/gsmc/Makefile4
-rw-r--r--cad/gtk2-wcalc/Makefile4
-rw-r--r--cad/gtkwave/Makefile3
-rw-r--r--cad/gwave/Makefile4
-rw-r--r--cad/nelma/Makefile4
-rw-r--r--cad/nelma/distinfo3
-rw-r--r--cad/nelma/patches/patch-ac49
-rw-r--r--cad/pcb/Makefile4
-rw-r--r--cad/qcad/Makefile4
-rw-r--r--cad/transcalc/Makefile4
-rw-r--r--cad/vipec/Makefile4
-rw-r--r--chat/amsn/Makefile3
-rw-r--r--chat/empathy/Makefile4
-rw-r--r--chat/empathy/buildlink3.mk4
-rw-r--r--chat/finch/Makefile4
-rw-r--r--chat/gg2/Makefile4
-rw-r--r--chat/gnomeicu/Makefile4
-rw-r--r--chat/gossip/Makefile4
-rw-r--r--chat/kadu/Makefile4
-rw-r--r--chat/kmess/Makefile4
-rw-r--r--chat/konversation-kde3/Makefile4
-rw-r--r--chat/konversation/Makefile3
-rw-r--r--chat/libpurple/buildlink3.mk4
-rw-r--r--chat/licq-gui-qt/Makefile4
-rw-r--r--chat/msn-pecan/Makefile4
-rw-r--r--chat/pidgin-facebookchat/Makefile4
-rw-r--r--chat/pidgin-icb/Makefile4
-rw-r--r--chat/pidgin-latex/Makefile4
-rw-r--r--chat/pidgin-libnotify/Makefile4
-rw-r--r--chat/pidgin-otr/Makefile4
-rw-r--r--chat/pidgin-sametime/Makefile4
-rw-r--r--chat/pidgin-silc/Makefile4
-rw-r--r--chat/pidgin/Makefile4
-rw-r--r--chat/pidgin/buildlink3.mk4
-rw-r--r--chat/psi/Makefile4
-rw-r--r--chat/telepathy-farsight/Makefile4
-rw-r--r--chat/telepathy-farsight/buildlink3.mk4
-rw-r--r--chat/telepathy-gabble/Makefile4
-rw-r--r--chat/telepathy-mission-control/Makefile4
-rw-r--r--chat/telepathy-mission-control/buildlink3.mk4
-rw-r--r--chat/xchat-systray-integration/Makefile4
-rw-r--r--chat/xchat/Makefile4
-rw-r--r--comms/efax-gtk/Makefile3
-rw-r--r--comms/gnome-pilot/Makefile4
-rw-r--r--comms/gnome-pilot/buildlink3.mk4
-rw-r--r--comms/jpilot-syncmal/Makefile4
-rw-r--r--comms/jpilot/Makefile4
-rw-r--r--comms/jpilot/buildlink3.mk4
-rw-r--r--comms/libopensync-plugin-evolution2/Makefile4
-rw-r--r--comms/libopensync-plugin-kdepim/Makefile4
-rw-r--r--comms/mgetty+sendfax/Makefile4
-rw-r--r--comms/multisync-gui/Makefile4
-rw-r--r--comms/p5-pilot-link/Makefile3
-rw-r--r--comms/pilot-link/Makefile3
-rw-r--r--converters/qrencode/Makefile3
-rw-r--r--converters/qrencode/distinfo3
-rw-r--r--converters/qrencode/patches/patch-aa63
-rw-r--r--converters/tex2rtf/Makefile4
-rw-r--r--converters/wv/Makefile4
-rw-r--r--converters/wv/buildlink3.mk4
-rw-r--r--databases/gourmet/Makefile4
-rw-r--r--databases/gq/Makefile4
-rw-r--r--databases/gramps/Makefile4
-rw-r--r--databases/gramps2/Makefile4
-rw-r--r--databases/gramps3/Makefile3
-rw-r--r--databases/kmysqladmin/Makefile4
-rw-r--r--databases/krecipes/Makefile4
-rw-r--r--databases/libgnomedb/Makefile4
-rw-r--r--databases/libgnomedb/buildlink3.mk4
-rw-r--r--databases/luma/Makefile4
-rw-r--r--databases/mergeant/Makefile4
-rw-r--r--databases/mysqlcc/Makefile3
-rw-r--r--databases/p5-RRD-Simple/Makefile3
-rw-r--r--databases/pgadmin3/Makefile3
-rw-r--r--databases/rrdtool/Makefile4
-rw-r--r--databases/rrdtool/buildlink3.mk3
-rw-r--r--databases/rrdtool12/Makefile3
-rw-r--r--databases/rrdtool12/buildlink3.mk3
-rw-r--r--databases/sqlitebrowser/Makefile4
-rw-r--r--devel/ArX/Makefile4
-rw-r--r--devel/GConf-ui/Makefile3
-rw-r--r--devel/GConf-ui/buildlink3.mk4
-rw-r--r--devel/SDL_Pango/Makefile3
-rw-r--r--devel/SDL_Pango/buildlink3.mk4
-rw-r--r--devel/accerciser/Makefile4
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--devel/at-spi/Makefile3
-rw-r--r--devel/at-spi/buildlink3.mk4
-rw-r--r--devel/automoc4/Makefile4
-rw-r--r--devel/blib/Makefile4
-rw-r--r--devel/blib/buildlink3.mk4
-rw-r--r--devel/boa-constructor/Makefile4
-rw-r--r--devel/bouml/Makefile4
-rw-r--r--devel/cmake/Makefile6
-rw-r--r--devel/cmake/PLIST3
-rw-r--r--devel/cmake/distinfo3
-rw-r--r--devel/cmake/patches/patch-ad13
-rw-r--r--devel/coconut/Makefile4
-rw-r--r--devel/compizconfig-backend-gconf/Makefile3
-rw-r--r--devel/cvsgraph/Makefile4
-rw-r--r--devel/devIL/Makefile4
-rw-r--r--devel/devIL/buildlink3.mk4
-rw-r--r--devel/devIL/distinfo4
-rw-r--r--devel/devIL/patches/patch-ac13
-rw-r--r--devel/devIL/patches/patch-ad13
-rw-r--r--devel/devhelp/Makefile4
-rw-r--r--devel/devhelp/buildlink3.mk4
-rw-r--r--devel/diffuse/Makefile3
-rw-r--r--devel/distccmon-gnome/Makefile4
-rw-r--r--devel/distccmon-gtk/Makefile4
-rw-r--r--devel/eel/Makefile4
-rw-r--r--devel/eel/buildlink3.mk4
-rw-r--r--devel/eric4/Makefile3
-rw-r--r--devel/frama-c/Makefile4
-rw-r--r--devel/gconfmm/Makefile3
-rw-r--r--devel/gconfmm/buildlink3.mk4
-rw-r--r--devel/gdl/Makefile4
-rw-r--r--devel/gdl/buildlink3.mk4
-rw-r--r--devel/geany/Makefile4
-rw-r--r--devel/giblib/Makefile4
-rw-r--r--devel/giblib/buildlink3.mk4
-rw-r--r--devel/glade/Makefile4
-rw-r--r--devel/glade3/Makefile4
-rw-r--r--devel/glade3/buildlink3.mk4
-rw-r--r--devel/gnome-build/Makefile4
-rw-r--r--devel/gnome-build/buildlink3.mk4
-rw-r--r--devel/gst-plugins0.10-pango/Makefile4
-rw-r--r--devel/guile-gnome/Makefile4
-rw-r--r--devel/guile-gtk/Makefile4
-rw-r--r--devel/guile16-gtk/Makefile4
-rw-r--r--devel/kdbg/Makefile4
-rw-r--r--devel/kdesdk3/Makefile4
-rw-r--r--devel/kdesdk3/buildlink3.mk4
-rw-r--r--devel/kdesdk4/Makefile3
-rw-r--r--devel/kdevelop-base/Makefile4
-rw-r--r--devel/kdevelop4/Makefile3
-rw-r--r--devel/kdevplatform/Makefile3
-rw-r--r--devel/kdiff3/Makefile4
-rw-r--r--devel/kscope/Makefile4
-rw-r--r--devel/libast/Makefile4
-rw-r--r--devel/libast/buildlink3.mk4
-rw-r--r--devel/libbonoboui/Makefile3
-rw-r--r--devel/libbonoboui/buildlink3.mk4
-rw-r--r--devel/libcompizconfig/Makefile3
-rw-r--r--devel/libextractor/Makefile4
-rw-r--r--devel/libgail-gnome/Makefile4
-rw-r--r--devel/libgail-gnome/buildlink3.mk4
-rw-r--r--devel/libglade/Makefile4
-rw-r--r--devel/libglade/buildlink3.mk4
-rw-r--r--devel/libglademm/Makefile4
-rw-r--r--devel/libglademm/buildlink3.mk4
-rw-r--r--devel/libgnome/Makefile3
-rw-r--r--devel/libgnome/buildlink3.mk4
-rw-r--r--devel/libgnomemm/Makefile4
-rw-r--r--devel/libgnomemm/buildlink3.mk4
-rw-r--r--devel/libgnomeui/Makefile3
-rw-r--r--devel/libgnomeui/buildlink3.mk4
-rw-r--r--devel/libgnomeuimm/Makefile4
-rw-r--r--devel/libgnomeuimm/buildlink3.mk4
-rw-r--r--devel/libgsf-gnome/Makefile3
-rw-r--r--devel/libgsf-gnome/buildlink3.mk3
-rw-r--r--devel/libgweather/Makefile3
-rw-r--r--devel/libgweather/buildlink3.mk4
-rw-r--r--devel/libmatchbox/Makefile3
-rw-r--r--devel/libmatchbox/buildlink3.mk4
-rw-r--r--devel/libsexy/Makefile4
-rw-r--r--devel/libsexy/buildlink3.mk4
-rw-r--r--devel/libsexymm/Makefile4
-rw-r--r--devel/libsexymm/buildlink3.mk4
-rw-r--r--devel/libslang2/buildlink3.mk3
-rw-r--r--devel/libview/Makefile3
-rw-r--r--devel/libview/buildlink3.mk3
-rw-r--r--devel/libwnck/Makefile4
-rw-r--r--devel/libwnck/buildlink3.mk4
-rw-r--r--devel/m17n-lib/buildlink3.mk4
-rw-r--r--devel/mono-tools/Makefile3
-rw-r--r--devel/monodevelop/Makefile4
-rw-r--r--devel/monotone-viz/Makefile4
-rw-r--r--devel/ogre/Makefile4
-rw-r--r--devel/ogre/buildlink3.mk4
-rw-r--r--devel/p5-Gtk2-GladeXML/Makefile4
-rw-r--r--devel/p5-SDL/Makefile4
-rw-r--r--devel/p5-Wx-Perl-DataWalker/Makefile4
-rw-r--r--devel/p5-pango/Makefile3
-rw-r--r--devel/p5-pango/buildlink3.mk3
-rw-r--r--devel/pango/Makefile3
-rw-r--r--devel/pango/buildlink3.mk4
-rw-r--r--devel/pangomm/Makefile3
-rw-r--r--devel/pangomm/buildlink3.mk3
-rw-r--r--devel/py-at-spi/Makefile3
-rw-r--r--devel/py-at-spi/buildlink3.mk4
-rw-r--r--devel/py-compizconfig/Makefile3
-rw-r--r--devel/py-game/Makefile4
-rw-r--r--devel/py-game/buildlink3.mk4
-rw-r--r--devel/py-windbg/Makefile4
-rw-r--r--devel/qconf/Makefile4
-rw-r--r--devel/qtscriptgenerator/Makefile4
-rw-r--r--devel/qtscriptgenerator/buildlink3.mk4
-rw-r--r--devel/rapidsvn/Makefile4
-rw-r--r--devel/rox-lib/Makefile4
-rw-r--r--devel/ruby-SDL/Makefile4
-rw-r--r--devel/ruby-gnome2-bonobo/Makefile3
-rw-r--r--devel/ruby-gnome2-bonoboui/Makefile4
-rw-r--r--devel/ruby-gnome2-libglade/Makefile3
-rw-r--r--devel/ruby-gnome2-pango/Makefile3
-rw-r--r--devel/ruby-gnome2-pango/buildlink3.mk3
-rw-r--r--devel/swt/Makefile3
-rw-r--r--devel/teem/Makefile4
-rw-r--r--devel/teem/distinfo3
-rw-r--r--devel/teem/patches/patch-ad13
-rw-r--r--devel/valide/Makefile4
-rw-r--r--devel/xfconf/buildlink3.mk3
-rw-r--r--devel/xulrunner/buildlink3.mk4
-rw-r--r--editors/Sigil/Makefile3
-rw-r--r--editors/abiword/Makefile4
-rw-r--r--editors/beaver/Makefile4
-rw-r--r--editors/conglomerate/Makefile4
-rw-r--r--editors/dasher/Makefile4
-rw-r--r--editors/gconf-editor/Makefile4
-rw-r--r--editors/gedit/Makefile3
-rw-r--r--editors/gedit/buildlink3.mk4
-rw-r--r--editors/ghex/Makefile4
-rw-r--r--editors/gice/Makefile4
-rw-r--r--editors/gobby/Makefile3
-rw-r--r--editors/gtranslator/Makefile4
-rw-r--r--editors/kdissert/Makefile4
-rw-r--r--editors/kile/Makefile4
-rw-r--r--editors/leafpad/Makefile3
-rw-r--r--editors/lyx/Makefile3
-rw-r--r--editors/mlview/Makefile4
-rw-r--r--editors/notecase/Makefile4
-rw-r--r--editors/p5-Padre/Makefile3
-rw-r--r--editors/poedit/Makefile3
-rw-r--r--editors/tea/Makefile4
-rw-r--r--editors/ted/Makefile11
-rw-r--r--editors/texmaker/Makefile4
-rw-r--r--editors/tomboy/Makefile4
-rw-r--r--editors/vim-gtk2/Makefile4
-rw-r--r--editors/xfce4-mousepad/Makefile3
-rw-r--r--emulators/NeoPop-SDL/Makefile4
-rw-r--r--emulators/atari800/Makefile3
-rw-r--r--emulators/blinkensim/Makefile4
-rw-r--r--emulators/dosbox/Makefile3
-rw-r--r--emulators/fuse/Makefile4
-rw-r--r--emulators/gens/Makefile4
-rw-r--r--emulators/gpsim-devel/Makefile4
-rw-r--r--emulators/gpsim-devel/buildlink3.mk4
-rw-r--r--emulators/gpsim-oscilloscope/Makefile4
-rw-r--r--emulators/gpsim-ptyusart/Makefile4
-rw-r--r--emulators/gpsim/Makefile4
-rw-r--r--emulators/kenigma/Makefile4
-rw-r--r--emulators/nestopia/Makefile4
-rw-r--r--emulators/openmsx/Makefile4
-rw-r--r--emulators/palmosemulator/Makefile4
-rw-r--r--emulators/raine/Makefile3
-rw-r--r--emulators/sdlmame/Makefile3
-rw-r--r--emulators/snes9x-gtk/Makefile3
-rw-r--r--emulators/stella/Makefile3
-rw-r--r--emulators/uae/Makefile4
-rw-r--r--emulators/vba/Makefile4
-rw-r--r--emulators/vice/Makefile4
-rw-r--r--emulators/wine/Makefile4
-rw-r--r--emulators/yabause/Makefile3
-rw-r--r--emulators/zsnes/Makefile3
-rw-r--r--filesystems/fuse-pod/Makefile4
-rw-r--r--finance/gkrellm-stock/Makefile4
-rw-r--r--finance/gnucash/Makefile4
-rw-r--r--finance/kmymoney2/Makefile3
-rw-r--r--fonts/fontforge/Makefile3
-rw-r--r--fonts/gbdfed/Makefile4
-rw-r--r--fonts/gucharmap/buildlink3.mk4
-rw-r--r--games/4stAttack/Makefile4
-rw-r--r--games/InterLOGIC/Makefile4
-rw-r--r--games/KoboDeluxe/Makefile4
-rw-r--r--games/LostPixels/Makefile4
-rw-r--r--games/alephone/Makefile3
-rw-r--r--games/asc/Makefile4
-rw-r--r--games/atomix/Makefile4
-rw-r--r--games/blindmine/Makefile4
-rw-r--r--games/bluemoon/Makefile4
-rw-r--r--games/bomberclone/Makefile4
-rw-r--r--games/boson/Makefile4
-rw-r--r--games/ccgo/Makefile4
-rw-r--r--games/chromium-bsu/Makefile4
-rw-r--r--games/circuslinux/Makefile4
-rw-r--r--games/crack-attack/Makefile4
-rw-r--r--games/criticalmass/Makefile4
-rw-r--r--games/criticalmass/distinfo3
-rw-r--r--games/criticalmass/patches/patch-aa54
-rw-r--r--games/crossfire-client-gtk2/Makefile4
-rw-r--r--games/crossfire-client/Makefile4
-rw-r--r--games/crossfire-server/Makefile4
-rw-r--r--games/d2x/Makefile4
-rw-r--r--games/duckmaze/Makefile4
-rw-r--r--games/eboard/Makefile4
-rw-r--r--games/enigma/Makefile4
-rw-r--r--games/fillets-ng/Makefile4
-rw-r--r--games/fltk-sudoku/Makefile4
-rw-r--r--games/foobillard/Makefile4
-rw-r--r--games/freeciv-client/Makefile4
-rw-r--r--games/freedroid/Makefile4
-rw-r--r--games/gamazons/Makefile4
-rw-r--r--games/gbrainy/Makefile3
-rw-r--r--games/gcompris/Makefile4
-rw-r--r--games/genecys-client/Makefile4
-rw-r--r--games/glaxium/Makefile4
-rw-r--r--games/gltron/Makefile4
-rw-r--r--games/gnome-games/Makefile4
-rw-r--r--games/gnome-mastermind/Makefile4
-rw-r--r--games/grhino/Makefile4
-rw-r--r--games/gtetrinet/Makefile4
-rw-r--r--games/gtkballs/Makefile4
-rw-r--r--games/gtklevel9/Makefile4
-rw-r--r--games/gtkmagnetic/Makefile4
-rw-r--r--games/gturing/Makefile4
-rw-r--r--games/kajaani-kombat/Makefile4
-rw-r--r--games/kanatest/Makefile3
-rw-r--r--games/kapooka/Makefile4
-rw-r--r--games/kdegames3/Makefile4
-rw-r--r--games/kdegames3/buildlink3.mk4
-rw-r--r--games/kdegames4/Makefile3
-rw-r--r--games/kdetoys3/Makefile4
-rw-r--r--games/kdetoys4/Makefile3
-rw-r--r--games/knights/Makefile4
-rw-r--r--games/kye/Makefile3
-rw-r--r--games/lbreakout2/Makefile4
-rw-r--r--games/mirrormagic-sdl/Makefile4
-rw-r--r--games/nethack-qt/Makefile4
-rw-r--r--games/neverball/Makefile4
-rw-r--r--games/openmortal/Makefile4
-rw-r--r--games/openttd/Makefile3
-rw-r--r--games/orbital_eunuchs_sniper/Makefile4
-rw-r--r--games/pioneers/Makefile4
-rw-r--r--games/pokerth/Makefile4
-rw-r--r--games/puzzles/Makefile3
-rw-r--r--games/pytraffic/Makefile4
-rw-r--r--games/qnetwalk/Makefile4
-rw-r--r--games/qonk/Makefile4
-rw-r--r--games/quakeforge/Makefile4
-rw-r--r--games/quarry/Makefile4
-rw-r--r--games/rftg/Makefile3
-rw-r--r--games/scummvm-tools/Makefile3
-rw-r--r--games/singularity/Makefile4
-rw-r--r--games/sirius/Makefile4
-rw-r--r--games/six/Makefile4
-rw-r--r--games/spaceracer/Makefile4
-rw-r--r--games/stegavorto/Makefile4
-rw-r--r--games/stratagus/Makefile4
-rw-r--r--games/teg/Makefile4
-rw-r--r--games/tuxmath/Makefile4
-rw-r--r--games/ufoai/Makefile4
-rw-r--r--games/ufoai/distinfo4
-rw-r--r--games/ufoai/patches/patch-ab11
-rw-r--r--games/warzone2100/Makefile3
-rw-r--r--games/wesnoth/Makefile4
-rw-r--r--games/wormux/Makefile3
-rw-r--r--games/wxhugo/Makefile4
-rw-r--r--games/xarchon/Makefile4
-rw-r--r--games/xye/Makefile4
-rw-r--r--games/zoom/Makefile4
-rw-r--r--geography/gdal-lib/Makefile3
-rw-r--r--geography/gdal-lib/buildlink3.mk4
-rw-r--r--geography/gipfel/Makefile4
-rw-r--r--geography/gpsdrive/Makefile4
-rw-r--r--geography/mapserver/Makefile3
-rw-r--r--geography/merkaartor/Makefile3
-rw-r--r--geography/qlandkartegt/Makefile3
-rw-r--r--geography/qlandkartem/Makefile3
-rw-r--r--geography/viking/Makefile3
-rw-r--r--graphics/Coin/Makefile4
-rw-r--r--graphics/Coin/buildlink3.mk4
-rw-r--r--graphics/GraphicsMagick/Makefile4
-rw-r--r--graphics/GraphicsMagick/buildlink3.mk4
-rw-r--r--graphics/ImageMagick/Makefile3
-rw-r--r--graphics/ImageMagick/buildlink3.mk4
-rw-r--r--graphics/SDL_image/Makefile4
-rw-r--r--graphics/SDL_image/buildlink3.mk4
-rw-r--r--graphics/TiffIO/Makefile4
-rw-r--r--graphics/autopano-sift-C/Makefile4
-rw-r--r--graphics/autotrace/Makefile4
-rw-r--r--graphics/aview/Makefile4
-rw-r--r--graphics/blender/Makefile4
-rw-r--r--graphics/blinkenthemes/Makefile4
-rw-r--r--graphics/blinkentools/Makefile4
-rw-r--r--graphics/cairo/Makefile3
-rw-r--r--graphics/cairo/buildlink3.mk4
-rw-r--r--graphics/cairomm/Makefile3
-rw-r--r--graphics/cairomm/buildlink3.mk3
-rw-r--r--graphics/camlimages/Makefile4
-rw-r--r--graphics/cheese/Makefile4
-rw-r--r--graphics/cinepaint/Makefile4
-rw-r--r--graphics/clutter-box2d/Makefile3
-rw-r--r--graphics/clutter-cairo/Makefile4
-rw-r--r--graphics/clutter-cairo/buildlink3.mk4
-rw-r--r--graphics/clutter-gtk/Makefile3
-rw-r--r--graphics/clutter-gtk/buildlink3.mk3
-rw-r--r--graphics/clutter-qt/Makefile4
-rw-r--r--graphics/clutter/Makefile3
-rw-r--r--graphics/clutter/buildlink3.mk3
-rw-r--r--graphics/clutter08-gtk/Makefile3
-rw-r--r--graphics/clutter08-gtk/buildlink3.mk3
-rw-r--r--graphics/clutter08/Makefile4
-rw-r--r--graphics/clutter08/buildlink3.mk3
-rw-r--r--graphics/cnxtview/Makefile4
-rw-r--r--graphics/comix/Makefile4
-rw-r--r--graphics/cpia2view/Makefile4
-rw-r--r--graphics/denemo/Makefile4
-rw-r--r--graphics/dia-python/Makefile4
-rw-r--r--graphics/dia/Makefile3
-rw-r--r--graphics/digikam-doc-kde3/Makefile4
-rw-r--r--graphics/digikam-kde3/Makefile4
-rw-r--r--graphics/digikam-kde3/distinfo4
-rw-r--r--graphics/digikam-kde3/patches/patch-aa13
-rw-r--r--graphics/digikam-kde3/patches/patch-ab13
-rw-r--r--graphics/digikam/Makefile3
-rw-r--r--graphics/djview4/Makefile4
-rw-r--r--graphics/dvipng/Makefile4
-rw-r--r--graphics/dx/Makefile4
-rw-r--r--graphics/enblend-enfuse/Makefile4
-rw-r--r--graphics/enblend-enfuse/distinfo3
-rw-r--r--graphics/enblend-enfuse/patches/patch-ae15
-rw-r--r--graphics/eog/Makefile4
-rw-r--r--graphics/evas-png/Makefile4
-rw-r--r--graphics/evas-svg/Makefile4
-rw-r--r--graphics/extrema/Makefile3
-rw-r--r--graphics/f-spot/Makefile3
-rw-r--r--graphics/f4l/Makefile4
-rw-r--r--graphics/feh/Makefile4
-rw-r--r--graphics/flphoto/Makefile4
-rw-r--r--graphics/fly/Makefile4
-rw-r--r--graphics/fnlib/Makefile4
-rw-r--r--graphics/fnlib/buildlink3.mk4
-rw-r--r--graphics/fotoxx/Makefile4
-rw-r--r--graphics/frameworks/Makefile4
-rw-r--r--graphics/g2/Makefile4
-rw-r--r--graphics/gd/Makefile4
-rw-r--r--graphics/gd/buildlink3.mk4
-rw-r--r--graphics/gdchart/Makefile4
-rw-r--r--graphics/gdchart/buildlink3.mk4
-rw-r--r--graphics/gdk-pixbuf/Makefile4
-rw-r--r--graphics/gdk-pixbuf/buildlink3.mk4
-rw-r--r--graphics/geeqie/Makefile3
-rw-r--r--graphics/gegl/Makefile4
-rw-r--r--graphics/gegl/buildlink3.mk4
-rw-r--r--graphics/gfract/Makefile4
-rw-r--r--graphics/gif2png/Makefile4
-rw-r--r--graphics/gimageview/Makefile4
-rw-r--r--graphics/gimmage/Makefile4
-rw-r--r--graphics/gimp-color-manager/Makefile4
-rw-r--r--graphics/gimp-exif-browser/Makefile4
-rw-r--r--graphics/gimp-fix-ca/Makefile4
-rw-r--r--graphics/gimp-liquid-rescale/Makefile4
-rw-r--r--graphics/gimp-rawphoto/Makefile4
-rw-r--r--graphics/gimp-refocus-it/Makefile4
-rw-r--r--graphics/gimp-resynthesizer/Makefile3
-rw-r--r--graphics/gimp-ufraw/Makefile4
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gimp/buildlink3.mk4
-rw-r--r--graphics/gimp/distinfo3
-rw-r--r--graphics/gimp/patches/patch-ad21
-rw-r--r--graphics/gimp1-base/Makefile4
-rw-r--r--graphics/gimp1-base/buildlink3.mk4
-rw-r--r--graphics/gimp1-data/Makefile4
-rw-r--r--graphics/gimp1-wideangle/Makefile4
-rw-r--r--graphics/gimp2-wideangle/Makefile4
-rw-r--r--graphics/giram/Makefile4
-rw-r--r--graphics/gliv/Makefile4
-rw-r--r--graphics/glpng/Makefile3
-rw-r--r--graphics/glpng/buildlink3.mk3
-rw-r--r--graphics/gmngview/Makefile4
-rw-r--r--graphics/gnuplot-nox11/Makefile4
-rw-r--r--graphics/gnuplot/Makefile4
-rw-r--r--graphics/gocr/Makefile4
-rw-r--r--graphics/goocanvas/Makefile4
-rw-r--r--graphics/goocanvas/buildlink3.mk4
-rw-r--r--graphics/goocanvasmm/Makefile3
-rw-r--r--graphics/gphoto/Makefile4
-rw-r--r--graphics/gqview-devel/Makefile4
-rw-r--r--graphics/gqview-gtk1/Makefile4
-rw-r--r--graphics/gqview/Makefile4
-rw-r--r--graphics/graphviz/Makefile4
-rw-r--r--graphics/gst-plugins0.10-cairo/Makefile4
-rw-r--r--graphics/gst-plugins0.10-png/Makefile4
-rw-r--r--graphics/gthumb/Makefile3
-rw-r--r--graphics/gtkam/Makefile4
-rw-r--r--graphics/gtkglext/Makefile4
-rw-r--r--graphics/gtkglext/buildlink3.mk4
-rw-r--r--graphics/gtkimageview/Makefile4
-rw-r--r--graphics/gtksee/Makefile4
-rw-r--r--graphics/guile-cairo/Makefile4
-rw-r--r--graphics/gwenview-i18n/Makefile4
-rw-r--r--graphics/gwenview/Makefile4
-rw-r--r--graphics/gwenview/distinfo3
-rw-r--r--graphics/gwenview/patches/patch-ab22
-rw-r--r--graphics/h5utils/Makefile4
-rw-r--r--graphics/hp2xx/Makefile4
-rw-r--r--graphics/hugin/Makefile4
-rw-r--r--graphics/hugin/distinfo4
-rw-r--r--graphics/hugin/patches/patch-ab13
-rw-r--r--graphics/hugin/patches/patch-ad15
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/imlib/buildlink3.mk4
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/imlib2/buildlink3.mk4
-rw-r--r--graphics/inkscape/Makefile4
-rw-r--r--graphics/kbarcode/Makefile4
-rw-r--r--graphics/kdegraphics3/Makefile4
-rw-r--r--graphics/kdegraphics3/buildlink3.mk4
-rw-r--r--graphics/kdegraphics4/Makefile3
-rw-r--r--graphics/kdegraphics4/buildlink3.mk4
-rw-r--r--graphics/kipi-plugins-calendar-kde3/Makefile4
-rw-r--r--graphics/kipi-plugins-kde3/Makefile4
-rw-r--r--graphics/kipi-plugins/Makefile4
-rw-r--r--graphics/koverartist/Makefile4
-rw-r--r--graphics/kphotoalbum/Makefile4
-rw-r--r--graphics/kphotobook/Makefile4
-rw-r--r--graphics/kphotools/Makefile4
-rw-r--r--graphics/lensfun/Makefile4
-rw-r--r--graphics/libexif-gtk/Makefile4
-rw-r--r--graphics/libexif-gtk/buildlink3.mk4
-rw-r--r--graphics/libgdiplus/Makefile3
-rw-r--r--graphics/libgdiplus/buildlink3.mk4
-rw-r--r--graphics/libgnomecanvas/Makefile3
-rw-r--r--graphics/libgnomecanvas/buildlink3.mk4
-rw-r--r--graphics/libgnomecanvasmm/Makefile4
-rw-r--r--graphics/libgnomecanvasmm/buildlink3.mk4
-rw-r--r--graphics/libkdcraw/Makefile4
-rw-r--r--graphics/libkdcraw/buildlink3.mk4
-rw-r--r--graphics/libkexif/Makefile4
-rw-r--r--graphics/libkexif/buildlink3.mk4
-rw-r--r--graphics/libkexiv2/Makefile4
-rw-r--r--graphics/libkexiv2/buildlink3.mk4
-rw-r--r--graphics/libkipi/Makefile4
-rw-r--r--graphics/libkipi/buildlink3.mk4
-rw-r--r--graphics/libpano13/Makefile4
-rw-r--r--graphics/libpano13/buildlink3.mk4
-rw-r--r--graphics/libpuzzle/Makefile4
-rw-r--r--graphics/libpuzzle/buildlink3.mk4
-rw-r--r--graphics/librsvg/Makefile3
-rw-r--r--graphics/librsvg/buildlink3.mk4
-rw-r--r--graphics/libscigraphica/Makefile4
-rw-r--r--graphics/libscigraphica/buildlink3.mk4
-rw-r--r--graphics/libvideogfx/Makefile4
-rw-r--r--graphics/libvideogfx/buildlink3.mk4
-rw-r--r--graphics/libwmf/Makefile4
-rw-r--r--graphics/libwmf/buildlink3.mk4
-rw-r--r--graphics/lprof/Makefile4
-rw-r--r--graphics/magicpoint/Makefile4
-rw-r--r--graphics/mgl/Makefile4
-rw-r--r--graphics/netpbm/Makefile3
-rw-r--r--graphics/netpbm/buildlink3.mk4
-rw-r--r--graphics/netpbm/distinfo4
-rw-r--r--graphics/netpbm/patches/patch-ac49
-rw-r--r--graphics/netpbm/patches/patch-af64
-rw-r--r--graphics/nvtv/Makefile4
-rw-r--r--graphics/opencv/Makefile4
-rw-r--r--graphics/optipng/Makefile3
-rw-r--r--graphics/optipng/distinfo3
-rw-r--r--graphics/optipng/patches/patch-ab17
-rw-r--r--graphics/ov519view/Makefile4
-rw-r--r--graphics/p5-GD/Makefile4
-rw-r--r--graphics/p5-Gdk-Imlib/Makefile4
-rw-r--r--graphics/p5-Gdk-Pixbuf/Makefile4
-rw-r--r--graphics/p5-Image-Imlib2/Makefile4
-rw-r--r--graphics/p5-PerlMagick/Makefile4
-rw-r--r--graphics/p5-cairo/Makefile3
-rw-r--r--graphics/p5-cairo/buildlink3.mk3
-rw-r--r--graphics/p5-clutter/Makefile4
-rw-r--r--graphics/panomatic/Makefile3
-rw-r--r--graphics/panomatic/distinfo3
-rw-r--r--graphics/panomatic/patches/patch-ad15
-rw-r--r--graphics/pdiff/Makefile7
-rw-r--r--graphics/pdiff/distinfo4
-rw-r--r--graphics/pdiff/patches/patch-aa42
-rw-r--r--graphics/pdiff/patches/patch-ac32
-rw-r--r--graphics/pfstools/Makefile4
-rw-r--r--graphics/php-gd/Makefile3
-rw-r--r--graphics/phpsview/Makefile4
-rw-r--r--graphics/pixieplus/Makefile4
-rw-r--r--graphics/ploticus/Makefile4
-rw-r--r--graphics/plotutils-nox11/Makefile8
-rw-r--r--graphics/plotutils-nox11/buildlink3.mk4
-rw-r--r--graphics/plotutils/Makefile3
-rw-r--r--graphics/plotutils/buildlink3.mk4
-rw-r--r--graphics/png2html/Makefile4
-rw-r--r--graphics/pngcrush/Makefile3
-rw-r--r--graphics/pornview/Makefile4
-rw-r--r--graphics/povray/Makefile4
-rw-r--r--graphics/pstoedit/Makefile3
-rw-r--r--graphics/py-biggles/Makefile4
-rw-r--r--graphics/py-cairo/Makefile3
-rw-r--r--graphics/py-cairo/buildlink3.mk4
-rw-r--r--graphics/py-clutter-gtk/Makefile3
-rw-r--r--graphics/py-clutter/Makefile3
-rw-r--r--graphics/py-clutter/buildlink3.mk3
-rw-r--r--graphics/py-gd/Makefile4
-rw-r--r--graphics/py-gdchart/Makefile4
-rw-r--r--graphics/py-goocanvas/Makefile4
-rw-r--r--graphics/py-gtkglext/Makefile4
-rw-r--r--graphics/py-matplotlib-gtk2/Makefile3
-rw-r--r--graphics/py-matplotlib-tk/Makefile3
-rw-r--r--graphics/py-matplotlib/Makefile3
-rw-r--r--graphics/py-matplotlib/distinfo3
-rw-r--r--graphics/py-matplotlib/patches/patch-ab13
-rw-r--r--graphics/qcamview/Makefile4
-rw-r--r--graphics/qimageblitz/Makefile4
-rw-r--r--graphics/qimageblitz/buildlink3.mk4
-rw-r--r--graphics/qiv/Makefile3
-rw-r--r--graphics/rayshade/Makefile4
-rw-r--r--graphics/ristretto/Makefile3
-rw-r--r--graphics/ruby-RMagick/Makefile4
-rw-r--r--graphics/ruby-clutter-cairo/Makefile4
-rw-r--r--graphics/ruby-clutter-core/Makefile4
-rw-r--r--graphics/ruby-clutter-gtk/Makefile4
-rw-r--r--graphics/ruby-gd/Makefile4
-rw-r--r--graphics/ruby-gnome2-gdkpixbuf/Makefile3
-rw-r--r--graphics/ruby-gnome2-gnomecanvas/Makefile3
-rw-r--r--graphics/ruby-gnome2-goocanvas/Makefile3
-rw-r--r--graphics/ruby-gnome2-gtkglext/Makefile3
-rw-r--r--graphics/ruby-gnome2-libart/Makefile4
-rw-r--r--graphics/ruby-gnome2-rsvg/Makefile3
-rw-r--r--graphics/ruby-imlib2/Makefile4
-rw-r--r--graphics/ruby-rcairo/Makefile4
-rw-r--r--graphics/ruby-rcairo/buildlink3.mk3
-rw-r--r--graphics/sane-frontends/Makefile4
-rw-r--r--graphics/scidavis/Makefile4
-rw-r--r--graphics/scigraphica/Makefile4
-rw-r--r--graphics/scrot/Makefile4
-rw-r--r--graphics/showimg/Makefile4
-rw-r--r--graphics/simage/Makefile4
-rw-r--r--graphics/simage/buildlink3.mk4
-rw-r--r--graphics/snx101view/Makefile4
-rw-r--r--graphics/spcaview/Makefile4
-rw-r--r--graphics/tango-icon-theme/Makefile4
-rw-r--r--graphics/tuxpaint-config/Makefile3
-rw-r--r--graphics/tuxpaint/Makefile4
-rw-r--r--graphics/ucview/Makefile4
-rw-r--r--graphics/unicap/Makefile4
-rw-r--r--graphics/unicap/distinfo5
-rw-r--r--graphics/unicap/patches/patch-an58
-rw-r--r--graphics/unicap/patches/patch-ap11
-rw-r--r--graphics/urt/Makefile4
-rw-r--r--graphics/urt/buildlink3.mk4
-rw-r--r--graphics/vid/Makefile4
-rw-r--r--graphics/vigra/Makefile4
-rw-r--r--graphics/vigra/distinfo3
-rw-r--r--graphics/vigra/patches/patch-ab15
-rw-r--r--graphics/vp/Makefile4
-rw-r--r--graphics/wxsvg/Makefile3
-rw-r--r--graphics/wxsvg/buildlink3.mk4
-rw-r--r--graphics/xart/Makefile4
-rw-r--r--graphics/xart/distinfo4
-rw-r--r--graphics/xart/patches/patch-ac4
-rw-r--r--graphics/xfce4-icon-theme/buildlink3.mk3
-rw-r--r--graphics/xfig/Makefile4
-rw-r--r--graphics/xli/Makefile4
-rw-r--r--graphics/xpaint/Makefile4
-rw-r--r--graphics/xsane/Makefile4
-rw-r--r--graphics/xv/Makefile4
-rw-r--r--graphics/xzgv/Makefile4
-rw-r--r--graphics/zphoto/Makefile4
-rw-r--r--ham/fl_logbook/Makefile3
-rw-r--r--ham/fldigi/Makefile4
-rw-r--r--ham/fldigi/distinfo4
-rw-r--r--ham/fldigi/patches/patch-ab15
-rw-r--r--ham/gmfsk/Makefile4
-rw-r--r--ham/gnuradio-examples/Makefile4
-rw-r--r--ham/gnuradio-radio-astronomy/Makefile4
-rw-r--r--ham/gnuradio-wxgui/Makefile4
-rw-r--r--ham/gnuradio-wxgui/buildlink3.mk4
-rw-r--r--ham/gpredict/Makefile4
-rw-r--r--ham/grig/Makefile4
-rw-r--r--ham/linpsk/Makefile4
-rw-r--r--ham/xdx/Makefile4
-rw-r--r--ham/xlog/Makefile4
-rw-r--r--inputmethod/ami/Makefile4
-rw-r--r--inputmethod/im-ja/Makefile3
-rw-r--r--inputmethod/imhangul_status_applet/Makefile4
-rw-r--r--inputmethod/kasumi/Makefile3
-rw-r--r--inputmethod/kimera-tomoe-gtk/Makefile3
-rw-r--r--inputmethod/kimera/Makefile3
-rw-r--r--inputmethod/m17n-im-config/Makefile4
-rw-r--r--inputmethod/m17n-im-config/buildlink3.mk4
-rw-r--r--inputmethod/nabi/Makefile4
-rw-r--r--inputmethod/novel-pinyin/Makefile4
-rw-r--r--inputmethod/scim-anthy/Makefile4
-rw-r--r--inputmethod/scim-array/Makefile3
-rw-r--r--inputmethod/scim-bridge/Makefile4
-rw-r--r--inputmethod/scim-canna/Makefile3
-rw-r--r--inputmethod/scim-ccinput/Makefile3
-rw-r--r--inputmethod/scim-chewing/Makefile3
-rw-r--r--inputmethod/scim-fcitx/Makefile3
-rw-r--r--inputmethod/scim-hangul/Makefile3
-rw-r--r--inputmethod/scim-input-pad/Makefile3
-rw-r--r--inputmethod/scim-m17n/Makefile4
-rw-r--r--inputmethod/scim-pinyin/Makefile3
-rw-r--r--inputmethod/scim-prime/Makefile3
-rw-r--r--inputmethod/scim-sinhala/Makefile3
-rw-r--r--inputmethod/scim-skk/Makefile3
-rw-r--r--inputmethod/scim-tables/Makefile3
-rw-r--r--inputmethod/scim-thai/Makefile3
-rw-r--r--inputmethod/scim-tomoe/Makefile4
-rw-r--r--inputmethod/scim-uim/Makefile3
-rw-r--r--inputmethod/scim-unikey/Makefile3
-rw-r--r--inputmethod/scim/Makefile3
-rw-r--r--inputmethod/scim/buildlink3.mk3
-rw-r--r--inputmethod/tomoe-gtk/Makefile4
-rw-r--r--inputmethod/tomoe-gtk/buildlink3.mk4
-rw-r--r--inputmethod/uim-tomoe-gtk/Makefile4
-rw-r--r--lang/classpath-gui/Makefile4
-rw-r--r--lang/coq/Makefile3
-rw-r--r--lang/kaffe-x11/Makefile4
-rw-r--r--lang/openjdk7/Makefile3
-rw-r--r--lang/php5/distinfo4
-rw-r--r--lang/php5/patches/patch-al35
-rw-r--r--lang/php53/distinfo4
-rw-r--r--lang/php53/patches/patch-ac33
-rw-r--r--lang/sablevm-classpath-gui/Makefile4
-rw-r--r--lang/smalltalk/Makefile4
-rw-r--r--lang/squeak-vm/Makefile3
-rw-r--r--lang/vala/Makefile3
-rw-r--r--mail/akonadi/Makefile4
-rw-r--r--mail/akonadi/buildlink3.mk4
-rw-r--r--mail/balsa/Makefile4
-rw-r--r--mail/claws-mail-archive/Makefile3
-rw-r--r--mail/claws-mail-attachwarner/Makefile3
-rw-r--r--mail/claws-mail-attremover/Makefile3
-rw-r--r--mail/claws-mail-cachesaver/Makefile4
-rw-r--r--mail/claws-mail-dillo-viewer/Makefile4
-rw-r--r--mail/claws-mail-fetchinfo/Makefile4
-rw-r--r--mail/claws-mail-gtkhtml/Makefile3
-rw-r--r--mail/claws-mail-mailmbox/Makefile3
-rw-r--r--mail/claws-mail-newmail/Makefile4
-rw-r--r--mail/claws-mail-notification/Makefile3
-rw-r--r--mail/claws-mail-pgpcore/buildlink3.mk4
-rw-r--r--mail/claws-mail-pgpinline/Makefile4
-rw-r--r--mail/claws-mail-pgpmime/Makefile4
-rw-r--r--mail/claws-mail-rssyl/Makefile3
-rw-r--r--mail/claws-mail-smime/Makefile4
-rw-r--r--mail/claws-mail-spamreport/Makefile3
-rw-r--r--mail/claws-mail-synce/Makefile4
-rw-r--r--mail/claws-mail-tnef/Makefile3
-rw-r--r--mail/claws-mail-vcalendar/Makefile3
-rw-r--r--mail/claws-mail/Makefile4
-rw-r--r--mail/evolution-data-server/Makefile4
-rw-r--r--mail/evolution-data-server/buildlink3.mk4
-rw-r--r--mail/evolution-exchange/Makefile4
-rw-r--r--mail/evolution-sharp/Makefile4
-rw-r--r--mail/evolution/Makefile4
-rw-r--r--mail/evolution/buildlink3.mk4
-rw-r--r--mail/kbiff/Makefile4
-rw-r--r--mail/mail-notification/Makefile4
-rw-r--r--mail/netbiff/Makefile4
-rw-r--r--mail/sylpheed/Makefile3
-rw-r--r--mail/wmbiff/Makefile4
-rw-r--r--math/R/Makefile3
-rw-r--r--math/calcoo/Makefile4
-rw-r--r--math/euler/Makefile4
-rw-r--r--math/extcalc/Makefile3
-rw-r--r--math/fityk/Makefile3
-rw-r--r--math/galculator/Makefile4
-rw-r--r--math/gcalctool/Makefile3
-rw-r--r--math/genius/Makefile4
-rw-r--r--math/gnumeric/Makefile4
-rw-r--r--math/gnumeric110/Makefile3
-rw-r--r--math/grace/Makefile4
-rw-r--r--math/grpn/Makefile3
-rw-r--r--math/gtklife/Makefile4
-rw-r--r--math/kseg/Makefile3
-rw-r--r--math/octave-forge/Makefile4
-rw-r--r--math/qalculate-bases/Makefile4
-rw-r--r--math/qalculate-currency/Makefile4
-rw-r--r--math/qalculate-gtk/Makefile3
-rw-r--r--math/qalculate-kde/Makefile4
-rw-r--r--math/qalculate-units/Makefile4
-rw-r--r--math/speedcrunch/Makefile3
-rw-r--r--meta-pkgs/xfce4-extras/Makefile4
-rw-r--r--meta-pkgs/xfce4/Makefile4
-rw-r--r--meta-pkgs/xfce4/buildlink3.mk4
-rw-r--r--misc/attica/Makefile3
-rw-r--r--misc/attica/buildlink3.mk3
-rw-r--r--misc/basket/Makefile4
-rw-r--r--misc/blccc/Makefile4
-rw-r--r--misc/calibre/Makefile4
-rw-r--r--misc/celestia/Makefile4
-rw-r--r--misc/celestia/distinfo3
-rw-r--r--misc/celestia/patches/patch-ap22
-rw-r--r--misc/deskbar-applet/Makefile4
-rw-r--r--misc/fbreader/Makefile4
-rw-r--r--misc/gelemental/Makefile4
-rw-r--r--misc/gkrellm-flynn/Makefile4
-rw-r--r--misc/gkrellm-launch/Makefile4
-rw-r--r--misc/gkrellm-leds/Makefile4
-rw-r--r--misc/gkrellm-moon/Makefile4
-rw-r--r--misc/gkrellm-weather/Makefile4
-rw-r--r--misc/gnome-utils/Makefile3
-rw-r--r--misc/goffice0.6/Makefile4
-rw-r--r--misc/goffice0.6/buildlink3.mk4
-rw-r--r--misc/goffice0.8/Makefile3
-rw-r--r--misc/goffice0.8/buildlink3.mk4
-rw-r--r--misc/gok/Makefile4
-rw-r--r--misc/gperiodic/Makefile4
-rw-r--r--misc/gwaei/Makefile4
-rw-r--r--misc/gxmame/Makefile4
-rw-r--r--misc/kanjipad/Makefile4
-rw-r--r--misc/kchm/Makefile4
-rw-r--r--misc/kchmviewer/Makefile3
-rw-r--r--misc/kdeaccessibility3/Makefile4
-rw-r--r--misc/kdeaccessibility4/Makefile3
-rw-r--r--misc/kdeaddons3/Makefile4
-rw-r--r--misc/kdeadmin3/Makefile4
-rw-r--r--misc/kdeadmin4/Makefile3
-rw-r--r--misc/kdeartwork3/Makefile4
-rw-r--r--misc/kdeartwork4/Makefile3
-rw-r--r--misc/kdeedu3/Makefile4
-rw-r--r--misc/kdeedu4/Makefile3
-rw-r--r--misc/kdeedu4/buildlink3.mk4
-rw-r--r--misc/kdepim-runtime4/Makefile3
-rw-r--r--misc/kdepim3/Makefile4
-rw-r--r--misc/kdepim3/buildlink3.mk4
-rw-r--r--misc/kdepim4/Makefile3
-rw-r--r--misc/kdepimlibs4/Makefile3
-rw-r--r--misc/kdepimlibs4/buildlink3.mk4
-rw-r--r--misc/kdeplasma-addons4/Makefile3
-rw-r--r--misc/kdeutils3/Makefile4
-rw-r--r--misc/kdeutils4/Makefile3
-rw-r--r--misc/kodos/Makefile4
-rw-r--r--misc/koffice/Makefile4
-rw-r--r--misc/koffice/distinfo3
-rw-r--r--misc/koffice/patches/patch-aa13
-rw-r--r--misc/mnemosyne/Makefile4
-rw-r--r--misc/most/Makefile3
-rw-r--r--misc/mousetweaks/Makefile4
-rw-r--r--misc/openoffice2/Makefile4
-rw-r--r--misc/openoffice3/Makefile4
-rw-r--r--misc/orca/Makefile4
-rw-r--r--misc/qbrew/Makefile4
-rw-r--r--misc/root/Makefile3
-rw-r--r--misc/stellarium/Makefile4
-rw-r--r--misc/taskjuggler/Makefile4
-rw-r--r--misc/tellico-kde3/Makefile4
-rw-r--r--misc/tellico/Makefile3
-rw-r--r--misc/vym/Makefile4
-rw-r--r--misc/xchm/Makefile4
-rw-r--r--misc/xfce4-weather-plugin/Makefile4
-rw-r--r--misc/xfce4-weather-plugin/buildlink3.mk4
-rw-r--r--misc/yelp/Makefile4
-rw-r--r--misc/zyGrib/Makefile4
-rw-r--r--mk/tools/replace.mk4
-rw-r--r--multimedia/alevt/Makefile3
-rw-r--r--multimedia/avidemux/Makefile4
-rw-r--r--multimedia/clutter-gst/Makefile3
-rw-r--r--multimedia/clutter-gst/buildlink3.mk3
-rw-r--r--multimedia/clutter08-gst/Makefile3
-rw-r--r--multimedia/clutter08-gst/buildlink3.mk3
-rw-r--r--multimedia/dvdauthor/Makefile3
-rw-r--r--multimedia/dvdstyler/Makefile3
-rw-r--r--multimedia/dvdview/Makefile4
-rw-r--r--multimedia/farsight2/Makefile4
-rw-r--r--multimedia/farsight2/buildlink3.mk4
-rw-r--r--multimedia/ffmpegthumbnailer/Makefile4
-rw-r--r--multimedia/fuppes/Makefile4
-rw-r--r--multimedia/fxtv/Makefile4
-rw-r--r--multimedia/gmencoder/Makefile4
-rw-r--r--multimedia/gmplayer/Makefile4
-rw-r--r--multimedia/gnash/Makefile4
-rw-r--r--multimedia/gnome-media/Makefile4
-rw-r--r--multimedia/gnome-media/buildlink3.mk4
-rw-r--r--multimedia/goggles/Makefile4
-rw-r--r--multimedia/gopchop/Makefile4
-rw-r--r--multimedia/gpac/Makefile4
-rw-r--r--multimedia/gpac/distinfo3
-rw-r--r--multimedia/gpac/patches/patch-ad13
-rw-r--r--multimedia/gxine/Makefile3
-rw-r--r--multimedia/handbrake/Makefile4
-rw-r--r--multimedia/kaffeine/Makefile4
-rw-r--r--multimedia/kdemultimedia3/Makefile4
-rw-r--r--multimedia/kdemultimedia3/buildlink3.mk4
-rw-r--r--multimedia/kdemultimedia4/Makefile3
-rw-r--r--multimedia/kmplayer-kde3/Makefile4
-rw-r--r--multimedia/kmplayer/Makefile8
-rw-r--r--multimedia/ming/Makefile3
-rw-r--r--multimedia/ming/buildlink3.mk3
-rw-r--r--multimedia/mjpegtools/Makefile4
-rw-r--r--multimedia/mkvtoolnix/Makefile4
-rw-r--r--multimedia/mplayer-plugin/Makefile4
-rw-r--r--multimedia/ogle_gui/Makefile4
-rw-r--r--multimedia/phonon/Makefile3
-rw-r--r--multimedia/phonon/buildlink3.mk4
-rw-r--r--multimedia/php-ming/Makefile4
-rw-r--r--multimedia/pspvc/Makefile4
-rw-r--r--multimedia/py-clutter-gst/Makefile3
-rw-r--r--multimedia/py-ming/Makefile3
-rw-r--r--multimedia/ruby-clutter-gst/Makefile4
-rw-r--r--multimedia/ruby-ming/Makefile3
-rw-r--r--multimedia/subtitleeditor/Makefile4
-rw-r--r--multimedia/swfdec-gnome/Makefile3
-rw-r--r--multimedia/swfdec-mozilla/Makefile4
-rw-r--r--multimedia/swfdec/Makefile4
-rw-r--r--multimedia/swfdec/buildlink3.mk4
-rw-r--r--multimedia/totem-browser-plugin/Makefile4
-rw-r--r--multimedia/totem-nautilus/Makefile4
-rw-r--r--multimedia/totem-pl-parser/Makefile3
-rw-r--r--multimedia/totem-pl-parser/buildlink3.mk4
-rw-r--r--multimedia/totem/Makefile3
-rw-r--r--multimedia/totem/buildlink3.mk4
-rw-r--r--multimedia/transcode/Makefile4
-rw-r--r--multimedia/tvtime/Makefile4
-rw-r--r--multimedia/vlc/buildlink3.mk4
-rw-r--r--multimedia/vlc/distinfo3
-rw-r--r--multimedia/vlc/patches/patch-ab22
-rw-r--r--multimedia/vlc08/Makefile4
-rw-r--r--multimedia/vlc08/buildlink3.mk4
-rw-r--r--multimedia/xfce4-mpc-plugin/Makefile4
-rw-r--r--multimedia/xfce4-mpc-plugin/buildlink3.mk4
-rw-r--r--multimedia/xfmedia/Makefile4
-rw-r--r--multimedia/xine-lib/Makefile4
-rw-r--r--multimedia/xine-ui/Makefile3
-rw-r--r--multimedia/xvid4conf/Makefile4
-rw-r--r--net/amule/Makefile3
-rw-r--r--net/avahi/Makefile4
-rw-r--r--net/avahi/buildlink3.mk4
-rw-r--r--net/bittornado-gui/Makefile4
-rw-r--r--net/bittorrent-gui/Makefile4
-rw-r--r--net/bug-buddy/Makefile4
-rw-r--r--net/dc_gui2/Makefile3
-rw-r--r--net/dcsharp/Makefile4
-rw-r--r--net/dhcpcd-gtk/Makefile3
-rw-r--r--net/ed2k-gtk-gui/Makefile4
-rw-r--r--net/ekiga/Makefile4
-rw-r--r--net/etherape/Makefile3
-rw-r--r--net/filezilla/Makefile3
-rw-r--r--net/gkrellm-multiping/Makefile4
-rw-r--r--net/gkrellm-snmp/Makefile4
-rw-r--r--net/gkrellm-wireless/Makefile4
-rw-r--r--net/gnome-netstatus/Makefile4
-rw-r--r--net/gnome-nettool/Makefile4
-rw-r--r--net/gssdp/Makefile3
-rw-r--r--net/gssdp/buildlink3.mk3
-rw-r--r--net/gst-plugins0.10-soup/Makefile4
-rw-r--r--net/gtk-vnc/Makefile3
-rw-r--r--net/gtk-vnc/buildlink3.mk4
-rw-r--r--net/gupnp-av/Makefile3
-rw-r--r--net/gupnp-av/buildlink3.mk3
-rw-r--r--net/gupnp-igd/Makefile4
-rw-r--r--net/gupnp-igd/buildlink3.mk4
-rw-r--r--net/gupnp-tools/Makefile3
-rw-r--r--net/gupnp/Makefile3
-rw-r--r--net/gupnp/buildlink3.mk4
-rw-r--r--net/hobbitmon/Makefile4
-rw-r--r--net/jigdo/Makefile4
-rw-r--r--net/kdenetwork3/Makefile4
-rw-r--r--net/kdenetwork3/buildlink3.mk4
-rw-r--r--net/kdenetwork4/Makefile3
-rw-r--r--net/kftpgrabber/Makefile4
-rw-r--r--net/kiax/Makefile4
-rw-r--r--net/kmldonkey-kde3/Makefile4
-rw-r--r--net/kmldonkey/Makefile3
-rw-r--r--net/kphone/Makefile4
-rw-r--r--net/ktorrent-kde3/Makefile4
-rw-r--r--net/ktorrent/Makefile4
-rw-r--r--net/libgdata/Makefile3
-rw-r--r--net/libgdata/buildlink3.mk3
-rw-r--r--net/libnice/Makefile3
-rw-r--r--net/libnice/buildlink3.mk4
-rw-r--r--net/libsoup24/buildlink3.mk4
-rw-r--r--net/logjam/Makefile4
-rw-r--r--net/mldonkey/Makefile4
-rw-r--r--net/monsoon/Makefile4
-rw-r--r--net/mrtg/Makefile4
-rw-r--r--net/nagios-base/Makefile4
-rw-r--r--net/nagstamon/Makefile3
-rw-r--r--net/nfdump/Makefile3
-rw-r--r--net/nicotine/Makefile4
-rw-r--r--net/ntop/Makefile4
-rw-r--r--net/tsclient/Makefile4
-rw-r--r--net/twitux/Makefile4
-rw-r--r--net/urlgfe/Makefile4
-rw-r--r--net/vinagre/Makefile4
-rw-r--r--net/vino/Makefile3
-rw-r--r--net/wistumbler2-gtk/Makefile4
-rw-r--r--net/wpa_gui/Makefile4
-rw-r--r--net/xfce4-wavelan-plugin/Makefile4
-rw-r--r--net/xfce4-wavelan-plugin/buildlink3.mk4
-rw-r--r--net/xymon/Makefile3
-rw-r--r--news/knews/Makefile4
-rw-r--r--news/lottanzb/Makefile4
-rw-r--r--news/pan/Makefile4
-rw-r--r--news/slrn/Makefile3
-rw-r--r--parallel/ganglia-monitor-core/Makefile4
-rw-r--r--pkgtools/gnome-packagekit/Makefile4
-rw-r--r--pkgtools/packagekit/Makefile4
-rw-r--r--print/advi/Makefile4
-rw-r--r--print/bg5pdf/Makefile4
-rw-r--r--print/cups-drivers-Magicolor5440DL/Makefile3
-rw-r--r--print/cups/Makefile4
-rw-r--r--print/cups/buildlink3.mk4
-rw-r--r--print/diffpdf/Makefile3
-rw-r--r--print/dvipdfmx/Makefile4
-rw-r--r--print/epdfview/Makefile4
-rw-r--r--print/evince-nautilus/Makefile4
-rw-r--r--print/evince/Makefile7
-rw-r--r--print/evince/buildlink3.mk4
-rw-r--r--print/flpsed/Makefile3
-rw-r--r--print/foomatic4-filters/Makefile3
-rw-r--r--print/ghostscript/Makefile4
-rw-r--r--print/ghostscript/buildlink3.mk4
-rw-r--r--print/ghostscript/distinfo4
-rw-r--r--print/ghostscript/patches/patch-ah57
-rw-r--r--print/gimp-print-cups/Makefile4
-rw-r--r--print/gimp-print/Makefile4
-rw-r--r--print/glabels/Makefile3
-rw-r--r--print/gtklp/Makefile4
-rw-r--r--print/gutenprint-lib/Makefile4
-rw-r--r--print/img2eps/Makefile4
-rw-r--r--print/imposter/Makefile4
-rw-r--r--print/ja-vfxdvik/Makefile4
-rw-r--r--print/kbibtex/Makefile4
-rw-r--r--print/libgnomecups/Makefile4
-rw-r--r--print/libgnomecups/buildlink3.mk4
-rw-r--r--print/libgnomeprint/Makefile4
-rw-r--r--print/libgnomeprint/buildlink3.mk4
-rw-r--r--print/libgnomeprintui/Makefile4
-rw-r--r--print/libgnomeprintui/buildlink3.mk4
-rw-r--r--print/libspectre/Makefile3
-rw-r--r--print/libspectre/buildlink3.mk4
-rw-r--r--print/lilypond/Makefile4
-rw-r--r--print/luatex/Makefile3
-rw-r--r--print/p5-Net-CUPS/Makefile3
-rw-r--r--print/pdflib/Makefile4
-rw-r--r--print/pdflib/buildlink3.mk4
-rw-r--r--print/php-pdflib/Makefile3
-rw-r--r--print/poppler-glib/Makefile3
-rw-r--r--print/poppler-glib/buildlink3.mk4
-rw-r--r--print/poppler-includes/Makefile3
-rw-r--r--print/poppler-qt/Makefile3
-rw-r--r--print/poppler-qt4/Makefile3
-rw-r--r--print/poppler-utils/Makefile3
-rw-r--r--print/poppler/Makefile3
-rw-r--r--print/py-cups/Makefile3
-rw-r--r--print/py-cups/buildlink3.mk4
-rw-r--r--print/ruby-gnome2-gnomeprint/Makefile4
-rw-r--r--print/ruby-gnome2-gnomeprintui/Makefile4
-rw-r--r--print/ruby-gnome2-poppler/Makefile4
-rw-r--r--print/scribus/Makefile3
-rw-r--r--print/tcl-pdflib/Makefile4
-rw-r--r--print/teTeX3-bin/Makefile4
-rw-r--r--print/transfig/Makefile4
-rw-r--r--print/transfig/buildlink3.mk4
-rw-r--r--print/web2c/Makefile3
-rw-r--r--print/xetex/Makefile3
-rw-r--r--print/xfce4-print/Makefile3
-rw-r--r--print/xfce4-print/buildlink3.mk4
-rw-r--r--print/xpp/Makefile4
-rw-r--r--security/fprint-demo/Makefile4
-rw-r--r--security/fwbuilder/Makefile4
-rw-r--r--security/fwbuilder21/Makefile4
-rw-r--r--security/gnome-keyring-manager/Makefile4
-rw-r--r--security/gnome-keyring/Makefile3
-rw-r--r--security/gnome-keyring/buildlink3.mk4
-rw-r--r--security/gpa/Makefile4
-rw-r--r--security/gpass/Makefile4
-rw-r--r--security/keepassx/Makefile4
-rw-r--r--security/kssh/Makefile4
-rw-r--r--security/libfprint/Makefile4
-rw-r--r--security/libfwbuilder/Makefile4
-rw-r--r--security/libfwbuilder/buildlink3.mk4
-rw-r--r--security/libfwbuilder21/Makefile4
-rw-r--r--security/libfwbuilder21/buildlink3.mk4
-rw-r--r--security/nessus-core/Makefile4
-rw-r--r--security/nessus-core/buildlink3.mk4
-rw-r--r--security/nessus-plugins/Makefile4
-rw-r--r--security/openvas-client/Makefile4
-rw-r--r--security/pinentry-gtk2/Makefile3
-rw-r--r--security/pinentry-qt/Makefile3
-rw-r--r--security/pinentry-qt4/Makefile3
-rw-r--r--security/policykit-gnome/Makefile4
-rw-r--r--security/policykit-gnome/PLIST10
-rw-r--r--security/polkit-qt/Makefile3
-rw-r--r--security/polkit-qt/buildlink3.mk4
-rw-r--r--security/putty-devel/Makefile3
-rw-r--r--security/qca-tls/Makefile4
-rw-r--r--security/qca/Makefile4
-rw-r--r--security/qca/buildlink3.mk4
-rw-r--r--security/qca2-ossl/Makefile4
-rw-r--r--security/qca2/Makefile4
-rw-r--r--security/qca2/buildlink3.mk4
-rw-r--r--security/seahorse-plugins/Makefile4
-rw-r--r--security/seahorse/Makefile4
-rw-r--r--security/seahorse/buildlink3.mk4
-rw-r--r--sysutils/bacula-qt-console/Makefile3
-rw-r--r--sysutils/bacula-tray-monitor/Makefile3
-rw-r--r--sysutils/bacula-wx-console/Makefile3
-rw-r--r--sysutils/brasero-nautilus/Makefile3
-rw-r--r--sysutils/brasero/Makefile4
-rw-r--r--sysutils/brasero/buildlink3.mk4
-rw-r--r--sysutils/btpin-qt/Makefile4
-rw-r--r--sysutils/bubblemon/Makefile4
-rw-r--r--sysutils/dbus-qt3/Makefile4
-rw-r--r--sysutils/dbus-qt3/buildlink3.mk4
-rw-r--r--sysutils/dvdisaster/Makefile4
-rw-r--r--sysutils/filelight/Makefile4
-rw-r--r--sysutils/fsviewer/Makefile4
-rw-r--r--sysutils/ftwin/Makefile4
-rw-r--r--sysutils/gcdmaster/Makefile4
-rw-r--r--sysutils/gkrellm-est/Makefile4
-rw-r--r--sysutils/gkrellm/Makefile4
-rw-r--r--sysutils/gkrellm/buildlink3.mk4
-rw-r--r--sysutils/gnome-commander/Makefile3
-rw-r--r--sysutils/gnome-device-manager/Makefile4
-rw-r--r--sysutils/gnome-mount/Makefile4
-rw-r--r--sysutils/gnome-mount/buildlink3.mk4
-rw-r--r--sysutils/gnome-nds-thumbnailer/Makefile4
-rw-r--r--sysutils/gnome-pkgview/Makefile4
-rw-r--r--sysutils/gnome-power-manager/Makefile4
-rw-r--r--sysutils/gnome-settings-daemon/Makefile4
-rw-r--r--sysutils/gnome-system-monitor/Makefile4
-rw-r--r--sysutils/gnome-system-tools/Makefile4
-rw-r--r--sysutils/gnome-vfs-monikers/Makefile4
-rw-r--r--sysutils/gnome-vfs/Makefile4
-rw-r--r--sysutils/gnome-vfs/buildlink3.mk4
-rw-r--r--sysutils/gnome-vfsmm/Makefile3
-rw-r--r--sysutils/gnome-vfsmm/buildlink3.mk4
-rw-r--r--sysutils/gnome-volume-manager/Makefile4
-rw-r--r--sysutils/grun/Makefile4
-rw-r--r--sysutils/gst-plugins0.10-gnomevfs/Makefile4
-rw-r--r--sysutils/gtk-send-pr/Makefile4
-rw-r--r--sysutils/gvfs/Makefile3
-rw-r--r--sysutils/idesk/Makefile4
-rw-r--r--sysutils/k3b/Makefile4
-rw-r--r--sysutils/kdirstat/Makefile4
-rw-r--r--sysutils/krusader/Makefile4
-rw-r--r--sysutils/libgksu/Makefile4
-rw-r--r--sysutils/libgksu/buildlink3.mk4
-rw-r--r--sysutils/libnotify/Makefile4
-rw-r--r--sysutils/libnotify/buildlink3.mk4
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--sysutils/nautilus-sendto/Makefile4
-rw-r--r--sysutils/nautilus/Makefile4
-rw-r--r--sysutils/nautilus/buildlink3.mk4
-rw-r--r--sysutils/notification-daemon/Makefile4
-rw-r--r--sysutils/pcmanfm/Makefile4
-rw-r--r--sysutils/pfstat/Makefile4
-rw-r--r--sysutils/py-notify/Makefile4
-rw-r--r--sysutils/py-notify/buildlink3.mk4
-rw-r--r--sysutils/rox/Makefile3
-rw-r--r--sysutils/ruby-gnome2-gnomevfs/Makefile3
-rw-r--r--sysutils/screentest/Makefile3
-rw-r--r--sysutils/strigi/Makefile4
-rw-r--r--sysutils/ups-nut-cgi/Makefile4
-rw-r--r--sysutils/xcdroast/Makefile4
-rw-r--r--sysutils/xfce4-appfinder/Makefile3
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile4
-rw-r--r--sysutils/xfce4-battery-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile4
-rw-r--r--sysutils/xfce4-cpugraph-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfce4-diskperf-plugin/Makefile4
-rw-r--r--sysutils/xfce4-diskperf-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile4
-rw-r--r--sysutils/xfce4-fsguard-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile4
-rw-r--r--sysutils/xfce4-genmon-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile4
-rw-r--r--sysutils/xfce4-netload-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfce4-quicklauncher-plugin/Makefile4
-rw-r--r--sysutils/xfce4-quicklauncher-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile4
-rw-r--r--sysutils/xfce4-systemload-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfce4-thunar/Makefile3
-rw-r--r--sysutils/xfce4-thunar/buildlink3.mk3
-rw-r--r--sysutils/xfce4-volman/Makefile4
-rw-r--r--sysutils/xfce4-xarchiver/Makefile4
-rw-r--r--sysutils/xfce4-xarchiver/buildlink3.mk4
-rw-r--r--sysutils/xfce4-xkb-plugin/Makefile4
-rw-r--r--sysutils/xfce4-xkb-plugin/buildlink3.mk4
-rw-r--r--sysutils/xfe/Makefile4
-rw-r--r--sysutils/xnc/Makefile4
-rw-r--r--textproc/OdfConverter/Makefile4
-rw-r--r--textproc/ebview/Makefile4
-rw-r--r--textproc/gnome-spell/Makefile4
-rw-r--r--textproc/gnome-spell/buildlink3.mk4
-rw-r--r--textproc/gnome-subtitles/Makefile3
-rw-r--r--textproc/gtkspell/Makefile4
-rw-r--r--textproc/gtkspell/buildlink3.mk4
-rw-r--r--textproc/py-gdick/Makefile4
-rw-r--r--textproc/soprano/Makefile3
-rw-r--r--textproc/soprano/buildlink3.mk4
-rw-r--r--textproc/subtitleripper/Makefile4
-rw-r--r--textproc/tex2page/Makefile4
-rw-r--r--textproc/xfce4-dict-plugin/Makefile4
-rw-r--r--textproc/xfce4-dict-plugin/buildlink3.mk4
-rw-r--r--textproc/xml2doc/Makefile4
-rw-r--r--time/cairo-clock/Makefile4
-rw-r--r--time/evolution-webcal/Makefile3
-rw-r--r--time/gchore/Makefile4
-rw-r--r--time/gdeskcal/Makefile4
-rw-r--r--time/gnotime/Makefile4
-rw-r--r--time/gtodo-applet/Makefile4
-rw-r--r--time/gtodo/Makefile4
-rw-r--r--time/hamster-applet/Makefile4
-rw-r--r--time/planner/Makefile4
-rw-r--r--time/ptimetracker/Makefile4
-rw-r--r--time/rsibreak-kde3/Makefile4
-rw-r--r--time/rsibreak/Makefile3
-rw-r--r--time/xfce4-datetime-plugin/Makefile3
-rw-r--r--time/xfce4-datetime-plugin/buildlink3.mk4
-rw-r--r--time/xfce4-orage/Makefile3
-rw-r--r--time/xfce4-timer-plugin/Makefile4
-rw-r--r--time/xfce4-timer-plugin/buildlink3.mk4
-rw-r--r--time/xonclock/Makefile4
-rw-r--r--time/xtide/Makefile4
-rw-r--r--wm/3ddesktop/Makefile4
-rw-r--r--wm/afterstep/Makefile4
-rw-r--r--wm/awesome/Makefile4
-rw-r--r--wm/compiz-fusion-plugins-extra/Makefile4
-rw-r--r--wm/compiz-fusion-plugins-main/Makefile4
-rw-r--r--wm/compiz-fusion-plugins-main/buildlink3.mk4
-rw-r--r--wm/compiz/Makefile4
-rw-r--r--wm/compiz/buildlink3.mk4
-rw-r--r--wm/e16menuedit2/Makefile4
-rw-r--r--wm/enlightenment/Makefile4
-rw-r--r--wm/fluxconf/Makefile4
-rw-r--r--wm/flwm/Makefile3
-rw-r--r--wm/fvwm-devel/Makefile3
-rw-r--r--wm/icecc/Makefile4
-rw-r--r--wm/icewm-imlib/Makefile4
-rw-r--r--wm/matchbox-wm/Makefile3
-rw-r--r--wm/metacity/Makefile3
-rw-r--r--wm/metacity/buildlink3.mk4
-rw-r--r--wm/metisse/Makefile4
-rw-r--r--wm/metisse/distinfo3
-rw-r--r--wm/metisse/patches/patch-ah13
-rw-r--r--wm/obconf/Makefile4
-rw-r--r--wm/openbox/Makefile3
-rw-r--r--wm/oroborox/Makefile4
-rw-r--r--wm/pekwm/Makefile3
-rw-r--r--wm/qvwm/Makefile4
-rw-r--r--wm/sawfish/Makefile4
-rw-r--r--wm/selectwm/Makefile4
-rw-r--r--wm/skippy/Makefile4
-rw-r--r--wm/waimea/Makefile4
-rw-r--r--wm/whiteBOX/Makefile4
-rw-r--r--wm/windowmaker/Makefile4
-rw-r--r--wm/windowmaker/buildlink3.mk4
-rw-r--r--wm/wmakerconf/Makefile4
-rw-r--r--wm/wmdrawer/Makefile4
-rw-r--r--wm/xfce4-wm/Makefile3
-rw-r--r--www/amaya/Makefile4
-rw-r--r--www/amaya/distinfo4
-rw-r--r--www/amaya/patches/patch-ap59
-rw-r--r--www/ap22-dnssd/Makefile4
-rw-r--r--www/bluefish/Makefile4
-rw-r--r--www/browser-bookmarks-menu/Makefile4
-rw-r--r--www/chimera/Makefile4
-rw-r--r--www/chimera/distinfo6
-rw-r--r--www/chimera/patches/patch-aa4
-rw-r--r--www/chimera/patches/patch-ad31
-rw-r--r--www/dillo/Makefile3
-rw-r--r--www/drivel/Makefile4
-rw-r--r--www/epiphany-extensions/Makefile4
-rw-r--r--www/epiphany/Makefile5
-rw-r--r--www/epiphany/buildlink3.mk4
-rw-r--r--www/firefox/Makefile3
-rw-r--r--www/gtkhtml314/Makefile3
-rw-r--r--www/htmldoc/Makefile4
-rw-r--r--www/kazehakase/Makefile5
-rw-r--r--www/kdewebdev3/Makefile4
-rw-r--r--www/kdewebdev4/Makefile3
-rw-r--r--www/konq-plugins/Makefile3
-rw-r--r--www/libgtkhtml/Makefile4
-rw-r--r--www/libgtkhtml/buildlink3.mk4
-rw-r--r--www/liferea-current/Makefile3
-rw-r--r--www/liferea/Makefile4
-rw-r--r--www/links-gui/Makefile4
-rw-r--r--www/mMosaic/Makefile4
-rw-r--r--www/midori/Makefile3
-rw-r--r--www/netsurf/Makefile4
-rw-r--r--www/nspluginwrapper/Makefile4
-rw-r--r--www/p5-Apache-Gallery/Makefile4
-rw-r--r--www/ruby-gnome2-gtkhtml2/Makefile3
-rw-r--r--www/ruby-gnome2-gtkmozembed/Makefile4
-rw-r--r--www/sarg/Makefile4
-rw-r--r--www/skipstone/Makefile4
-rw-r--r--www/webalizer/Makefile3
-rw-r--r--www/webkit-gtk/Makefile3
-rw-r--r--www/webkit-gtk/buildlink3.mk4
-rw-r--r--x11/XaoS/Makefile3
-rw-r--r--x11/XmHTML/Makefile4
-rw-r--r--x11/XmHTML/buildlink3.mk4
-rw-r--r--x11/acidlaunch/Makefile4
-rw-r--r--x11/alacarte/Makefile4
-rw-r--r--x11/antiright/Makefile4
-rw-r--r--x11/aterm/Makefile4
-rw-r--r--x11/deskmenu/Makefile4
-rw-r--r--x11/devilspie/Makefile4
-rw-r--r--x11/dfm/Makefile4
-rw-r--r--x11/driconf/Makefile4
-rw-r--r--x11/ede/Makefile4
-rw-r--r--x11/efltk/Makefile4
-rw-r--r--x11/efltk/buildlink3.mk4
-rw-r--r--x11/eterm/Makefile4
-rw-r--r--x11/fast-user-switch-applet/Makefile4
-rw-r--r--x11/fbdesk/Makefile4
-rw-r--r--x11/fltk/Makefile3
-rw-r--r--x11/fltk/buildlink3.mk4
-rw-r--r--x11/fltk2/Makefile4
-rw-r--r--x11/fltk2/buildlink3.mk4
-rw-r--r--x11/fox/Makefile4
-rw-r--r--x11/fox/buildlink3.mk4
-rw-r--r--x11/ftmenu/Makefile4
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gnome-applets/Makefile4
-rw-r--r--x11/gnome-control-center/Makefile4
-rw-r--r--x11/gnome-control-center/buildlink3.mk4
-rw-r--r--x11/gnome-desktop-sharp/Makefile4
-rw-r--r--x11/gnome-desktop-sharp/buildlink3.mk4
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/buildlink3.mk4
-rw-r--r--x11/gnome-mag/Makefile3
-rw-r--r--x11/gnome-mag/buildlink3.mk4
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gnome-panel/buildlink3.mk4
-rw-r--r--x11/gnome-screensaver/Makefile3
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-sharp/Makefile4
-rw-r--r--x11/gnome-sharp/buildlink3.mk4
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/gnome-themes-extras/Makefile4
-rw-r--r--x11/gnome-themes/Makefile3
-rw-r--r--x11/gnopernicus/Makefile4
-rw-r--r--x11/gnustep-gui/Makefile4
-rw-r--r--x11/grandr_applet/Makefile4
-rw-r--r--x11/gromit/Makefile4
-rw-r--r--x11/gselt/Makefile3
-rw-r--r--x11/gtk-engines/Makefile4
-rw-r--r--x11/gtk-sharp/Makefile3
-rw-r--r--x11/gtk2+extra/Makefile3
-rw-r--r--x11/gtk2+extra/buildlink3.mk4
-rw-r--r--x11/gtk2-chtheme/Makefile4
-rw-r--r--x11/gtk2-engines-bluecurve/Makefile4
-rw-r--r--x11/gtk2-engines-murrine/Makefile3
-rw-r--r--x11/gtk2-engines/Makefile3
-rw-r--r--x11/gtk2-engines/buildlink3.mk4
-rw-r--r--x11/gtk2-theme-switch/Makefile4
-rw-r--r--x11/gtk2/Makefile3
-rw-r--r--x11/gtk2/buildlink3.mk4
-rw-r--r--x11/gtk2/distinfo4
-rw-r--r--x11/gtk2/patches/patch-af26
-rw-r--r--x11/gtkmm-utils/Makefile3
-rw-r--r--x11/gtkmm-utils/buildlink3.mk3
-rw-r--r--x11/gtkmm/Makefile3
-rw-r--r--x11/gtkmm/buildlink3.mk4
-rw-r--r--x11/gtksourceview-sharp2/Makefile4
-rw-r--r--x11/gtksourceview/Makefile4
-rw-r--r--x11/gtksourceview/buildlink3.mk4
-rw-r--r--x11/gtksourceview2/Makefile3
-rw-r--r--x11/gtksourceview2/buildlink3.mk4
-rw-r--r--x11/gtkterm2/Makefile4
-rw-r--r--x11/hot-babe/Makefile4
-rw-r--r--x11/hsetroot/Makefile4
-rw-r--r--x11/kde3-i18n-af/Makefile4
-rw-r--r--x11/kde3-i18n-ar/Makefile4
-rw-r--r--x11/kde3-i18n-az/Makefile4
-rw-r--r--x11/kde3-i18n-bg/Makefile4
-rw-r--r--x11/kde3-i18n-bn/Makefile4
-rw-r--r--x11/kde3-i18n-br/Makefile4
-rw-r--r--x11/kde3-i18n-bs/Makefile4
-rw-r--r--x11/kde3-i18n-ca/Makefile4
-rw-r--r--x11/kde3-i18n-cs/Makefile4
-rw-r--r--x11/kde3-i18n-cy/Makefile4
-rw-r--r--x11/kde3-i18n-da/Makefile4
-rw-r--r--x11/kde3-i18n-de/Makefile4
-rw-r--r--x11/kde3-i18n-el/Makefile4
-rw-r--r--x11/kde3-i18n-en_GB/Makefile4
-rw-r--r--x11/kde3-i18n-eo/Makefile4
-rw-r--r--x11/kde3-i18n-es/Makefile4
-rw-r--r--x11/kde3-i18n-et/Makefile4
-rw-r--r--x11/kde3-i18n-eu/Makefile4
-rw-r--r--x11/kde3-i18n-fa/Makefile4
-rw-r--r--x11/kde3-i18n-fi/Makefile4
-rw-r--r--x11/kde3-i18n-fr/Makefile4
-rw-r--r--x11/kde3-i18n-fy/Makefile4
-rw-r--r--x11/kde3-i18n-ga/Makefile4
-rw-r--r--x11/kde3-i18n-gl/Makefile4
-rw-r--r--x11/kde3-i18n-he/Makefile4
-rw-r--r--x11/kde3-i18n-hi/Makefile4
-rw-r--r--x11/kde3-i18n-hr/Makefile4
-rw-r--r--x11/kde3-i18n-hu/Makefile4
-rw-r--r--x11/kde3-i18n-is/Makefile4
-rw-r--r--x11/kde3-i18n-it/Makefile4
-rw-r--r--x11/kde3-i18n-ja/Makefile4
-rw-r--r--x11/kde3-i18n-kk/Makefile4
-rw-r--r--x11/kde3-i18n-km/Makefile4
-rw-r--r--x11/kde3-i18n-ko/Makefile4
-rw-r--r--x11/kde3-i18n-lt/Makefile4
-rw-r--r--x11/kde3-i18n-lv/Makefile4
-rw-r--r--x11/kde3-i18n-mk/Makefile4
-rw-r--r--x11/kde3-i18n-mn/Makefile4
-rw-r--r--x11/kde3-i18n-ms/Makefile4
-rw-r--r--x11/kde3-i18n-nb/Makefile4
-rw-r--r--x11/kde3-i18n-nds/Makefile4
-rw-r--r--x11/kde3-i18n-nl/Makefile4
-rw-r--r--x11/kde3-i18n-nn/Makefile4
-rw-r--r--x11/kde3-i18n-pa/Makefile4
-rw-r--r--x11/kde3-i18n-pl/Makefile4
-rw-r--r--x11/kde3-i18n-pt/Makefile4
-rw-r--r--x11/kde3-i18n-pt_BR/Makefile4
-rw-r--r--x11/kde3-i18n-ro/Makefile4
-rw-r--r--x11/kde3-i18n-ru/Makefile4
-rw-r--r--x11/kde3-i18n-rw/Makefile4
-rw-r--r--x11/kde3-i18n-se/Makefile4
-rw-r--r--x11/kde3-i18n-sk/Makefile4
-rw-r--r--x11/kde3-i18n-sl/Makefile4
-rw-r--r--x11/kde3-i18n-sr/Makefile4
-rw-r--r--x11/kde3-i18n-sr_Latn/Makefile4
-rw-r--r--x11/kde3-i18n-ss/Makefile4
-rw-r--r--x11/kde3-i18n-sv/Makefile4
-rw-r--r--x11/kde3-i18n-ta/Makefile4
-rw-r--r--x11/kde3-i18n-tg/Makefile4
-rw-r--r--x11/kde3-i18n-tr/Makefile4
-rw-r--r--x11/kde3-i18n-uk/Makefile4
-rw-r--r--x11/kde3-i18n-uz/Makefile4
-rw-r--r--x11/kde3-i18n-vi/Makefile4
-rw-r--r--x11/kde3-i18n-zh_CN/Makefile4
-rw-r--r--x11/kde3-i18n-zh_TW/Makefile4
-rw-r--r--x11/kdebase-runtime4/Makefile3
-rw-r--r--x11/kdebase-runtime4/buildlink3.mk4
-rw-r--r--x11/kdebase-workspace4/Makefile3
-rw-r--r--x11/kdebase-workspace4/buildlink3.mk4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/kdebase3/buildlink3.mk4
-rw-r--r--x11/kdebase4/Makefile3
-rw-r--r--x11/kdebindings-ruby/Makefile4
-rw-r--r--x11/kdebindings-ruby/buildlink3.mk4
-rw-r--r--x11/kdebindings4-python/Makefile3
-rw-r--r--x11/kdelibdocs3/Makefile4
-rw-r--r--x11/kdelibs4/Makefile3
-rw-r--r--x11/kdelibs4/buildlink3.mk4
-rw-r--r--x11/kkbswitch/Makefile4
-rw-r--r--x11/kmessage/Makefile4
-rw-r--r--x11/kterm/Makefile4
-rw-r--r--x11/lablgtk/Makefile4
-rw-r--r--x11/libgnomekbd/Makefile4
-rw-r--r--x11/libunique/Makefile3
-rw-r--r--x11/libunique/buildlink3.mk4
-rw-r--r--x11/libxfce4gui/Makefile3
-rw-r--r--x11/libxfce4gui/buildlink3.mk3
-rw-r--r--x11/libxfce4menu/buildlink3.mk3
-rw-r--r--x11/matchbox-common/Makefile4
-rw-r--r--x11/matchbox-desktop/Makefile4
-rw-r--r--x11/matchbox-nest/Makefile4
-rw-r--r--x11/matchbox-panel-manager/Makefile4
-rw-r--r--x11/matchbox-panel/Makefile4
-rw-r--r--x11/mlterm/Makefile4
-rw-r--r--x11/mrxvt/Makefile4
-rw-r--r--x11/nucleo/Makefile4
-rw-r--r--x11/nucleo/buildlink3.mk4
-rw-r--r--x11/nucleo/distinfo3
-rw-r--r--x11/nucleo/patches/patch-an13
-rw-r--r--x11/openmotif/Makefile4
-rw-r--r--x11/openmotif/buildlink3.mk4
-rw-r--r--x11/p5-Alien-wxWidgets/Makefile4
-rw-r--r--x11/p5-Tk/Makefile4
-rw-r--r--x11/p5-Wx-Perl-ProcessStream/Makefile3
-rw-r--r--x11/p5-Wx/Makefile4
-rw-r--r--x11/p5-Wx/buildlink3.mk3
-rw-r--r--x11/p5-gtk2/Makefile4
-rw-r--r--x11/p5-gtk2/buildlink3.mk4
-rw-r--r--x11/paragui/Makefile4
-rw-r--r--x11/paragui/buildlink3.mk4
-rw-r--r--x11/py-gnome2-desktop/Makefile4
-rw-r--r--x11/py-gnome2-desktop/buildlink3.mk4
-rw-r--r--x11/py-gnome2-extras/Makefile4
-rw-r--r--x11/py-gnome2-extras/buildlink3.mk4
-rw-r--r--x11/py-gnome2/Makefile3
-rw-r--r--x11/py-gnome2/buildlink3.mk4
-rw-r--r--x11/py-gtk2/Makefile3
-rw-r--r--x11/py-gtk2/buildlink3.mk4
-rw-r--r--x11/py-gtksourceview/Makefile3
-rw-r--r--x11/py-kiwi/Makefile4
-rw-r--r--x11/py-kiwi/buildlink3.mk4
-rw-r--r--x11/py-qt3-base/Makefile4
-rw-r--r--x11/py-qt3-base/buildlink3.mk4
-rw-r--r--x11/py-qt3-modules/Makefile4
-rw-r--r--x11/py-qt3-modules/buildlink3.mk4
-rw-r--r--x11/py-qt3-qscintilla/Makefile4
-rw-r--r--x11/py-qt4-qscintilla/Makefile3
-rw-r--r--x11/py-qt4-qscintilla/buildlink3.mk17
-rw-r--r--x11/py-qt4/Makefile3
-rw-r--r--x11/py-wxWidgets/Makefile4
-rw-r--r--x11/py-wxWidgets/buildlink3.mk4
-rw-r--r--x11/qt3-docs/Makefile4
-rw-r--r--x11/qt3-libs/Makefile4
-rw-r--r--x11/qt3-libs/buildlink3.mk4
-rw-r--r--x11/qt3-libs/distinfo3
-rw-r--r--x11/qt3-libs/patches/patch-as22
-rw-r--r--x11/qt3-mysql/Makefile4
-rw-r--r--x11/qt3-pgsql/Makefile4
-rw-r--r--x11/qt3-qscintilla/Makefile4
-rw-r--r--x11/qt3-qscintilla/buildlink3.mk4
-rw-r--r--x11/qt3-tools/Makefile4
-rw-r--r--x11/qt3-tools/buildlink3.mk4
-rw-r--r--x11/qt4-creator/Makefile4
-rw-r--r--x11/qt4-docs/Makefile3
-rw-r--r--x11/qt4-libs/Makefile4
-rw-r--r--x11/qt4-libs/buildlink3.mk4
-rw-r--r--x11/qt4-mng/Makefile3
-rw-r--r--x11/qt4-mysql/Makefile3
-rw-r--r--x11/qt4-pgsql/Makefile3
-rw-r--r--x11/qt4-qdbus/Makefile3
-rw-r--r--x11/qt4-qdbus/buildlink3.mk4
-rw-r--r--x11/qt4-qscintilla/Makefile3
-rw-r--r--x11/qt4-qscintilla/buildlink3.mk3
-rw-r--r--x11/qt4-sqlite3/Makefile3
-rw-r--r--x11/qt4-tiff/Makefile3
-rw-r--r--x11/qt4-tools/Makefile3
-rw-r--r--x11/qt4-tools/buildlink3.mk4
-rw-r--r--x11/qwt-qt4/Makefile4
-rw-r--r--x11/qwt-qt4/buildlink3.mk4
-rw-r--r--x11/qwtplot3d-qt4/Makefile4
-rw-r--r--x11/qwtplot3d-qt4/buildlink3.mk4
-rw-r--r--x11/rep-gtk2/Makefile4
-rw-r--r--x11/rox-session/Makefile4
-rw-r--r--x11/ruby-gnome2-gnome/Makefile4
-rw-r--r--x11/ruby-gnome2-gtk/Makefile3
-rw-r--r--x11/ruby-gnome2-gtk/buildlink3.mk4
-rw-r--r--x11/ruby-gnome2-gtksourceview/Makefile4
-rw-r--r--x11/ruby-gnome2-gtksourceview2/Makefile3
-rw-r--r--x11/ruby-gnome2-panelapplet/Makefile4
-rw-r--r--x11/ruby-gnome2-vte/Makefile3
-rw-r--r--x11/ruby-gtk/Makefile4
-rw-r--r--x11/tint2/Makefile4
-rw-r--r--x11/vte/Makefile12
-rw-r--r--x11/vte/buildlink3.mk4
-rw-r--r--x11/wdm/Makefile4
-rw-r--r--x11/wterm/Makefile4
-rw-r--r--x11/wxGTK24/Makefile5
-rw-r--r--x11/wxGTK24/buildlink3.mk4
-rw-r--r--x11/wxGTK24/distinfo4
-rw-r--r--x11/wxGTK24/patches/patch-aa30
-rw-r--r--x11/wxGTK26-contrib/Makefile4
-rw-r--r--x11/wxGTK26-contrib/buildlink3.mk4
-rw-r--r--x11/wxGTK26/Makefile4
-rw-r--r--x11/wxGTK26/buildlink3.mk4
-rw-r--r--x11/wxGTK26/distinfo4
-rw-r--r--x11/wxGTK26/patches/patch-aa59
-rw-r--r--x11/wxGTK28-contrib/Makefile4
-rw-r--r--x11/wxGTK28-contrib/buildlink3.mk4
-rw-r--r--x11/wxGTK28/Makefile4
-rw-r--r--x11/wxGTK28/buildlink3.mk4
-rw-r--r--x11/wxGTK28/distinfo4
-rw-r--r--x11/wxGTK28/patches/patch-aa57
-rw-r--r--x11/wxhaskell/Makefile4
-rw-r--r--x11/xcursorgen/Makefile4
-rw-r--r--x11/xfce4-clipman-plugin/Makefile4
-rw-r--r--x11/xfce4-clipman-plugin/buildlink3.mk4
-rw-r--r--x11/xfce4-desktop/Makefile3
-rw-r--r--x11/xfce4-exo/Makefile4
-rw-r--r--x11/xfce4-exo/buildlink3.mk3
-rw-r--r--x11/xfce4-eyes-plugin/Makefile4
-rw-r--r--x11/xfce4-eyes-plugin/buildlink3.mk4
-rw-r--r--x11/xfce4-gtk2-engine/Makefile3
-rw-r--r--x11/xfce4-notes-plugin/Makefile4
-rw-r--r--x11/xfce4-notes-plugin/buildlink3.mk4
-rw-r--r--x11/xfce4-panel/Makefile4
-rw-r--r--x11/xfce4-panel/buildlink3.mk3
-rw-r--r--x11/xfce4-places-plugin/Makefile4
-rw-r--r--x11/xfce4-places-plugin/buildlink3.mk4
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile4
-rw-r--r--x11/xfce4-screenshooter-plugin/buildlink3.mk4
-rw-r--r--x11/xfce4-session/Makefile3
-rw-r--r--x11/xfce4-session/buildlink3.mk3
-rw-r--r--x11/xfce4-settings/Makefile4
-rw-r--r--x11/xfce4-terminal/Makefile3
-rw-r--r--x11/xfce4-utils/Makefile3
-rw-r--r--x11/xglobe/Makefile4
-rw-r--r--x11/xlockmore/Makefile3
-rw-r--r--x11/xmms-osd/Makefile4
-rw-r--r--x11/xpad/Makefile4
-rw-r--r--x11/xplanet/Makefile4
-rw-r--r--x11/xscreensaver-demo/Makefile3
-rw-r--r--x11/xteddy2/Makefile4
-rw-r--r--x11/xvidcap-gtk2/Makefile4
-rw-r--r--x11/xvidcap/Makefile4
-rw-r--r--x11/zenity/Makefile3
1673 files changed, 4451 insertions, 2920 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 90f9a9bca59..3f6be2ba7e1 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.100 2010/02/11 17:50:40 drochner Exp $
+# $NetBSD: Makefile,v 1.101 2010/06/13 22:43:46 wiz Exp $
#
DISTNAME= file-roller-2.28.2
+PKGREVISION= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/albumplayer/Makefile b/audio/albumplayer/Makefile
index 5bbc67901cd..a3fadcb51d2 100644
--- a/audio/albumplayer/Makefile
+++ b/audio/albumplayer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/09/09 16:54:13 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:47 wiz Exp $
#
DISTNAME= albumplayer_0.3.orig
PKGNAME= albumplayer-0.3
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://rvb.mytanet.de/debian/
@@ -11,7 +12,7 @@ HOMEPAGE= http://rvb.mytanet.de/
COMMENT= FLAC album player
LICENSE= original-bsd
-WRKSRC= ${WRKDIR}/${PKGNAME}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
diff --git a/audio/amarok-kde3/Makefile b/audio/amarok-kde3/Makefile
index 1eb4ccfbb28..6cd34e412ab 100644
--- a/audio/amarok-kde3/Makefile
+++ b/audio/amarok-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 09:02:57 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:43:47 wiz Exp $
DISTNAME= amarok-${VERSION}
VERSION= 1.4.10
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE:=amarok/${VERSION}/src/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 2f17b7c1457..20aecdb6f31 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2010/04/16 13:49:29 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/13 22:43:47 wiz Exp $
#
DISTNAME= amarok-${VERS}
VERS= 2.3.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio multimedia
#MASTER_SITES= http://download.kde.org/unstable/amarok/${VERS}/src/ \
# ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 29eb3ebb153..f782fe919d1 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:47 wiz Exp $
#
DISTNAME= ario-1.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ario-player/1.3/}
diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile
index 79d99df2c84..e8bf2e45d84 100644
--- a/audio/audacious-plugins/Makefile
+++ b/audio/audacious-plugins/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:47 wiz Exp $
#
DISTNAME= audacious-plugins-1.5.1
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://distfiles.atheme.org/
EXTRACT_SUFX= .tgz
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 9f878fe4115..82ff4e94cc6 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/29 13:15:23 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:47 wiz Exp $
#
DISTNAME= audacious-1.5.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://distfiles.atheme.org/
EXTRACT_SUFX= .tbz2
diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk
index 6b6cdfbfd6d..18177d9aa4f 100644
--- a/audio/audacious/buildlink3.mk
+++ b/audio/audacious/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:43:47 wiz Exp $
BUILDLINK_TREE+= audacious
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= audacious
AUDACIOUS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.audacious+= audacious>=1.5.0
-BUILDLINK_ABI_DEPENDS.audacious?= audacious>=1.5.1nb1
+BUILDLINK_ABI_DEPENDS.audacious?= audacious>=1.5.1nb2
BUILDLINK_PKGSRCDIR.audacious?= ../../audio/audacious
BUILDLINK_DEPMETHOD.audacious?= build
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index d686025083e..fbdbd6fe116 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2010/01/18 09:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:43:47 wiz Exp $
DISTNAME= audacity-src-1.2.6
-PKGREVISION= 5
+PKGREVISION= 6
PKGNAME= ${DISTNAME:S/-src-/-/}
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
diff --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile
index 38051a9c5dc..2954c658258 100644
--- a/audio/aumix-gtk/Makefile
+++ b/audio/aumix-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:08 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:47 wiz Exp $
.include "../../audio/aumix/Makefile.common"
PKGNAME= ${DISTNAME:S/aumix/aumix-gtk/}
-PKGREVISION= 4
+PKGREVISION= 5
COMMENT+= (ncurses and GTK+ 2.0 interfaces)
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index a40805e3bb9..55ce2b17709 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 16:04:50 kefren Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:43:48 wiz Exp $
#
DISTNAME= flac-1.1.3
PKGNAME= bmp-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/}
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index f93118e6cb6..2bf224189bc 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:57:08 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:48 wiz Exp $
#
DISTNAME= bmp-mac-0.1.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://bsd.cenkes.org/myports/
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index b05f7d16e40..2149d734d20 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:08 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:43:48 wiz Exp $
#
DISTNAME= bmp-musepack-1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://files.musepack.net/linux/plugins/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/bmp-pulse/Makefile b/audio/bmp-pulse/Makefile
index 6b2ffeb304b..cc18101e1ee 100644
--- a/audio/bmp-pulse/Makefile
+++ b/audio/bmp-pulse/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:08 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:43:48 wiz Exp $
#
DISTNAME= xmms-pulse-0.9.4
PKGNAME= ${DISTNAME:S/xmms/bmp/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/xmms-pulse/
diff --git a/audio/bmp-scrobbler/Makefile b/audio/bmp-scrobbler/Makefile
index fb7d57d7d2c..c9541f9ff37 100644
--- a/audio/bmp-scrobbler/Makefile
+++ b/audio/bmp-scrobbler/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:43:48 wiz Exp $
DISTNAME= xmms-scrobbler-0.4.0
PKGNAME= ${DISTNAME:S/xmms/bmp/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://armish.linux-sevenler.org/downloads/pub/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index efeb69a2852..1d0e556c8f7 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2009/08/26 20:20:32 sno Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:43:47 wiz Exp $
#
BMP_ENABLE_ENCODERS= yes
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-
-PKGREVISION= 6
+PKGREVISION= 7
DEPENDS+= unzip-[0-9]*:../../archivers/unzip
diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk
index 369ec0d4ec2..41098428eab 100644
--- a/audio/bmp/buildlink3.mk
+++ b/audio/bmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:43:47 wiz Exp $
BUILDLINK_TREE+= bmp
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= bmp
BMP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.bmp+= bmp>=0.9.7rc2nb3
-BUILDLINK_ABI_DEPENDS.bmp?= bmp>=0.9.7.1nb6
+BUILDLINK_ABI_DEPENDS.bmp?= bmp>=0.9.7.1nb7
BUILDLINK_PKGSRCDIR.bmp?= ../../audio/bmp
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index 3252bdba3c9..0cff7b81123 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2010/05/15 07:03:29 adam Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:43:48 wiz Exp $
DISTNAME= bmpx-0.40.14
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://files.backtrace.info/releases/0.40/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/bsl/Makefile b/audio/bsl/Makefile
index 680483cde8f..2290bde79a3 100644
--- a/audio/bsl/Makefile
+++ b/audio/bsl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/09/10 20:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:43:48 wiz Exp $
#
DISTNAME= bsl-0.5.0
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=buzztard/}
diff --git a/audio/buzztard/Makefile b/audio/buzztard/Makefile
index c5d2d424536..7d323eac814 100644
--- a/audio/buzztard/Makefile
+++ b/audio/buzztard/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/09/10 20:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:43:48 wiz Exp $
#
DISTNAME= buzztard-0.5.0
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=buzztard/}
diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile
index 837c1be6d04..be0cc835316 100644
--- a/audio/csound5/Makefile
+++ b/audio/csound5/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/02/10 19:17:32 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:43:48 wiz Exp $
#
DISTNAME= Csound${CSOUND_VERSION}_src
PKGNAME= csound5-${CSOUND_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=csound/}
WRKSRC= ${WRKDIR}/Csound${CSOUND_VERSION}
diff --git a/audio/easytag-current/Makefile b/audio/easytag-current/Makefile
index 7b04f6f336f..4ce1c1bc7fc 100644
--- a/audio/easytag-current/Makefile
+++ b/audio/easytag-current/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:09 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:49 wiz Exp $
#
DISTNAME= easytag-2.1.6
+PKGREVISION= 3
CATEGORIES= audio
-PKGREVISION= 2
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=easytag/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 4880534b28f..46affc29c1f 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2009/08/26 19:57:09 sno Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:43:48 wiz Exp $
#
DISTNAME= easytag-2.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=easytag/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index f4cab80fec4..6b02cc59a5a 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/02/10 19:17:32 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:43:49 wiz Exp $
#
DISTNAME= exaile_0.2.14
PKGNAME= exaile-0.2.14
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= audio
MASTER_SITES= http://www.exaile.org/files/
diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile
index 35bb0d96049..ba7b05f674b 100644
--- a/audio/gbemol/Makefile
+++ b/audio/gbemol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:49 wiz Exp $
#
DISTNAME= gbemol-0.3.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gbemol/}
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 392760446fb..03ff67e219c 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:43:49 wiz Exp $
#
DISTNAME= gimmix-0.5.7.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.berlios.de/gimmix/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 1d5c4fe196b..38de26184b1 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/02/01 01:10:28 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:43:49 wiz Exp $
DISTNAME= gkrellm-volume-2.1.13
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 653f7a6417c..21c78fef797 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2010/02/01 01:13:28 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:43:49 wiz Exp $
#
DISTNAME= gkrellmms-2.1.20
PKGNAME= ${DISTNAME:S/mms/m-xmms/}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index e49422c7b88..95655f59ea5 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:09 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:49 wiz Exp $
#
DISTNAME= glurp-0.11.6
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=glurp/}
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index 4dc11f6dc87..85282b579a9 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2009/08/26 19:57:09 sno Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:43:49 wiz Exp $
DISTNAME= mp3info-0.8.5a
PKGNAME= g${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/ \
${MASTER_SITE_SUNSITE:=apps/sound/mp3-utils/mp3info/}
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 2ebb1d8ce9f..eacf7aa14c5 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:43:49 wiz Exp $
#
DISTNAME= gmpc-0.19.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/0.19.1/ \
${MASTER_SITE_SOURCEFORGE:=musicpd/}
diff --git a/audio/gmpc/buildlink3.mk b/audio/gmpc/buildlink3.mk
index b19cb3f7c75..b42e54fedf7 100644
--- a/audio/gmpc/buildlink3.mk
+++ b/audio/gmpc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/10/20 20:26:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:43:49 wiz Exp $
BUILDLINK_TREE+= gmpc
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= gmpc
GMPC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gmpc+= gmpc>=0.19.1
+BUILDLINK_ABI_DEPENDS.gmpc?= gmpc>=0.19.1nb2
BUILDLINK_PKGSRCDIR.gmpc?= ../../audio/gmpc
BUILDLINK_DEPMETHOD.gmpc?= build
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 7e35273f12b..fd9f9e6b42a 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2009/12/03 16:26:47 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:43:50 wiz Exp $
DISTNAME= gqmpeg-0.91.1
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 1d349d260a5..ffbd6986bd9 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2010/06/13 22:43:49 wiz Exp $
DISTNAME= gqmpeg-0.20.0
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index 3522207344e..2e15a24f67d 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:57:10 sno Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:43:50 wiz Exp $
#
DISTNAME= gtick-0.3.10
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.antcom.de/gtick/download/
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 31f532bbccf..a3c78487e1f 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/02/10 19:17:32 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:43:50 wiz Exp $
#
DISTNAME= gtkpod-0.99.14
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 700906004cc..4d857edfee4 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/30 18:05:58 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:43:50 wiz Exp $
DISTNAME= hydrogen-0.8.0
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 0d9e6920bdb..6f85302097c 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:43:50 wiz Exp $
#
DISTNAME= jack-rack-1.4.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jack-rack/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 93bb4c72618..d7842a74e6e 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:43:50 wiz Exp $
#
DISTNAME= kid3-1.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= kde audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kid3/}
diff --git a/audio/kmp/Makefile b/audio/kmp/Makefile
index 1a0b364b437..cea95d79b66 100644
--- a/audio/kmp/Makefile
+++ b/audio/kmp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:43:50 wiz Exp $
DISTNAME= kmp-0.01
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://mercury.chem.pitt.edu/~shank/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index c042d9f16d0..e5ecc5c0991 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/05/23 11:19:27 obache Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:43:50 wiz Exp $
#
DISTNAME= libcanberra-0.22
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
diff --git a/audio/libcanberra/buildlink3.mk b/audio/libcanberra/buildlink3.mk
index 1cb30e082b3..4002b0fda95 100644
--- a/audio/libcanberra/buildlink3.mk
+++ b/audio/libcanberra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/12/15 21:30:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:43:50 wiz Exp $
BUILDLINK_TREE+= libcanberra
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libcanberra
LIBCANBERRA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libcanberra+= libcanberra>=0.10
-BUILDLINK_ABI_DEPENDS.libcanberra?= libcanberra>=0.22nb1
+BUILDLINK_ABI_DEPENDS.libcanberra?= libcanberra>=0.22nb2
BUILDLINK_PKGSRCDIR.libcanberra?= ../../audio/libcanberra
#.include "../../multimedia/gstreamer0.10/buildlink3.mk"
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 44c88d5e3a3..1777e53d7d2 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/11/27 10:54:21 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:43:50 wiz Exp $
DISTNAME= libgpod-0.7.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
diff --git a/audio/libgpod/buildlink3.mk b/audio/libgpod/buildlink3.mk
index 6b5d4585e3b..8a7e6294f77 100644
--- a/audio/libgpod/buildlink3.mk
+++ b/audio/libgpod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:43:50 wiz Exp $
BUILDLINK_TREE+= libgpod
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgpod
LIBGPOD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.3.2
-BUILDLINK_ABI_DEPENDS.libgpod?= libgpod>=0.7.0nb1
+BUILDLINK_ABI_DEPENDS.libgpod?= libgpod>=0.7.0nb2
BUILDLINK_PKGSRCDIR.libgpod?= ../../audio/libgpod
.include "../../devel/glib2/buildlink3.mk"
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index b7c68b9ed3b..f7fd305ffd7 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/05/11 12:14:43 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:43:50 wiz Exp $
#
DISTNAME= liblastfm-0.3.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio net
MASTER_SITES= http://cdn.last.fm/src/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/liblastfm/buildlink3.mk b/audio/liblastfm/buildlink3.mk
index 3b75a958d0e..7c202bbafa0 100644
--- a/audio/liblastfm/buildlink3.mk
+++ b/audio/liblastfm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/02/15 15:51:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:43:51 wiz Exp $
BUILDLINK_TREE+= liblastfm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= liblastfm
LIBLASTFM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.liblastfm+= liblastfm>=0.3.0
-BUILDLINK_ABI_DEPENDS.liblastfm?= liblastfm>=0.3.0nb1
+BUILDLINK_ABI_DEPENDS.liblastfm?= liblastfm>=0.3.0nb3
BUILDLINK_PKGSRCDIR.liblastfm?= ../../audio/liblastfm
.include "../../audio/libsamplerate/buildlink3.mk"
diff --git a/audio/libvisual-bmp/Makefile b/audio/libvisual-bmp/Makefile
index f8a6698e142..e91f545a7b7 100644
--- a/audio/libvisual-bmp/Makefile
+++ b/audio/libvisual-bmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:57:10 sno Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:43:51 wiz Exp $
#
DISTNAME= libvisual-bmp-0.2.0
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
diff --git a/audio/libvisual-plugins/Makefile b/audio/libvisual-plugins/Makefile
index 350713a0252..15ca02014b7 100644
--- a/audio/libvisual-plugins/Makefile
+++ b/audio/libvisual-plugins/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/08/26 19:57:10 sno Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:43:51 wiz Exp $
#
DISTNAME= libvisual-plugins-0.4.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= audio graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
diff --git a/audio/libvisual0.2-plugins/Makefile b/audio/libvisual0.2-plugins/Makefile
index 3716eb1af75..b64356437fc 100644
--- a/audio/libvisual0.2-plugins/Makefile
+++ b/audio/libvisual0.2-plugins/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/02/01 00:52:10 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:51 wiz Exp $
#
DISTNAME= libvisual-plugins-0.2.0
PKGNAME= libvisual0.2-plugins-0.2.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvisual/}
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 032be84926c..de3e8d7ea6c 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:43:51 wiz Exp $
DISTNAME= liteamp-0.2.4.2
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= audio
MASTER_SITES= http://kldp.net/frs/download.php/1153/
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index ef56060b88e..a96e23cf0f0 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:43:51 wiz Exp $
#
DISTNAME= lmms-0.2.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lmms/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index 9d018da9b56..d7ddce7dab0 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/02/10 19:17:32 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:43:51 wiz Exp $
DISTNAME= madman-0.93
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=madman/}
diff --git a/audio/mp3diags/Makefile b/audio/mp3diags/Makefile
index c8e663a1712..1f067b6a14d 100644
--- a/audio/mp3diags/Makefile
+++ b/audio/mp3diags/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/05/15 08:51:30 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:43:51 wiz Exp $
DISTNAME= MP3Diags-1.0.05.050
PKGNAME= ${DISTNAME:S/MP3D/mp3d/}
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3diags/}
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 24bc9d31140..7fbdff49eae 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2010/02/01 01:25:29 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:43:52 wiz Exp $
#
DISTNAME= MuSE-0.9
PKGNAME= ${DISTNAME:S/MuSE/muse/}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= audio
MASTER_SITES= ftp://ftp.dyne.org/muse/releases/ \
http://www.ljudmila.org/~jaromil/mirror/muse/releases/
diff --git a/audio/padevchooser/Makefile b/audio/padevchooser/Makefile
index 15f3829d9a4..57e453b4d1a 100644
--- a/audio/padevchooser/Makefile
+++ b/audio/padevchooser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:11 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:52 wiz Exp $
#
DISTNAME= padevchooser-0.9.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/padevchooser/
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index 83a38e35867..0998aa0b254 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:11 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:52 wiz Exp $
#
DISTNAME= paman-0.9.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/paman/
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index 2c4748a23de..8bc7350920b 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:11 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:43:52 wiz Exp $
#
DISTNAME= paprefs-0.9.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/paprefs/
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index 16b4cb6e30f..2aec7f0fd9b 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/12/15 21:30:53 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:52 wiz Exp $
#
DISTNAME= pavucontrol-0.9.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/pavucontrol/
diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile
index 6468ccde5bd..8704b4eb57f 100644
--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/12/15 21:30:53 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:43:52 wiz Exp $
#
DISTNAME= pavumeter-0.9.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/pavumeter/
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 36a65d8650b..f6ea32ebe2c 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2010/02/10 11:37:21 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:52 wiz Exp $
#
DISTNAME= pykaraoke-0.7.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pykaraoke/}
EXTRACT_SUFX= .zip
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index ecaea10992a..0f7e7e10758 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2009/08/26 19:57:12 sno Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:43:52 wiz Exp $
#
DISTNAME= pymusique-0.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= audio
MASTER_SITES= http://www.pyronecrophilia.com/content/pymusique/
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 0f36660b4fa..9109d7a7219 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:52 wiz Exp $
#
DISTNAME= qjackctl-0.3.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qjackctl/}
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 3acc0c3d144..73f51167285 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:52 wiz Exp $
DISTNAME= qsynth-0.2.4
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qsynth/}
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 1010f4fe20a..4b3ef48421b 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2010/05/20 21:15:54 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= rhythmbox-0.12.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/rhythmbox/0.12/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/sfxr/Makefile b/audio/sfxr/Makefile
index 1989002b86e..3dd4b5de0e1 100644
--- a/audio/sfxr/Makefile
+++ b/audio/sfxr/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/03 22:29:34 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= sfxr-sdl-1.1
PKGNAME= ${DISTNAME:S/-sdl//}
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.drpetter.se/files/
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index b1e8b662a43..06f11eb1b04 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= solfege-3.14.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=solfege/}
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 1a18ce3a615..c0054c9c7e5 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:57:12 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= sonata-1.6.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://download.berlios.de/sonata/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 3c98cbee70b..eee5d32807e 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2010/05/18 20:03:04 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= sound-juicer-2.28.2
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.burtonini.com/computing/ \
${MASTER_SITE_GNOME:=sources/sound-juicer/2.28/}
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 9a772817e42..69cf780893a 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2008/03/02 06:10:34 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= SpiralLoops-2.0.0
PKGNAME= spiralloops-2.0.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.pawfal.org/Software/SpiralLoops/dload/
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 9478167ef7a..21864b4f979 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2008/03/02 06:10:34 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= SpiralSynth-2.0.0
PKGNAME= spiralsynth-2.0.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.pawfal.org/Software/SpiralSynth/dload/
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 6f9c1918b3f..0a18ed98f7c 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/17 12:02:05 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= streamtuner-0.99.99
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= audio www
MASTER_SITES= http://savannah.nongnu.org/download/streamtuner/
diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk
index 343c9ee1cc3..11825cbb8f8 100644
--- a/audio/streamtuner/buildlink3.mk
+++ b/audio/streamtuner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/17 12:02:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:43:53 wiz Exp $
BUILDLINK_TREE+= streamtuner
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= streamtuner
STREAMTUNER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.streamtuner+= streamtuner>=0.99
-BUILDLINK_ABI_DEPENDS.streamtuner?= streamtuner>=0.99.99nb9
+BUILDLINK_ABI_DEPENDS.streamtuner?= streamtuner>=0.99.99nb10
BUILDLINK_PKGSRCDIR.streamtuner?= ../../audio/streamtuner
.include "../../www/curl/buildlink3.mk"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 1af8bcf16fd..cdac5518b6c 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2009/08/26 19:57:12 sno Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= sweep-0.9.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sweep/}
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 7ac8737da31..49c7207c2b9 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2010/02/01 01:43:59 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:43:53 wiz Exp $
#
DISTNAME= terminatorX-3.82
PKGNAME= ${DISTNAME:S/X/x/}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://terminatorx.org/dist/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index e23797e0d42..092ea6618e8 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2010/05/19 18:26:39 drochner Exp $
+# $NetBSD: Makefile,v 1.71 2010/06/13 22:43:54 wiz Exp $
DISTNAME= TiMidity++-2.13.2
PKGNAME= ${DISTNAME:S/TiMidity++/timidity/}
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=timidity/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/tunapie/Makefile b/audio/tunapie/Makefile
index 6aeeec454fe..8195ece7a29 100644
--- a/audio/tunapie/Makefile
+++ b/audio/tunapie/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:54 wiz Exp $
#
DISTNAME= tunapie-2.1.6
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tunapie/}
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index c409fca2045..a089062ff52 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2010/02/01 02:00:32 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:43:54 wiz Exp $
DISTNAME= WSoundPrefs-1.1.1
PKGNAME= wsoundprefs-1.1.1
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= audio wm windowmaker
MASTER_SITES= # ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 8c2c5613e09..1ab6dadc97d 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2010/02/01 02:01:59 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:43:54 wiz Exp $
#
DISTNAME= WSoundServer-0.4.0
PKGNAME= wsoundserver-0.4.0
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= audio wm windowmaker
MASTER_SITES= # ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk
index 91dabd0f716..de59e86d410 100644
--- a/audio/wsoundserver/buildlink3.mk
+++ b/audio/wsoundserver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:43:54 wiz Exp $
BUILDLINK_TREE+= wsoundserver
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= wsoundserver
WSOUNDSERVER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb4
-BUILDLINK_ABI_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb11
+BUILDLINK_ABI_DEPENDS.wsoundserver+= wsoundserver>=0.4.0nb12
BUILDLINK_PKGSRCDIR.wsoundserver?= ../../audio/wsoundserver
.include "../../audio/libaudiofile/buildlink3.mk"
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index f683afc02b1..e1608a1bfd3 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:33 reed Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:43:54 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-mixer-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= audio
COMMENT= Xfce mixer plugin
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index c3b5005b07a..bb4b398e846 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:43:54 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 0.5.1
DISTNAME= xfce4-xmms-plugin-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-xmms-plugin/
COMMENT= Xfce XMMS plugin
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index a2659199716..b3e272777e4 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:43:54 wiz Exp $
BUILDLINK_TREE+= xfce4-xmms-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-xmms-plugin
XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+= xfce4-xmms-plugin>=0.5.1
-BUILDLINK_ABI_DEPENDS.xfce4-xmms-plugin?= xfce4-xmms-plugin>=0.5.1nb1
+BUILDLINK_ABI_DEPENDS.xfce4-xmms-plugin?= xfce4-xmms-plugin>=0.5.1nb2
BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?= ../../audio/xfce4-xmms-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 3af8f7d1412..7b587f6d6e7 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:43:54 wiz Exp $
#
DISTNAME= xsidplay-1.6.5.1a
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= audio x11
MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
EXTRACT_SUFX= .tgz
diff --git a/benchmarks/zelibm/Makefile b/benchmarks/zelibm/Makefile
index 25fb9b08d19..bd2eef353a7 100644
--- a/benchmarks/zelibm/Makefile
+++ b/benchmarks/zelibm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2010/03/24 19:43:22 asau Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:54 wiz Exp $
#
DISTNAME= zelibm
PKGNAME= zelibm-0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= benchmarks
MASTER_SITES= http://people.redhat.com/drepper/libm/
diff --git a/biology/py-mol/Makefile b/biology/py-mol/Makefile
index 16507aaeef2..67943139ede 100644
--- a/biology/py-mol/Makefile
+++ b/biology/py-mol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/07/08 15:40:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:54 wiz Exp $
DISTNAME= pymol-0_98-src
PKGNAME= ${PYPKGPREFIX}-mol-0.98
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= biology
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pymol/}
EXTRACT_SUFX= .tgz
@@ -21,6 +21,8 @@ CONFLICTS= pymol-[0-9]*
REPLACE_PYTHON= test/cyg test/run test/show test/win.py
+PYTHON_VERSIONS_ACCEPTED= 25 24
+
INSTALLATION_DIRS= bin
post-install:
diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 234d3460bc5..235e8723b06 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:43:54 wiz Exp $
#
DISTNAME= boolean_6_99
PKGNAME= boolean-6.99
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= cad graphics
MASTER_SITES= http://boolean.klaasholwerda.nl/download/boolzip/
EXTRACT_SUFX= .tgz
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 10572e15d97..d58270338fe 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.63 2010/03/24 19:43:22 asau Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:43:54 wiz Exp $
#
DISTNAME= geda-gaf-${PKGVERSION}
PKGNAME= geda-${PKGVERSION}
PKGVERSION= 1.6.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/release/v1.6/${PKGVERSION}/ \
http://geda.seul.org/release/v1.6/${PKGVERSION}/
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 1101195c83c..1caee376989 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/02/24 03:40:05 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:43:55 wiz Exp $
#
DISTNAME= gerbv-2.4.0
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gerbv/}
diff --git a/cad/gsmc/Makefile b/cad/gsmc/Makefile
index 88d71ada4df..267ca334cad 100644
--- a/cad/gsmc/Makefile
+++ b/cad/gsmc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:57:14 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:55 wiz Exp $
#
DISTNAME= gsmc-1.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= cad
MASTER_SITES= http://www.qsl.net/ik5nax/
diff --git a/cad/gtk2-wcalc/Makefile b/cad/gtk2-wcalc/Makefile
index c734785a71c..1c705ea90cc 100644
--- a/cad/gtk2-wcalc/Makefile
+++ b/cad/gtk2-wcalc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2010/01/28 01:11:27 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:55 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../cad/wcalc/Makefile.common"
PKGNAME= gtk2-${DISTNAME}
-PKGREVISION= 4
+PKGREVISION= 5
COMMENT= GTK2 Based Transmission Line Analysis/Synthesis Calculator
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 17d7e6cd61a..528c82aeaa1 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/31 21:31:21 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:43:55 wiz Exp $
#
DISTNAME= gtkwave-3.3.2
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkwave/}
#MASTER_SITES= http://home.nc.rr.com/gtkwave/
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index ba6681dd0d8..fc6c27eb508 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2009/12/15 21:31:52 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:43:55 wiz Exp $
#
DISTNAME= gwave-20060606
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/dist/ \
http://www.geda.seul.org/dist/
diff --git a/cad/nelma/Makefile b/cad/nelma/Makefile
index c6de54082ff..9854000f7b7 100644
--- a/cad/nelma/Makefile
+++ b/cad/nelma/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/28 19:27:03 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:55 wiz Exp $
#
DISTNAME= nelma-3.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= cad
MASTER_SITES= http://www.tablix.org/~avian/nelma/releases/
diff --git a/cad/nelma/distinfo b/cad/nelma/distinfo
index aec3db94133..59ea714ceb5 100644
--- a/cad/nelma/distinfo
+++ b/cad/nelma/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2010/01/28 19:27:03 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:43:55 wiz Exp $
SHA1 (nelma-3.0.tar.gz) = e08f1b0097ce7a90e535cb1920658780c50aec5c
RMD160 (nelma-3.0.tar.gz) = 68056717d5fe9b8268aeca5d839f974090e305ad
Size (nelma-3.0.tar.gz) = 64078 bytes
SHA1 (patch-aa) = 1ed06b063a0e0766e3a9d597629180aa27de9714
SHA1 (patch-ab) = a1ced09d3ce03ea92d82e8ad4edc51ed1050cfb0
+SHA1 (patch-ac) = 5585eed126e7bd3133cb412aaf191a7c363dcc1c
diff --git a/cad/nelma/patches/patch-ac b/cad/nelma/patches/patch-ac
new file mode 100644
index 00000000000..355ea00208a
--- /dev/null
+++ b/cad/nelma/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.1 2010/06/13 22:43:55 wiz Exp $
+
+--- src/pngutil.c.orig 2006-12-10 15:50:19.000000000 +0000
++++ src/pngutil.c
+@@ -145,7 +145,7 @@ int png_read(struct image **dest, char *
+ {
+ error("Can't allocate memory");
+ fclose(fp);
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return -1;
+ }
+
+@@ -159,7 +159,7 @@ int png_read(struct image **dest, char *
+ error("libpng error");
+ /* Free all of the memory associated with the png_ptr and
+ * info_ptr */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+ /* If we get here, we had a problem reading the file */
+ return -1;
+@@ -185,7 +185,7 @@ int png_read(struct image **dest, char *
+ PNG_TRANSFORM_PACKING |
+ PNG_TRANSFORM_EXPAND;
+
+- png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
++ png_read_png(png_ptr, info_ptr, png_transforms, NULL);
+
+ /* At this point you have read the entire image */
+ img=png_alloc( png_get_image_width(png_ptr, info_ptr),
+@@ -209,7 +209,7 @@ int png_read(struct image **dest, char *
+ *dest=img;
+
+ /* Clean up after the read, and free any memory allocated - REQUIRED */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ /* close the file */
+ fclose(fp);
+@@ -253,7 +253,7 @@ int png_write(struct image *img, char *f
+ if (info_ptr == NULL) {
+ error("Can't allocate memory");
+ fclose(fp);
+- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++ png_destroy_write_struct(&png_ptr, NULL);
+ return -1;
+ }
+
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index dbe0be8444a..daa6177d76c 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2010/01/18 09:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/06/13 22:43:55 wiz Exp $
#
DISTNAME= pcb-20091103
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pcb/}
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index e7f3e881212..eb59bc5c229 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2010/01/18 09:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:43:55 wiz Exp $
#
DISTNAME= qcad-2.0.5.0-1-community.src
@@ -6,7 +6,7 @@ DISTNAME= qcad-2.0.5.0-1-community.src
# (there's a 2.0.4.7 for some platforms), though I don't know about the
# thing after the hyphen, which always seems to be 1. Can I use four digits?
PKGNAME= qcad-2.0.5.0
-PKGREVISION= 2
+PKGREVISION= 3
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index 8fed4911de5..280c11a91b4 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2010/01/18 09:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:43:55 wiz Exp $
#
DISTNAME= transcalc-0.14
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= cad
MASTER_SITES= http://transcalc.sourceforge.net/
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=transcalc/}
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index de4ef1dbdb5..4de9419b4fb 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2010/01/18 09:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:43:56 wiz Exp $
#
DISTNAME= ViPEC-3.2.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vipec/}
diff --git a/chat/amsn/Makefile b/chat/amsn/Makefile
index 8e239909bb1..604f83c6fa0 100644
--- a/chat/amsn/Makefile
+++ b/chat/amsn/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/05/12 21:27:01 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:43:56 wiz Exp $
#
DISTNAME= amsn-0.98.3
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amsn/}
DISTFILES= ${DISTNAME}-src.tar.bz2
diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile
index 8592e224568..e99d4895288 100644
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:56 wiz Exp $
DISTNAME= empathy-2.26.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= chat gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/empathy/2.26/}
diff --git a/chat/empathy/buildlink3.mk b/chat/empathy/buildlink3.mk
index 9246cbfd3a3..9d20ec1a785 100644
--- a/chat/empathy/buildlink3.mk
+++ b/chat/empathy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:43:56 wiz Exp $
BUILDLINK_TREE+= empathy
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= empathy
EMPATHY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.empathy+= empathy>=2.24.1nb1
-BUILDLINK_ABI_DEPENDS.empathy?= empathy>=2.26.2nb1
+BUILDLINK_ABI_DEPENDS.empathy?= empathy>=2.26.2nb6
BUILDLINK_PKGSRCDIR.empathy?= ../../chat/empathy
.include "../../chat/telepathy-mission-control/buildlink3.mk"
diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index 7ab39bffd13..348c2b3c882 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/01/20 14:04:52 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:43:56 wiz Exp $
#
PKGNAME= finch-${PIDGIN_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Multi-protocol Instant Messaging client console frontend
diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index 1e8bb165193..080bcda0b79 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/01/18 09:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:43:56 wiz Exp $
DISTNAME= gg2-2.3.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ggadu/}
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index d56638d1147..374c546625e 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2010/06/13 22:43:56 wiz Exp $
DISTNAME= gnomeicu-0.99.12
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= chat gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index abe87a62cad..4a1f614fe5b 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:43:56 wiz Exp $
#
DISTNAME= gossip-0.10.2
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gossip/0.10/}
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/kadu/Makefile b/chat/kadu/Makefile
index ef3216a298f..12a4a2c15ed 100644
--- a/chat/kadu/Makefile
+++ b/chat/kadu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:43:56 wiz Exp $
DISTNAME= kadu-0.5.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= chat
MASTER_SITES= http://www.kadu.net/download/stable/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/kmess/Makefile b/chat/kmess/Makefile
index d108a439f0c..161df1a622c 100644
--- a/chat/kmess/Makefile
+++ b/chat/kmess/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/01/28 19:57:36 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:43:56 wiz Exp $
#
DISTNAME= kmess-1.4.3
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= chat kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kmess/}
diff --git a/chat/konversation-kde3/Makefile b/chat/konversation-kde3/Makefile
index 8badc1fc130..72adf2fe750 100644
--- a/chat/konversation-kde3/Makefile
+++ b/chat/konversation-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/10 22:23:05 markd Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:43:57 wiz Exp $
#
DISTNAME= konversation-1.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= chat kde
MASTER_SITES= http://download.berlios.de/konversation/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/konversation/Makefile b/chat/konversation/Makefile
index 25c53dc0dba..7a873453751 100644
--- a/chat/konversation/Makefile
+++ b/chat/konversation/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/04/10 22:26:05 markd Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:43:56 wiz Exp $
#
DISTNAME= konversation-1.2.3
+PKGREVISION= 1
CATEGORIES= chat kde
MASTER_SITES= ${MASTER_SITE_KDE:=konversation/1.2.3/src/}
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index a1df651685d..950c2c5f5e4 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/20 14:04:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:43:57 wiz Exp $
BUILDLINK_TREE+= libpurple
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libpurple
LIBPURPLE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libpurple+= libpurple>=2.5.0
-BUILDLINK_ABI_DEPENDS.libpurple?= libpurple>=2.6.2nb1
+BUILDLINK_ABI_DEPENDS.libpurple?= libpurple>=2.6.2nb3
BUILDLINK_PKGSRCDIR.libpurple?= ../../chat/libpurple
pkgbase := libpurple
diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile
index 02a5c2a073f..17f305cfacc 100644
--- a/chat/licq-gui-qt/Makefile
+++ b/chat/licq-gui-qt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:43:57 wiz Exp $
#
DISTNAME= licq-1.3.5
PKGNAME= ${DISTNAME:C/-/-gui-qt-/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=licq/}
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/msn-pecan/Makefile b/chat/msn-pecan/Makefile
index 32ec6c50d24..eeb36d99ff6 100644
--- a/chat/msn-pecan/Makefile
+++ b/chat/msn-pecan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/28 20:11:36 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:57 wiz Exp $
#
DISTNAME= msn-pecan-0.0.18
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= chat
MASTER_SITES= http://msn-pecan.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/pidgin-facebookchat/Makefile b/chat/pidgin-facebookchat/Makefile
index d3427f75c88..de8dc785436 100644
--- a/chat/pidgin-facebookchat/Makefile
+++ b/chat/pidgin-facebookchat/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/01/28 20:18:44 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:57 wiz Exp $
VERSION= 1.27
DISTNAME= pidgin-facebookchat-source-${VERSION}
PKGNAME= pidgin-facebookchat-${VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= chat
MASTER_SITES= http://pidgin-facebookchat.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/pidgin-icb/Makefile b/chat/pidgin-icb/Makefile
index c869b1588a3..5734a90c779 100644
--- a/chat/pidgin-icb/Makefile
+++ b/chat/pidgin-icb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/04/24 09:27:50 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:57 wiz Exp $
DISTNAME= pidgin-icb-20070505
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= chat
MASTER_SITES= http://nic.com.pl/~alek/pidgin-icb/
diff --git a/chat/pidgin-latex/Makefile b/chat/pidgin-latex/Makefile
index eef2fabfbdf..95cee6ec8ec 100644
--- a/chat/pidgin-latex/Makefile
+++ b/chat/pidgin-latex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/01/28 20:19:01 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:57 wiz Exp $
VERSION= 1.2.1
-PKGREVISION= 4
+PKGREVISION= 5
DISTNAME= pidgin-latex-${VERSION}
EXTRACT_SUFX= .tar.bz2
CATEGORIES= chat print
diff --git a/chat/pidgin-libnotify/Makefile b/chat/pidgin-libnotify/Makefile
index 69b397c9abb..e2c3beab092 100644
--- a/chat/pidgin-libnotify/Makefile
+++ b/chat/pidgin-libnotify/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/01/20 14:04:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:43:58 wiz Exp $
#
DISTNAME= pidgin-libnotify-0.14
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim-libnotify/}
diff --git a/chat/pidgin-otr/Makefile b/chat/pidgin-otr/Makefile
index 2cc024ba592..65f9bbd2590 100644
--- a/chat/pidgin-otr/Makefile
+++ b/chat/pidgin-otr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:43:58 wiz Exp $
VERSION= 3.2.0
DISTNAME= pidgin-otr-${VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= chat security
MASTER_SITES= http://www.cypherpunks.ca/otr/
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index 7d7478fe7fe..ae9fe07876d 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:43:58 wiz Exp $
#
PKGNAME= pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Lotus Sametime plugin for the Pidgin instant messenger
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index 9e8dc98aefb..e618366f1f6 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:58 wiz Exp $
#
PKGNAME= pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= SILC plugin for the Pidgin instant messenger
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index df795eca798..ccf0ba2a57c 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2010/01/20 14:04:52 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:43:57 wiz Exp $
#
# XXX appease pkglint
#PKGNAME= pidgin-${PIDGIN_VERSION}
COMMENT= Multi-protocol Instant Messaging client GTK frontend
-PKGREVISION= 2
+PKGREVISION= 3
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/chat/pidgin/buildlink3.mk b/chat/pidgin/buildlink3.mk
index 61ae3af7a18..a23f24f460d 100644
--- a/chat/pidgin/buildlink3.mk
+++ b/chat/pidgin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/20 14:04:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:43:57 wiz Exp $
BUILDLINK_TREE+= pidgin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= pidgin
PIDGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.pidgin+= pidgin>=2.5.1
-BUILDLINK_ABI_DEPENDS.pidgin?= pidgin>=2.6.2nb2
+BUILDLINK_ABI_DEPENDS.pidgin?= pidgin>=2.6.2nb3
BUILDLINK_PKGSRCDIR.pidgin?= ../../chat/pidgin
.include "../../chat/libpurple/buildlink3.mk"
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index b430ebe4665..113799205e4 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2010/06/13 22:43:58 wiz Exp $
PSI_VERSION= 0.12.1
DISTNAME= psi-${PSI_VERSION}
PKGREVISION= # empty
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/telepathy-farsight/Makefile b/chat/telepathy-farsight/Makefile
index 95d7ddfb010..f16fd919842 100644
--- a/chat/telepathy-farsight/Makefile
+++ b/chat/telepathy-farsight/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:58 wiz Exp $
#
DISTNAME= telepathy-farsight-0.0.12
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat multimedia
MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-farsight/
diff --git a/chat/telepathy-farsight/buildlink3.mk b/chat/telepathy-farsight/buildlink3.mk
index 0c4c1c10f51..17d10c29c90 100644
--- a/chat/telepathy-farsight/buildlink3.mk
+++ b/chat/telepathy-farsight/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:43:58 wiz Exp $
BUILDLINK_TREE+= telepathy-farsight
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= telepathy-farsight
TELEPATHY_FARSIGHT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.telepathy-farsight+= telepathy-farsight>=0.0.8
-BUILDLINK_ABI_DEPENDS.telepathy-farsight?= telepathy-farsight>=0.0.12nb1
+BUILDLINK_ABI_DEPENDS.telepathy-farsight?= telepathy-farsight>=0.0.12nb3
BUILDLINK_PKGSRCDIR.telepathy-farsight?= ../../chat/telepathy-farsight
.include "../../chat/telepathy-glib/buildlink3.mk"
diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile
index a00c0d49b38..c681bf59384 100644
--- a/chat/telepathy-gabble/Makefile
+++ b/chat/telepathy-gabble/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:58 wiz Exp $
#
DISTNAME= telepathy-gabble-0.9.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= chat
MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-gabble/
diff --git a/chat/telepathy-mission-control/Makefile b/chat/telepathy-mission-control/Makefile
index dac62370f8d..e63d69b985c 100644
--- a/chat/telepathy-mission-control/Makefile
+++ b/chat/telepathy-mission-control/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:59 wiz Exp $
#
DISTNAME= telepathy-mission-control-4.67
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mission-control/}
diff --git a/chat/telepathy-mission-control/buildlink3.mk b/chat/telepathy-mission-control/buildlink3.mk
index e568829b19e..31aef67fa2d 100644
--- a/chat/telepathy-mission-control/buildlink3.mk
+++ b/chat/telepathy-mission-control/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:43:59 wiz Exp $
BUILDLINK_TREE+= telepathy-mission-control
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= telepathy-mission-control
TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.telepathy-mission-control+= telepathy-mission-control>=4.67
-BUILDLINK_ABI_DEPENDS.telepathy-mission-control?= telepathy-mission-control>=4.67nb2
+BUILDLINK_ABI_DEPENDS.telepathy-mission-control?= telepathy-mission-control>=4.67nb4
BUILDLINK_PKGSRCDIR.telepathy-mission-control?= ../../chat/telepathy-mission-control
.include "../../chat/libtelepathy/buildlink3.mk"
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile
index 68038625e6e..0ca31c4f4c6 100644
--- a/chat/xchat-systray-integration/Makefile
+++ b/chat/xchat-systray-integration/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/01/29 16:09:49 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:43:59 wiz Exp $
DISTNAME= xchat-systray-integration-2.4.5-src
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xchat2-plugins/}
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index c5e33e50b62..4bfd84c2cd7 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.66 2010/06/02 18:24:47 tnn Exp $
+# $NetBSD: Makefile,v 1.67 2010/06/13 22:43:59 wiz Exp $
.include "Makefile.common"
PKGNAME= ${DISTNAME}pl1
-PKGREVISION= 3
+PKGREVISION= 4
OWNER= tron@NetBSD.org
COMMENT= X11 (X Window System) IRC client, using the GTK2 toolkit
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 38558941fab..f095e636dca 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2010/06/10 06:44:00 adam Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:43:59 wiz Exp $
DISTNAME= efax-gtk-3.2.3.src
PKGNAME= efax-gtk-3.2.3
+PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=efax-gtk/}
EXTRACT_SUFX= .tgz
diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index 31e5f86a368..05b186d1803 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:43:59 wiz Exp $
#
DISTNAME= gnome-pilot-2.0.17
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-pilot/2.0/}
diff --git a/comms/gnome-pilot/buildlink3.mk b/comms/gnome-pilot/buildlink3.mk
index 8edebcbacc2..918e85bf5e9 100644
--- a/comms/gnome-pilot/buildlink3.mk
+++ b/comms/gnome-pilot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2010/06/13 22:43:59 wiz Exp $
BUILDLINK_TREE+= gnome-pilot
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-pilot
GNOME_PILOT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.12nb2
-BUILDLINK_ABI_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.17nb3
+BUILDLINK_ABI_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.17nb4
BUILDLINK_PKGSRCDIR.gnome-pilot?= ../../comms/gnome-pilot
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 1e9d9701dfb..b53c80ed0ee 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2009/08/26 19:57:17 sno Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:43:59 wiz Exp $
DISTNAME= jpilot-syncmal-0.80
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= comms
MASTER_SITES= http://jasonday.home.att.net/code/syncmal/
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 34515ad8e50..58b3dd53287 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2010/04/06 06:41:20 sbd Exp $
+# $NetBSD: Makefile,v 1.71 2010/06/13 22:43:59 wiz Exp $
#
DISTNAME= jpilot-1.6.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= comms
MASTER_SITES= http://www.jpilot.org/older/
diff --git a/comms/jpilot/buildlink3.mk b/comms/jpilot/buildlink3.mk
index e8d84c01b10..18436416bdc 100644
--- a/comms/jpilot/buildlink3.mk
+++ b/comms/jpilot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:43:59 wiz Exp $
BUILDLINK_TREE+= jpilot
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= jpilot
JPILOT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.jpilot+= jpilot>=1.6.0
-BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=1.6.0nb2
+BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=1.6.0nb5
BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot
.include "../../comms/pilot-link-libs/buildlink3.mk"
diff --git a/comms/libopensync-plugin-evolution2/Makefile b/comms/libopensync-plugin-evolution2/Makefile
index 2cdb0467772..7668e15b731 100644
--- a/comms/libopensync-plugin-evolution2/Makefile
+++ b/comms/libopensync-plugin-evolution2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/01/29 16:33:30 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:59 wiz Exp $
#
DISTNAME= libopensync-plugin-evolution2-0.22
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/download/releases/0.22/
EXTRACT_SUFX= .tar.bz2
diff --git a/comms/libopensync-plugin-kdepim/Makefile b/comms/libopensync-plugin-kdepim/Makefile
index 44bf84e0974..aee0d4f1ad3 100644
--- a/comms/libopensync-plugin-kdepim/Makefile
+++ b/comms/libopensync-plugin-kdepim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:58:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:59 wiz Exp $
#
DISTNAME= libopensync-plugin-kdepim-0.22
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/download/releases/0.22/
EXTRACT_SUFX= .tar.bz2
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 63a46eb81b3..c6736fb3800 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2010/01/18 09:58:42 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2010/06/13 22:43:59 wiz Exp $
DISTNAME= mgetty1.1.36-Jun15
PKGNAME= mgetty-1.1.36
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= comms
MASTER_SITES= ftp://alpha.greenie.net/pub/mgetty/source/1.1/
diff --git a/comms/multisync-gui/Makefile b/comms/multisync-gui/Makefile
index db398553af8..7df34ed858c 100644
--- a/comms/multisync-gui/Makefile
+++ b/comms/multisync-gui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:00 wiz Exp $
#
DISTNAME= multisync-gui-0.91.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/raw-attachment/wiki/releases/0.2x/download/
diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index bb4ed4ef212..625b6ed3b13 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/08/09 08:36:34 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:44:00 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../comms/pilot-link/Makefile.common"
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
COMMENT= Perl bindings for pilot-link
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index f5325733677..cf2bd317924 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.50 2009/08/09 08:36:34 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:44:00 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../comms/pilot-link/Makefile.common"
+PKGREVISION= 1
COMMENT= Tools to talk to the 3Com Pilot PDA
BUILDLINK_API_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS}
diff --git a/converters/qrencode/Makefile b/converters/qrencode/Makefile
index 8adf123484a..b11572c175b 100644
--- a/converters/qrencode/Makefile
+++ b/converters/qrencode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/10/22 02:35:45 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:00 wiz Exp $
#
DISTNAME= qrencode-3.0.3
+PKGREVISION= 1
CATEGORIES= converters
MASTER_SITES= http://megaui.net/fukuchi/works/qrencode/
diff --git a/converters/qrencode/distinfo b/converters/qrencode/distinfo
index 0fde84c9376..7d6ff731d33 100644
--- a/converters/qrencode/distinfo
+++ b/converters/qrencode/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2008/06/15 10:33:38 gavan Exp $
+$NetBSD: distinfo,v 1.2 2010/06/13 22:44:00 wiz Exp $
SHA1 (qrencode-3.0.3.tar.gz) = 818924a8b648ddee3cd2df556455a3d468ab87c5
RMD160 (qrencode-3.0.3.tar.gz) = 7e94883cdc8434e1511eef319af01d9733e8960a
Size (qrencode-3.0.3.tar.gz) = 399547 bytes
+SHA1 (patch-aa) = e4241ea1c7443f9dd748e4df0e8aa1777b734c72
diff --git a/converters/qrencode/patches/patch-aa b/converters/qrencode/patches/patch-aa
new file mode 100644
index 00000000000..1d3d3defedb
--- /dev/null
+++ b/converters/qrencode/patches/patch-aa
@@ -0,0 +1,63 @@
+$NetBSD: patch-aa,v 1.1 2010/06/13 22:44:00 wiz Exp $
+
+--- configure.orig 2008-05-26 18:01:17.000000000 +0000
++++ configure
+@@ -21145,12 +21145,12 @@ if test -n "$PKG_CONFIG"; then
+ pkg_cv_png_CFLAGS="$png_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\"") >&5
+- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\"") >&5
++ ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null`
++ pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng"" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -21163,12 +21163,12 @@ if test -n "$PKG_CONFIG"; then
+ pkg_cv_png_LIBS="$png_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\"") >&5
+- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\"") >&5
++ ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null`
++ pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng"" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -21187,14 +21187,14 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""`
++ png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng""`
+ else
+- png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""`
++ png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng""`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$png_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements (\"libpng12\") were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (\"libpng\") were not met:
+
+ $png_PKG_ERRORS
+
+@@ -21205,7 +21205,7 @@ Alternatively, you may set the environme
+ and png_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (\"libpng12\") were not met:
++echo "$as_me: error: Package requirements (\"libpng\") were not met:
+
+ $png_PKG_ERRORS
+
diff --git a/converters/tex2rtf/Makefile b/converters/tex2rtf/Makefile
index c388c7e9f4e..e01395fb9f6 100644
--- a/converters/tex2rtf/Makefile
+++ b/converters/tex2rtf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:58:42 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:00 wiz Exp $
DISTNAME= tex2rtf-2.01-source
PKGNAME= tex2rtf-2.01
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= converters textproc
MASTER_SITES= ftp://biolpc22.york.ac.uk/pub/tex2rtf/
EXTRACT_SUFX= .tar.bz2
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index e24a7d5f634..c9ec05cdcb5 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2010/01/18 09:58:42 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2010/06/13 22:44:00 wiz Exp $
DISTNAME= wv-1.2.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= converters
MASTER_SITES= http://www.abiword.com/downloads/wv/1.2.5/
diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk
index 1a763c40552..53efe39809f 100644
--- a/converters/wv/buildlink3.mk
+++ b/converters/wv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:58:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:00 wiz Exp $
BUILDLINK_TREE+= wv
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= wv
WV_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.wv+= wv>=1.0.0
-BUILDLINK_ABI_DEPENDS.wv+= wv>=1.2.5nb2
+BUILDLINK_ABI_DEPENDS.wv+= wv>=1.2.5nb3
BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/databases/gourmet/Makefile b/databases/gourmet/Makefile
index 45106bf99f0..3995b6961e0 100644
--- a/databases/gourmet/Makefile
+++ b/databases/gourmet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:00 wiz Exp $
#
DISTNAME= gourmet-0.8.5.14
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=grecipe-manager/}
diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index c8ad7009afe..25844d4bce5 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2010/01/17 12:02:08 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:00 wiz Exp $
DISTNAME= gq-1.2.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= databases net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqclient/}
diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index eadff819c88..f58db31f302 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:44:00 wiz Exp $
#
DISTNAME= gramps-1.0.11
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/}
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 6b184e52547..876391fde44 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2010/01/18 09:58:42 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2010/06/13 22:44:00 wiz Exp $
#
DISTNAME= gramps-2.2.10
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/}
diff --git a/databases/gramps3/Makefile b/databases/gramps3/Makefile
index af03e4291f6..2dbf12ae00d 100644
--- a/databases/gramps3/Makefile
+++ b/databases/gramps3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/05/18 16:38:53 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:01 wiz Exp $
#
DISTNAME= gramps-3.2.3
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/}
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 8c76ce92b70..8514deda44c 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2010/01/29 17:14:07 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2010/06/13 22:44:01 wiz Exp $
DISTNAME= kmysqladmin-0.7.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= databases kde
MASTER_SITES= http://www.alwins-world.de/programs/download/kmysqladmin/
diff --git a/databases/krecipes/Makefile b/databases/krecipes/Makefile
index a1c139a8bf7..4e37374399e 100644
--- a/databases/krecipes/Makefile
+++ b/databases/krecipes/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/01/29 17:16:49 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:01 wiz Exp $
#
DISTNAME= krecipes-1.0-beta1
PKGNAME= krecipes-1.0beta1
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= databases kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=krecipes/}
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 818cfa64b06..26a88d2c2d2 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2010/01/18 09:58:42 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:44:01 wiz Exp $
#
DISTNAME= libgnomedb-3.0.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomedb/3.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
index 3de1fd50efc..79893e76e67 100644
--- a/databases/libgnomedb/buildlink3.mk
+++ b/databases/libgnomedb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2010/01/18 09:58:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2010/06/13 22:44:01 wiz Exp $
BUILDLINK_TREE+= libgnomedb
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomedb
LIBGNOMEDB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnomedb+= libgnomedb>=2.99.2
-BUILDLINK_ABI_DEPENDS.libgnomedb+= libgnomedb>=3.0.0nb6
+BUILDLINK_ABI_DEPENDS.libgnomedb+= libgnomedb>=3.0.0nb7
BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb
.include "../../databases/libgda/buildlink3.mk"
diff --git a/databases/luma/Makefile b/databases/luma/Makefile
index 4097748282e..c09f8dacb1e 100644
--- a/databases/luma/Makefile
+++ b/databases/luma/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:01 wiz Exp $
DISTNAME= luma-2.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=luma/}
EXTRACT_SUFX= .tar.bz2
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 94510ee0327..5ead6a62e3b 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2010/01/18 09:58:43 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:44:01 wiz Exp $
#
DISTNAME= mergeant-0.66
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/mergeant/0.66/}
EXTRACT_SUFX= .tar.bz2
diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile
index 5c4970f418e..84e7aa421d9 100644
--- a/databases/mysqlcc/Makefile
+++ b/databases/mysqlcc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2010/03/05 13:50:03 taca Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:01 wiz Exp $
#
DISTNAME= mysqlcc-0.9.8-src
PKGNAME= ${DISTNAME:S/-src//}
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mysqlcc/}
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index 613fb8a6d52..ba05f5352be 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/15 05:52:32 pettai Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:01 wiz Exp $
DISTNAME= RRD-Simple-1.44
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= perl5 databases
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/N/NI/NICOLAW/}
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index c544f9ec010..c0911a6c1b1 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/05/20 13:27:20 adam Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:01 wiz Exp $
.include "../../databases/postgresql84/Makefile.mirrors"
DISTNAME= pgadmin3-1.10.3
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${PGSQL_MIRRORS:=pgadmin3/release/v1.10.3/src/}
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 3f3e6a55ce2..fa431cb9b78 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2010/03/13 16:41:21 spz Exp $
+# $NetBSD: Makefile,v 1.82 2010/06/13 22:44:01 wiz Exp $
DISTNAME= rrdtool-1.3.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases graphics net
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index 60393f79a94..ac7f3ff3a8d 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2009/10/29 12:43:49 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2010/06/13 22:44:01 wiz Exp $
BUILDLINK_TREE+= rrdtool
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= rrdtool
RRDTOOL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.rrdtool+= rrdtool>=1.3.9
+BUILDLINK_ABI_DEPENDS.rrdtool?= rrdtool>=1.3.9nb2
BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index 4723094ad30..f127456a004 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2009/05/12 12:27:19 martti Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:02 wiz Exp $
DISTNAME= rrdtool-1.2.30
+PKGREVISION= 1
CATEGORIES= databases graphics net
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
diff --git a/databases/rrdtool12/buildlink3.mk b/databases/rrdtool12/buildlink3.mk
index a4c3cd818f0..ce75e40be13 100644
--- a/databases/rrdtool12/buildlink3.mk
+++ b/databases/rrdtool12/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:07 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:02 wiz Exp $
BUILDLINK_TREE+= rrdtool
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= rrdtool
RRDTOOL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.rrdtool+= rrdtool>=1.2.29
+BUILDLINK_ABI_DEPENDS.rrdtool?= rrdtool>=1.2.30nb1
BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
index 8766ef13197..30c6c445d13 100644
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:58:43 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:02 wiz Exp $
DISTNAME= sqlitebrowser-1.3-src
PKGNAME= sqlitebrowser-1.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= databases x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sqlitebrowser/}
diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index 66d53d0974c..7eefbda740e 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2009/04/26 10:08:49 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:02 wiz Exp $
#
DISTNAME= ArX-2.2.4
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= devel scm
MASTER_SITES= http://savannah.nongnu.org/download/arx/
diff --git a/devel/GConf-ui/Makefile b/devel/GConf-ui/Makefile
index 53d51f4dc92..731c991c025 100644
--- a/devel/GConf-ui/Makefile
+++ b/devel/GConf-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/11/02 17:28:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:02 wiz Exp $
#
MAKE_JOBS_SAFE= no
@@ -6,6 +6,7 @@ MAKE_JOBS_SAFE= no
.include "../../devel/GConf/Makefile.common"
PKGNAME= ${DISTNAME:S/GConf/GConf-ui/}
+PKGREVISION= 1
BUILDLINK_API_DEPENDS.GConf+= GConf>=${GCONF_VERSION}
diff --git a/devel/GConf-ui/buildlink3.mk b/devel/GConf-ui/buildlink3.mk
index f085125a112..6039962164d 100644
--- a/devel/GConf-ui/buildlink3.mk
+++ b/devel/GConf-ui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:02 wiz Exp $
BUILDLINK_TREE+= GConf-ui
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= GConf-ui
GCONF_UI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.GConf-ui+= GConf-ui>=2.8.0.1
-BUILDLINK_ABI_DEPENDS.GConf-ui?= GConf-ui>=2.26.2
+BUILDLINK_ABI_DEPENDS.GConf-ui?= GConf-ui>=2.28.0nb1
BUILDLINK_PKGSRCDIR.GConf-ui?= ../../devel/GConf-ui
.include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/SDL_Pango/Makefile b/devel/SDL_Pango/Makefile
index 0d888864855..75bb68a6134 100644
--- a/devel/SDL_Pango/Makefile
+++ b/devel/SDL_Pango/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/08/08 06:44:53 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:02 wiz Exp $
#
DISTNAME= SDL_Pango-0.1.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sdlpango/}
diff --git a/devel/SDL_Pango/buildlink3.mk b/devel/SDL_Pango/buildlink3.mk
index 912732e3ea1..82ac9449d71 100644
--- a/devel/SDL_Pango/buildlink3.mk
+++ b/devel/SDL_Pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:44:02 wiz Exp $
BUILDLINK_TREE+= SDL_Pango
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= SDL_Pango
SDL_PANGO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.SDL_Pango+= SDL_Pango>=0.1.2
-BUILDLINK_ABI_DEPENDS.SDL_Pango+= SDL_Pango>=0.1.2
+BUILDLINK_ABI_DEPENDS.SDL_Pango+= SDL_Pango>=0.1.2nb1
BUILDLINK_PKGSRCDIR.SDL_Pango?= ../../devel/SDL_Pango
# Seems to be unnecessary, pkg-config does not show anything from SDL
diff --git a/devel/accerciser/Makefile b/devel/accerciser/Makefile
index 485995b8bb5..81e3db8475d 100644
--- a/devel/accerciser/Makefile
+++ b/devel/accerciser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:19 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:02 wiz Exp $
#
DISTNAME= accerciser-1.6.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/accerciser/1.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 5d62fe400f2..372e1e31976 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2010/01/18 09:58:43 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2010/06/13 22:44:02 wiz Exp $
DISTNAME= anjuta-2.24.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/anjuta/2.24/}
#MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=anjuta/}
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index a23b1f9b2f7..95d302d922f 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2010/06/05 11:05:58 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:02 wiz Exp $
#
DISTNAME= at-spi-1.30.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/at-spi/1.30/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index a1ee6a466a0..0a9e3e49601 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2009/10/25 10:48:09 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:44:02 wiz Exp $
BUILDLINK_TREE+= at-spi
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= at-spi
AT_SPI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.at-spi+= at-spi>=1.6.0
-BUILDLINK_ABI_DEPENDS.at-spi+= at-spi>=1.26.0nb1
+BUILDLINK_ABI_DEPENDS.at-spi+= at-spi>=1.30.1nb1
BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi
.include "../../devel/atk/buildlink3.mk"
diff --git a/devel/automoc4/Makefile b/devel/automoc4/Makefile
index ff2220fe0b7..a0a9b47f6b2 100644
--- a/devel/automoc4/Makefile
+++ b/devel/automoc4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:58:43 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:02 wiz Exp $
DISTNAME= automoc4-0.9.88
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_KDE:=automoc4/0.9.88/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/blib/Makefile b/devel/blib/Makefile
index 8da3027c684..f2695316591 100644
--- a/devel/blib/Makefile
+++ b/devel/blib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:02 wiz Exp $
#
DISTNAME= blib-1.0.2
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= devel graphics
MASTER_SITES= http://sven.gimp.org/blinkenlights/old/
diff --git a/devel/blib/buildlink3.mk b/devel/blib/buildlink3.mk
index 4fb355b0acc..2e973b92aac 100644
--- a/devel/blib/buildlink3.mk
+++ b/devel/blib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:02 wiz Exp $
BUILDLINK_TREE+= blib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= blib
BLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.blib+= blib>=1.0.2nb1
-BUILDLINK_ABI_DEPENDS.blib+= blib>=1.0.2nb7
+BUILDLINK_ABI_DEPENDS.blib+= blib>=1.0.2nb8
BUILDLINK_PKGSRCDIR.blib?= ../../devel/blib
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/boa-constructor/Makefile b/devel/boa-constructor/Makefile
index 33ea14bb934..578d1ae3a4a 100644
--- a/devel/boa-constructor/Makefile
+++ b/devel/boa-constructor/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:03 wiz Exp $
#
VERSION= 0.6.1
DISTNAME= boa-constructor-${VERSION}.src
PKGNAME= boa-constructor-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boa-constructor/}
EXTRACT_SUFX= .zip
diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile
index e6e9621a2e0..36e7bb29d0e 100644
--- a/devel/bouml/Makefile
+++ b/devel/bouml/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:58:43 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:03 wiz Exp $
#
DISTNAME= bouml_${BOUMLVERSION}
PKGNAME= bouml-${BOUMLVERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://bouml.free.fr/
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index ae5b26e1663..8bbe3476563 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2010/04/09 13:25:34 adam Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:44:03 wiz Exp $
DISTNAME= cmake-${CMAKE_API}.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v2.8/
@@ -42,6 +43,9 @@ SUBST_VARS.cmake= X11BASE
post-patch:
${RM} ${WRKSRC}/Modules/*.orig
+post-install:
+ ${RM} -f ${DESTDIR}${PREFIX}/share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake.orig
+
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/xmlrpc-c/buildlink3.mk"
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 03b8cb98f24..571081de3f0 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2010/04/09 13:25:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2010/06/13 22:44:03 wiz Exp $
bin/ccmake
bin/cmake
bin/cpack
@@ -397,7 +397,6 @@ share/cmake-${CMAKE_API}/Modules/Platform/Tru64.cmake
share/cmake-${CMAKE_API}/Modules/Platform/ULTRIX.cmake
share/cmake-${CMAKE_API}/Modules/Platform/UNIX_SV.cmake
share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake.orig
share/cmake-${CMAKE_API}/Modules/Platform/UnixWare.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-C.cmake
share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-CXX.cmake
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 4c8b5053ada..04ebb404cd2 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2010/04/09 13:25:34 adam Exp $
+$NetBSD: distinfo,v 1.25 2010/06/13 22:44:03 wiz Exp $
SHA1 (cmake-2.8.1.tar.gz) = e9f99cfccf8ec4fb5bbd8ca7d499771a2f1d4ebe
RMD160 (cmake-2.8.1.tar.gz) = 71e216704ee4313640efdbefcc65c6576071ef82
@@ -6,3 +6,4 @@ Size (cmake-2.8.1.tar.gz) = 3605586 bytes
SHA1 (patch-aa) = b093f4992a7fea099d7c26a90b150ac0d057067a
SHA1 (patch-ab) = f7372942f7e28b01c26794ce1a94914b68d1b24e
SHA1 (patch-ac) = e5127b9e28375528e977898c59cb6b5044d76ebe
+SHA1 (patch-ad) = a3c705c01dc7de4354756092fc5f3ad3b9a8090c
diff --git a/devel/cmake/patches/patch-ad b/devel/cmake/patches/patch-ad
new file mode 100644
index 00000000000..b56d5b8652f
--- /dev/null
+++ b/devel/cmake/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.7 2010/06/13 22:44:03 wiz Exp $
+
+--- Modules/FindPNG.cmake.orig 2010-04-06 14:45:31.000000000 +0000
++++ Modules/FindPNG.cmake
+@@ -33,7 +33,7 @@ if(ZLIB_FOUND)
+ /usr/local/include/libpng # OpenBSD
+ )
+
+- set(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
++ set(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12 png14 libpng14)
+ find_library(PNG_LIBRARY NAMES ${PNG_NAMES} )
+
+ if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 9c750fe2448..fb6300fff93 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2009/08/26 19:57:20 sno Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:44:03 wiz Exp $
#
DISTNAME= coconut-0.3.0
-PKGREVISION= 17
+PKGREVISION= 18
CATEGORIES= devel
MASTER_SITES= # ${MASTER_SITE_SOURCEFORGE:=coconut-lib/}
diff --git a/devel/compizconfig-backend-gconf/Makefile b/devel/compizconfig-backend-gconf/Makefile
index 0cd2ebc41a0..3916d151b29 100644
--- a/devel/compizconfig-backend-gconf/Makefile
+++ b/devel/compizconfig-backend-gconf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/11/26 20:08:53 imil Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:03 wiz Exp $
#
PKGVER= 0.8.4
DISTNAME= compizconfig-backend-gconf-${PKGVER}
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= http://releases.compiz.org/${PKGVER}/
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 950fa24b051..2445e423fad 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/03/20 21:32:40 adrianp Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:44:03 wiz Exp $
#
DISTNAME= cvsgraph-1.6.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel scm
MASTER_SITES= http://www.akhphd.au.dk/~bertho/cvsgraph/release/
diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile
index 8bcbffa584b..17c3402e466 100644
--- a/devel/devIL/Makefile
+++ b/devel/devIL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:03 wiz Exp $
#
DISTNAME= DevIL-${DEVIL_VERSION}
PKGNAME= ${DISTNAME:S/D/d/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openil/}
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index a1a7e8e7ce4..c4b6ee555dc 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:03 wiz Exp $
BUILDLINK_TREE+= devIL
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= devIL
DEVIL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.devIL+= devIL>=1.7.8
-BUILDLINK_ABI_DEPENDS.devIL+= devIL>=1.7.8nb2
+BUILDLINK_ABI_DEPENDS.devIL+= devIL>=1.7.8nb3
BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL
.include "../../devel/SDL/buildlink3.mk"
diff --git a/devel/devIL/distinfo b/devel/devIL/distinfo
index 5144bf0e295..eb034befb44 100644
--- a/devel/devIL/distinfo
+++ b/devel/devIL/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.6 2009/12/15 10:29:35 tnn Exp $
+$NetBSD: distinfo,v 1.7 2010/06/13 22:44:03 wiz Exp $
SHA1 (DevIL-1.7.8.tar.gz) = bc27e3e830ba666a3af03548789700d10561fcb1
RMD160 (DevIL-1.7.8.tar.gz) = a3cdb14fcca5e75ada240a53cbdc3e749a759da5
Size (DevIL-1.7.8.tar.gz) = 2051993 bytes
SHA1 (patch-aa) = 2784234ee79ada44f04219c5f49d5ea2c9e6bf4c
SHA1 (patch-ab) = 995f402fa98cbfe96d43b98f6c409e484a53bf09
+SHA1 (patch-ac) = b540afa8baca5bb5e71edc63291ce49eb2fafd23
+SHA1 (patch-ad) = c8885607457c9af2d89dcf2d9e163fd224e0fa35
diff --git a/devel/devIL/patches/patch-ac b/devel/devIL/patches/patch-ac
new file mode 100644
index 00000000000..3312228f3e3
--- /dev/null
+++ b/devel/devIL/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2010/06/13 22:44:03 wiz Exp $
+
+--- src-IL/src/il_png.c.orig 2009-03-08 07:10:09.000000000 +0000
++++ src-IL/src/il_png.c
+@@ -278,7 +278,7 @@ ILboolean readpng_get_image(ILdouble dis
+
+ // Expand low-bit-depth grayscale images to 8 bits
+ if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ // Expand RGB images with transparency to full alpha channels
diff --git a/devel/devIL/patches/patch-ad b/devel/devIL/patches/patch-ad
new file mode 100644
index 00000000000..0c232514932
--- /dev/null
+++ b/devel/devIL/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:03 wiz Exp $
+
+--- src-IL/src/il_icon.c.orig 2009-03-08 07:10:09.000000000 +0000
++++ src-IL/src/il_icon.c
+@@ -525,7 +525,7 @@ ILboolean ico_readpng_get_image(ICOIMAGE
+
+ // Expand low-bit-depth grayscale images to 8 bits
+ if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+- png_set_gray_1_2_4_to_8(ico_png_ptr);
++ png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
+ }
+
+ // Expand RGB images with transparency to full alpha channels
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 65a57f8c15a..88897ed6b88 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2010/03/19 11:27:07 obache Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:44:03 wiz Exp $
DISTNAME= devhelp-2.28.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/devhelp/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/devhelp/buildlink3.mk b/devel/devhelp/buildlink3.mk
index 57751ab6d3a..71ba809161b 100644
--- a/devel/devhelp/buildlink3.mk
+++ b/devel/devhelp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:03 wiz Exp $
BUILDLINK_TREE+= devhelp
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= devhelp
DEVHELP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.devhelp+= devhelp>=0.12nb1
-BUILDLINK_ABI_DEPENDS.devhelp?= devhelp>=2.28.1nb1
+BUILDLINK_ABI_DEPENDS.devhelp?= devhelp>=2.28.1nb3
BUILDLINK_PKGSRCDIR.devhelp?= ../../devel/devhelp
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 91270fac4ce..5d2f1070f91 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/04/16 09:55:30 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:04 wiz Exp $
#
DISTNAME= diffuse-0.4.3
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=diffuse/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/distccmon-gnome/Makefile b/devel/distccmon-gnome/Makefile
index 879014440a8..2b6ff1e88a1 100644
--- a/devel/distccmon-gnome/Makefile
+++ b/devel/distccmon-gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:04 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-gnome-/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES+= gnome
COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler
diff --git a/devel/distccmon-gtk/Makefile b/devel/distccmon-gtk/Makefile
index 954b435e7b9..a0813bfa8e9 100644
--- a/devel/distccmon-gtk/Makefile
+++ b/devel/distccmon-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:20 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:04 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-gtk-/}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index d19145b0477..8a5491e23b0 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2009/08/26 19:56:46 sno Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:44:04 wiz Exp $
DISTNAME= eel-2.26.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eel/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/eel/buildlink3.mk b/devel/eel/buildlink3.mk
index 9a6a97476d9..41f81b7a9c0 100644
--- a/devel/eel/buildlink3.mk
+++ b/devel/eel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/10/26 09:46:22 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:44:04 wiz Exp $
BUILDLINK_TREE+= eel
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= eel
EEL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.eel+= eel>=2.10.0
-BUILDLINK_ABI_DEPENDS.eel?= eel>=2.26.0nb1
+BUILDLINK_ABI_DEPENDS.eel?= eel>=2.26.0nb2
BUILDLINK_PKGSRCDIR.eel?= ../../devel/eel
.include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/eric4/Makefile b/devel/eric4/Makefile
index 3cb97a1ea99..e77b137c6a3 100644
--- a/devel/eric4/Makefile
+++ b/devel/eric4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/05/17 15:48:48 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:04 wiz Exp $
#
VERS= 4.4.4a
DISTNAME= eric4-${VERS}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://downloads.sourceforge.net/project/eric-ide/eric4/stable/${VERS}/
diff --git a/devel/frama-c/Makefile b/devel/frama-c/Makefile
index 181ff309bdd..0dce94febd7 100644
--- a/devel/frama-c/Makefile
+++ b/devel/frama-c/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:04 wiz Exp $
#
DISTNAME= frama-c-Beryllium-20090901
PKGNAME= ${DISTNAME:S/-Beryllium//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://frama-c.cea.fr/download/
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index a1505a17fad..2f467eca69f 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2009/10/22 09:40:10 adam Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:44:04 wiz Exp $
DISTNAME= gconfmm-2.28.0
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gconfmm/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk
index 711a2841cb6..d747892a607 100644
--- a/devel/gconfmm/buildlink3.mk
+++ b/devel/gconfmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:04 wiz Exp $
BUILDLINK_TREE+= gconfmm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gconfmm
GCONFMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gconfmm+= gconfmm>=2.10.0
-BUILDLINK_ABI_DEPENDS.gconfmm+= gconfmm>=2.24.0nb1
+BUILDLINK_ABI_DEPENDS.gconfmm+= gconfmm>=2.28.0nb1
BUILDLINK_PKGSRCDIR.gconfmm?= ../../devel/gconfmm
.include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/gdl/Makefile b/devel/gdl/Makefile
index c94931530e6..74cea57a34d 100644
--- a/devel/gdl/Makefile
+++ b/devel/gdl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:04 wiz Exp $
DISTNAME= gdl-2.26.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdl/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gdl/buildlink3.mk b/devel/gdl/buildlink3.mk
index 9a7955531d0..17b2d358a28 100644
--- a/devel/gdl/buildlink3.mk
+++ b/devel/gdl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:04 wiz Exp $
BUILDLINK_TREE+= gdl
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gdl
GDL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gdl+= gdl>=0.6.1
-BUILDLINK_ABI_DEPENDS.gdl?= gdl>=2.26.2nb2
+BUILDLINK_ABI_DEPENDS.gdl?= gdl>=2.26.2nb3
BUILDLINK_PKGSRCDIR.gdl?= ../../devel/gdl
.include "../../devel/libglade/buildlink3.mk"
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 33890f1e93a..0b711d63eb5 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:57:20 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:04 wiz Exp $
DISTNAME= geany-0.17
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=geany/}
diff --git a/devel/giblib/Makefile b/devel/giblib/Makefile
index 6c1644483d5..75a9d50caef 100644
--- a/devel/giblib/Makefile
+++ b/devel/giblib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:04 wiz Exp $
DISTNAME= giblib-1.2.4
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= devel
MASTER_SITES= http://linuxbrit.co.uk/downloads/
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index ca0ff935b32..875a63a938f 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:04 wiz Exp $
BUILDLINK_TREE+= giblib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= giblib
GIBLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.giblib+= giblib>=1.2.3nb3
-BUILDLINK_ABI_DEPENDS.giblib+= giblib>=1.2.4nb7
+BUILDLINK_ABI_DEPENDS.giblib+= giblib>=1.2.4nb8
BUILDLINK_PKGSRCDIR.giblib?= ../../devel/giblib
.include "../../graphics/imlib2/buildlink3.mk"
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index de698bebb9b..2e9d47c1b74 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2009/08/26 19:57:20 sno Exp $
+# $NetBSD: Makefile,v 1.63 2010/06/13 22:44:04 wiz Exp $
DISTNAME= glade-2.12.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glade/2.12/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 330b6da05c4..ef169872415 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:05 wiz Exp $
#
DISTNAME= glade3-3.4.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glade3/3.4/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/glade3/buildlink3.mk b/devel/glade3/buildlink3.mk
index beb762d6f24..7c07306c615 100644
--- a/devel/glade3/buildlink3.mk
+++ b/devel/glade3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:05 wiz Exp $
BUILDLINK_TREE+= glade3
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= glade3
GLADE3_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.glade3+= glade3>=3.4.0
-BUILDLINK_ABI_DEPENDS.glade3?= glade3>=3.4.5nb1
+BUILDLINK_ABI_DEPENDS.glade3?= glade3>=3.4.5nb3
BUILDLINK_PKGSRCDIR.glade3?= ../../devel/glade3
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 46b94befa27..547c0f3a8ae 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:05 wiz Exp $
#
DISTNAME= gnome-build-2.24.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-build/2.24/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gnome-build/buildlink3.mk b/devel/gnome-build/buildlink3.mk
index 457af1c5ef7..82696b9b6cf 100644
--- a/devel/gnome-build/buildlink3.mk
+++ b/devel/gnome-build/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:44:05 wiz Exp $
BUILDLINK_TREE+= gnome-build
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-build
GNOME_BUILD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-build+= gnome-build>=0.1.3
-BUILDLINK_ABI_DEPENDS.gnome-build?= gnome-build>=2.24.1nb3
+BUILDLINK_ABI_DEPENDS.gnome-build?= gnome-build>=2.24.1nb4
BUILDLINK_PKGSRCDIR.gnome-build?= ../../devel/gnome-build
.include "../../devel/gdl/buildlink3.mk"
diff --git a/devel/gst-plugins0.10-pango/Makefile b/devel/gst-plugins0.10-pango/Makefile
index 1bdef9a151f..5f2e26b6943 100644
--- a/devel/gst-plugins0.10-pango/Makefile
+++ b/devel/gst-plugins0.10-pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:13 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:05 wiz Exp $
#
GST_PLUGINS0.10_NAME= pango
@@ -9,5 +9,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../multimedia/gst-plugins0.10-base/Makefile.common"
+PKGREVISION= 1
+
.include "../../devel/pango/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-gnome/Makefile b/devel/guile-gnome/Makefile
index 4cf779babae..2527f19c54e 100644
--- a/devel/guile-gnome/Makefile
+++ b/devel/guile-gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2010/03/24 19:43:23 asau Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:05 wiz Exp $
DISTNAME= guile-gnome-platform-2.16.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= devel
MASTER_SITES= http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index 744b72fc6ad..7b4ca28babc 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2010/03/24 19:43:23 asau Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:05 wiz Exp $
#
DISTNAME= guile-gtk-0.60
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= devel x11
MASTER_SITES= ${MASTER_SITE_GNU:=guile-gtk/}
diff --git a/devel/guile16-gtk/Makefile b/devel/guile16-gtk/Makefile
index 3418c1d7f66..eb96444c4ac 100644
--- a/devel/guile16-gtk/Makefile
+++ b/devel/guile16-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:45 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:05 wiz Exp $
#
DISTNAME= guile-gtk-0.5
PKGNAME= guile16-gtk-0.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= devel x11
MASTER_SITES= ${MASTER_SITE_GNU:=guile-gtk/}
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index e80921a772d..d45b91aa89a 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2010/01/18 09:58:45 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2010/06/13 22:44:05 wiz Exp $
DISTNAME= kdbg-2.1.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kdbg/}
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 5b6771b289c..6a73df343ad 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2010/06/02 12:26:13 adam Exp $
+# $NetBSD: Makefile,v 1.71 2010/06/13 22:44:05 wiz Exp $
DISTNAME= kdesdk-${_KDE_VERSION}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= devel
COMMENT= Support applications and tools used by KDE developers
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index 0df0bcd30ae..2a642f41ae4 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2010/06/02 12:26:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:44:05 wiz Exp $
BUILDLINK_TREE+= kdesdk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdesdk
KDESDK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdesdk+= kdesdk>=3.5.0nb1
-BUILDLINK_ABI_DEPENDS.kdesdk?= kdesdk>=3.5.10nb6
+BUILDLINK_ABI_DEPENDS.kdesdk?= kdesdk>=3.5.10nb8
BUILDLINK_PKGSRCDIR.kdesdk?= ../../devel/kdesdk3
BDB_ACCEPTED?= db4 db5
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index afc7e1003cc..25db9041a73 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/04/11 08:22:40 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:05 wiz Exp $
DISTNAME= kdesdk-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= devel
COMMENT= Support applications and tools used by KDE developers
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index ba2d89ea524..ac9bc09d131 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2010/06/11 12:42:55 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2010/06/13 22:44:05 wiz Exp $
DISTNAME= kdevelop_3.5.5.orig
PKGNAME= kdevelop-base-3.5.5
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= devel kde
MASTER_SITES= http://download.opensuse.org/repositories/home:/amilcarlucas/xUbuntu_6.06/
EXTRACT_SUFX= .tar.gz
diff --git a/devel/kdevelop4/Makefile b/devel/kdevelop4/Makefile
index a2f65e1d82c..f13cd2a5b9a 100644
--- a/devel/kdevelop4/Makefile
+++ b/devel/kdevelop4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/01 21:38:38 markd Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:06 wiz Exp $
#
DISTNAME= kdevelop-4.0.0
PKGNAME= kdevelop4-4.0.0
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_KDE:=kdevelop/4.0.0/src/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index eaa90ce9132..d67f834bf7b 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/01 21:35:51 markd Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:06 wiz Exp $
#
DISTNAME= kdevplatform-1.0.0
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE:=kdevelop/4.0.0/src/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile
index be1924662dc..50866fc5340 100644
--- a/devel/kdiff3/Makefile
+++ b/devel/kdiff3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:06 wiz Exp $
DISTNAME= kdiff3-0.9.91
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kdiff3/}
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index eedb9ab077b..58cbdddd05c 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/29 19:05:18 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:44:06 wiz Exp $
#
DISTNAME= kscope-1.6.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kscope/}
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 7efde803aa6..84afe834934 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:06 wiz Exp $
DISTNAME= libast-0.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://www.eterm.org/download/
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index 0b1eddaadc1..463b5c48e35 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:06 wiz Exp $
BUILDLINK_TREE+= libast
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libast
LIBAST_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libast+= libast>=0.5nb5
-BUILDLINK_ABI_DEPENDS.libast+= libast>=0.7nb2
+BUILDLINK_ABI_DEPENDS.libast+= libast>=0.7nb3
BUILDLINK_PKGSRCDIR.libast?= ../../devel/libast
.include "../../devel/pcre/buildlink3.mk"
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 3f0ef68a50b..b79d664d397 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2010/06/11 13:31:10 drochner Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:44:06 wiz Exp $
#
DISTNAME= libbonoboui-2.24.3
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libbonoboui/2.24/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index af60bfa69a4..503959c1026 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2009/10/29 23:08:33 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2010/06/13 22:44:06 wiz Exp $
BUILDLINK_TREE+= libbonoboui
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libbonoboui
LIBBONOBOUI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libbonoboui+= libbonoboui>=2.8.0
-BUILDLINK_ABI_DEPENDS.libbonoboui+= libbonoboui>=2.24.1nb1
+BUILDLINK_ABI_DEPENDS.libbonoboui+= libbonoboui>=2.24.3nb1
BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui
.include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/libcompizconfig/Makefile b/devel/libcompizconfig/Makefile
index aa1bdb7b383..9914d174ac5 100644
--- a/devel/libcompizconfig/Makefile
+++ b/devel/libcompizconfig/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2009/11/26 19:51:14 imil Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:06 wiz Exp $
#
PKGVER= 0.8.4
DISTNAME= libcompizconfig-${PKGVER}
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= http://releases.compiz.org/${PKGVER}/
diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile
index bda9baf91a9..eb32fab6632 100644
--- a/devel/libextractor/Makefile
+++ b/devel/libextractor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2009/12/15 21:40:01 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:44:06 wiz Exp $
DISTNAME= libextractor-0.5.20c
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://gnunet.org/libextractor/download/
diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile
index 3956f709a9a..519d6f9188a 100644
--- a/devel/libgail-gnome/Makefile
+++ b/devel/libgail-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:06 wiz Exp $
#
DISTNAME= libgail-gnome-1.20.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgail-gnome/1.20/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgail-gnome/buildlink3.mk b/devel/libgail-gnome/buildlink3.mk
index c4e594f28d8..d11fcbe0283 100644
--- a/devel/libgail-gnome/buildlink3.mk
+++ b/devel/libgail-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/06/13 22:44:06 wiz Exp $
BUILDLINK_TREE+= libgail-gnome
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgail-gnome
LIBGAIL_GNOME_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgail-gnome+= libgail-gnome>=1.1.1nb2
-BUILDLINK_ABI_DEPENDS.libgail-gnome?= libgail-gnome>=1.20.1nb2
+BUILDLINK_ABI_DEPENDS.libgail-gnome?= libgail-gnome>=1.20.1nb3
BUILDLINK_PKGSRCDIR.libgail-gnome?= ../../devel/libgail-gnome
.include "../../devel/at-spi/buildlink3.mk"
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 4accdbcce93..b217272b850 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2010/01/30 16:28:00 heinz Exp $
+# $NetBSD: Makefile,v 1.70 2010/06/13 22:44:06 wiz Exp $
#
DISTNAME= libglade-2.6.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libglade/2.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index 44c61d02394..10f516deda0 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:06 wiz Exp $
BUILDLINK_TREE+= libglade
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libglade
LIBGLADE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libglade+= libglade>=2.3.6
-BUILDLINK_ABI_DEPENDS.libglade+= libglade>=2.6.4nb1
+BUILDLINK_ABI_DEPENDS.libglade+= libglade>=2.6.4nb2
BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 97db54f255e..6bdaad62e92 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:07 wiz Exp $
DISTNAME= libglademm-2.6.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libglademm/2.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libglademm/buildlink3.mk b/devel/libglademm/buildlink3.mk
index f4c6effeb06..859640c08ba 100644
--- a/devel/libglademm/buildlink3.mk
+++ b/devel/libglademm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:07 wiz Exp $
BUILDLINK_TREE+= libglademm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libglademm
LIBGLADEMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libglademm+= libglademm>=2.6.0
-BUILDLINK_ABI_DEPENDS.libglademm+= libglademm>=2.6.7nb1
+BUILDLINK_ABI_DEPENDS.libglademm+= libglademm>=2.6.7nb2
BUILDLINK_PKGSRCDIR.libglademm?= ../../devel/libglademm
.include "../../devel/libglade/buildlink3.mk"
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 72989672f9e..e3cebbb3fe5 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.77 2010/06/11 13:23:56 drochner Exp $
+# $NetBSD: Makefile,v 1.78 2010/06/13 22:44:07 wiz Exp $
#
DISTNAME= libgnome-2.30.0
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnome/2.30/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index 2d0ebee6b48..0f05cf60c84 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/10/29 23:05:00 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:44:07 wiz Exp $
BUILDLINK_TREE+= libgnome
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnome
LIBGNOME_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.8.0
-BUILDLINK_ABI_DEPENDS.libgnome+= libgnome>=2.20.1.1nb1
+BUILDLINK_ABI_DEPENDS.libgnome+= libgnome>=2.30.0nb1
BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome
.include "../../mk/bsd.fast.prefs.mk"
diff --git a/devel/libgnomemm/Makefile b/devel/libgnomemm/Makefile
index b4186cd8183..a1fd5a9a4e0 100644
--- a/devel/libgnomemm/Makefile
+++ b/devel/libgnomemm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2009/10/29 23:14:13 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:07 wiz Exp $
DISTNAME= libgnomemm-2.28.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomemm/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgnomemm/buildlink3.mk b/devel/libgnomemm/buildlink3.mk
index b09fff8901c..77505ee3933 100644
--- a/devel/libgnomemm/buildlink3.mk
+++ b/devel/libgnomemm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/10/22 15:46:49 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:07 wiz Exp $
BUILDLINK_TREE+= libgnomemm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomemm
LIBGNOMEMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnomemm+= libgnomemm>=2.10.0
-BUILDLINK_ABI_DEPENDS.libgnomemm+= libgnomemm>=2.28.0
+BUILDLINK_ABI_DEPENDS.libgnomemm+= libgnomemm>=2.28.0nb2
BUILDLINK_PKGSRCDIR.libgnomemm?= ../../devel/libgnomemm
.include "../../devel/libgnome/buildlink3.mk"
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index bf97d28c342..3fb3ed607e1 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2010/06/11 13:34:29 drochner Exp $
+# $NetBSD: Makefile,v 1.91 2010/06/13 22:44:07 wiz Exp $
#
DISTNAME= libgnomeui-2.24.3
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeui/2.24/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index dd6752ac371..6b68b8a80dc 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2010/06/11 13:34:29 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2010/06/13 22:44:07 wiz Exp $
BUILDLINK_TREE+= libgnomeui
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomeui
LIBGNOMEUI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0
-BUILDLINK_ABI_DEPENDS.libgnomeui+= libgnomeui>=2.24.2nb3
+BUILDLINK_ABI_DEPENDS.libgnomeui+= libgnomeui>=2.24.3nb1
BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui
.include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/libgnomeuimm/Makefile b/devel/libgnomeuimm/Makefile
index 83523ef3b74..3ada02f5c64 100644
--- a/devel/libgnomeuimm/Makefile
+++ b/devel/libgnomeuimm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:07 wiz Exp $
DISTNAME= libgnomeuimm-2.28.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeuimm/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgnomeuimm/buildlink3.mk b/devel/libgnomeuimm/buildlink3.mk
index cf5f1033bd3..ca93813c58e 100644
--- a/devel/libgnomeuimm/buildlink3.mk
+++ b/devel/libgnomeuimm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:07 wiz Exp $
BUILDLINK_TREE+= libgnomeuimm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomeuimm
LIBGNOMEUIMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnomeuimm+= libgnomeuimm>=2.10.0
-BUILDLINK_ABI_DEPENDS.libgnomeuimm+= libgnomeuimm>=2.28.0nb2
+BUILDLINK_ABI_DEPENDS.libgnomeuimm+= libgnomeuimm>=2.28.0nb3
BUILDLINK_PKGSRCDIR.libgnomeuimm?= ../../devel/libgnomeuimm
.include "../../devel/gconfmm/buildlink3.mk"
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index 31da96ddd6d..fdf32106acf 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/04/22 02:41:29 dsainty Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:07 wiz Exp $
#
DISTNAME= libgsf-1.14.18
PKGNAME= libgsf-gnome-1.14.18
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgsf/1.14/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgsf-gnome/buildlink3.mk b/devel/libgsf-gnome/buildlink3.mk
index 46bbbb0531f..b9a97713b57 100644
--- a/devel/libgsf-gnome/buildlink3.mk
+++ b/devel/libgsf-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/08/02 10:52:06 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:07 wiz Exp $
BUILDLINK_TREE+= libgsf-gnome
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= libgsf-gnome
LIBGSF_GNOME_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgsf-gnome+= libgsf-gnome>=1.14.15
+BUILDLINK_ABI_DEPENDS.libgsf-gnome?= libgsf-gnome>=1.14.18nb1
BUILDLINK_PKGSRCDIR.libgsf-gnome?= ../../devel/libgsf-gnome
.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/devel/libgweather/Makefile b/devel/libgweather/Makefile
index 23ce6a3608d..98017291f21 100644
--- a/devel/libgweather/Makefile
+++ b/devel/libgweather/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/03/26 17:48:56 zafer Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:07 wiz Exp $
#
DISTNAME= libgweather-2.28.0
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgweather/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgweather/buildlink3.mk b/devel/libgweather/buildlink3.mk
index e91b459aa19..5c7eae4f6ea 100644
--- a/devel/libgweather/buildlink3.mk
+++ b/devel/libgweather/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/10/21 15:53:23 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:44:07 wiz Exp $
BUILDLINK_TREE+= libgweather
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgweather
LIBGWEATHER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgweather+= libgweather>=2.22.0
-BUILDLINK_ABI_DEPENDS.libgweather?= libgweather>=2.26.2.1nb1
+BUILDLINK_ABI_DEPENDS.libgweather?= libgweather>=2.28.0nb1
BUILDLINK_PKGSRCDIR.libgweather?= ../../devel/libgweather
.include "../../net/libsoup24/buildlink3.mk"
diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile
index 2b3e0cbe08e..fb6931e8217 100644
--- a/devel/libmatchbox/Makefile
+++ b/devel/libmatchbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/07/16 21:17:45 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:07 wiz Exp $
#
DISTNAME= libmatchbox-1.9
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://matchbox-project.org/sources/libmatchbox/1.9/
diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk
index d88cb765222..f17813bed17 100644
--- a/devel/libmatchbox/buildlink3.mk
+++ b/devel/libmatchbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:07 wiz Exp $
BUILDLINK_TREE+= libmatchbox
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libmatchbox
LIBMATCHBOX_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libmatchbox+= libmatchbox>=1.4
-BUILDLINK_ABI_DEPENDS.libmatchbox+= libmatchbox>=1.7nb3
+BUILDLINK_ABI_DEPENDS.libmatchbox+= libmatchbox>=1.9nb1
BUILDLINK_PKGSRCDIR.libmatchbox?= ../../devel/libmatchbox
.include "../../graphics/png/buildlink3.mk"
diff --git a/devel/libsexy/Makefile b/devel/libsexy/Makefile
index 6cf1b38bec5..a4fe7273991 100644
--- a/devel/libsexy/Makefile
+++ b/devel/libsexy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:07 wiz Exp $
#
DISTNAME= libsexy-0.1.11
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= http://releases.chipx86.com/libsexy/libsexy/
diff --git a/devel/libsexy/buildlink3.mk b/devel/libsexy/buildlink3.mk
index e11549b5c2e..a6868e7d16c 100644
--- a/devel/libsexy/buildlink3.mk
+++ b/devel/libsexy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:07 wiz Exp $
BUILDLINK_TREE+= libsexy
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libsexy
LIBSEXY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libsexy+= libsexy>=0.1.8
-BUILDLINK_ABI_DEPENDS.libsexy?= libsexy>=0.1.11nb1
+BUILDLINK_ABI_DEPENDS.libsexy?= libsexy>=0.1.11nb2
BUILDLINK_PKGSRCDIR.libsexy?= ../../devel/libsexy
.include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/libsexymm/Makefile b/devel/libsexymm/Makefile
index 80532c5add6..3fc0fb70fee 100644
--- a/devel/libsexymm/Makefile
+++ b/devel/libsexymm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:08 wiz Exp $
#
DISTNAME= libsexymm-0.1.9
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://releases.chipx86.com/libsexy/libsexymm/
diff --git a/devel/libsexymm/buildlink3.mk b/devel/libsexymm/buildlink3.mk
index 2d61f0809d3..60dc9e6c78a 100644
--- a/devel/libsexymm/buildlink3.mk
+++ b/devel/libsexymm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:08 wiz Exp $
BUILDLINK_TREE+= libsexymm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libsexymm
LIBSEXYMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libsexymm+= libsexymm>=0.1.9
-BUILDLINK_ABI_DEPENDS.libsexymm?= libsexymm>=0.1.9nb2
+BUILDLINK_ABI_DEPENDS.libsexymm?= libsexymm>=0.1.9nb3
BUILDLINK_PKGSRCDIR.libsexymm?= ../../devel/libsexymm
.include "../../x11/gtkmm/buildlink3.mk"
diff --git a/devel/libslang2/buildlink3.mk b/devel/libslang2/buildlink3.mk
index 7d0cf1485c7..c027216489c 100644
--- a/devel/libslang2/buildlink3.mk
+++ b/devel/libslang2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:44:08 wiz Exp $
BUILDLINK_TREE+= libslang2
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= libslang2
LIBSLANG2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libslang2+= libslang2>=2.1.3
+BUILDLINK_ABI_DEPENDS.libslang2?= libslang2>=2.2.2
BUILDLINK_PKGSRCDIR.libslang2?= ../../devel/libslang2
BUILDLINK_FNAME_TRANSFORM.libslang2+= -e 's|include/slang2/|include/|g'
BUILDLINK_TRANSFORM+= l:slang:slang2
diff --git a/devel/libview/Makefile b/devel/libview/Makefile
index 19f6914aa49..f3fe93c5180 100644
--- a/devel/libview/Makefile
+++ b/devel/libview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/26 11:29:45 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:08 wiz Exp $
#
DISTNAME= libview-0.6.4
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=view/}
diff --git a/devel/libview/buildlink3.mk b/devel/libview/buildlink3.mk
index 6767b46d49a..705cf54b6b0 100644
--- a/devel/libview/buildlink3.mk
+++ b/devel/libview/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/26 11:29:45 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:08 wiz Exp $
BUILDLINK_TREE+= libview
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= libview
LIBVIEW_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libview+= libview>=0.6.4
+BUILDLINK_ABI_DEPENDS.libview?= libview>=0.6.4nb1
BUILDLINK_PKGSRCDIR.libview?= ../../devel/libview
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index f4820cd6c92..9ac0b24e476 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2010/03/31 03:50:25 dsainty Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/13 22:44:08 wiz Exp $
#
DISTNAME= libwnck-2.28.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libwnck/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index 4a0f8f16f59..aa65b2e4f1f 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/03/31 04:04:10 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:44:08 wiz Exp $
BUILDLINK_TREE+= libwnck
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libwnck
LIBWNCK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libwnck+= libwnck>=2.20.0
-BUILDLINK_ABI_DEPENDS.libwnck?= libwnck>=2.26.2nb1
+BUILDLINK_ABI_DEPENDS.libwnck?= libwnck>=2.28.0nb2
BUILDLINK_PKGSRCDIR.libwnck?= ../../devel/libwnck
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/m17n-lib/buildlink3.mk b/devel/m17n-lib/buildlink3.mk
index cd5dacb4153..0ab463094f7 100644
--- a/devel/m17n-lib/buildlink3.mk
+++ b/devel/m17n-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:44:08 wiz Exp $
BUILDLINK_TREE+= m17n-lib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= m17n-lib
M17N_LIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.m17n-lib+= m17n-lib>=1.5.1
-BUILDLINK_ABI_DEPENDS.m17n-lib?= m17n-lib>=1.5.5
+BUILDLINK_ABI_DEPENDS.m17n-lib?= m17n-lib>=1.6.1
BUILDLINK_PKGSRCDIR.m17n-lib?= ../../devel/m17n-lib
pkgbase := m17n-lib
diff --git a/devel/mono-tools/Makefile b/devel/mono-tools/Makefile
index 180d0bd9cca..8dad9854e5b 100644
--- a/devel/mono-tools/Makefile
+++ b/devel/mono-tools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/04/09 16:03:08 kefren Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:08 wiz Exp $
DISTNAME= mono-tools-2.6.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono-tools/
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 7fd72e7c755..7e40a1f8864 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2010/04/17 17:11:04 kefren Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:08 wiz Exp $
DISTNAME= monodevelop-2.2.2
+PKGREVISION= 3
CATEGORIES= devel
-PKGREVISION= 2
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/monodevelop/
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index c128cbb0ccc..49c8a59bfd5 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2010/01/17 12:02:13 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:44:08 wiz Exp $
#
DISTNAME= monotone-viz-1.0.1-nolablgtk
PKGNAME= ${DISTNAME:S/-nolablgtk//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel scm
MASTER_SITES= http://oandrieu.nerim.net/monotone-viz/
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index d03c7955a7d..267aad4ceda 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:08 wiz Exp $
#
DISTNAME= ogre-v1-6-3
PKGNAME= ogre-1.6.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ogre/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index e2105a617e2..6b9f4902134 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:08 wiz Exp $
BUILDLINK_TREE+= ogre
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ogre
OGRE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ogre+= ogre>=1.6.3
-BUILDLINK_ABI_DEPENDS.ogre+= ogre>=1.6.3nb1
+BUILDLINK_ABI_DEPENDS.ogre+= ogre>=1.6.3nb2
BUILDLINK_PKGSRCDIR.ogre?= ../../devel/ogre
.include "../../archivers/zziplib/buildlink3.mk"
diff --git a/devel/p5-Gtk2-GladeXML/Makefile b/devel/p5-Gtk2-GladeXML/Makefile
index ac9a4ffb1e2..1041f13f450 100644
--- a/devel/p5-Gtk2-GladeXML/Makefile
+++ b/devel/p5-Gtk2-GladeXML/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:22 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:09 wiz Exp $
DISTNAME= Gtk2-GladeXML-1.007
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index d54c7b3918f..e6d2118d292 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:09 wiz Exp $
#
DISTNAME= SDL_Perl-2.1.2
PKGNAME= p5-SDL-2.1.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DG/DGOEHRIG/}
diff --git a/devel/p5-Wx-Perl-DataWalker/Makefile b/devel/p5-Wx-Perl-DataWalker/Makefile
index cc7b7e59ae9..42efea9adc8 100644
--- a/devel/p5-Wx-Perl-DataWalker/Makefile
+++ b/devel/p5-Wx-Perl-DataWalker/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/02/03 11:30:15 sno Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:09 wiz Exp $
#
DISTNAME= Wx-Perl-DataWalker-0.02
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Wx/}
diff --git a/devel/p5-pango/Makefile b/devel/p5-pango/Makefile
index b90ee761008..72c08d401e8 100644
--- a/devel/p5-pango/Makefile
+++ b/devel/p5-pango/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2009/05/24 05:45:47 kefren Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:09 wiz Exp $
#
DISTNAME= Pango-${DIST_VER}
PKGNAME= p5-pango-${DIST_VER}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
diff --git a/devel/p5-pango/buildlink3.mk b/devel/p5-pango/buildlink3.mk
index 36447e57c35..870f3809bbd 100644
--- a/devel/p5-pango/buildlink3.mk
+++ b/devel/p5-pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/05/21 19:24:44 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:09 wiz Exp $
BUILDLINK_TREE+= p5-pango
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= p5-pango
P5_PANGO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.p5-pango+= p5-pango>=1.200
+BUILDLINK_ABI_DEPENDS.p5-pango?= p5-pango>=1.220nb1
BUILDLINK_PKGSRCDIR.p5-pango?= ../../devel/p5-pango
.include "../../devel/pango/buildlink3.mk"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 7d6453ee124..302a3a5711b 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.142 2010/05/31 17:57:37 drochner Exp $
+# $NetBSD: Makefile,v 1.143 2010/06/13 22:44:09 wiz Exp $
DISTNAME= pango-1.28.0
+PKGREVISION= 1
CATEGORIES= devel fonts
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index fc41af569d0..7a3d2145706 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:44:09 wiz Exp $
BUILDLINK_TREE+= pango
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= pango
PANGO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.pango+= pango>=1.6.0
-BUILDLINK_ABI_DEPENDS.pango+= pango>=1.12.1nb1
+BUILDLINK_ABI_DEPENDS.pango+= pango>=1.28.0nb1
BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
.include "../../mk/bsd.fast.prefs.mk"
diff --git a/devel/pangomm/Makefile b/devel/pangomm/Makefile
index 0868f343e5b..8d3aa80f4b5 100644
--- a/devel/pangomm/Makefile
+++ b/devel/pangomm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/06/02 16:45:11 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:09 wiz Exp $
DISTNAME= pangomm-2.26.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pangomm/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/pangomm/buildlink3.mk b/devel/pangomm/buildlink3.mk
index 72a1a10806a..51fd43db875 100644
--- a/devel/pangomm/buildlink3.mk
+++ b/devel/pangomm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/06/02 16:45:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:09 wiz Exp $
BUILDLINK_TREE+= pangomm
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= pangomm
PANGOMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.pangomm+= pangomm>=2.26.2
+BUILDLINK_ABI_DEPENDS.pangomm?= pangomm>=2.26.2nb1
BUILDLINK_PKGSRCDIR.pangomm?= ../../devel/pangomm
.include "../../devel/glibmm/buildlink3.mk"
diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile
index 5dd733b8cc5..16deadf0f73 100644
--- a/devel/py-at-spi/Makefile
+++ b/devel/py-at-spi/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/06/10 19:24:35 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:09 wiz Exp $
#
DISTNAME= at-spi-1.30.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/at-spi/1.30/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/py-at-spi/buildlink3.mk b/devel/py-at-spi/buildlink3.mk
index a345e522e98..cf0f74abc2d 100644
--- a/devel/py-at-spi/buildlink3.mk
+++ b/devel/py-at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:44:09 wiz Exp $
BUILDLINK_TREE+= py-at-spi
@@ -8,7 +8,7 @@ PY_AT_SPI_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.py-at-spi+= ${PYPKGPREFIX}-at-spi>=1.20.1
-BUILDLINK_ABI_DEPENDS.py-at-spi?= ${PYPKGPREFIX}-at-spi>=1.26.0nb1
+BUILDLINK_ABI_DEPENDS.py-at-spi?= ${PYPKGPREFIX}-at-spi>=1.30.1nb1
BUILDLINK_PKGSRCDIR.py-at-spi?= ../../devel/py-at-spi
.include "../../devel/at-spi/buildlink3.mk"
diff --git a/devel/py-compizconfig/Makefile b/devel/py-compizconfig/Makefile
index e019f2936bb..ed93877adc4 100644
--- a/devel/py-compizconfig/Makefile
+++ b/devel/py-compizconfig/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2010/02/14 18:08:48 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:09 wiz Exp $
#
PKGVER= 0.8.4
DISTNAME= compizconfig-python-${PKGVER}
PKGNAME= ${PYPKGPREFIX}-compizconfig-${PKGVER}
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= http://releases.compiz.org/${PKGVER}/
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 4553f26a9cf..eee2d831cd8 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:09 wiz Exp $
#
DISTNAME= pygame-1.8.1release
PKGNAME= ${PYPKGPREFIX}-game-1.8.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://pygame.org/ftp/
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index 69152806e5e..55da1feeeba 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:44:09 wiz Exp $
BUILDLINK_TREE+= ${PYPKGPREFIX}-game
@@ -8,7 +8,7 @@ PY_GAME_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+= ${PYPKGPREFIX}-game>=1.6
-BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?= ${PYPKGPREFIX}-game>=1.8.1nb4
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?= ${PYPKGPREFIX}-game>=1.8.1nb5
BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?= ../../devel/py-game
.include "../../audio/SDL_mixer/buildlink3.mk"
diff --git a/devel/py-windbg/Makefile b/devel/py-windbg/Makefile
index 07271ad1b6b..1c03c4971b3 100644
--- a/devel/py-windbg/Makefile
+++ b/devel/py-windbg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:09 wiz Exp $
#
DISTNAME= winpdb-1.4.6
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel python
MASTER_SITES= http://winpdb.googlecode.com/files/
diff --git a/devel/qconf/Makefile b/devel/qconf/Makefile
index 897b3046aaf..e8e6b885284 100644
--- a/devel/qconf/Makefile
+++ b/devel/qconf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:10 wiz Exp $
#
DISTNAME= qconf-1.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://delta.affinix.com/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile
index 8fd93be9fc8..b985b3eaf05 100644
--- a/devel/qtscriptgenerator/Makefile
+++ b/devel/qtscriptgenerator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/15 15:57:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:10 wiz Exp $
#
DISTNAME= qtscriptgenerator-src-0.1.0
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://qtscriptgenerator.googlecode.com/files/
diff --git a/devel/qtscriptgenerator/buildlink3.mk b/devel/qtscriptgenerator/buildlink3.mk
index d084e87d24a..901eb6a1a3d 100644
--- a/devel/qtscriptgenerator/buildlink3.mk
+++ b/devel/qtscriptgenerator/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/02/15 15:57:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:10 wiz Exp $
BUILDLINK_TREE+= qtscriptgenerator
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qtscriptgenerator
QTSCRIPTGENERATOR_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qtscriptgenerator+= qtscriptgenerator>=0.1.0
-BUILDLINK_ABI_DEPENDS.qtscriptgenerator?= qtscriptgenerator>=0.1.0nb2
+BUILDLINK_ABI_DEPENDS.qtscriptgenerator?= qtscriptgenerator>=0.1.0nb4
BUILDLINK_PKGSRCDIR.qtscriptgenerator?= ../../devel/qtscriptgenerator
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index a3b82c59ba6..e0a730b4e58 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:10 wiz Exp $
DISTNAME= rapidsvn-0.10.0-1
PKGNAME= ${DISTNAME:S/-1$/.1/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel x11 scm
MASTER_SITES= http://rapidsvn.org/download/release/0.10/
diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile
index ce6faf11a50..a8f2d69d466 100644
--- a/devel/rox-lib/Makefile
+++ b/devel/rox-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/02/10 19:17:36 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:10 wiz Exp $
#
DISTNAME= rox-lib-2.0.2
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
EXTRACT_SUFX= .tgz
diff --git a/devel/ruby-SDL/Makefile b/devel/ruby-SDL/Makefile
index 28070369f0d..d4e7e7aff33 100644
--- a/devel/ruby-SDL/Makefile
+++ b/devel/ruby-SDL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:10 wiz Exp $
DISTNAME= rubysdl-2.0.1
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/rubysdl/SDL/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel audio graphics
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/devel/ruby-gnome2-bonobo/Makefile b/devel/ruby-gnome2-bonobo/Makefile
index 3b40176a405..2e4faa335d6 100644
--- a/devel/ruby-gnome2-bonobo/Makefile
+++ b/devel/ruby-gnome2-bonobo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/10/12 03:09:31 obache Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:10 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-bonobo-${VERSION}
COMMENT= Ruby binding of libbonobo-2.x or later
+PKGREVISION= 1
CATEGORIES= devel
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/ruby-gnome2-bonoboui/Makefile b/devel/ruby-gnome2-bonoboui/Makefile
index e7f60290cb4..da403eedad8 100644
--- a/devel/ruby-gnome2-bonoboui/Makefile
+++ b/devel/ruby-gnome2-bonoboui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:10 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-bonoboui-${VERSION}
COMMENT= Ruby binding of libbonoboui-2.x or later
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/ruby-gnome2-libglade/Makefile b/devel/ruby-gnome2-libglade/Makefile
index ee1182febf8..d159b30cbc4 100644
--- a/devel/ruby-gnome2-libglade/Makefile
+++ b/devel/ruby-gnome2-libglade/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2009/10/12 03:09:31 obache Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:10 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-libglade-${VERSION}
COMMENT= Ruby binding of libglade
+PKGREVISION= 1
CATEGORIES= devel
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile
index f2ba7f9c841..9a0771467c4 100644
--- a/devel/ruby-gnome2-pango/Makefile
+++ b/devel/ruby-gnome2-pango/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/08/12 12:43:09 obache Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:10 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-pango-${VERSION}
COMMENT= Ruby binding of pango-1.x
+PKGREVISION= 1
CATEGORIES= devel fonts
CONFLICTS+= ruby-gnome2-pango-[0-9]*
diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk
index c9ae329b60e..7486f3e2fda 100644
--- a/devel/ruby-gnome2-pango/buildlink3.mk
+++ b/devel/ruby-gnome2-pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:10 wiz Exp $
BUILDLINK_TREE+= ruby-gnome2-pango
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= ruby-gnome2-pango
RUBY_GNOME2_PANGO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ruby-gnome2-pango+= ${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango?= ruby18-gnome2-pango>=0.19.4nb1
BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?= ../../devel/ruby-gnome2-pango
.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
diff --git a/devel/swt/Makefile b/devel/swt/Makefile
index c499bb91544..cf7d21735ce 100644
--- a/devel/swt/Makefile
+++ b/devel/swt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/06/10 19:25:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:10 wiz Exp $
#
SWTREL= 3.5.1
@@ -7,6 +7,7 @@ SWTDATE= 200909170800
PKGNAME= swt-${SWTREL}.${SWTVER}
DISTNAME= swt-${SWTREL}-gtk-linux-x86
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.eclipse.org/eclipse/downloads/drops/R-${SWTREL}-${SWTDATE}/
EXTRACT_SUFX= .zip
diff --git a/devel/teem/Makefile b/devel/teem/Makefile
index e9959b720a0..116fa7f1a4f 100644
--- a/devel/teem/Makefile
+++ b/devel/teem/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2009/03/17 21:40:45 darcy Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:10 wiz Exp $
#
DISTNAME= teem-1.8.0-src
PKGNAME= ${DISTNAME:C/-src//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=teem/}
diff --git a/devel/teem/distinfo b/devel/teem/distinfo
index bcaf0452c04..56cbda2375c 100644
--- a/devel/teem/distinfo
+++ b/devel/teem/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/01/09 16:32:11 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:44:10 wiz Exp $
SHA1 (teem-1.8.0-src.tar.gz) = fd57c40136d877d33cb45b2afc54a95564e67225
RMD160 (teem-1.8.0-src.tar.gz) = 7154b1a7b12a08f7267017e213794673f6192827
@@ -6,3 +6,4 @@ Size (teem-1.8.0-src.tar.gz) = 1127914 bytes
SHA1 (patch-aa) = ebb0d5be710416276fbc028ee8e635b669eaa378
SHA1 (patch-ab) = 0dbbe8290711e18d4c1312a452aaee19a13b5a04
SHA1 (patch-ac) = 5e3f9a3fcf2c3807025fec65f5bb034691ba9457
+SHA1 (patch-ad) = 8a342c486f4bbbce1ac7c54ded5ebcf7eca63bdd
diff --git a/devel/teem/patches/patch-ad b/devel/teem/patches/patch-ad
new file mode 100644
index 00000000000..9ced11c3e9b
--- /dev/null
+++ b/devel/teem/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:11 wiz Exp $
+
+--- src/nrrd/formatPNG.c.orig 2005-03-01 22:27:40.000000000 +0000
++++ src/nrrd/formatPNG.c
+@@ -216,7 +216,7 @@ _nrrdFormatPNG_read(FILE *file, Nrrd *nr
+ png_set_palette_to_rgb(png);
+ /* expand grayscale images to 8 bits from 1, 2, or 4 bits */
+ if (type == PNG_COLOR_TYPE_GRAY && depth < 8)
+- png_set_gray_1_2_4_to_8(png);
++ png_set_expand_gray_1_2_4_to_8(png);
+ /* expand paletted or rgb images with transparency to full alpha
+ channels so the data will be available as rgba quartets */
+ if (png_get_valid(png, info, PNG_INFO_tRNS))
diff --git a/devel/valide/Makefile b/devel/valide/Makefile
index 6e0ebffac8c..bb3c7fbd509 100644
--- a/devel/valide/Makefile
+++ b/devel/valide/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/05/07 08:34:22 ahoka Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:11 wiz Exp $
#
DISTNAME= valide-0.4.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://valide.googlecode.com/files/
diff --git a/devel/xfconf/buildlink3.mk b/devel/xfconf/buildlink3.mk
index 22a24f8332c..3546cd69adf 100644
--- a/devel/xfconf/buildlink3.mk
+++ b/devel/xfconf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/09/16 01:06:30 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:11 wiz Exp $
BUILDLINK_TREE+= xfconf
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= xfconf
XFCONF_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfconf+= xfconf>=4.6.0
+BUILDLINK_ABI_DEPENDS.xfconf?= xfconf>=4.6.1
BUILDLINK_PKGSRCDIR.xfconf?= ../../devel/xfconf
.include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/xulrunner/buildlink3.mk b/devel/xulrunner/buildlink3.mk
index f68c7b0c772..5885aeb35bb 100644
--- a/devel/xulrunner/buildlink3.mk
+++ b/devel/xulrunner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/03/16 15:57:02 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:11 wiz Exp $
BUILDLINK_TREE+= xulrunner
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xulrunner
XULRUNNER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=1.9.2.2
-BUILDLINK_ABI_DEPENDS.xulrunner?= xulrunner>=1.9.2.2
+BUILDLINK_ABI_DEPENDS.xulrunner?= xulrunner>=1.9.2.3
BUILDLINK_PKGSRCDIR.xulrunner?= ../../devel/xulrunner
pkgbase := xulrunner
diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile
index 0764d6f1c64..e58b0f88888 100644
--- a/editors/Sigil/Makefile
+++ b/editors/Sigil/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2010/02/16 15:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:11 wiz Exp $
#
DISTNAME= Sigil-0.1.9-Code
PKGNAME= ${DISTNAME:S/-Code//}
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://sigil.googlecode.com/files/
EXTRACT_SUFX= .zip
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 4a962fa1e6e..60893fc9416 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.122 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2010/06/13 22:44:11 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-PKGREVISION= 4
+PKGREVISION= 6
COMMENT= Open Source cross-platform word processor
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index cd143e23c7a..87c7b15310a 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:57:23 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:11 wiz Exp $
#
DISTNAME= beaver${BEAVER_VERSION:S/./_/g}
PKGNAME= beaver-${BEAVER_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://download.savannah.gnu.org/releases/beaver/0.3.0.1%20-%202008.06.26/
EXTRACT_SUFX= .tgz
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 72f70783cf7..3298590e25e 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2010/04/14 23:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2010/06/13 22:44:11 wiz Exp $
#
DISTNAME= conglomerate-0.9.1
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=conglomerate/}
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index a35cca65cf7..ee92ae7d79f 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2010/01/22 19:55:07 ghen Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:11 wiz Exp $
DISTNAME= dasher-4.10.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dasher/4.10/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 1e1a4c8e581..257ee146c2c 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2010/06/11 08:36:19 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2010/06/13 22:44:11 wiz Exp $
#
DISTNAME= gconf-editor-2.28.0
-#PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gconf-editor/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index e97c16252dc..31809a755dc 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.103 2010/04/13 16:52:39 drochner Exp $
+# $NetBSD: Makefile,v 1.104 2010/06/13 22:44:12 wiz Exp $
#
DISTNAME= gedit-2.28.4
+PKGREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gedit/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index 89cfec6a851..7a46874f857 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:12 wiz Exp $
BUILDLINK_TREE+= gedit
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gedit
GEDIT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gedit+= gedit>=2.12.1nb4
-BUILDLINK_ABI_DEPENDS.gedit?= gedit>=2.26.3nb1
+BUILDLINK_ABI_DEPENDS.gedit?= gedit>=2.28.4nb1
BUILDLINK_PKGSRCDIR.gedit?= ../../editors/gedit
.include "../../x11/gtksourceview2/buildlink3.mk"
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 3946d625121..ee9ba7b9e69 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/29 19:43:32 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:12 wiz Exp $
#
DISTNAME= ghex-2.24.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ghex/2.24/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index 557738af7c4..a3406bf3daf 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2009/08/26 19:57:24 sno Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:12 wiz Exp $
#
DISTNAME= gice-0.6.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gice/}
EXTRACT_SUFX= .tgz
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index f7b13a1e02b..4541469ad91 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/10/27 19:47:54 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:12 wiz Exp $
#
DISTNAME= gobby-0.4.11
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://releases.0x539.de/gobby/
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 59b7db6ee77..44010f3d508 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:12 wiz Exp $
DISTNAME= gtranslator-1.1.7
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtranslator/1.1/}
diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile
index eff8fad5b9a..01ebcbaa57d 100644
--- a/editors/kdissert/Makefile
+++ b/editors/kdissert/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/04/01 06:07:43 obache Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:12 wiz Exp $
#
DISTNAME= kdissert-1.0.7
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= editors
MASTER_SITES= http://freehackers.org/~tnagy/kdissert/
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 67f4947a82d..205f37c9a01 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:12 wiz Exp $
DISTNAME= kile-2.0.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kile/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index b0a2ac722ed..c7b5b80ac9c 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2009/11/17 03:55:19 snj Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:12 wiz Exp $
DISTNAME= leafpad-0.8.17
+PKGREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= http://savannah.nongnu.org/download/leafpad/
diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile
index a0451371b41..0e56942df5c 100644
--- a/editors/lyx/Makefile
+++ b/editors/lyx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/05/06 10:46:49 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:12 wiz Exp $
#
DISTNAME= lyx-1.6.5
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/ \
http://gd.tuwien.ac.at/publishing/tex/lyx/stable/1.6.x/ \
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index ac471800b23..96791ab2dc4 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:12 wiz Exp $
#
DISTNAME= mlview-0.9.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/mlview/0.9/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/notecase/Makefile b/editors/notecase/Makefile
index 935bc9c809d..579960b105c 100644
--- a/editors/notecase/Makefile
+++ b/editors/notecase/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/01/29 19:54:39 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:12 wiz Exp $
#
DISTNAME= notecase-1.8.8_src
PKGNAME= notecase-1.8.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=notecase/}
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index f79d90f111d..32fdf767e68 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/03/09 21:56:59 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:13 wiz Exp $
#
DISTNAME= Padre-0.58
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= editors perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Padre/}
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index c86e3863db0..b3d73aa5db9 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/06/02 12:32:18 adam Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:13 wiz Exp $
DISTNAME= poedit-1.4.6.1
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poedit/}
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index 364779fea21..d85318784af 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:26 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:13 wiz Exp $
#
DISTNAME= tea-16.0.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tea-editor/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index aeeed83816b..5edc154c8d3 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:44:13 wiz Exp $
DISTNAME= ted-2.16.src
PKGNAME= ted-2.16
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
@@ -24,8 +24,9 @@ INFODIR= ${PREFIX}/share/doc/Ted
CONFIGURE_ENV+= ac_jpeg_includes="${BUILDLINK_PREFIX.jpeg}/include"
CONFIGURE_ENV+= ac_jpeg_libraries="${BUILDLINK_PREFIX.jpeg}/lib"
-CONFIGURE_ENV+= ac_png_includes="${BUILDLINK_PREFIX.png}/include"
-CONFIGURE_ENV+= ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
+# disabled, has not been update since about libpng-0.90
+#CONFIGURE_ENV+= ac_png_includes="${BUILDLINK_PREFIX.png}/include"
+#CONFIGURE_ENV+= ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include"
CONFIGURE_ENV+= ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib"
CONFIGURE_ENV+= ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include"
@@ -85,7 +86,7 @@ do-install:
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
+#.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../mk/motif.buildlink3.mk"
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 6d335497198..a911ebed2eb 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/29 20:06:06 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:13 wiz Exp $
DISTNAME= texmaker-1.8
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= editors
MASTER_SITES= http://www.xm1math.net/texmaker/
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/tomboy/Makefile b/editors/tomboy/Makefile
index 3e95d9dce30..fc635ff91e2 100644
--- a/editors/tomboy/Makefile
+++ b/editors/tomboy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:13 wiz Exp $
#
DISTNAME= tomboy-1.0.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= editors misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/tomboy/1.0/}
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index 44fa2e6ee9c..3275cde0c08 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:58:48 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:44:13 wiz Exp $
PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Vim editor (vi clone) with X11 GTK2 GUI
diff --git a/editors/xfce4-mousepad/Makefile b/editors/xfce4-mousepad/Makefile
index be919900d00..3de8ae4e123 100644
--- a/editors/xfce4-mousepad/Makefile
+++ b/editors/xfce4-mousepad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/09/16 01:15:33 reed Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:13 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,6 +8,7 @@ XFCE4_VERSION= 0.2.16
DISTNAME= mousepad-${XFCE4_VERSION}
PKGNAME= xfce4-mousepad-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= editors
COMMENT= Xfce text editor
diff --git a/emulators/NeoPop-SDL/Makefile b/emulators/NeoPop-SDL/Makefile
index e4595d9e6b7..6fed40bebd1 100644
--- a/emulators/NeoPop-SDL/Makefile
+++ b/emulators/NeoPop-SDL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/06/12 02:14:29 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:13 wiz Exp $
#
DISTNAME= NeoPop-SDL-0.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= emulators
MASTER_SITES= http://www.nih.at/NeoPop-SDL/
EXTRACT_SUFX= .tar.bz2
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 19c250756ea..87537ada120 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2009/11/04 11:44:15 adam Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:44:13 wiz Exp $
DISTNAME= atari800-2.1.0
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atari800/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip
diff --git a/emulators/blinkensim/Makefile b/emulators/blinkensim/Makefile
index 81c10e30ab9..2135ea85af6 100644
--- a/emulators/blinkensim/Makefile
+++ b/emulators/blinkensim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:26 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:14 wiz Exp $
#
DISTNAME= blinkensim-2.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= emulators graphics
MASTER_SITES= http://sven.gimp.org/blinkenlights/old/
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 4f7d23632ac..754243bea01 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2009/05/28 11:04:52 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:14 wiz Exp $
DISTNAME= dosbox-0.73
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dosbox/}
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index d8ac57eac57..82ba3e1b451 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2009/08/26 19:58:44 sno Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:14 wiz Exp $
DISTNAME= fuse-0.10.0.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index cc92b532f87..4c87f9de260 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2010/05/29 16:28:17 dillo Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:14 wiz Exp $
#
DISTNAME= gens-rc3
PKGNAME= gens-2.12rc3
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gens/}
diff --git a/emulators/gpsim-devel/Makefile b/emulators/gpsim-devel/Makefile
index f885da0ba9c..c37ed732fd8 100644
--- a/emulators/gpsim-devel/Makefile
+++ b/emulators/gpsim-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:14 wiz Exp $
#
DISTNAME= gpsim-20050905
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= emulators
MASTER_SITES= http://www-asim.lip6.fr/~bouyer/pic/
diff --git a/emulators/gpsim-devel/buildlink3.mk b/emulators/gpsim-devel/buildlink3.mk
index c0cdad1043e..251599d35bc 100644
--- a/emulators/gpsim-devel/buildlink3.mk
+++ b/emulators/gpsim-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:14 wiz Exp $
BUILDLINK_TREE+= gpsim
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gpsim
GPSIM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gpsim+= gpsim>=20050905
-BUILDLINK_ABI_DEPENDS.gpsim+= gpsim>=20050905nb5
+BUILDLINK_ABI_DEPENDS.gpsim+= gpsim>=20050905nb6
BUILDLINK_PKGSRCDIR.gpsim?= ../../emulators/gpsim-devel
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/emulators/gpsim-oscilloscope/Makefile b/emulators/gpsim-oscilloscope/Makefile
index 911b6ada15b..02d478ae924 100644
--- a/emulators/gpsim-oscilloscope/Makefile
+++ b/emulators/gpsim-oscilloscope/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/08/26 19:57:26 sno Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:14 wiz Exp $
#
DISTNAME= oscilloscope-0.1.2
PKGNAME= gpsim-${DISTNAME}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= emulators
MASTER_SITES= http://www-asim.lip6.fr/~bouyer/pic/
diff --git a/emulators/gpsim-ptyusart/Makefile b/emulators/gpsim-ptyusart/Makefile
index 1521c90ed49..3d64945bd55 100644
--- a/emulators/gpsim-ptyusart/Makefile
+++ b/emulators/gpsim-ptyusart/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2010/01/29 22:54:48 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:14 wiz Exp $
#
DISTNAME= ptyusart-0.3.2
PKGNAME= gpsim-${DISTNAME}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= emulators
MASTER_SITES= http://www-asim.lip6.fr/~bouyer/pic/
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index 98e6f08992e..a8b02bfa682 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2009/08/26 19:57:27 sno Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:14 wiz Exp $
#
DISTNAME= gpsim-0.21.11
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpsim/}
diff --git a/emulators/kenigma/Makefile b/emulators/kenigma/Makefile
index 3bc7288a86a..a14a5d7a48f 100644
--- a/emulators/kenigma/Makefile
+++ b/emulators/kenigma/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:58:49 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:14 wiz Exp $
DISTNAME= 28107-kenigma-1.2.1
PKGNAME= kenigma-1.2.1
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= emulators security
MASTER_SITES= http://www.kde-apps.org/content/files/
diff --git a/emulators/nestopia/Makefile b/emulators/nestopia/Makefile
index a7a8b8df125..38131bd0c81 100644
--- a/emulators/nestopia/Makefile
+++ b/emulators/nestopia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:27 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:14 wiz Exp $
#
DISTNAME= Nestopia140src
PKGNAME= nestopia-1.40h
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nestopia/}
EXTRACT_SUFX= .zip
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 45e8c5178b0..cb846e7f36f 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2010/01/29 23:01:53 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:14 wiz Exp $
#
DISTNAME= openmsx-0.6.2
#PKGREVISION= 1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openmsx/}
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 76e837b3829..a1fc321b23e 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2010/04/06 04:36:00 dsainty Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:44:15 wiz Exp $
#
DISTNAME= emulator_src_${POSE_VERSION}
PKGNAME= palmosemulator-${POSE_VERSION}
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= emulators x11
MASTER_SITES= http://www.palmos.com/dev/tools/emulator/sources/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 4ec79f7d264..5da0ea89537 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/01/17 08:16:52 dholland Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:15 wiz Exp $
#
DISTNAME= raines-0.43.3
PKGNAME= ${DISTNAME:S/raines/raine/}
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://rainemu.swishparty.co.uk/html/archive/
EXTRACT_SUFX= .tar.bz2
diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile
index fb75cfeb1f7..935c6d0ce22 100644
--- a/emulators/sdlmame/Makefile
+++ b/emulators/sdlmame/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2010/01/16 21:25:19 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:15 wiz Exp $
#
# Don't update to 0.XXXuN, those are development snapshots.
DISTNAME= sdlmame0136
PKGNAME= ${DISTNAME:S/0/-0./}
+PKGREVISION= 1
COMMENT= Multiple Arcade Machine Emulator, SDL port
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index 3328cae269a..896383fa994 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/02/05 12:57:27 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:15 wiz Exp $
#
DISTNAME= snes9x-1.52-src
PKGNAME= snes9x-gtk-1.52.79
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://snes9x-gtk.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 6ef2bcb4bab..7f3a32e14ab 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2009/09/26 19:55:47 dholland Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:44:15 wiz Exp $
STELLA_VERSION= 3.0
DISTNAME= stella-${STELLA_VERSION}-src
PKGNAME= stella-${STELLA_VERSION}
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=stella/}
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index a8e5a5f1d9d..7b5aaa21b44 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2009/08/26 19:57:27 sno Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:44:15 wiz Exp $
DISTNAME= uae-0.8.25
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= emulators
MASTER_SITES= http://www.freiburg.linux.de/~uae/bin/sources/develop/
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index d4a2912ad4b..ac13ac2dd1f 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2008/03/03 19:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:15 wiz Exp $
DISTNAME= VisualBoyAdvance-src-1.7.2
PKGNAME= vba-1.7.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vba/}
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index b8cc2e3d1b2..f94932c89d3 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2009/08/26 19:58:44 sno Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/13 22:44:15 wiz Exp $
#
DISTNAME= vice-1.22
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ \
http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index b2395cc0657..15f12729bf5 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.155 2010/01/18 09:58:49 wiz Exp $
+# $NetBSD: Makefile,v 1.156 2010/06/13 22:44:15 wiz Exp $
DISTNAME= wine-1.0.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= emulators
MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \
${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 59f69fc26c6..05737ac0c8d 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/06/05 12:20:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:15 wiz Exp $
DISTNAME= yabause-0.9.10
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yabause/}
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index bd27f60c281..5093e389b44 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2007/06/06 22:05:45 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:16 wiz Exp $
DISTNAME= zsnes151src
PKGNAME= zsnes-1.51
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsnes/}
EXTRACT_SUFX= .tar.bz2
diff --git a/filesystems/fuse-pod/Makefile b/filesystems/fuse-pod/Makefile
index cbf4a280d6f..ec2a86b7d4b 100644
--- a/filesystems/fuse-pod/Makefile
+++ b/filesystems/fuse-pod/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:27 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:16 wiz Exp $
#
DISTNAME= fusepod-0.5.1
PKGNAME= fuse-pod-0.5.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= filesystems
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fusepod/}
EXTRACT_SUFX= .tar.bz2
diff --git a/finance/gkrellm-stock/Makefile b/finance/gkrellm-stock/Makefile
index e9176ca0e36..28e1580efae 100644
--- a/finance/gkrellm-stock/Makefile
+++ b/finance/gkrellm-stock/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2010/01/17 12:02:16 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:16 wiz Exp $
#
DISTNAME= gkrellstock-0.5.1
PKGNAME= gkrellm-stock-0.5.1
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellstock/}
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 4885cdbf8e8..c4b467f6aa8 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.141 2010/03/24 19:43:23 asau Exp $
+# $NetBSD: Makefile,v 1.142 2010/06/13 22:44:16 wiz Exp $
#
DISTNAME= gnucash-2.2.9
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnucash/}
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index aaac0d07786..46aa672e85a 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2010/03/16 09:17:38 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:44:16 wiz Exp $
DISTNAME= kmymoney2-1.0.3
+PKGREVISION= 1
CATEGORIES= finance kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kmymoney2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 5ef72d118f9..c58957be50e 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2010/05/21 06:34:23 adam Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/13 22:44:16 wiz Exp $
DISTNAME= fontforge_full-${VERSION}
PKGNAME= fontforge-${VERSION}
+PKGREVISION= 1
CATEGORIES= fonts editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/}
EXTRACT_SUFX= .tar.bz2
diff --git a/fonts/gbdfed/Makefile b/fonts/gbdfed/Makefile
index f5924a3a2e0..32292af3132 100644
--- a/fonts/gbdfed/Makefile
+++ b/fonts/gbdfed/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:28 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:16 wiz Exp $
#
DISTNAME= gbdfed-1.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts
MASTER_SITES= http://www.math.nmsu.edu/~mleisher/Software/gbdfed/
EXTRACT_SUFX= .tbz2
diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk
index d9162378fd6..b58b6c93ff1 100644
--- a/fonts/gucharmap/buildlink3.mk
+++ b/fonts/gucharmap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2010/04/20 17:01:09 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:44:16 wiz Exp $
BUILDLINK_TREE+= gucharmap
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gucharmap
GUCHARMAP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gucharmap+= gucharmap>=2.24.1
-BUILDLINK_ABI_DEPENDS.gucharmap?= gucharmap>=2.26.3.1
+BUILDLINK_ABI_DEPENDS.gucharmap?= gucharmap>=2.28.2
BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/games/4stAttack/Makefile b/games/4stAttack/Makefile
index 77c14b5bc46..d68dc32c9a5 100644
--- a/games/4stAttack/Makefile
+++ b/games/4stAttack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/02/10 19:17:38 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:16 wiz Exp $
#
DISTNAME= 4stAttack-2.1.4
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=forcedattack/}
diff --git a/games/InterLOGIC/Makefile b/games/InterLOGIC/Makefile
index 6c5a6d03212..6d31fd268f6 100644
--- a/games/InterLOGIC/Makefile
+++ b/games/InterLOGIC/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:58:49 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:16 wiz Exp $
#
DISTNAME= interLOGIC-src-0.30
# authors' preferred casing
PKGNAME= InterLOGIC-0.30
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=interlogic/}
diff --git a/games/KoboDeluxe/Makefile b/games/KoboDeluxe/Makefile
index ec8d70e4939..3b8f3734b72 100644
--- a/games/KoboDeluxe/Makefile
+++ b/games/KoboDeluxe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:58:50 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:17 wiz Exp $
#
DISTNAME= KoboDeluxe-0.5.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= http://olofson.net/kobodl/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/games/LostPixels/Makefile b/games/LostPixels/Makefile
index 0503f79a082..28e37caa968 100644
--- a/games/LostPixels/Makefile
+++ b/games/LostPixels/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/01/29 20:15:46 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:17 wiz Exp $
#
DISTNAME= LostPixels-0.5.3-source
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blinkensisters/}
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 817e66d9120..e4132d26305 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/05/15 09:11:40 adam Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:17 wiz Exp $
DISTNAME= AlephOne-20100424
PKGNAME= ${DISTNAME:tl}
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=marathon/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 469b2a600b2..d30bdfdca0e 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:58:50 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:17 wiz Exp $
DISTNAME= asc-source-1.16.4.0
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asc-hq/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index 4614a8d42b8..8c5a10b6303 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/29 20:21:21 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:17 wiz Exp $
#
DISTNAME= atomix-2.14.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/atomix/2.14/}
diff --git a/games/blindmine/Makefile b/games/blindmine/Makefile
index 5e8de65f660..35b8ad6491c 100644
--- a/games/blindmine/Makefile
+++ b/games/blindmine/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/02/10 19:17:38 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:17 wiz Exp $
#
DISTNAME= blindmine-0.3-src
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games python
MASTER_SITES= http://kldp.net/frs/download.php/3097/
EXTRACT_SUFX= .zip
diff --git a/games/bluemoon/Makefile b/games/bluemoon/Makefile
index d2f99446ab7..8e1b565620b 100644
--- a/games/bluemoon/Makefile
+++ b/games/bluemoon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:28 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:17 wiz Exp $
#
DISTNAME= bluemoon-1.3.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://keldon.net/bluemoon/
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index edb6ec94c71..1f6f387d588 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:58:50 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:17 wiz Exp $
DISTNAME= bomberclone-0.11.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bomberclone/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/boson/Makefile b/games/boson/Makefile
index 193f8e37df3..35c593f24c6 100644
--- a/games/boson/Makefile
+++ b/games/boson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2010/01/18 09:58:50 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:44:17 wiz Exp $
#
DISTNAME= boson-all-0.8
PKGNAME= ${DISTNAME:S/-all//}
-PKGREVISION= 21
+PKGREVISION= 22
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boson/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index b3cfa120edb..0fd3dd513fc 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2009/08/26 19:57:29 sno Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:17 wiz Exp $
DISTNAME= ccgo-0.3.6.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://ccdw.org/~cjj/prog/ccgo/src/
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index c9c2432560b..c8bd15fbd8b 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:58:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:17 wiz Exp $
#
DISTNAME= chromium-bsu-0.9.14
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=chromium-bsu/}
diff --git a/games/circuslinux/Makefile b/games/circuslinux/Makefile
index bd901744cd9..641e659e4da 100644
--- a/games/circuslinux/Makefile
+++ b/games/circuslinux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/01/29 20:26:04 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:18 wiz Exp $
#
DISTNAME= circuslinux-1.0.3
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/circus-linux/src/
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index bbf31b18e64..e60499bc032 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 19:57:29 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:18 wiz Exp $
DISTNAME= crack-attack-1.1.14
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games
MASTER_SITES= http://savannah.nongnu.org/download/crack-attack/
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index b3dcbb98878..d807ec4e034 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:58:50 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:44:18 wiz Exp $
#
DISTNAME= CriticalMass-1.0.2
PKGNAME= ${DISTNAME:tl}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=criticalmass/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/criticalmass/distinfo b/games/criticalmass/distinfo
index 78464fc6380..29e49d8d09d 100644
--- a/games/criticalmass/distinfo
+++ b/games/criticalmass/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/08/15 08:42:36 xtraeme Exp $
+$NetBSD: distinfo,v 1.8 2010/06/13 22:44:18 wiz Exp $
SHA1 (CriticalMass-1.0.2.tar.bz2) = d2d1f35183e9fbed76fd8da2a948745a4c89f20b
RMD160 (CriticalMass-1.0.2.tar.bz2) = 6c0b6988f6a52c4b19fbca2525b1daec0202693d
Size (CriticalMass-1.0.2.tar.bz2) = 5122126 bytes
+SHA1 (patch-aa) = c8f329fdf20df88a961e95b2a1fb8dbca85871f0
diff --git a/games/criticalmass/patches/patch-aa b/games/criticalmass/patches/patch-aa
new file mode 100644
index 00000000000..696c9dd3c75
--- /dev/null
+++ b/games/criticalmass/patches/patch-aa
@@ -0,0 +1,54 @@
+$NetBSD: patch-aa,v 1.3 2010/06/13 22:44:18 wiz Exp $
+
+--- configure.orig 2006-07-16 01:48:28.000000000 +0000
++++ configure
+@@ -3864,13 +3864,13 @@ else
+ LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
+ CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
+
+-echo "$as_me:$LINENO: checking for main in -lpng12" >&5
+-echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6
+-if test "${ac_cv_lib_png12_main+set}" = set; then
++echo "$as_me:$LINENO: checking for main in -lpng" >&5
++echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng12 $LIBS"
++LIBS="-lpng $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -3908,25 +3908,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_png12_main=yes
++ ac_cv_lib_png_main=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_png12_main=no
++ac_cv_lib_png_main=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png12_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_png12_main" >&6
+-if test $ac_cv_lib_png12_main = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
++echo "${ECHO_T}$ac_cv_lib_png_main" >&6
++if test $ac_cv_lib_png_main = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPNG12 1
+ _ACEOF
+
+- LIBS="-lpng12 $LIBS"
++ LIBS="-lpng $LIBS"
+
+ else
+ { { echo "$as_me:$LINENO: error: libpng is needed" >&5
diff --git a/games/crossfire-client-gtk2/Makefile b/games/crossfire-client-gtk2/Makefile
index 16353338f92..08b0cdb69db 100644
--- a/games/crossfire-client-gtk2/Makefile
+++ b/games/crossfire-client-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:18 wiz Exp $
.include "../../games/crossfire-client/Makefile.common"
PKGNAME= crossfire-client-gtk2-${CROSSFIRE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Multi-player graphical arcade and adventure game; GTK2 client
INSTALL_DIRS= gtk-v2
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 312da093568..a2a1d8fa9a2 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:58:50 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:18 wiz Exp $
.include "../../games/crossfire-client/Makefile.common"
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= Multi-player graphical arcade and adventure game; X11 client
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 2b91bd8aaef..00324da1708 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/02/10 19:17:38 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:18 wiz Exp $
DISTNAME= crossfire-1.11.0
PKGNAME= crossfire-server-1.11.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=crossfire/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index 1dfaeae5e24..17d97eb42a4 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:18 wiz Exp $
#
DISTNAME= d2x-0.2.5
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= games x11
MASTER_SITES= http://icculus.org/d2x/src/
diff --git a/games/duckmaze/Makefile b/games/duckmaze/Makefile
index 31b846439d3..68d62796b79 100644
--- a/games/duckmaze/Makefile
+++ b/games/duckmaze/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/02/10 19:17:38 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:18 wiz Exp $
#
DISTNAME= duckmaze-pc-0.2
PKGNAME= duckmaze-0.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=duckmaze/}
EXTRACT_SUFX= .zip
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 157da3c4020..db498f07846 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:29 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:18 wiz Exp $
#
DISTNAME= eboard-1.0.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eboard/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 1672519f378..77c4e7c5090 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:58:51 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:18 wiz Exp $
DISTNAME= enigma-1.01
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= http://download.berlios.de/enigma-game/
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 8a688e9519f..4c943ccc290 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:58:51 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:19 wiz Exp $
#
DISTNAME= fillets-ng-0.7.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fillets/}
diff --git a/games/fltk-sudoku/Makefile b/games/fltk-sudoku/Makefile
index 9e495514ed1..778e4634d45 100644
--- a/games/fltk-sudoku/Makefile
+++ b/games/fltk-sudoku/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:58:51 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:19 wiz Exp $
DISTNAME= fltk-1.1.7-source
PKGNAME= fltk-sudoku-1.1.7
-PKGREVISION= 3
+PKGREVISION= 4
VERS= ${DISTNAME:S/fltk-//:S/-source//}
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fltk/} \
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 4499d371b54..68e8d5a8166 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/11/10 17:21:35 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:19 wiz Exp $
#
DISTNAME= foobillard-3.0a
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= games
MASTER_SITES= http://foobillard.sunsite.dk/dnl/
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 190d8b7ddca..838d6e70706 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2010/02/10 19:17:38 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2010/06/13 22:44:19 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Freeciv client
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index db0d57ab635..311e8543d42 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:58:51 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:19 wiz Exp $
#
DISTNAME= freedroid-1.0.2
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freedroid/}
diff --git a/games/gamazons/Makefile b/games/gamazons/Makefile
index 16db141650f..f16eb7cc9fb 100644
--- a/games/gamazons/Makefile
+++ b/games/gamazons/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:58:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:19 wiz Exp $
#
DISTNAME= gamazons-0.83
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= games
MASTER_SITES= http://www.yorgalily.org/gamazons/src/
diff --git a/games/gbrainy/Makefile b/games/gbrainy/Makefile
index 1f53f91be82..1a1d963dd40 100644
--- a/games/gbrainy/Makefile
+++ b/games/gbrainy/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/05/02 11:08:06 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:44:19 wiz Exp $
#
DISTNAME= gbrainy-1.41
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://gent.softcatala.org/jmas/gbrainy/
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 5cf0279f51f..2bab7b6c117 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/02/10 19:17:38 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:19 wiz Exp $
DISTNAME= gcompris-8.4.4
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gcompris/}
diff --git a/games/genecys-client/Makefile b/games/genecys-client/Makefile
index 2f440fcaed3..8861ce6fc74 100644
--- a/games/genecys-client/Makefile
+++ b/games/genecys-client/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:19 wiz Exp $
#
DISTNAME= genecys-0.2
PKGNAME= genecys-client-0.2
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=genecys/}
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index c5cbabb6b5e..179414383d6 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2010/01/29 23:06:03 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:20 wiz Exp $
#
DISTNAME= glaxium_0.5
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games
MASTER_SITES= http://xhosxe.free.fr/glaxium/
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 0c1c52cc123..b847bfd3242 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2008/11/08 21:13:28 bjs Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:20 wiz Exp $
#
DISTNAME= gltron-0.70-source
PKGNAME= ${DISTNAME:S/-source$//}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gltron/}
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 452b1d684df..ed938074ea1 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2010/03/24 19:43:24 asau Exp $
+# $NetBSD: Makefile,v 1.109 2010/06/13 22:44:20 wiz Exp $
DISTNAME= gnome-games-2.28.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-games/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/gnome-mastermind/Makefile b/games/gnome-mastermind/Makefile
index e1b0a15f03c..363fe6afdec 100644
--- a/games/gnome-mastermind/Makefile
+++ b/games/gnome-mastermind/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:31 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:20 wiz Exp $
#
DISTNAME= gnome-mastermind-0.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://download.gna.org/gnome-mastermind/
EXTRACT_SUFX= .tar.bz2
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index 852eb2ee8d5..3903eddd008 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2010/01/18 09:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:20 wiz Exp $
#
DISTNAME= grhino-0.16.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rhino/}
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index aa86d3a9ec8..98bdc163e84 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2010/01/18 09:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:44:20 wiz Exp $
#
DISTNAME= gtetrinet-0.7.11
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtetrinet/0.7/}
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 5cafdf9329c..26ee2dadc5a 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/02/19 20:14:07 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:44:20 wiz Exp $
DISTNAME= gtkballs-3.1.5
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= games
MASTER_SITES= http://gtkballs.antex.ru/dist/
diff --git a/games/gtklevel9/Makefile b/games/gtklevel9/Makefile
index 38e32ce15e2..4108bc33cc5 100644
--- a/games/gtklevel9/Makefile
+++ b/games/gtklevel9/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/08/26 19:57:31 sno Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:20 wiz Exp $
DISTNAME= Level9_4.0_Source
PKGNAME= gtklevel9-4.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.ifarchive.org/if-archive/level9/interpreters/level9/
EXTRACT_SUFX= .zip
diff --git a/games/gtkmagnetic/Makefile b/games/gtkmagnetic/Makefile
index 430e6f369b9..8819d451d35 100644
--- a/games/gtkmagnetic/Makefile
+++ b/games/gtkmagnetic/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2009/08/26 19:57:31 sno Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:20 wiz Exp $
#
DISTNAME= Magnetic22Src
# core version: 2.2, gui version: 1.6
PKGNAME= gtkmagnetic-2.2.1.6
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= http://www.ifarchive.org/if-archive/magnetic-scrolls/interpreters/magnetic/
EXTRACT_SUFX= .zip
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 32ed42bc4a5..3bda92aec08 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2010/01/18 09:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/06/13 22:44:20 wiz Exp $
#
DISTNAME= gturing-0.1.1
-PKGREVISION= 27
+PKGREVISION= 28
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gturing/0.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile
index 2cbcb655b12..e3677ce294b 100644
--- a/games/kajaani-kombat/Makefile
+++ b/games/kajaani-kombat/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:20 wiz Exp $
#
DISTNAME= kajaani-kombat-0.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= http://kombat.kajaani.net/dl/
diff --git a/games/kanatest/Makefile b/games/kanatest/Makefile
index 7fae4c8c2ff..16091b28474 100644
--- a/games/kanatest/Makefile
+++ b/games/kanatest/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/12/16 23:55:13 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:21 wiz Exp $
DISTNAME= kanatest-0.4.8
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://clayo.org/kanatest/
diff --git a/games/kapooka/Makefile b/games/kapooka/Makefile
index 6d2a41614b4..2da17e81a3d 100644
--- a/games/kapooka/Makefile
+++ b/games/kapooka/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:21 wiz Exp $
#
DISTNAME= kapooka_0.2
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kapooka/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 3517e698f57..32b4d50ae11 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2010/01/18 09:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:21 wiz Exp $
DISTNAME= kdegames-${_KDE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games
COMMENT= Games for the KDE integrated X11 desktop
diff --git a/games/kdegames3/buildlink3.mk b/games/kdegames3/buildlink3.mk
index 62f8b24d67f..73f0bd203c5 100644
--- a/games/kdegames3/buildlink3.mk
+++ b/games/kdegames3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/01/18 09:58:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:44:21 wiz Exp $
BUILDLINK_TREE+= kdegames
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdegames
KDEGAMES_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdegames+= kdegames>=3.5.0nb1
-BUILDLINK_ABI_DEPENDS.kdegames?= kdegames>=3.5.10nb4
+BUILDLINK_ABI_DEPENDS.kdegames?= kdegames>=3.5.10nb5
BUILDLINK_PKGSRCDIR.kdegames?= ../../games/kdegames3
.include "../../x11/kdebase3/buildlink3.mk"
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index a3d2b3eb70f..3e36df95b25 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/05/08 22:13:56 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:21 wiz Exp $
DISTNAME= kdegames-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= games
COMMENT= Games for the KDE integrated X11 desktop
diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile
index 4129a823614..1c1a54849ae 100644
--- a/games/kdetoys3/Makefile
+++ b/games/kdetoys3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2010/01/31 22:09:06 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2010/06/13 22:44:21 wiz Exp $
DISTNAME= kdetoys-${_KDE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games
COMMENT= Toys for the KDE integrated X11 desktop
diff --git a/games/kdetoys4/Makefile b/games/kdetoys4/Makefile
index 74f59de9e51..34a779e4b8d 100644
--- a/games/kdetoys4/Makefile
+++ b/games/kdetoys4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 10:38:39 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:21 wiz Exp $
DISTNAME= kdetoys-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= games
COMMENT= Toys for the KDE integrated X11 desktop
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 06604646d73..9aa6ed5a8f3 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/29 23:33:15 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:21 wiz Exp $
DISTNAME= knights-0.6
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=knights/}
diff --git a/games/kye/Makefile b/games/kye/Makefile
index 4c06154f032..d65f14809bc 100644
--- a/games/kye/Makefile
+++ b/games/kye/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/05/05 18:33:25 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:21 wiz Exp $
#
DISTNAME= kye-0.9.4
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://games.moria.org.uk/kye/download/
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index e2567b65443..25704369ce3 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/02/07 21:04:13 heinz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:44:21 wiz Exp $
DISTNAME= lbreakout2-2.5.2
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lgames/}
diff --git a/games/mirrormagic-sdl/Makefile b/games/mirrormagic-sdl/Makefile
index c8566664c5c..2fd4c80396b 100644
--- a/games/mirrormagic-sdl/Makefile
+++ b/games/mirrormagic-sdl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:58:53 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:21 wiz Exp $
#
DISTNAME= mirrormagic-2.0.2
PKGNAME= ${DISTNAME:S/-/-sdl-/}
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= games x11
MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 22d49b50f54..64f2e6fca70 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.56 2010/01/18 09:58:53 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2010/06/13 22:44:21 wiz Exp $
#
.include "../../games/nethack-lib/Makefile.common"
PKGNAME= nethack-qt-${NETHACK_VERSION}
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES+= x11
MAKE_JOBS_SAFE= no
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index e4c2f8118e6..3bc0986d3ca 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:58:53 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:22 wiz Exp $
DISTNAME= neverball-1.5.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://neverball.org/
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index a3bb5c5b651..292c1478e17 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:58:53 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:22 wiz Exp $
#
DISTNAME= openmortal-0.7
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openmortal/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 5e334a3e658..76b00a70301 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/01/03 12:07:58 obache Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:44:22 wiz Exp $
DISTNAME= openttd-0.7.2-source
PKGNAME= ${DISTNAME:S/-source//}
+PKGREVISION= 1
CATEGORIES= games x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openttd/}
diff --git a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile
index c16f9a0417b..dc8ae0d41be 100644
--- a/games/orbital_eunuchs_sniper/Makefile
+++ b/games/orbital_eunuchs_sniper/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:53 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:22 wiz Exp $
#
DISTNAME= orbital_eunuchs_sniper-1.30
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= http://icculus.org/oes/
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index f88b70ce08e..f963910e7cf 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:57:33 sno Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:22 wiz Exp $
#
DISTNAME= pioneers-0.11.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pio/}
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index f39c68cca50..abc1d872507 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/05/15 07:22:15 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:22 wiz Exp $
DISTNAME= PokerTH-0.7.1-src
PKGNAME= pokerth-0.7.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pokerth/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/puzzles/Makefile b/games/puzzles/Makefile
index f855f37010e..715121472b7 100644
--- a/games/puzzles/Makefile
+++ b/games/puzzles/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/01/16 17:23:50 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:22 wiz Exp $
#
DISTNAME= puzzles-r8839
PKGNAME= ${DISTNAME:S/-r/-/}
+PKGREVISION= 1
CATEGORIES= games
# distfile changes daily
MASTER_SITES= # http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
diff --git a/games/pytraffic/Makefile b/games/pytraffic/Makefile
index 25b442f7154..8d2a533220e 100644
--- a/games/pytraffic/Makefile
+++ b/games/pytraffic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/02/10 19:17:39 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:22 wiz Exp $
#
DISTNAME= pytraffic-2.5.4
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games
MASTER_SITES= http://alpha.uhasselt.be/Research/Algebra/Members/pytraffic/
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index 74f509fe0af..c00f0ad1552 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/02/14 22:20:05 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= qnetwalk-1.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11 games
MASTER_SITES= http://qt.osdn.org.ua/
diff --git a/games/qonk/Makefile b/games/qonk/Makefile
index 11915c9707b..86984e23311 100644
--- a/games/qonk/Makefile
+++ b/games/qonk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:58:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= qonk-0.3.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qonk/}
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 6007c5f4615..b00a74eb930 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/05/22 16:50:00 snj Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:23 wiz Exp $
DISTNAME= quakeforge-0.5.5
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quake/}
diff --git a/games/quarry/Makefile b/games/quarry/Makefile
index 972376399d5..322b89b70ee 100644
--- a/games/quarry/Makefile
+++ b/games/quarry/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:57:33 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= quarry-0.2.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://download.gna.org/quarry/
diff --git a/games/rftg/Makefile b/games/rftg/Makefile
index 43f8efa786c..2a35790d428 100644
--- a/games/rftg/Makefile
+++ b/games/rftg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/16 16:35:04 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= rftg-0.6.1
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://warpcore.org/rftg/ \
http://keldon.net/rftg/
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 3916f1e9291..8c78f97159c 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/05/25 13:16:11 dillo Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= scummvm-tools-0.9.0
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/singularity/Makefile b/games/singularity/Makefile
index 035747bd9c5..423ff6c6051 100644
--- a/games/singularity/Makefile
+++ b/games/singularity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/02/10 19:17:39 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= singularity_0.28
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.emhsoft.com/singularity/
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index d6584eeb0cb..235dd485c45 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2010/01/18 09:58:53 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= sirius-0.8.0
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= games gnome
MASTER_SITES= http://sirius.bitvis.nu/files/
diff --git a/games/six/Makefile b/games/six/Makefile
index 3c3eb8746ba..1931c87f6ed 100644
--- a/games/six/Makefile
+++ b/games/six/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:58:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= six-0.5.3
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= games
MASTER_SITES= http://six.retes.hu/download/
diff --git a/games/spaceracer/Makefile b/games/spaceracer/Makefile
index d705e49349b..d9cd48a21ff 100644
--- a/games/spaceracer/Makefile
+++ b/games/spaceracer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/06/20 01:09:20 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= spaceracer-0.2.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= http://spaceracer.sourceforge.net/
EXTRACT_SUFX= .tgz
diff --git a/games/stegavorto/Makefile b/games/stegavorto/Makefile
index 6520344e4b6..980b7a4a257 100644
--- a/games/stegavorto/Makefile
+++ b/games/stegavorto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/02/14 21:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:23 wiz Exp $
#
DISTNAME= stegavorto-src-2009.01.22
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games
MASTER_SITES= http://hamsterrepublic.com/games/stegavorto/
EXTRACT_SUFX= .tar.bz2
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index e1fb0c3f6df..75c154dcfeb 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2009/06/30 00:07:16 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:24 wiz Exp $
#
DISTNAME= stratagus-2.1-src
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=stratagus/}
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 27d6aba8097..5c228f69b69 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:58:54 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:24 wiz Exp $
DISTNAME= teg-0.11.1
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=teg/}
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index 97a00b8e671..b84efda12da 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2010/01/18 09:58:54 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:24 wiz Exp $
#
DISTNAME= tuxmath-2001.09.07-0102
PKGNAME= tuxmath-20010907
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= games math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxmath/}
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index b4afe79705d..26caf83ff95 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:58:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:24 wiz Exp $
DISTNAME= ufoai-2.2.1
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufoai/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games
DISTFILES= ${DISTNAME}-source.tar.bz2
diff --git a/games/ufoai/distinfo b/games/ufoai/distinfo
index 215abfaf9c8..a34439d7bd9 100644
--- a/games/ufoai/distinfo
+++ b/games/ufoai/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2010/03/03 07:07:40 wiz Exp $
+$NetBSD: distinfo,v 1.4 2010/06/13 22:44:24 wiz Exp $
SHA1 (ufoai-2.2.1-data.tar) = eb071333478bd6860179e12d8655301980f87d60
RMD160 (ufoai-2.2.1-data.tar) = af91dd473f59c73e705181759059bd37ba215f62
@@ -10,5 +10,5 @@ SHA1 (ufoai-2.2.1-source.tar.bz2) = 6ad1b8c357fdbbe9a31839b3bf8de46ad17a40eb
RMD160 (ufoai-2.2.1-source.tar.bz2) = 980405a5d38bcbb5ae2cea4e25c54374c7dd8e99
Size (ufoai-2.2.1-source.tar.bz2) = 7640531 bytes
SHA1 (patch-aa) = 2b196e8d94a1848b42212f32c90a259e56440382
-SHA1 (patch-ab) = 373101e64ca4037bdb6b5c042dbf0c3b607b0955
+SHA1 (patch-ab) = 3700077a35ba84648b52449be047b39f1274c9ee
SHA1 (patch-ac) = 29069a06c2442060734e32162a9b561c19be8739
diff --git a/games/ufoai/patches/patch-ab b/games/ufoai/patches/patch-ab
index ab7b4080e90..dd63ad87264 100644
--- a/games/ufoai/patches/patch-ab
+++ b/games/ufoai/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2010/03/03 07:07:40 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2010/06/13 22:44:24 wiz Exp $
--- src/renderer/r_image.c.orig 2008-04-25 16:15:02.000000000 +0000
+++ src/renderer/r_image.c
+@@ -254,7 +254,7 @@ static int R_LoadPNG (const char *name,
+ png_set_palette_to_rgb(png_ptr);
+ /* convert 1-2-4 bits grayscale images to 8 bits grayscale */
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ png_set_tRNS_to_alpha(png_ptr);
+
@@ -651,17 +651,6 @@ static void jpg_skip_input_data (j_decom
cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
}
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index b00e19ec7bf..a604b9d76e4 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/08/26 17:36:45 hasso Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:24 wiz Exp $
#
DISTNAME= warzone2100-2.2.2
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 0f8b34e0c72..0cbefc15460 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2010/05/15 07:22:54 adam Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:44:24 wiz Exp $
DISTNAME= wesnoth-1.6.4
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wesnoth/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/wormux/Makefile b/games/wormux/Makefile
index b844548da1f..526bda7d5f2 100644
--- a/games/wormux/Makefile
+++ b/games/wormux/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/03/14 14:00:35 adam Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:24 wiz Exp $
DISTNAME= wormux-0.9.1
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://download.gna.org/wormux/
EXTRACT_SUFX= .tar.bz2
diff --git a/games/wxhugo/Makefile b/games/wxhugo/Makefile
index 253b482523f..d666258e7b5 100644
--- a/games/wxhugo/Makefile
+++ b/games/wxhugo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 09:58:54 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:24 wiz Exp $
#
DISTNAME= hugov31_unix_source
PKGNAME= wxhugo-3.1.02
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_IFARCHIVE:=programming/hugo/source/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTFILE_WX}
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index a2e47cf5ef9..5e94d3484f2 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2010/02/14 21:36:26 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:44:24 wiz Exp $
#
DISTNAME= xarchon-0.60
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games x11
MASTER_SITES= http://xarchon.seul.org/ \
ftp://xarchon.seul.org/pub/xarchon/
diff --git a/games/xye/Makefile b/games/xye/Makefile
index 9d7bf4102ef..5e0d13a5ea6 100644
--- a/games/xye/Makefile
+++ b/games/xye/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:24 wiz Exp $
#
DISTNAME= xye-0.9.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITE_SOURCEFORGE_NEW= http://downloads.sourceforge.net/project/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_NEW:=xye/xye/0.9.1/}
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index d5002893ce8..dbc2a96c9ca 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/12/10 20:50:15 abs Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:25 wiz Exp $
DISTNAME= zoom-1.0.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.logicalshift.co.uk/unix/zoom/
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 621b22fcf7d..5e2c616284a 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:25 wiz Exp $
DISTNAME= gdal-1.7.1
PKGNAME= gdal-lib-1.7.1
+PKGREVISION= 1
CATEGORIES= geography
MASTER_SITES= http://download.osgeo.org/gdal/
diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk
index 44c279343f7..49620712289 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:25 wiz Exp $
BUILDLINK_TREE+= gdal-lib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gdal-lib
GDAL_LIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gdal-lib+= gdal-lib>=1.6.1
-BUILDLINK_ABI_DEPENDS.gdal-lib+= gdal-lib>=1.6.3nb1
+BUILDLINK_ABI_DEPENDS.gdal-lib+= gdal-lib>=1.7.1nb1
BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib
pkgbase := gdal-lib
diff --git a/geography/gipfel/Makefile b/geography/gipfel/Makefile
index 0f0dcff757c..05858beeaa7 100644
--- a/geography/gipfel/Makefile
+++ b/geography/gipfel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/11 08:10:56 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:25 wiz Exp $
#
DISTNAME= gipfel-0.3.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= geography graphics
MASTER_SITES= http://www.ecademix.com/JohannesHofmann/
diff --git a/geography/gpsdrive/Makefile b/geography/gpsdrive/Makefile
index 4e34466131a..87be63bcff9 100644
--- a/geography/gpsdrive/Makefile
+++ b/geography/gpsdrive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:25 wiz Exp $
DISTNAME= gpsdrive-1.31
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= geography
MASTER_SITES= http://gpsdrive.kraftvoll.at/
diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index 9af87a7033b..a0828244549 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/04/27 14:24:14 matthias Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:25 wiz Exp $
DISTNAME= mapserver-5.6.3
+PKGREVISION= 1
CATEGORIES= geography www
MASTER_SITES= http://download.osgeo.org/mapserver/
diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile
index 0f4bb04aeed..98f9cac8d30 100644
--- a/geography/merkaartor/Makefile
+++ b/geography/merkaartor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:25 wiz Exp $
#
DISTNAME= merkaartor-0.15.2
+PKGREVISION= 1
CATEGORIES= geography
MASTER_SITES= http://www.merkaartor.org/downloads/source/
EXTRACT_SUFX= .tar.bz2
diff --git a/geography/qlandkartegt/Makefile b/geography/qlandkartegt/Makefile
index 22f07ac0e87..862817de0bb 100644
--- a/geography/qlandkartegt/Makefile
+++ b/geography/qlandkartegt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:25 wiz Exp $
#
DISTNAME= qlandkartegt-0.18.0
+PKGREVISION= 1
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
diff --git a/geography/qlandkartem/Makefile b/geography/qlandkartem/Makefile
index 279a5e08b9e..2b6a924ef5d 100644
--- a/geography/qlandkartem/Makefile
+++ b/geography/qlandkartem/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/03/29 13:34:39 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:25 wiz Exp $
#
DISTNAME= QLandkarteM.0.2.0
PKGNAME= qlandkartem-0.2.0
+PKGREVISION= 1
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
diff --git a/geography/viking/Makefile b/geography/viking/Makefile
index f33da36a2d0..55d1c088cf6 100644
--- a/geography/viking/Makefile
+++ b/geography/viking/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/04/12 01:06:40 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:25 wiz Exp $
#
DISTNAME= viking-0.9.93
+PKGREVISION= 1
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=viking/}
diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index f687ccc588a..7d0340dd793 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:25 wiz Exp $
DISTNAME= Coin-2.4.4
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://ftp.coin3d.org/coin/src/all/
diff --git a/graphics/Coin/buildlink3.mk b/graphics/Coin/buildlink3.mk
index fa983a7d777..92c3eac569b 100644
--- a/graphics/Coin/buildlink3.mk
+++ b/graphics/Coin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:25 wiz Exp $
BUILDLINK_TREE+= Coin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= Coin
COIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.Coin+= Coin>=2.2.1
-BUILDLINK_ABI_DEPENDS.Coin+= Coin>=2.4.4nb5
+BUILDLINK_ABI_DEPENDS.Coin+= Coin>=2.4.4nb6
BUILDLINK_PKGSRCDIR.Coin?= ../../graphics/Coin
.include "../../graphics/simage/buildlink3.mk"
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index b960760f3bb..8b1fd059e37 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/06/05 13:30:33 obache Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:44:26 wiz Exp $
#
DISTNAME= GraphicsMagick-1.3.12
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk
index e4a14da45b2..cd063efac96 100644
--- a/graphics/GraphicsMagick/buildlink3.mk
+++ b/graphics/GraphicsMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/06/05 13:30:33 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:26 wiz Exp $
BUILDLINK_TREE+= GraphicsMagick
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= GraphicsMagick
GRAPHICSMAGICK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.GraphicsMagick+= GraphicsMagick>=1.2
-BUILDLINK_ABI_DEPENDS.GraphicsMagick?= GraphicsMagick>=1.3.12nb1
+BUILDLINK_ABI_DEPENDS.GraphicsMagick?= GraphicsMagick>=1.3.12nb2
BUILDLINK_PKGSRCDIR.GraphicsMagick?= ../../graphics/GraphicsMagick
.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index ec619f7ba98..bbc51f4f249 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.164 2010/05/04 11:14:23 drochner Exp $
+# $NetBSD: Makefile,v 1.165 2010/06/13 22:44:26 wiz Exp $
.include "Makefile.common"
PKGNAME= ImageMagick-${DISTVERSION}
+PKGREVISION= 1
MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.imagemagick.org/
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index c755a778cb5..edac3c12d4d 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2010/06/13 22:44:26 wiz Exp $
BUILDLINK_TREE+= ImageMagick
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ImageMagick
IMAGEMAGICK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1
-BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=6.5.7.9nb1
+BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=6.6.1.5nb1
BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick
pkgbase := ImageMagick
diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile
index 8132dc11aff..124741d4e5b 100644
--- a/graphics/SDL_image/Makefile
+++ b/graphics/SDL_image/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:26 wiz Exp $
DISTNAME= SDL_image-1.2.10
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics devel
MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index b9e74a1c081..355bf176fb9 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:26 wiz Exp $
BUILDLINK_TREE+= SDL_image
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= SDL_image
SDL_IMAGE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1
-BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.10nb1
+BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.10nb2
BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image
BUILDLINK_INCDIRS.SDL_image?= include/SDL
diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile
index c291a117a4b..649b2e6b116 100644
--- a/graphics/TiffIO/Makefile
+++ b/graphics/TiffIO/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:26 wiz Exp $
#
DISTNAME= TiffIO-120e
PKGNAME= TiffIO-1.2.0e
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://artis.imag.fr/Software/TiffIO/SOURCES/
EXTRACT_SUFX= .tgz
diff --git a/graphics/autopano-sift-C/Makefile b/graphics/autopano-sift-C/Makefile
index 56b3244c014..b7835d08c70 100644
--- a/graphics/autopano-sift-C/Makefile
+++ b/graphics/autopano-sift-C/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:58:56 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:26 wiz Exp $
DISTNAME= autopano-sift-C-2.5.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/}
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 16b6a76b671..68093904d02 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:58:56 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:26 wiz Exp $
#
DISTNAME= autotrace-0.31.1
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= graphics cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=autotrace/}
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 729fb8168d0..475a489b6ff 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:58:56 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:26 wiz Exp $
#
DISTNAME= aview-1.3.0rc1
PKGNAME= aview-1.3.0.1
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= graphics converters
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aa-project/}
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 539d7034f91..5a252f47e99 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2010/02/10 19:17:39 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2010/06/13 22:44:26 wiz Exp $
DISTNAME= blender-2.49b
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://download.blender.org/source/
diff --git a/graphics/blinkenthemes/Makefile b/graphics/blinkenthemes/Makefile
index 56b89dbae4c..a4ef7a2e536 100644
--- a/graphics/blinkenthemes/Makefile
+++ b/graphics/blinkenthemes/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:36 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:26 wiz Exp $
#
DISTNAME= blinkenthemes-0.8
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://sven.gimp.org/blinkenlights/old/
diff --git a/graphics/blinkentools/Makefile b/graphics/blinkentools/Makefile
index b7a9b71ca4d..ecf638e7562 100644
--- a/graphics/blinkentools/Makefile
+++ b/graphics/blinkentools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:58:56 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:26 wiz Exp $
#
DISTNAME= blinkentools-2.2
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://sven.gimp.org/blinkenlights/old/
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index f3331b9193f..7f094e8e47d 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2010/02/21 13:02:46 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2010/06/13 22:44:27 wiz Exp $
DISTNAME= cairo-1.8.10
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 2fbbbf15ff5..143224e086a 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2010/06/13 22:44:27 wiz Exp $
BUILDLINK_TREE+= cairo
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= cairo
CAIRO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2
-BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.6.4
+BUILDLINK_ABI_DEPENDS.cairo+= cairo>=1.8.10nb1
BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo
BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 16303d867ae..908912a8ca5 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2009/10/22 08:47:23 adam Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:27 wiz Exp $
DISTNAME= cairomm-1.8.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
diff --git a/graphics/cairomm/buildlink3.mk b/graphics/cairomm/buildlink3.mk
index f6367959c8f..046f4fe20d1 100644
--- a/graphics/cairomm/buildlink3.mk
+++ b/graphics/cairomm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:44:27 wiz Exp $
BUILDLINK_TREE+= cairomm
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= cairomm
CAIROMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cairomm+= cairomm>=1.2.2
+BUILDLINK_ABI_DEPENDS.cairomm?= cairomm>=1.8.4nb1
BUILDLINK_PKGSRCDIR.cairomm?= ../../graphics/cairomm
.include "../../graphics/cairo/buildlink3.mk"
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 5502e021ef7..0ae5c4ff4b6 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/03/17 14:17:02 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:27 wiz Exp $
DISTNAME= camlimages-2.2.0
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/caml-light/bazar-ocaml/
EXTRACT_SUFX= .tgz
diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile
index 823125955ae..89dc9a98e89 100644
--- a/graphics/cheese/Makefile
+++ b/graphics/cheese/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:57:36 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:27 wiz Exp $
DISTNAME= cheese-2.26.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cheese/2.26/}
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 2bf955a2910..8860e7397b8 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:58:56 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:27 wiz Exp $
DISTNAME= cinepaint-0.22-1
PKGNAME= cinepaint-0.22.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cinepaint/}
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index 1b58f7c6bec..a3aa49d7248 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/10/26 08:48:05 obache Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:27 wiz Exp $
#
DISTNAME= clutter-box2d-0.10.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/clutter-box2d/0.10/
diff --git a/graphics/clutter-cairo/Makefile b/graphics/clutter-cairo/Makefile
index f016b1745e0..9e17bbc8947 100644
--- a/graphics/clutter-cairo/Makefile
+++ b/graphics/clutter-cairo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/10/26 08:36:30 obache Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:27 wiz Exp $
#
DISTNAME= clutter-cairo-0.8.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/clutter-cairo/0.8/
diff --git a/graphics/clutter-cairo/buildlink3.mk b/graphics/clutter-cairo/buildlink3.mk
index a710ad4ef3f..ba91d7ad021 100644
--- a/graphics/clutter-cairo/buildlink3.mk
+++ b/graphics/clutter-cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/10/26 08:36:30 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:27 wiz Exp $
#
BUILDLINK_TREE+= clutter-cairo
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= clutter-cairo
CLUTTER_CAIRO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.clutter-cairo+= clutter-cairo>=0.8.0
-BUILDLINK_ABI_DEPENDS.clutter-cairo+= clutter-cairo>=0.8.2nb2
+BUILDLINK_ABI_DEPENDS.clutter-cairo+= clutter-cairo>=0.8.2nb3
BUILDLINK_PKGSRCDIR.clutter-cairo?= ../../graphics/clutter-cairo
.include "../../graphics/cairo/buildlink3.mk"
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index 06c5931c1bc..6db8161ccc7 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/06/02 06:44:22 obache Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:27 wiz Exp $
#
DISTNAME= clutter-gtk-0.10.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/clutter-gtk/0.10/
diff --git a/graphics/clutter-gtk/buildlink3.mk b/graphics/clutter-gtk/buildlink3.mk
index dc4473f9a39..1aa5a739002 100644
--- a/graphics/clutter-gtk/buildlink3.mk
+++ b/graphics/clutter-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/10/26 08:51:01 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:27 wiz Exp $
#
BUILDLINK_TREE+= clutter-gtk
@@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter-gtk
CLUTTER_GTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.clutter-gtk+= clutter-gtk>=0.10.0
+BUILDLINK_ABI_DEPENDS.clutter-gtk?= clutter-gtk>=0.10.4nb1
BUILDLINK_PKGSRCDIR.clutter-gtk?= ../../graphics/clutter-gtk
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/clutter-qt/Makefile b/graphics/clutter-qt/Makefile
index bc2f7adc6f0..fd82a9a0baf 100644
--- a/graphics/clutter-qt/Makefile
+++ b/graphics/clutter-qt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/02/07 12:29:18 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:27 wiz Exp $
#
DISTNAME= clutter-qt-1.0.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/clutter-qt/1.0/
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index 5e34c83f919..d72de720e33 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/05/16 17:06:49 zafer Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:27 wiz Exp $
#
DISTNAME= clutter-1.2.8
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/clutter/1.2/
# ${MASTER_SITE_GNOME:=sources/clutter/1.2/}
diff --git a/graphics/clutter/buildlink3.mk b/graphics/clutter/buildlink3.mk
index 639286aeb7d..8e4f54b3bec 100644
--- a/graphics/clutter/buildlink3.mk
+++ b/graphics/clutter/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/11/03 06:01:54 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:27 wiz Exp $
#
BUILDLINK_TREE+= clutter
@@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter
CLUTTER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.clutter+= clutter>=1.0.0
+BUILDLINK_ABI_DEPENDS.clutter?= clutter>=1.2.8nb1
BUILDLINK_PKGSRCDIR.clutter?= ../../graphics/clutter
pkgbase := clutter
diff --git a/graphics/clutter08-gtk/Makefile b/graphics/clutter08-gtk/Makefile
index d24099fad14..6d0a1c7b823 100644
--- a/graphics/clutter08-gtk/Makefile
+++ b/graphics/clutter08-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/26 08:32:30 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:28 wiz Exp $
#
DISTNAME= clutter-gtk-0.8.3
PKGNAME= ${DISTNAME:S/clutter/clutter08/}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/clutter-gtk/0.8/
diff --git a/graphics/clutter08-gtk/buildlink3.mk b/graphics/clutter08-gtk/buildlink3.mk
index 87b2427180e..c37867b772a 100644
--- a/graphics/clutter08-gtk/buildlink3.mk
+++ b/graphics/clutter08-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/26 08:32:30 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:28 wiz Exp $
#
BUILDLINK_TREE+= clutter08-gtk
@@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter08-gtk
CLUTTER08_GTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.clutter08-gtk+= clutter08-gtk>=0.8.0
+BUILDLINK_ABI_DEPENDS.clutter08-gtk?= clutter08-gtk>=0.8.3nb1
BUILDLINK_PKGSRCDIR.clutter08-gtk?= ../../graphics/clutter08-gtk
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/clutter08/Makefile b/graphics/clutter08/Makefile
index 6488909c8b6..248d0e871f2 100644
--- a/graphics/clutter08/Makefile
+++ b/graphics/clutter08/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/05/25 07:25:44 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:28 wiz Exp $
#
DISTNAME= clutter-0.8.8
PKGNAME= ${DISTNAME:S/clutter/clutter08/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/clutter/0.8/
diff --git a/graphics/clutter08/buildlink3.mk b/graphics/clutter08/buildlink3.mk
index 885c67272f8..d388e249b42 100644
--- a/graphics/clutter08/buildlink3.mk
+++ b/graphics/clutter08/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/26 08:30:16 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:28 wiz Exp $
#
BUILDLINK_TREE+= clutter08
@@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter08
CLUTTER08_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.clutter08+= clutter08>=0.8.0
+BUILDLINK_ABI_DEPENDS.clutter08?= clutter08>=0.8.8nb2
BUILDLINK_PKGSRCDIR.clutter08?= ../../graphics/clutter08
pkgbase := clutter08
diff --git a/graphics/cnxtview/Makefile b/graphics/cnxtview/Makefile
index 1631f47b18e..93dd68d3d9c 100644
--- a/graphics/cnxtview/Makefile
+++ b/graphics/cnxtview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/02/03 05:35:00 obache Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:28 wiz Exp $
#
DISTNAME= cnxtutil-0.00-alpha
PKGNAME= cnxtview-0.00a
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics x11
MASTER_SITES= http://home.384.jp/takam/bsd/
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index a10c4569a57..02f9e2a8d6d 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/02/10 19:17:39 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:28 wiz Exp $
#
DISTNAME= comix-4.0.4
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=comix/}
diff --git a/graphics/cpia2view/Makefile b/graphics/cpia2view/Makefile
index 0ea9916525e..a955c512ada 100644
--- a/graphics/cpia2view/Makefile
+++ b/graphics/cpia2view/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2010/02/01 02:57:04 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:28 wiz Exp $
#
DISTNAME= cpia2_driver-1.0
PKGNAME= cpia2view-0.03
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cpia2/}
EXTRACT_SUFX= .tgz
diff --git a/graphics/denemo/Makefile b/graphics/denemo/Makefile
index 2dbd2378949..89279095dba 100644
--- a/graphics/denemo/Makefile
+++ b/graphics/denemo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/08/26 19:57:37 sno Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:28 wiz Exp $
#
DISTNAME= denemo-0.7.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=denemo/}
diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile
index 009404c4c2a..6489dac14a4 100644
--- a/graphics/dia-python/Makefile
+++ b/graphics/dia-python/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2010/02/10 19:17:39 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:28 wiz Exp $
#
-PKGREVISION= 1
+PKGREVISION= 2
DIA_SUBPKG= -python
.include "../../graphics/dia/Makefile.common"
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index fe4815ed2c1..65aa9fa16a4 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2010/01/27 19:38:51 drochner Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:44:28 wiz Exp $
#
.include "Makefile.common"
+PKGREVISION= 1
.include "options.mk"
diff --git a/graphics/digikam-doc-kde3/Makefile b/graphics/digikam-doc-kde3/Makefile
index 32e9f617556..26df1006d17 100644
--- a/graphics/digikam-doc-kde3/Makefile
+++ b/graphics/digikam-doc-kde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/02/15 14:44:16 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:28 wiz Exp $
DISTNAME= digikam-doc-0.9.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/digikam-kde3/Makefile b/graphics/digikam-kde3/Makefile
index 2275872be90..aaecbd6a764 100644
--- a/graphics/digikam-kde3/Makefile
+++ b/graphics/digikam-kde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/02/15 14:44:17 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:28 wiz Exp $
DISTNAME= digikam-0.9.6
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/digikam-kde3/distinfo b/graphics/digikam-kde3/distinfo
index f80ed9d4ae0..ed47e7eb523 100644
--- a/graphics/digikam-kde3/distinfo
+++ b/graphics/digikam-kde3/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/02/15 14:16:57 wiz Exp $
+$NetBSD: distinfo,v 1.2 2010/06/13 22:44:28 wiz Exp $
SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5
RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215
Size (digikam-0.9.6.tar.bz2) = 11517637 bytes
+SHA1 (patch-aa) = 818a8ae95459dd8fb25ace8210af0a0576084aba
+SHA1 (patch-ab) = 50636e14be0b183ac8ee2147a3b3a8227cef10d5
diff --git a/graphics/digikam-kde3/patches/patch-aa b/graphics/digikam-kde3/patches/patch-aa
new file mode 100644
index 00000000000..bb9392364c6
--- /dev/null
+++ b/graphics/digikam-kde3/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2010/06/13 22:44:29 wiz Exp $
+
+--- digikam/libs/dimg/loaders/pngloader.cpp.orig 2009-07-03 05:19:41.000000000 +0000
++++ digikam/libs/dimg/loaders/pngloader.cpp
+@@ -252,7 +252,7 @@ bool PNGLoader::load(const QString& file
+ #ifdef ENABLE_DEBUG_MESSAGES
+ DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl;
+ #endif
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ png_set_gray_to_rgb(png_ptr);
+
+ if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel
diff --git a/graphics/digikam-kde3/patches/patch-ab b/graphics/digikam-kde3/patches/patch-ab
new file mode 100644
index 00000000000..971ffc26741
--- /dev/null
+++ b/graphics/digikam-kde3/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2010/06/13 22:44:29 wiz Exp $
+
+--- digikam/kioslave/digikamthumbnail.cpp.orig 2009-07-03 05:19:41.000000000 +0000
++++ digikam/kioslave/digikamthumbnail.cpp
+@@ -465,7 +465,7 @@ QImage kio_digikamthumbnailProtocol::loa
+ {
+ png_set_gray_to_rgb(png_ptr);
+ if (png_get_bit_depth(png_ptr, info_ptr) < 8)
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ int sizeOfUint = sizeof(unsigned int);
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 7fd395b85e1..f04707978ed 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2010/05/09 21:11:52 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2010/06/13 22:44:28 wiz Exp $
#
DISTNAME= digikam-1.2.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 079d73c60b6..5f0943cd4fa 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:29 wiz Exp $
#
DISTNAME= djview4-4.2-2
PKGNAME= djview4-4.2.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=djvu/}
diff --git a/graphics/dvipng/Makefile b/graphics/dvipng/Makefile
index 0b9d1c5bc83..14b977eec7a 100644
--- a/graphics/dvipng/Makefile
+++ b/graphics/dvipng/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2010/05/17 20:21:38 tez Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:29 wiz Exp $
DISTNAME= dvipng-1.12
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvipng/}
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index dc7e1f2b7c6..d7a4b8117a2 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2010/01/18 09:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:29 wiz Exp $
DISTNAME= dx-4.4.4
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://opendx.npaci.edu/source/
diff --git a/graphics/enblend-enfuse/Makefile b/graphics/enblend-enfuse/Makefile
index b44502b1e32..205af569423 100644
--- a/graphics/enblend-enfuse/Makefile
+++ b/graphics/enblend-enfuse/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/05/15 05:47:58 adam Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:29 wiz Exp $
DISTNAME= enblend-enfuse-4.0
# XXX distribution file has changed; remove the line below on next update
DIST_SUBDIR= ${PKGNAME_NOREV}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enblend/}
diff --git a/graphics/enblend-enfuse/distinfo b/graphics/enblend-enfuse/distinfo
index 66abf0ce382..1f1573ba501 100644
--- a/graphics/enblend-enfuse/distinfo
+++ b/graphics/enblend-enfuse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2010/05/15 05:47:58 adam Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:44:29 wiz Exp $
SHA1 (enblend-enfuse-4.0/enblend-enfuse-4.0.tar.gz) = 34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033
RMD160 (enblend-enfuse-4.0/enblend-enfuse-4.0.tar.gz) = 9e531b5bf6f7258ef8778c01b456979e0bc04338
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = b1809fe6ef6609658b697635c6cbf0c112a03fd1
SHA1 (patch-ab) = afc074bb94e2a2b96c654c37540072514ba0bce0
SHA1 (patch-ac) = 916f4655ff30013583014eb8deecc72bd19ae55d
SHA1 (patch-ad) = bc0a04dbf7477c3db7c9ef979fb851a975a93571
+SHA1 (patch-ae) = d16fc0157c9796bfc63bc434cc627dcf99669d6f
diff --git a/graphics/enblend-enfuse/patches/patch-ae b/graphics/enblend-enfuse/patches/patch-ae
new file mode 100644
index 00000000000..c083c9fd80d
--- /dev/null
+++ b/graphics/enblend-enfuse/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2010/06/13 22:44:29 wiz Exp $
+
+--- src/vigra_impex/png.cxx.orig 2009-12-20 15:32:28.000000000 +0000
++++ src/vigra_impex/png.cxx
+@@ -274,8 +274,8 @@ namespace vigra {
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+ if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+- png_set_gray_1_2_4_to_8(png);
++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++ png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+ }
+
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 296a14b972f..2952f42d9a6 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2010/01/18 09:58:58 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:29 wiz Exp $
#
DISTNAME= eog-2.28.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/evas-png/Makefile b/graphics/evas-png/Makefile
index 6d2a5fa603d..d2bfdc6d920 100644
--- a/graphics/evas-png/Makefile
+++ b/graphics/evas-png/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:29 wiz Exp $
PKGNAME= ${DISTNAME:S/evas/evas-png/}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Evas PNG image loader
diff --git a/graphics/evas-svg/Makefile b/graphics/evas-svg/Makefile
index bc79351334e..a6e3453862b 100644
--- a/graphics/evas-svg/Makefile
+++ b/graphics/evas-svg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:29 wiz Exp $
PKGNAME= ${DISTNAME:S/evas/evas-svg/}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Evas SVG image loader
diff --git a/graphics/extrema/Makefile b/graphics/extrema/Makefile
index ec9d67a3157..c518ed5ee45 100644
--- a/graphics/extrema/Makefile
+++ b/graphics/extrema/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/02/11 18:28:07 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:29 wiz Exp $
#
DISTNAME= extrema-4.4.3
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=extrema/}
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 829b746d9c5..28e0f5a8762 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2010/05/17 17:46:44 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:30 wiz Exp $
#
DISTNAME= f-spot-0.6.2
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/f-spot/0.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/f4l/Makefile b/graphics/f4l/Makefile
index 8de1b7fc3cf..3677f2d593a 100644
--- a/graphics/f4l/Makefile
+++ b/graphics/f4l/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:30 wiz Exp $
DISTNAME= f4l-0.2.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=f4l/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index ce6aab5a156..6a557ce7823 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:44:30 wiz Exp $
#
DISTNAME= feh-1.3.4
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://linuxbrit.co.uk/downloads/
diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index 258104a55bc..3739b3757be 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:30 wiz Exp $
#
DISTNAME= flphoto-1.2-source
PKGNAME= flphoto-1.2
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fltk/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 40eb27ccc35..6fcf116d69e 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:30 wiz Exp $
DISTNAME= fly-1.6.5
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= graphics www
MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index e069aa83dab..5300f3efb64 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2010/02/03 23:23:27 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:30 wiz Exp $
#
DISTNAME= fnlib-0.5
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= x11 graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
diff --git a/graphics/fnlib/buildlink3.mk b/graphics/fnlib/buildlink3.mk
index 61e5d3cef87..644e0cad24a 100644
--- a/graphics/fnlib/buildlink3.mk
+++ b/graphics/fnlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:58:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:30 wiz Exp $
BUILDLINK_TREE+= fnlib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= fnlib
FNLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.fnlib+= fnlib>=0.5nb6
-BUILDLINK_ABI_DEPENDS.fnlib+= fnlib>=0.5nb12
+BUILDLINK_ABI_DEPENDS.fnlib+= fnlib>=0.5nb13
BUILDLINK_PKGSRCDIR.fnlib?= ../../graphics/fnlib
.include "../../graphics/imlib/buildlink3.mk"
diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 64f71c63458..79372b419f5 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/02/03 23:21:36 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:30 wiz Exp $
#
DISTNAME= fotoxx-5.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/
diff --git a/graphics/frameworks/Makefile b/graphics/frameworks/Makefile
index 63d2afed85f..9bcb79cb413 100644
--- a/graphics/frameworks/Makefile
+++ b/graphics/frameworks/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:40 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:30 wiz Exp $
#
DISTNAME= frameworks-0.3.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://frameworks.polycrystal.org/release/
SITES.frameworks.png= http://frameworks.polycrystal.org/images/
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index 923758a9fb8..69bb3f823b7 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/02/03 23:21:08 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:30 wiz Exp $
DISTNAME= g2-0.50
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://g2.sourceforge.net/pub/
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 04e48a981c5..ef00353e99b 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/13 22:44:30 wiz Exp $
DISTNAME= gd-2.0.35
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://www.libgd.org/releases/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 6e412237bb5..173230f74db 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:30 wiz Exp $
BUILDLINK_TREE+= gd
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gd
GD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gd+= gd>=2.0.15nb1
-BUILDLINK_ABI_DEPENDS.gd+= gd>=2.0.35nb4
+BUILDLINK_ABI_DEPENDS.gd+= gd>=2.0.35nb5
BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd
pkgbase := gd
diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 10b487e38dc..fd357e84845 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:31 wiz Exp $
DISTNAME= gdchart0.11.5dev
PKGNAME= gdchart-0.11.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://www.fred.net/brv/chart/
diff --git a/graphics/gdchart/buildlink3.mk b/graphics/gdchart/buildlink3.mk
index afc2b177579..4a84ec3b3a1 100644
--- a/graphics/gdchart/buildlink3.mk
+++ b/graphics/gdchart/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:31 wiz Exp $
BUILDLINK_TREE+= gdchart
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gdchart
GDCHART_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gdchart+= gdchart>=0.11.4nb1
-BUILDLINK_ABI_DEPENDS.gdchart+= gdchart>=0.11.5nb4
+BUILDLINK_ABI_DEPENDS.gdchart+= gdchart>=0.11.5nb5
BUILDLINK_PKGSRCDIR.gdchart?= ../../graphics/gdchart
.include "../../graphics/gd/buildlink3.mk"
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 5e472b2f237..487e3d24d9a 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:31 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-PKGREVISION= 11
+PKGREVISION= 12
COMMENT= The GNOME image loading library
# XXX hopefully there is no x.gnome-config.x in PATH
diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk
index a48b7c2fa9e..29d715a6abb 100644
--- a/graphics/gdk-pixbuf/buildlink3.mk
+++ b/graphics/gdk-pixbuf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:31 wiz Exp $
BUILDLINK_TREE+= gdk-pixbuf
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gdk-pixbuf
GDK_PIXBUF_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2
-BUILDLINK_ABI_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb11
+BUILDLINK_ABI_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb12
BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf
BUILDLINK_CPPFLAGS.gdk-pixbuf+= \
-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index d867a3675a4..578cd30d477 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/02/25 14:13:54 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:31 wiz Exp $
#
DISTNAME= geeqie-1.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=geeqie/}
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index fa5f72ba167..1825b31d2b0 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/02/04 12:28:43 adam Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:31 wiz Exp $
DISTNAME= gegl-0.1.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gegl/0.1/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gegl/buildlink3.mk b/graphics/gegl/buildlink3.mk
index 465402e6975..3fc7647e45c 100644
--- a/graphics/gegl/buildlink3.mk
+++ b/graphics/gegl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/02/04 12:28:43 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:31 wiz Exp $
BUILDLINK_TREE+= gegl
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gegl
GEGL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gegl+= gegl>=0.0.20
-BUILDLINK_ABI_DEPENDS.gegl+= gegl>=0.1.0nb3
+BUILDLINK_ABI_DEPENDS.gegl+= gegl>=0.1.0nb4
BUILDLINK_PKGSRCDIR.gegl?= ../../graphics/gegl
pkgbase := gegl
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 369b7d565ef..14fb135c5cc 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2009/08/26 19:57:41 sno Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:44:31 wiz Exp $
#
DISTNAME= gfract-0.32
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics x11
MASTER_SITES= http://www.oskusoft.com/osku/gfract/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gfract-palettes-0.1.tar.gz
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index a8e417bc6ec..15e34398d5c 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/02/10 19:17:39 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:31 wiz Exp $
DISTNAME= gif2png-2.5.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics converters
MASTER_SITES= http://www.catb.org/~esr/gif2png/
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 48b06768fdd..8d0fca600a7 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2010/06/13 22:44:31 wiz Exp $
DISTNAME= gimageview-0.2.27
-PKGREVISION= 17
+PKGREVISION= 18
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile
index b66d929b30e..0bc8030cfab 100644
--- a/graphics/gimmage/Makefile
+++ b/graphics/gimmage/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/17 12:02:20 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:32 wiz Exp $
#
DISTNAME= gimmage-0.2.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://download.berlios.de/gimmage/
diff --git a/graphics/gimp-color-manager/Makefile b/graphics/gimp-color-manager/Makefile
index c20f6e8e423..4c7090d0158 100644
--- a/graphics/gimp-color-manager/Makefile
+++ b/graphics/gimp-color-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:32 wiz Exp $
#
DISTNAME= gimp-color-manager-0.1.0
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= graphics
MASTER_SITES= ftp://www.virtual-sub.org/
diff --git a/graphics/gimp-exif-browser/Makefile b/graphics/gimp-exif-browser/Makefile
index cf358a3626e..2ecff76e792 100644
--- a/graphics/gimp-exif-browser/Makefile
+++ b/graphics/gimp-exif-browser/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:32 wiz Exp $
#
DISTNAME= exif-browser
PKGNAME= gimp-exif-browser-0.1.0
DIST_SUBDIR= gimp-exif-browser-0.1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://registry.gimp.org/files/
diff --git a/graphics/gimp-fix-ca/Makefile b/graphics/gimp-fix-ca/Makefile
index a7198a6b89c..7f322be6cd5 100644
--- a/graphics/gimp-fix-ca/Makefile
+++ b/graphics/gimp-fix-ca/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:32 wiz Exp $
#
DISTNAME= gimp-fix-ca-3.0.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://registry.gimp.org/file/fix-ca.c?action=download&id=9884&file=
EXTRACT_SUFX= .c
diff --git a/graphics/gimp-liquid-rescale/Makefile b/graphics/gimp-liquid-rescale/Makefile
index 433c4ac10a4..e6867aa6535 100644
--- a/graphics/gimp-liquid-rescale/Makefile
+++ b/graphics/gimp-liquid-rescale/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:32 wiz Exp $
#
DISTNAME= gimp-lqr-plugin-0.6.1
PKGNAME= gimp-liquid-rescale-0.6.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://liquidrescale.wikidot.com/local--files/en:download-page/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gimp-rawphoto/Makefile b/graphics/gimp-rawphoto/Makefile
index 11620174667..1d11e0240f1 100644
--- a/graphics/gimp-rawphoto/Makefile
+++ b/graphics/gimp-rawphoto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:44:32 wiz Exp $
#
DISTNAME= rawphoto-200410220928
PKGNAME= gimp-rawphoto-1.19
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= graphics
MASTER_SITES= #
EXTRACT_SUFX= .tgz
diff --git a/graphics/gimp-refocus-it/Makefile b/graphics/gimp-refocus-it/Makefile
index 3d78c3b6cd0..c8a73cac41a 100644
--- a/graphics/gimp-refocus-it/Makefile
+++ b/graphics/gimp-refocus-it/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:32 wiz Exp $
#
DISTNAME= refocus-it-2.0.0
PKGNAME= gimp-refocus-it-2.0.0
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=refocus-it/}
diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile
index 62d4edab028..6dfcfcbfc05 100644
--- a/graphics/gimp-resynthesizer/Makefile
+++ b/graphics/gimp-resynthesizer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/04/20 22:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:32 wiz Exp $
#
DISTNAME= resynthesizer-0.16
PKGNAME= gimp-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.logarithmic.net/pfh-files/resynthesizer/
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index 8e721570da7..72ce61a9a0c 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2010/06/13 22:44:32 wiz Exp $
DISTNAME= ufraw-0.16
PKGNAME= gimp-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufraw/}
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index f5fb6189bd3..829c0f01ce6 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.190 2010/04/09 15:45:09 wiz Exp $
+# $NetBSD: Makefile,v 1.191 2010/06/13 22:44:32 wiz Exp $
DISTNAME= gimp-2.6.8
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.6/ \
${MASTER_SITE_GNU:=gimp/v2.6/} \
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index d6bd8d80bce..adde132683f 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2010/01/18 09:59:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2010/06/13 22:44:32 wiz Exp $
BUILDLINK_TREE+= gimp
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gimp
GIMP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gimp+= gimp>=2.4.0
-BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.6.8nb1
+BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.6.8nb3
BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp
pkgbase := gimp
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index ec3e2e79155..3e0e62da21e 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2009/12/16 19:16:49 drochner Exp $
+$NetBSD: distinfo,v 1.52 2010/06/13 22:44:32 wiz Exp $
SHA1 (gimp-2.6.8.tar.bz2) = a550943f086abc9bf6b96d576741337b7186a4f4
RMD160 (gimp-2.6.8.tar.bz2) = da02fedcc00ebaac04bfd21c153a7130d3ff5e08
@@ -6,3 +6,4 @@ Size (gimp-2.6.8.tar.bz2) = 16342377 bytes
SHA1 (patch-aa) = 52d9b1995e47b3ae34510fef074c7000f2527adb
SHA1 (patch-ab) = 4f5ba210bc69db55f79b67f0238aafc13992c050
SHA1 (patch-ac) = b1f4b802eebbb2d2145e0e282e65d48a0409a6b8
+SHA1 (patch-ad) = c17936829fb90c6cf726caf10ac8d42c146ef0a7
diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad
new file mode 100644
index 00000000000..31ba313b740
--- /dev/null
+++ b/graphics/gimp/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.8 2010/06/13 22:44:32 wiz Exp $
+
+--- plug-ins/file-ico/ico-load.c.orig 2009-07-20 20:20:51.000000000 +0000
++++ plug-ins/file-ico/ico-load.c
+@@ -287,14 +287,14 @@ ico_read_png (FILE *fp,
+ switch (color_type)
+ {
+ case PNG_COLOR_TYPE_GRAY:
+- png_set_gray_1_2_4_to_8 (png_ptr);
++ png_set_expand_gray_1_2_4_to_8 (png_ptr);
+ if ( bit_depth == 16 )
+ png_set_strip_16 (png_ptr);
+ png_set_gray_to_rgb (png_ptr);
+ png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+- png_set_gray_1_2_4_to_8 (png_ptr);
++ png_set_expand_gray_1_2_4_to_8 (png_ptr);
+ if ( bit_depth == 16 )
+ png_set_strip_16 (png_ptr);
+ png_set_gray_to_rgb (png_ptr);
diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile
index 884b781a778..9da5d2a224a 100644
--- a/graphics/gimp1-base/Makefile
+++ b/graphics/gimp1-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:33 wiz Exp $
#
DISTNAME= gimp-1.2.5
PKGNAME= gimp-base-1.2.5
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.5/ \
ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.5/
diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
index 005448cd0b9..06b819df115 100644
--- a/graphics/gimp1-base/buildlink3.mk
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:33 wiz Exp $
BUILDLINK_TREE+= gimp-base
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gimp-base
GIMP_BASE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gimp-base+= gimp-base>=1.2.5nb2
-BUILDLINK_ABI_DEPENDS.gimp-base+= gimp-base>=1.2.5nb9
+BUILDLINK_ABI_DEPENDS.gimp-base+= gimp-base>=1.2.5nb10
BUILDLINK_PKGSRCDIR.gimp-base?= ../../graphics/gimp1-base
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/gimp1-data/Makefile b/graphics/gimp1-data/Makefile
index ea08843ca68..887bcbe0826 100644
--- a/graphics/gimp1-data/Makefile
+++ b/graphics/gimp1-data/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:33 wiz Exp $
#
DISTNAME= gimp-data-extras-1.2.0
PKGNAME= gimp-data-1.2
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.5/ \
ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.5/
diff --git a/graphics/gimp1-wideangle/Makefile b/graphics/gimp1-wideangle/Makefile
index bbda73bbf37..d31e0e04569 100644
--- a/graphics/gimp1-wideangle/Makefile
+++ b/graphics/gimp1-wideangle/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/02/03 23:11:15 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:33 wiz Exp $
#
DISTNAME= wideangleFeb03
PKGNAME= gimp-wideangle-0.4
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://members.ozemail.com.au/~hodsond/
EXTRACT_SUFX= .tgz
diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile
index f574019385b..8298686957c 100644
--- a/graphics/gimp2-wideangle/Makefile
+++ b/graphics/gimp2-wideangle/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/02/03 23:19:10 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:33 wiz Exp $
#
DISTNAME= wideangle
PKGNAME= gimp2-wideangle-1.0
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= graphics
MASTER_SITES= http://members.ozemail.com.au/~hodsond/
EXTRACT_SUFX= .c
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 14c36e0d461..7a119be229a 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2009/08/26 19:57:42 sno Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:33 wiz Exp $
#
DISTNAME= giram-0.3.5
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= graphics
MASTER_SITES= http://www.giram.org/downloads/
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 4c6a3c4d08b..55d19ad9b38 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2009/08/26 19:57:42 sno Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:33 wiz Exp $
DISTNAME= gliv-1.9.6
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://guichaz.free.fr/gliv/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile
index a0ab72bfbd3..b7e0380fc9c 100644
--- a/graphics/glpng/Makefile
+++ b/graphics/glpng/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/09/01 21:07:37 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:33 wiz Exp $
#
DISTNAME= glpng-1.45.20081203
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= #
diff --git a/graphics/glpng/buildlink3.mk b/graphics/glpng/buildlink3.mk
index 4e4d16cd5cc..2532ac3e5a7 100644
--- a/graphics/glpng/buildlink3.mk
+++ b/graphics/glpng/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/09/01 21:07:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:33 wiz Exp $
BUILDLINK_TREE+= glpng
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= glpng
GLPNG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.glpng+= glpng>=1.45.20081203
+BUILDLINK_ABI_DEPENDS.glpng?= glpng>=1.45.20081203nb1
BUILDLINK_PKGSRCDIR.glpng?= ../../graphics/glpng
.include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/gmngview/Makefile b/graphics/gmngview/Makefile
index 94b0633d8e5..9539f1e4100 100644
--- a/graphics/gmngview/Makefile
+++ b/graphics/gmngview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:33 wiz Exp $
#
DISTNAME= libmng-1.0.10
PKGNAME= ${DISTNAME:S/libmng/gmngview/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libmng/}
diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile
index cbd39303700..f7032c7d006 100644
--- a/graphics/gnuplot-nox11/Makefile
+++ b/graphics/gnuplot-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2010/01/24 13:26:10 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:33 wiz Exp $
#
PKGNAME= ${DISTNAME:C/-/-nox11-/}
-PKGREVISION= 2
+PKGREVISION= 3
CONFLICTS+= gnuplot-[0-9]*
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 04755852da1..4729f6f38ea 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2010/02/19 14:09:58 asau Exp $
+# $NetBSD: Makefile,v 1.50 2010/06/13 22:44:33 wiz Exp $
CATEGORIES+= x11
-PKGREVISION= 1
+PKGREVISION= 2
CONFLICTS+= gnuplot-nox11-[0-9]*
diff --git a/graphics/gocr/Makefile b/graphics/gocr/Makefile
index add21966591..8da572da585 100644
--- a/graphics/gocr/Makefile
+++ b/graphics/gocr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:33 wiz Exp $
DISTNAME= gocr-0.47
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jocr/}
diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile
index ba806238d34..ad614df9ee0 100644
--- a/graphics/goocanvas/Makefile
+++ b/graphics/goocanvas/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:33 wiz Exp $
#
DISTNAME= goocanvas-0.15
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goocanvas/0.15/}
diff --git a/graphics/goocanvas/buildlink3.mk b/graphics/goocanvas/buildlink3.mk
index 46b93041d34..d9c39f903b4 100644
--- a/graphics/goocanvas/buildlink3.mk
+++ b/graphics/goocanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:34 wiz Exp $
#
BUILDLINK_TREE+= goocanvas
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= goocanvas
GOOCANVAS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.goocanvas+= goocanvas>=0.12
-BUILDLINK_ABI_DEPENDS.goocanvas?= goocanvas>=0.15nb1
+BUILDLINK_ABI_DEPENDS.goocanvas?= goocanvas>=0.15nb2
BUILDLINK_PKGSRCDIR.goocanvas?= ../../graphics/goocanvas
.include "../../devel/glib2/buildlink3.mk"
diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile
index 1880f6f9f6f..ef8bb2a2134 100644
--- a/graphics/goocanvasmm/Makefile
+++ b/graphics/goocanvasmm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/03/29 06:00:12 obache Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:34 wiz Exp $
#
DISTNAME= goocanvasmm-0.15.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goocanvasmm/0.15/}
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index abce69cfb5b..a170bd228c7 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:34 wiz Exp $
DISTNAME= gphoto-0.4.3
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= graphics
#MASTER_SITES= http://www.gphoto.net/dist/
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index 6ea886c2a72..9d10d4cf781 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2009/11/26 17:34:54 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:34 wiz Exp $
DISTNAME= gqview-2.1.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/}
diff --git a/graphics/gqview-gtk1/Makefile b/graphics/gqview-gtk1/Makefile
index 683936ec006..9ab9abc6bbe 100644
--- a/graphics/gqview-gtk1/Makefile
+++ b/graphics/gqview-gtk1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:34 wiz Exp $
DISTNAME= gqview-1.2.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/}
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index a26592e59e5..41f1d77129f 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2009/12/07 00:02:25 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2010/06/13 22:44:34 wiz Exp $
DISTNAME= gqview-2.0.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/}
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 662b5d76818..16c33f123e2 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2010/03/24 19:43:24 asau Exp $
+# $NetBSD: Makefile,v 1.81 2010/06/13 22:44:34 wiz Exp $
DISTNAME= graphviz-2.24.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/
diff --git a/graphics/gst-plugins0.10-cairo/Makefile b/graphics/gst-plugins0.10-cairo/Makefile
index 5e4b7171183..af428b05e37 100644
--- a/graphics/gst-plugins0.10-cairo/Makefile
+++ b/graphics/gst-plugins0.10-cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:34 wiz Exp $
#
GST_PLUGINS0.10_NAME= cairo
@@ -9,5 +9,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../multimedia/gst-plugins0.10-good/Makefile.common"
+PKGREVISION= 1
+
.include "../../graphics/cairo/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gst-plugins0.10-png/Makefile b/graphics/gst-plugins0.10-png/Makefile
index 2bbdbaedb9f..11ec16922bf 100644
--- a/graphics/gst-plugins0.10-png/Makefile
+++ b/graphics/gst-plugins0.10-png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/09/08 20:28:54 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:34 wiz Exp $
#
GST_PLUGINS0.10_NAME= png
@@ -9,5 +9,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../multimedia/gst-plugins0.10-good/Makefile.common"
+PKGREVISION= 1
+
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 58e2233e4e7..b87cdebeff1 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2010/05/17 16:56:27 drochner Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:44:34 wiz Exp $
DISTNAME= gthumb-2.10.12
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gthumb/2.10/}
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 3f4ef330a38..0cffe896be9 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2009/12/15 21:48:01 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:44:34 wiz Exp $
#
DISTNAME= gtkam-0.1.16
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index 057d103bd4b..b2b6e303b3f 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/06/05 12:08:46 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:34 wiz Exp $
DISTNAME= gtkglext-1.2.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkglext/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk
index 9fd008a1688..a3b39e217be 100644
--- a/graphics/gtkglext/buildlink3.mk
+++ b/graphics/gtkglext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:56 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:34 wiz Exp $
BUILDLINK_TREE+= gtkglext
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtkglext
GTKGLEXT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0
-BUILDLINK_ABI_DEPENDS.gtkglext?= gtkglext>=1.2.0nb3
+BUILDLINK_ABI_DEPENDS.gtkglext?= gtkglext>=1.2.0nb5
BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext
.include "../../graphics/glu/buildlink3.mk"
diff --git a/graphics/gtkimageview/Makefile b/graphics/gtkimageview/Makefile
index 86a5a75b0fa..02fe38d6dad 100644
--- a/graphics/gtkimageview/Makefile
+++ b/graphics/gtkimageview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/02/03 23:05:44 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:35 wiz Exp $
DISTNAME= gtkimageview-1.6.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://trac.bjourne.webfactional.com/chrome/common/releases/
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index 32d6b1e2adc..7ab93f66b96 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/02/03 23:03:26 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:35 wiz Exp $
#
DISTNAME= gtksee-0.5.6
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics x11
MASTER_SITES= http://download.berlios.de/gtksee/
diff --git a/graphics/guile-cairo/Makefile b/graphics/guile-cairo/Makefile
index 33ebcd7c4c2..6f6fbfdbb04 100644
--- a/graphics/guile-cairo/Makefile
+++ b/graphics/guile-cairo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/03/24 19:43:24 asau Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:35 wiz Exp $
#
DISTNAME= guile-cairo-1.4.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://download.gna.org/guile-cairo/
diff --git a/graphics/gwenview-i18n/Makefile b/graphics/gwenview-i18n/Makefile
index 88f95985f2d..d88849ffea3 100644
--- a/graphics/gwenview-i18n/Makefile
+++ b/graphics/gwenview-i18n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:35 wiz Exp $
#
DISTNAME= gwenview-i18n-1.4.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= kde graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwenview/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 69818c4f7f1..33e1a821e3c 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/06/10 20:08:50 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:35 wiz Exp $
#
DISTNAME= gwenview-1.4.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= kde graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwenview/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gwenview/distinfo b/graphics/gwenview/distinfo
index b2bc387e976..d6086f08d55 100644
--- a/graphics/gwenview/distinfo
+++ b/graphics/gwenview/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2009/03/22 20:03:18 markd Exp $
+$NetBSD: distinfo,v 1.16 2010/06/13 22:44:35 wiz Exp $
SHA1 (gwenview-1.4.2.tar.bz2) = d2168b48eb7f27b4338681acc49b5b2a51268209
RMD160 (gwenview-1.4.2.tar.bz2) = 9c8bc84c90c2eda36f31fb6728990bc7e8063dd4
Size (gwenview-1.4.2.tar.bz2) = 984977 bytes
SHA1 (patch-aa) = 03d6fd5756e9ea500a8885cbfd0a69ebfe1ff7b8
+SHA1 (patch-ab) = 394f01d4c16f281fe412090dbbc92887044fd3f1
diff --git a/graphics/gwenview/patches/patch-ab b/graphics/gwenview/patches/patch-ab
new file mode 100644
index 00000000000..e50fa259915
--- /dev/null
+++ b/graphics/gwenview/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.3 2010/06/13 22:44:35 wiz Exp $
+
+--- src/gvcore/pngformattype.cpp.orig 2007-09-15 13:46:13.000000000 +0000
++++ src/gvcore/pngformattype.cpp
+@@ -245,7 +245,7 @@ void setup_qt( QImage& image, png_struct
+ image.setColor( i, qRgba(c,c,c,0xff) );
+ }
+ if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+- const int g = info_ptr->trans_values.gray;
++ const int g = info_ptr->trans_color.gray;
+ if (g < ncols) {
+ image.setAlphaBuffer(TRUE);
+ image.setColor(g, image.color(g) & RGB_MASK);
+@@ -273,7 +273,7 @@ void setup_qt( QImage& image, png_struct
+ info_ptr->palette[i].red,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].blue,
+- info_ptr->trans[i]
++ info_ptr->trans_alpha[i]
+ )
+ );
+ i++;
diff --git a/graphics/h5utils/Makefile b/graphics/h5utils/Makefile
index 9f91a96b0d3..9c2302a0983 100644
--- a/graphics/h5utils/Makefile
+++ b/graphics/h5utils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:35 wiz Exp $
#
DISTNAME= h5utils-1.12.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://ab-initio.mit.edu/h5utils/
diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index bc12910c10a..ac1b5d3103b 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/02/03 22:59:13 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:35 wiz Exp $
#
DISTNAME= hp2xx-3.4.4
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNU:=hp2xx/}
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 11ad1f16e02..f335a5547e7 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/05/15 07:26:22 adam Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:35 wiz Exp $
DISTNAME= hugin-2010.0.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/}
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 4b9f3a41b95..fe46a3dbca8 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2010/04/10 16:29:09 adam Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:44:35 wiz Exp $
SHA1 (hugin-2010.0.0.tar.gz) = 41eb7253aab12b913a5c9b6d9975d8652390dcb5
RMD160 (hugin-2010.0.0.tar.gz) = e2b03fe00a4a0242a1f3c4fd641cf8a3e312d516
Size (hugin-2010.0.0.tar.gz) = 12085453 bytes
SHA1 (patch-aa) = 87336d2059b3fe50346c9a806e28a1b881de011e
+SHA1 (patch-ab) = 3cf662d49f4cbfe742375d661653f25321d29aa1
SHA1 (patch-ac) = b091312601668e0504bca85da2ce808f7c447cd8
+SHA1 (patch-ad) = 64c30359067384fa058cb675dc1b08813bdc666c
diff --git a/graphics/hugin/patches/patch-ab b/graphics/hugin/patches/patch-ab
new file mode 100644
index 00000000000..259de989ffb
--- /dev/null
+++ b/graphics/hugin/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 2010/06/13 22:44:35 wiz Exp $
+
+--- CMakeModules/FindPNG.cmake.orig 2010-03-02 23:17:21.000000000 +0000
++++ CMakeModules/FindPNG.cmake
+@@ -29,7 +29,7 @@ IF (ZLIB_FOUND)
+
+ find_library_with_debug(PNG_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+- NAMES png libpng wxpng
++ NAMES png14 libpng14 wxpng
+ PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+ )
+
diff --git a/graphics/hugin/patches/patch-ad b/graphics/hugin/patches/patch-ad
new file mode 100644
index 00000000000..034225aa88b
--- /dev/null
+++ b/graphics/hugin/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:35 wiz Exp $
+
+--- src/foreign/vigra/vigra_impex/png.cxx.orig 2010-03-02 23:17:21.000000000 +0000
++++ src/foreign/vigra/vigra_impex/png.cxx
+@@ -271,8 +271,8 @@ namespace vigra {
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+ if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+- png_set_gray_1_2_4_to_8(png);
++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++ png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+ }
+
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 99016402c58..8887096f90d 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2010/01/18 09:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2010/06/13 22:44:36 wiz Exp $
DISTNAME= imlib-1.9.15
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/imlib/1.9/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index c741025e06a..90ea0abf7d1 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/01/18 09:59:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:36 wiz Exp $
BUILDLINK_TREE+= imlib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= imlib
IMLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.imlib+= imlib>=1.9.14nb5
-BUILDLINK_ABI_DEPENDS.imlib+= imlib>=1.9.15nb6
+BUILDLINK_ABI_DEPENDS.imlib+= imlib>=1.9.15nb7
BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index de0e9d696fe..cc51f1fb175 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2010/01/18 09:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:36 wiz Exp $
DISTNAME= imlib2-1.4.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index 447637c1845..27fb670655a 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2010/06/08 15:13:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2010/06/13 22:44:36 wiz Exp $
BUILDLINK_TREE+= imlib2
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= imlib2
IMLIB2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.1.0nb2
-BUILDLINK_ABI_DEPENDS.imlib2+= imlib2>=1.4.2nb4
+BUILDLINK_ABI_DEPENDS.imlib2+= imlib2>=1.4.2nb5
BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2
.include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index dd0f3bdcb08..a9139c22cc0 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2010/02/09 10:12:13 adam Exp $
+# $NetBSD: Makefile,v 1.49 2010/06/13 22:44:36 wiz Exp $
DISTNAME= inkscape-0.47
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index c8bdb1f0650..98fc11f6a97 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2010/02/03 22:46:02 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:36 wiz Exp $
DISTNAME= kbarcode-2.0.7
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kbarcode/}
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index b868a7cd97c..c3fc2c72687 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2010/01/18 09:59:03 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2010/06/13 22:44:36 wiz Exp $
DISTNAME= kdegraphics-${_KDE_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics
COMMENT= Graphics programs for the KDE integrated X11 desktop
diff --git a/graphics/kdegraphics3/buildlink3.mk b/graphics/kdegraphics3/buildlink3.mk
index 206502ce1b6..30af920bcbb 100644
--- a/graphics/kdegraphics3/buildlink3.mk
+++ b/graphics/kdegraphics3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2010/01/18 09:59:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:44:36 wiz Exp $
BUILDLINK_TREE+= kdegraphics
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdegraphics
KDEGRAPHICS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdegraphics+= kdegraphics>=3.5.0nb2
-BUILDLINK_ABI_DEPENDS.kdegraphics?= kdegraphics>=3.5.10nb6
+BUILDLINK_ABI_DEPENDS.kdegraphics?= kdegraphics>=3.5.10nb7
BUILDLINK_PKGSRCDIR.kdegraphics?= ../../graphics/kdegraphics3
.include "../../converters/fribidi/buildlink3.mk"
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 6febaabe59c..e5cd2401cf7 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/01/27 10:38:39 markd Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:36 wiz Exp $
DISTNAME= kdegraphics-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= graphics
COMMENT= Graphical tools for the KDE desktop
diff --git a/graphics/kdegraphics4/buildlink3.mk b/graphics/kdegraphics4/buildlink3.mk
index ee17ca9884c..88073de8655 100644
--- a/graphics/kdegraphics4/buildlink3.mk
+++ b/graphics/kdegraphics4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:36 wiz Exp $
BUILDLINK_TREE+= kdegraphics4
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdegraphics4
KDEGRAPHICS4_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdegraphics4+= kdegraphics4>=4.1.1
-BUILDLINK_ABI_DEPENDS.kdegraphics4?= kdegraphics4>=4.3.4nb4
+BUILDLINK_ABI_DEPENDS.kdegraphics4?= kdegraphics4>=4.4.4nb1
BUILDLINK_PKGSRCDIR.kdegraphics4?= ../../graphics/kdegraphics4
.include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/kipi-plugins-calendar-kde3/Makefile b/graphics/kipi-plugins-calendar-kde3/Makefile
index 4665e2f2f8b..19a82627894 100644
--- a/graphics/kipi-plugins-calendar-kde3/Makefile
+++ b/graphics/kipi-plugins-calendar-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/02/15 14:45:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:36 wiz Exp $
DISTNAME= kipi-plugins-0.1.7
PKGNAME= kipi-plugins-calendar-0.1.7
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/kipi-plugins-kde3/Makefile b/graphics/kipi-plugins-kde3/Makefile
index 1ae427eceb1..00280cc92fa 100644
--- a/graphics/kipi-plugins-kde3/Makefile
+++ b/graphics/kipi-plugins-kde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/02/15 14:45:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:36 wiz Exp $
DISTNAME= kipi-plugins-0.1.7
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 860565e85d4..521cf3ac3f1 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2010/04/10 03:10:15 markd Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:44:36 wiz Exp $
#
DISTNAME= kipi-plugins-1.1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/kipi-plugins/1.1.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/koverartist/Makefile b/graphics/koverartist/Makefile
index 6aaac7974a6..4b5a5df3a3f 100644
--- a/graphics/koverartist/Makefile
+++ b/graphics/koverartist/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:03 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:36 wiz Exp $
DISTNAME= koverartist-0.5
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics kde
MASTER_SITES= # empty
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index cb1ef9a68bd..7077066638c 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/02/03 22:53:39 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:37 wiz Exp $
#
DISTNAME= kphotoalbum-3.1.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://ktown.kde.org/kphotoalbum/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/kphotobook/Makefile b/graphics/kphotobook/Makefile
index 5e36fe6d253..f10dbab40f8 100644
--- a/graphics/kphotobook/Makefile
+++ b/graphics/kphotobook/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/02/03 22:42:57 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:37 wiz Exp $
#
DISTNAME= kphotobook-0.0.6
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= kde graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kphotobook/}
diff --git a/graphics/kphotools/Makefile b/graphics/kphotools/Makefile
index 208924fb9b4..8e50937aeba 100644
--- a/graphics/kphotools/Makefile
+++ b/graphics/kphotools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/02/03 22:40:00 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:37 wiz Exp $
#
DISTNAME= kphotools-0.2.1
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= kde graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kphotools/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index e7409a8e97d..830df775672 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/06/05 11:47:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:37 wiz Exp $
#
DISTNAME= lensfun-0.2.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://download.berlios.de/lensfun/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 3c4413bf0c4..29c1eca0c97 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:37 wiz Exp $
DISTNAME= libexif-gtk-0.3.5
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libexif/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libexif-gtk/buildlink3.mk b/graphics/libexif-gtk/buildlink3.mk
index 2c6d31899f7..ab5ccefe73d 100644
--- a/graphics/libexif-gtk/buildlink3.mk
+++ b/graphics/libexif-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:37 wiz Exp $
#
# This file was created automatically using createbuildlink-3.4.
@@ -8,7 +8,7 @@ BUILDLINK_TREE+= libexif-gtk
LIBEXIF_GTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.3nb7
-BUILDLINK_ABI_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.5nb5
+BUILDLINK_ABI_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.5nb6
BUILDLINK_PKGSRCDIR.libexif-gtk?= ../../graphics/libexif-gtk
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index 6e8c54d1b20..0b7648b4628 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2010/04/29 08:44:58 kefren Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:44:37 wiz Exp $
DISTNAME= libgdiplus-2.6.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/libgdiplus/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index d1c2d809ccd..07d7fb57b2d 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2010/06/13 22:44:37 wiz Exp $
BUILDLINK_TREE+= libgdiplus
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgdiplus
LIBGDIPLUS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgdiplus+= libgdiplus>=2.0
-BUILDLINK_ABI_DEPENDS.libgdiplus?= libgdiplus>=2.4.2nb2
+BUILDLINK_ABI_DEPENDS.libgdiplus?= libgdiplus>=2.6.4nb1
BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus
.include "../../devel/glib2/buildlink3.mk"
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 63c158aaa20..840caaea631 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2010/06/11 13:22:51 drochner Exp $
+# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:37 wiz Exp $
#
DISTNAME= libgnomecanvas-2.30.1
+PKGREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.30/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index 9a628e28b4f..3ceb79a79b0 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/08/26 19:56:58 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:37 wiz Exp $
BUILDLINK_TREE+= libgnomecanvas
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomecanvas
LIBGNOMECANVAS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.8.0
-BUILDLINK_ABI_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.26.0nb1
+BUILDLINK_ABI_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.30.1nb1
BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index bae88db78c3..82455147218 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:37 wiz Exp $
DISTNAME= libgnomecanvasmm-2.26.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvasmm/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libgnomecanvasmm/buildlink3.mk b/graphics/libgnomecanvasmm/buildlink3.mk
index cfa0a0ec715..b2cc2ebf324 100644
--- a/graphics/libgnomecanvasmm/buildlink3.mk
+++ b/graphics/libgnomecanvasmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:37 wiz Exp $
BUILDLINK_TREE+= libgnomecanvasmm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomecanvasmm
LIBGNOMECANVASMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.10.0
-BUILDLINK_ABI_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.26.0nb1
+BUILDLINK_ABI_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.26.0nb2
BUILDLINK_PKGSRCDIR.libgnomecanvasmm?= ../../graphics/libgnomecanvasmm
.include "../../graphics/libgnomecanvas/buildlink3.mk"
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 1fb93252414..e7499f3d051 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:37 wiz Exp $
#
DISTNAME= libkdcraw-0.1.9
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libkdcraw/buildlink3.mk b/graphics/libkdcraw/buildlink3.mk
index 3fe6ecbfadb..62957cacdc6 100644
--- a/graphics/libkdcraw/buildlink3.mk
+++ b/graphics/libkdcraw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:44:37 wiz Exp $
BUILDLINK_TREE+= libkdcraw
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkdcraw
LIBKDCRAW_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libkdcraw+= libkdcraw>=0.1.1
-BUILDLINK_ABI_DEPENDS.libkdcraw?= libkdcraw>=0.1.9nb3
+BUILDLINK_ABI_DEPENDS.libkdcraw?= libkdcraw>=0.1.9nb4
BUILDLINK_PKGSRCDIR.libkdcraw?= ../../graphics/libkdcraw
.include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index d2db121d48c..9c2a6533083 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:37 wiz Exp $
DISTNAME= libkexif-0.2.5
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libkexif/buildlink3.mk b/graphics/libkexif/buildlink3.mk
index a4025bbc649..4b8868b93f5 100644
--- a/graphics/libkexif/buildlink3.mk
+++ b/graphics/libkexif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:37 wiz Exp $
BUILDLINK_TREE+= libkexif
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkexif
LIBKEXIF_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libkexif+= libkexif>=0.2.5
-BUILDLINK_ABI_DEPENDS.libkexif?= libkexif>=0.2.5nb8
+BUILDLINK_ABI_DEPENDS.libkexif?= libkexif>=0.2.5nb9
BUILDLINK_PKGSRCDIR.libkexif?= ../../graphics/libkexif
.include "../../graphics/libexif/buildlink3.mk"
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 51be65e4c03..765d07cd626 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:38 wiz Exp $
#
DISTNAME= libkexiv2-0.1.9
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libkexiv2/buildlink3.mk b/graphics/libkexiv2/buildlink3.mk
index 6e3f384e4f1..05608337863 100644
--- a/graphics/libkexiv2/buildlink3.mk
+++ b/graphics/libkexiv2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:44:38 wiz Exp $
BUILDLINK_TREE+= libkexiv2
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkexiv2
LIBKEXIV2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libkexiv2+= libkexiv2>=0.1.1
-BUILDLINK_ABI_DEPENDS.libkexiv2+= libkexiv2>=0.1.9nb2
+BUILDLINK_ABI_DEPENDS.libkexiv2+= libkexiv2>=0.1.9nb3
BUILDLINK_PKGSRCDIR.libkexiv2?= ../../graphics/libkexiv2
.include "../../graphics/exiv2/buildlink3.mk"
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 480d0c5952c..465642714d5 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:44:38 wiz Exp $
DISTNAME= libkipi-0.1.6
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libkipi/buildlink3.mk b/graphics/libkipi/buildlink3.mk
index 0bfa6852659..54c11ae9771 100644
--- a/graphics/libkipi/buildlink3.mk
+++ b/graphics/libkipi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:38 wiz Exp $
BUILDLINK_TREE+= libkipi
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkipi
LIBKIPI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libkipi+= libkipi>=0.1.5
-BUILDLINK_ABI_DEPENDS.libkipi?= libkipi>=0.1.6nb4
+BUILDLINK_ABI_DEPENDS.libkipi?= libkipi>=0.1.6nb5
BUILDLINK_PKGSRCDIR.libkipi?= ../../graphics/libkipi
.include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 377dad72119..b69b16eebf5 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:38 wiz Exp $
DISTNAME= libpano13-2.9.14
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=panotools/}
diff --git a/graphics/libpano13/buildlink3.mk b/graphics/libpano13/buildlink3.mk
index 712aef53998..4fc699e6601 100644
--- a/graphics/libpano13/buildlink3.mk
+++ b/graphics/libpano13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:38 wiz Exp $
BUILDLINK_TREE+= libpano13
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libpano13
LIBPANO13_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libpano13+= libpano13>=2.9.14
-BUILDLINK_ABI_DEPENDS.libpano13?= libpano13>=2.9.14nb2
+BUILDLINK_ABI_DEPENDS.libpano13?= libpano13>=2.9.14nb3
BUILDLINK_PKGSRCDIR.libpano13?= ../../graphics/libpano13
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/libpuzzle/Makefile b/graphics/libpuzzle/Makefile
index 09c4ab2e297..99dabd00af4 100644
--- a/graphics/libpuzzle/Makefile
+++ b/graphics/libpuzzle/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:38 wiz Exp $
#
DISTNAME= libpuzzle-0.11
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libpuzzle/buildlink3.mk b/graphics/libpuzzle/buildlink3.mk
index f6a74ebb95e..074a4aae46a 100644
--- a/graphics/libpuzzle/buildlink3.mk
+++ b/graphics/libpuzzle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:38 wiz Exp $
BUILDLINK_TREE+= libpuzzle
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libpuzzle
LIBPUZZLE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libpuzzle+= libpuzzle>=0.9
-BUILDLINK_ABI_DEPENDS.libpuzzle?= libpuzzle>=0.11nb2
+BUILDLINK_ABI_DEPENDS.libpuzzle?= libpuzzle>=0.11nb3
BUILDLINK_PKGSRCDIR.libpuzzle?= ../../graphics/libpuzzle
.include "../../graphics/gd/buildlink3.mk"
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 67fa3fe5a31..69328740149 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2010/05/02 11:50:16 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:38 wiz Exp $
DISTNAME= librsvg-2.26.3
+PKGREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk
index d33307dea40..90f6b1f121d 100644
--- a/graphics/librsvg/buildlink3.mk
+++ b/graphics/librsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:56 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:38 wiz Exp $
BUILDLINK_TREE+= librsvg
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= librsvg
LIBRSVG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1
-BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.26.0
+BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.26.3nb1
BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg
.include "../../devel/libgsf/buildlink3.mk"
diff --git a/graphics/libscigraphica/Makefile b/graphics/libscigraphica/Makefile
index f87ed538f5e..b26be9b2a26 100644
--- a/graphics/libscigraphica/Makefile
+++ b/graphics/libscigraphica/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/05/29 13:54:32 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:38 wiz Exp $
#
DISTNAME= libscigraphica-2.1.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/}
diff --git a/graphics/libscigraphica/buildlink3.mk b/graphics/libscigraphica/buildlink3.mk
index f84885bf218..5636c3a6b7c 100644
--- a/graphics/libscigraphica/buildlink3.mk
+++ b/graphics/libscigraphica/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:38 wiz Exp $
#
BUILDLINK_TREE+= libscigraphica
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= libscigraphica
LIBSCIGRAPHICA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libscigraphica+= libscigraphica>=2.1.1
-BUILDLINK_ABI_DEPENDS.libscigraphica?= libscigraphica>=2.1.1nb3
+BUILDLINK_ABI_DEPENDS.libscigraphica?= libscigraphica>=2.1.1nb6
BUILDLINK_PKGSRCDIR.libscigraphica?= ../../graphics/libscigraphica
.include "../../graphics/libart/buildlink3.mk"
diff --git a/graphics/libvideogfx/Makefile b/graphics/libvideogfx/Makefile
index c4b1c5903c2..6ebf8220996 100644
--- a/graphics/libvideogfx/Makefile
+++ b/graphics/libvideogfx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:38 wiz Exp $
#
DISTNAME= libvideogfx-1.0.3
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://rachmaninoff.informatik.uni-mannheim.de/libvideogfx/data/
diff --git a/graphics/libvideogfx/buildlink3.mk b/graphics/libvideogfx/buildlink3.mk
index b0a58d23982..9bd9da0d8dd 100644
--- a/graphics/libvideogfx/buildlink3.mk
+++ b/graphics/libvideogfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:38 wiz Exp $
BUILDLINK_TREE+= libvideogfx
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libvideogfx
LIBVIDEOGFX_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libvideogfx+= libvideogfx>=1.0.3
-BUILDLINK_ABI_DEPENDS.libvideogfx+= libvideogfx>=1.0.3nb5
+BUILDLINK_ABI_DEPENDS.libvideogfx+= libvideogfx>=1.0.3nb6
BUILDLINK_PKGSRCDIR.libvideogfx?= ../../graphics/libvideogfx
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 89386126d22..bd855882f75 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/13 22:44:38 wiz Exp $
DISTNAME= libwmf-0.2.8.4
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index 4ed677ed706..3a75656c3dc 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:38 wiz Exp $
BUILDLINK_TREE+= libwmf
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libwmf
LIBWMF_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8nb2
-BUILDLINK_ABI_DEPENDS.libwmf+= libwmf>=0.2.8.4nb6
+BUILDLINK_ABI_DEPENDS.libwmf+= libwmf>=0.2.8.4nb7
BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf
.include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/lprof/Makefile b/graphics/lprof/Makefile
index dce70417d20..5995e044715 100644
--- a/graphics/lprof/Makefile
+++ b/graphics/lprof/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:38 wiz Exp $
#
DISTNAME= lprof-1.10.1
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lprof/}
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index da17f9e7323..e31b81f436c 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2010/02/03 22:35:34 joerg Exp $
+# $NetBSD: Makefile,v 1.66 2010/06/13 22:44:38 wiz Exp $
DISTNAME= magicpoint-1.13a
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 graphics
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index e3abfe2d726..950e9fbac4d 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2010/02/22 11:39:10 obache Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:39 wiz Exp $
#
DISTNAME= mgl2-alpha-020
PKGNAME= mgl-0.2.0a
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics
MASTER_SITES= http://at.sakura.ne.jp/~suz/arc/
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 2e488a3fcb5..2d017eab5aa 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.165 2010/02/19 18:25:44 drochner Exp $
+# $NetBSD: Makefile,v 1.166 2010/06/13 22:44:39 wiz Exp $
DISTNAME= netpbm-10.35.73
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/}
EXTRACT_SUFX= .tgz
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index 8dd54927b9c..472c259b087 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:39 wiz Exp $
BUILDLINK_TREE+= netpbm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= netpbm
NETPBM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.netpbm+= netpbm>=10.11.6
-BUILDLINK_ABI_DEPENDS.netpbm+= netpbm>=10.34nb4
+BUILDLINK_ABI_DEPENDS.netpbm+= netpbm>=10.35.73nb1
BUILDLINK_PKGSRCDIR.netpbm?= ../../graphics/netpbm
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index f90e3c6f74e..86be28b372c 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.74 2010/03/28 12:36:35 drochner Exp $
+$NetBSD: distinfo,v 1.75 2010/06/13 22:44:39 wiz Exp $
SHA1 (netpbm-10.35.73.tgz) = e498fcedbc88c618e69163cdb9fa782178a1645e
RMD160 (netpbm-10.35.73.tgz) = b4507ac7897227bf0fb8addceb9a14c9f4601ee8
Size (netpbm-10.35.73.tgz) = 2548185 bytes
SHA1 (patch-aa) = fb94fb43c4c63113e9c720ea399a5cecb2c79977
SHA1 (patch-ab) = 7781c51e9a8cc9de953540a04e19303244ef8d57
+SHA1 (patch-ac) = d7e23b2b905c6f9c6114e17b16fcce3eadb29b56
SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1
SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
+SHA1 (patch-af) = 7ac8b5a431cd007ccc23ea337194a5c542ff0a54
SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26
SHA1 (patch-ao) = b4307205f605d4c9c8f11c00e1a633960b33b2d3
SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
new file mode 100644
index 00000000000..1946546c99a
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.19 2010/06/13 22:44:39 wiz Exp $
+
+--- converter/other/pnmtopng.c.orig 2009-09-03 15:34:36.000000000 +0000
++++ converter/other/pnmtopng.c
+@@ -69,11 +69,6 @@
+ #include "nstring.h"
+ #include "version.h"
+
+-#if PNG_LIBPNG_VER >= 10400
+-#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
+-#error You need either an older PNG library (older than 1.4)
+-#error newer Netpbm source code (at least 10.48)
+-#endif
+
+
+ struct zlibCompression {
+@@ -2611,7 +2606,7 @@ convertpnm(struct cmdlineInfo const cmdl
+ info_ptr->num_palette = palette_size;
+ if (trans_size > 0) {
+ info_ptr->valid |= PNG_INFO_tRNS;
+- info_ptr->trans = trans;
++ info_ptr->trans_alpha = trans;
+ info_ptr->num_trans = trans_size; /* omit opaque values */
+ }
+ /* creating hIST chunk */
+@@ -2648,7 +2643,7 @@ convertpnm(struct cmdlineInfo const cmdl
+ info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
+ if (transparent > 0) {
+ info_ptr->valid |= PNG_INFO_tRNS;
+- info_ptr->trans_values =
++ info_ptr->trans_color =
+ xelToPngColor_16(transcolor, maxval, png_maxval);
+ }
+ } else {
+@@ -2660,10 +2655,10 @@ convertpnm(struct cmdlineInfo const cmdl
+ if (info_ptr->valid && PNG_INFO_tRNS)
+ pm_message("Transparent color {gray, red, green, blue} = "
+ "{%d, %d, %d, %d}",
+- info_ptr->trans_values.gray,
+- info_ptr->trans_values.red,
+- info_ptr->trans_values.green,
+- info_ptr->trans_values.blue);
++ info_ptr->trans_color.gray,
++ info_ptr->trans_color.red,
++ info_ptr->trans_color.green,
++ info_ptr->trans_color.blue);
+ else
+ pm_message("No transparent color");
+ }
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
new file mode 100644
index 00000000000..0e9969ce69a
--- /dev/null
+++ b/graphics/netpbm/patches/patch-af
@@ -0,0 +1,64 @@
+$NetBSD: patch-af,v 1.14 2010/06/13 22:44:39 wiz Exp $
+
+--- converter/other/pngtopnm.c.orig 2009-09-03 15:34:36.000000000 +0000
++++ converter/other/pngtopnm.c
+@@ -44,12 +44,6 @@
+ #include "nstring.h"
+ #include "shhopt.h"
+
+-#if PNG_LIBPNG_VER >= 10400
+-#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
+-#error You need either an older PNG library (older than 1.4)
+-#error newer Netpbm source code (at least 10.48)
+-#endif
+-
+ typedef struct _jmpbuf_wrapper {
+ jmp_buf jmpbuf;
+ } jmpbuf_wrapper;
+@@ -482,7 +476,7 @@ isTransparentColor(pngcolor const colo
+ bool retval;
+
+ if (info_ptr->valid & PNG_INFO_tRNS) {
+- const png_color_16 * const transColorP = &info_ptr->trans_values;
++ const png_color_16 * const transColorP = &info_ptr->trans_color;
+
+
+ /* There seems to be a problem here: you can't compare real
+@@ -575,8 +569,8 @@ paletteHasPartialTransparency(png_info *
+ for (i = 0, foundGray = FALSE;
+ i < info_ptr->num_trans && !foundGray;
+ ++i) {
+- if (info_ptr->trans[i] != 0 &&
+- info_ptr->trans[i] != maxval) {
++ if (info_ptr->trans_alpha[i] != 0 &&
++ info_ptr->trans_alpha[i] != maxval) {
+ foundGray = TRUE;
+ }
+ }
+@@ -647,7 +641,7 @@ setupSignificantBits(png_struct *
+ unsigned int i;
+ trans_mix = TRUE;
+ for (i = 0; i < info_ptr->num_trans; ++i)
+- if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) {
++ if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) {
+ trans_mix = FALSE;
+ break;
+ }
+@@ -885,7 +879,7 @@ writePnm(FILE * const ofP,
+ setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
+ ((info_ptr->valid & PNG_INFO_tRNS) &&
+ (fgColor.r ==
+- gamma_correct(info_ptr->trans_values.gray,
++ gamma_correct(info_ptr->trans_color.gray,
+ totalgamma))) ?
+ 0 : maxval);
+ }
+@@ -914,7 +908,7 @@ writePnm(FILE * const ofP,
+ setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
+ (info_ptr->valid & PNG_INFO_tRNS) &&
+ index < info_ptr->num_trans ?
+- info_ptr->trans[index] : maxval);
++ info_ptr->trans_alpha[index] : maxval);
+ }
+ break;
+
diff --git a/graphics/nvtv/Makefile b/graphics/nvtv/Makefile
index 1479ee06050..0f813232cba 100644
--- a/graphics/nvtv/Makefile
+++ b/graphics/nvtv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:46 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:39 wiz Exp $
DISTNAME= nvtv-0.4.7
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nv-tv-out/}
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 83e163ada7b..c6003b24478 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:39 wiz Exp $
#
DISTNAME= opencv-1.0.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index f3e0d6e8bd6..cddedd452ed 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/04/11 10:08:51 adam Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:39 wiz Exp $
DISTNAME= optipng-0.6.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=optipng/}
diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
index c89eeb244c0..9424b89d3bc 100644
--- a/graphics/optipng/distinfo
+++ b/graphics/optipng/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/04/11 10:08:51 adam Exp $
+$NetBSD: distinfo,v 1.17 2010/06/13 22:44:39 wiz Exp $
SHA1 (optipng-0.6.4.tar.gz) = ebb8d623c7f79c5c6942803bb96789103780bce9
RMD160 (optipng-0.6.4.tar.gz) = 6b5248c3c6b744315e70e86b49d998fe66759879
Size (optipng-0.6.4.tar.gz) = 1483806 bytes
SHA1 (patch-aa) = 0d1340f90699d1c059d8d8afea67d9fa065a6778
+SHA1 (patch-ab) = a3dc6fc1b0009437d5c7011de6d93cf0539f3565
diff --git a/graphics/optipng/patches/patch-ab b/graphics/optipng/patches/patch-ab
new file mode 100644
index 00000000000..54af2d23beb
--- /dev/null
+++ b/graphics/optipng/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.7 2010/06/13 22:44:39 wiz Exp $
+
+--- src/opngreduc.c.orig 2010-01-03 05:59:00.000000000 +0000
++++ src/opngreduc.c
+@@ -23,7 +23,11 @@
+ #define PNG_NO_PEDANTIC_WARNINGS
+ #include "png.h"
+ #if PNG_LIBPNG_VER >= 10400
+-#include "pngpriv.h"
++#define PNG_FILLER 0x8000L
++#define PNG_FLAG_FILLER_AFTER 0x0080
++#ifndef png_debug
++#define png_debug(l,m)
++#endif
+ #else
+ #define trans_alpha trans
+ #define trans_color trans_values
diff --git a/graphics/ov519view/Makefile b/graphics/ov519view/Makefile
index d6b3d2d57e7..4ea801afae0 100644
--- a/graphics/ov519view/Makefile
+++ b/graphics/ov519view/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/02/03 22:32:00 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:39 wiz Exp $
#
DISTNAME= ov51x-1.65-1.11-mark
PKGNAME= ov519view-0.00
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics x11
MASTER_SITES= http://alpha.dyndns.org/ov511/download/ov51x/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index dceb822c298..b200ef78410 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:39 wiz Exp $
DISTNAME= GD-2.44
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 2
+PKGREVISION= 3
SVR4_PKGNAME= p5bd
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/}
diff --git a/graphics/p5-Gdk-Imlib/Makefile b/graphics/p5-Gdk-Imlib/Makefile
index aca2d67a68f..735349b6941 100644
--- a/graphics/p5-Gdk-Imlib/Makefile
+++ b/graphics/p5-Gdk-Imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:39 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ MAKE_JOBS_SAFE= no
.include "../../x11/p5-gtk/Makefile.common"
PKGNAME= p5-Gdk-Imlib-${GTKPERL_VERSION}
-PKGREVISION= 7
+PKGREVISION= 8
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Perl bindings for Imlib
diff --git a/graphics/p5-Gdk-Pixbuf/Makefile b/graphics/p5-Gdk-Pixbuf/Makefile
index 099c9090e4c..617592046b3 100644
--- a/graphics/p5-Gdk-Pixbuf/Makefile
+++ b/graphics/p5-Gdk-Pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:39 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ MAKE_JOBS_SAFE= no
.include "../../x11/p5-gtk/Makefile.common"
PKGNAME= p5-Gdk-Pixbuf-${GTKPERL_VERSION}
-PKGREVISION= 15
+PKGREVISION= 16
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Perl5 Gtk::Gdk::Pixbuf
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 7e2316def68..6a6251d1bea 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:40 wiz Exp $
#
DISTNAME= Image-Imlib2-2.02
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 3
+PKGREVISION= 4
SVR4_PKGNAME= p5im2
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Image/}
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index afb3844f643..78587284340 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.69 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2010/06/13 22:44:40 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../graphics/ImageMagick/Makefile.common"
PKGNAME= p5-PerlMagick-${DISTVERSION}
-PKGREVISION= 3
+PKGREVISION= 4
SVR4_PKGNAME= p5pma
diff --git a/graphics/p5-cairo/Makefile b/graphics/p5-cairo/Makefile
index bc8833acc0a..509decf1b19 100644
--- a/graphics/p5-cairo/Makefile
+++ b/graphics/p5-cairo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2009/05/21 19:42:44 sno Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:40 wiz Exp $
#
DISTNAME= Cairo-${DIST_VER}
PKGNAME= p5-cairo-${DIST_VER}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
diff --git a/graphics/p5-cairo/buildlink3.mk b/graphics/p5-cairo/buildlink3.mk
index c8582acf3bf..f9e0818cba0 100644
--- a/graphics/p5-cairo/buildlink3.mk
+++ b/graphics/p5-cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:44:40 wiz Exp $
BUILDLINK_TREE+= p5-cairo
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= p5-cairo
P5_CAIRO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.p5-cairo+= p5-cairo>=1.023
+BUILDLINK_ABI_DEPENDS.p5-cairo?= p5-cairo>=1.061nb1
BUILDLINK_PKGSRCDIR.p5-cairo?= ../../graphics/p5-cairo
.include "../../graphics/cairo/buildlink3.mk"
diff --git a/graphics/p5-clutter/Makefile b/graphics/p5-clutter/Makefile
index d498d3b29d5..e5981e393fa 100644
--- a/graphics/p5-clutter/Makefile
+++ b/graphics/p5-clutter/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/03/11 04:24:57 obache Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:40 wiz Exp $
#
DISTNAME= clutter-perl-1.0.1
PKGNAME= p5-${DISTNAME:S/-perl-/-/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/clutter-perl/1.0/
diff --git a/graphics/panomatic/Makefile b/graphics/panomatic/Makefile
index 9cee9bf647e..c34b4afce9a 100644
--- a/graphics/panomatic/Makefile
+++ b/graphics/panomatic/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/16 10:22:37 adam Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:40 wiz Exp $
DISTNAME= panomatic-0.9.4-src
PKGNAME= panomatic-0.9.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://aorlinsk2.free.fr/panomatic/bin/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/panomatic/distinfo b/graphics/panomatic/distinfo
index d691d26ab25..ef874c55edc 100644
--- a/graphics/panomatic/distinfo
+++ b/graphics/panomatic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/05/16 10:22:37 adam Exp $
+$NetBSD: distinfo,v 1.2 2010/06/13 22:44:40 wiz Exp $
SHA1 (panomatic-0.9.4-src.tar.bz2) = cc0a48d81d090ec90e134afba4b9e700a5843f09
RMD160 (panomatic-0.9.4-src.tar.bz2) = 14ad37420733f950b8f7640c2e7f0b3fe593af89
@@ -6,4 +6,5 @@ Size (panomatic-0.9.4-src.tar.bz2) = 1598683 bytes
SHA1 (patch-aa) = 0c30ac34a9f678083c0bc3353f0171c0d3f5bdfa
SHA1 (patch-ab) = 316d23c740ee23e35b7b2f4ae8c0cc1b87c47ccb
SHA1 (patch-ac) = 2fa2168a257b60ae194675e3b0abd00bf6c7799b
+SHA1 (patch-ad) = 9acda36b6ad47584177f4035a78719229132b905
SHA1 (patch-ba) = 65fd25c9ae6fd22046a050687154940ab41849b7
diff --git a/graphics/panomatic/patches/patch-ad b/graphics/panomatic/patches/patch-ad
new file mode 100644
index 00000000000..d45fac74db6
--- /dev/null
+++ b/graphics/panomatic/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:40 wiz Exp $
+
+--- vigra/src/impex/png.cxx.orig 2008-02-14 23:14:15.000000000 +0000
++++ vigra/src/impex/png.cxx
+@@ -270,8 +270,8 @@ namespace vigra {
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+ if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+- png_set_gray_1_2_4_to_8(png);
++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++ png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+ }
+
diff --git a/graphics/pdiff/Makefile b/graphics/pdiff/Makefile
index 8d3276e836c..0a824be2ef0 100644
--- a/graphics/pdiff/Makefile
+++ b/graphics/pdiff/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:40 wiz Exp $
#
DISTNAME= PerceptualDiff-1.0.1
PKGNAME= pdiff-1.0.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pdiff/}
@@ -17,6 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= c c++
USE_CMAKE= yes
-.include "../../graphics/png/buildlink3.mk"
+# not compatible with png>=1.4
+#.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pdiff/distinfo b/graphics/pdiff/distinfo
index 620d77412fb..ead7a8ed6cd 100644
--- a/graphics/pdiff/distinfo
+++ b/graphics/pdiff/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/03/24 20:17:57 heinz Exp $
+$NetBSD: distinfo,v 1.4 2010/06/13 22:44:40 wiz Exp $
SHA1 (PerceptualDiff-1.0.1.tar.gz) = 301d703e7d3c474b663a4abcd63d81500d073be9
RMD160 (PerceptualDiff-1.0.1.tar.gz) = a2931d55b7efa66b907f9002d9380f2f8a088534
Size (PerceptualDiff-1.0.1.tar.gz) = 32344 bytes
+SHA1 (patch-aa) = bb10324121c3c8051a1517438ffe87075787c3a5
SHA1 (patch-ab) = f8cc81b1cfdcc7658216d354a917232ec285c64e
+SHA1 (patch-ac) = 28fe818975fe6dd747b4a2a4e45d315a96998ec3
diff --git a/graphics/pdiff/patches/patch-aa b/graphics/pdiff/patches/patch-aa
new file mode 100644
index 00000000000..f44585b0da1
--- /dev/null
+++ b/graphics/pdiff/patches/patch-aa
@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.3 2010/06/13 22:44:40 wiz Exp $
+
+Not compatible with png-1.4.
+
+--- CompareArgs.cpp.orig 2007-03-16 06:17:17.000000000 +0000
++++ CompareArgs.cpp
+@@ -35,8 +35,6 @@ static const char *usage =
+ \t-gamma g : Value to convert rgb into linear space (default 2.2)\n\
+ \t-luminance l : White luminance (default 100.0 cdm^-2)\n\
+ \t-output o.ppm : Write difference to the file o.ppm\n\
+-\n\
+-\n Note: Input files can also be in the PNG format\
+ \n";
+
+ CompareArgs::CompareArgs()
+@@ -69,26 +67,18 @@ bool CompareArgs::Parse_Args(int argc, c
+ if (i == 1) {
+ ImgA = RGBAImage::ReadTiff(argv[1]);
+ if (!ImgA) {
+- ImgA = RGBAImage::ReadPNG(argv[1]);
+- if (!ImgA)
+- {
+ ErrorStr = "FAIL: Cannot open ";
+ ErrorStr += argv[1];
+ ErrorStr += "\n";
+ return false;
+- }
+ }
+ } else if (i == 2) {
+ ImgB = RGBAImage::ReadTiff(argv[2]);
+ if (!ImgB) {
+- ImgB = RGBAImage::ReadPNG(argv[2]);
+- if (!ImgB)
+- {
+ ErrorStr = "FAIL: Cannot open ";
+ ErrorStr += argv[2];
+ ErrorStr += "\n";
+ return false;
+- }
+ }
+ } else {
+ if (strstr(argv[i], "-fov")) {
diff --git a/graphics/pdiff/patches/patch-ac b/graphics/pdiff/patches/patch-ac
new file mode 100644
index 00000000000..dfb825c9687
--- /dev/null
+++ b/graphics/pdiff/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.1 2010/06/13 22:44:40 wiz Exp $
+
+Not compatible with png-1.4.
+
+--- RGBAImage.cpp.orig 2007-03-16 06:17:17.000000000 +0000
++++ RGBAImage.cpp
+@@ -15,7 +15,9 @@ if not, write to the Free Software Found
+ */
+
+ #include "RGBAImage.h"
++#if 0
+ #include "png.h"
++#endif
+ #include "tiff.h"
+ #include "tiffio.h"
+
+@@ -54,6 +56,7 @@ RGBAImage* RGBAImage::ReadTiff(char *fil
+ return fimg;
+ }
+
++#if 0
+ // This portion was written by Scott Corley
+ RGBAImage* RGBAImage::ReadPNG(char *filename)
+ {
+@@ -117,6 +120,7 @@ RGBAImage* RGBAImage::ReadPNG(char *file
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ return fimg;
+ }
++#endif
+
+ bool RGBAImage::WritePPM()
+ {
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 3660098d381..6fde23ab01a 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:40 wiz Exp $
#
DISTNAME= pfstools-1.7.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfstools/}
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index 1724a59d565..85e62f3084d 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2010/02/27 03:35:12 taca Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:41 wiz Exp $
MODNAME= gd
+PKGREVISION= 1
CATEGORIES+= graphics
COMMENT= PHP extension for GD graphics library
diff --git a/graphics/phpsview/Makefile b/graphics/phpsview/Makefile
index e94bc7b38dc..53d3ac33477 100644
--- a/graphics/phpsview/Makefile
+++ b/graphics/phpsview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:41 wiz Exp $
#
DISTNAME= pwc-9.0.2
PKGNAME= phpsview-${DISTNAME:C/.*-//}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics x11
MASTER_SITES= http://www.smcc.demon.nl/webcam/
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 9587ab9062d..342116e940c 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:41 wiz Exp $
#
DISTNAME= pixieplus-0.5.4
-PKGREVISION= 24
+PKGREVISION= 25
CATEGORIES= graphics
MASTER_SITES= http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/
diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile
index 61164d884b0..417eaee0cb6 100644
--- a/graphics/ploticus/Makefile
+++ b/graphics/ploticus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:41 wiz Exp $
DISTNAME= pl231src
PKGNAME= ploticus-2.31pl4
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://ploticus.sourceforge.net/download/
diff --git a/graphics/plotutils-nox11/Makefile b/graphics/plotutils-nox11/Makefile
index c96e9b5db48..39460225ba0 100644
--- a/graphics/plotutils-nox11/Makefile
+++ b/graphics/plotutils-nox11/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2008/06/12 02:14:32 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:41 wiz Exp $
#
-DISTNAME= plotutils-2.4.1
+DISTNAME= plotutils-2.6
PKGNAME= ${DISTNAME:C/-/-nox11-/}
-PKGREVISION= 2
+PKGREVISION= 1
CATEGORIES= devel graphics
MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/}
@@ -21,7 +21,7 @@ PATCHDIR= ${.CURDIR}/../../graphics/plotutils/patches
USE_LANGUAGES= c c++
USE_TOOLS+= lex
-INFO_FILES= # PLIST
+INFO_FILES= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-libplotter
diff --git a/graphics/plotutils-nox11/buildlink3.mk b/graphics/plotutils-nox11/buildlink3.mk
index 5aa6915a241..93f9555bc6d 100644
--- a/graphics/plotutils-nox11/buildlink3.mk
+++ b/graphics/plotutils-nox11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:41 wiz Exp $
BUILDLINK_TREE+= plotutils-nox11
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= plotutils-nox11
PLOTUTILS_NOX11_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.plotutils-nox11+= plotutils-nox11>=2.4.1
-BUILDLINK_ABI_DEPENDS.plotutils-nox11?= plotutils-nox11>=2.4.1nb2
+BUILDLINK_ABI_DEPENDS.plotutils-nox11?= plotutils-nox11>=2.4.1nb3
BUILDLINK_PKGSRCDIR.plotutils-nox11?= ../../graphics/plotutils-nox11
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 817c4350647..c8f55bbb10a 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/05/02 13:28:43 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:41 wiz Exp $
#
DISTNAME= plotutils-2.6
+PKGREVISION= 1
CATEGORIES= devel graphics x11
MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/}
diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk
index ee788149f7d..1fc5f612dbf 100644
--- a/graphics/plotutils/buildlink3.mk
+++ b/graphics/plotutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:41 wiz Exp $
BUILDLINK_TREE+= plotutils
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= plotutils
PLOTUTILS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.plotutils+= plotutils>=2.4.1nb2
-BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.4.1nb5
+BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.6nb1
BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index 55503f062cf..138a133faba 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:41 wiz Exp $
#
DISTNAME= png2html-1.1
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= graphics www
MASTER_SITES= http://www.engr.mun.ca/~holden/
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index 46401366840..7c7538565e8 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2010/04/18 08:35:44 adam Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:41 wiz Exp $
DISTNAME= pngcrush-1.7.10-nolib
PKGNAME= pngcrush-1.7.10
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pmt/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index f022f63a9cf..acb7fa83153 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:41 wiz Exp $
#
PKGNAME= pornview-0.2.0pre1
DISTNAME= pornview_0.2pre1.orig
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/p/pornview/}
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 05e0279f568..4cd2f93097f 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:41 wiz Exp $
DISTNAME= povray-3.6.1
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://www.povray.org/ftp/pub/povray/Official/Unix/ \
ftp://ftp.povray.org/pub/povray/Official/Unix/
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 5034686eae3..774c4c352a5 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2010/04/13 06:53:19 obache Exp $
+# $NetBSD: Makefile,v 1.50 2010/06/13 22:44:41 wiz Exp $
DISTNAME= pstoedit-3.50
+PKGREVISION= 1
CATEGORIES= converters graphics print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pstoedit/}
diff --git a/graphics/py-biggles/Makefile b/graphics/py-biggles/Makefile
index f980d550e9d..240e6fb4218 100644
--- a/graphics/py-biggles/Makefile
+++ b/graphics/py-biggles/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2009/03/05 18:51:29 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:42 wiz Exp $
#
DISTNAME= python-biggles-1.6.3
PKGNAME= ${PYPKGPREFIX}${DISTNAME:S/python//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=biggles/}
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 795efd5766d..0ed52ebc716 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2009/08/31 08:04:32 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:42 wiz Exp $
#
DISTNAME= pycairo-1.8.8
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
diff --git a/graphics/py-cairo/buildlink3.mk b/graphics/py-cairo/buildlink3.mk
index 273f1809d13..1366c70e69e 100644
--- a/graphics/py-cairo/buildlink3.mk
+++ b/graphics/py-cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:42 wiz Exp $
BUILDLINK_TREE+= pycairo
@@ -8,7 +8,7 @@ PY_CAIRO_BUILDLINK3_MK:=
. include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.0.2
-BUILDLINK_ABI_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.0.2nb1
+BUILDLINK_ABI_DEPENDS.pycairo+= ${PYPKGPREFIX}-cairo>=1.8.8nb1
BUILDLINK_PKGSRCDIR.pycairo?= ../../graphics/py-cairo
.include "../../math/py-Numeric/buildlink3.mk"
diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile
index fa5d7674007..c901735deaa 100644
--- a/graphics/py-clutter-gtk/Makefile
+++ b/graphics/py-clutter-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/11 06:12:59 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:42 wiz Exp $
#
DISTNAME= pyclutter-gtk-0.10.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/pyclutter-gtk/0.10/
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index a431306053f..0a6d14306d1 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2010/04/09 01:43:23 obache Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:42 wiz Exp $
#
DISTNAME= pyclutter-1.0.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/1.0/
diff --git a/graphics/py-clutter/buildlink3.mk b/graphics/py-clutter/buildlink3.mk
index 87285d0ed18..94c421c701c 100644
--- a/graphics/py-clutter/buildlink3.mk
+++ b/graphics/py-clutter/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2010/03/11 06:11:51 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:42 wiz Exp $
#
BUILDLINK_TREE+= py-clutter
@@ -9,6 +9,7 @@ PY_CLUTTER_BUILDLINK3_MK:=
. include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.py-clutter+= ${PYPKGPREFIX}-clutter>=1.0.0
+BUILDLINK_ABI_DEPENDS.py-clutter?= ${PYPKGPREFIX}-clutter>=1.0.2nb1
BUILDLINK_PKGSRCDIR.py-clutter?= ../../graphics/py-clutter
.include "../../graphics/clutter/buildlink3.mk"
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index 49e00b5ec24..9a299520764 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:42 wiz Exp $
DISTNAME= gdmodule.c
PKGNAME= ${PYPKGPREFIX}-gd-1.3
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= graphics python
MASTER_SITES= http://starship.python.net/~richard/gdmodule/
EXTRACT_SUFX=
diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile
index 3d12d2bc85f..18755606ca0 100644
--- a/graphics/py-gdchart/Makefile
+++ b/graphics/py-gdchart/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:42 wiz Exp $
#
DISTNAME= gdchart-py-0.6
PKGNAME= ${PYPKGPREFIX}-gdchart-0.6
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= graphics python
MASTER_SITES= http://www.nullcube.com/software/pygdchart.html
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index 1e7fa18fa21..45728a2610d 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2009/08/26 19:57:48 sno Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:42 wiz Exp $
#
DISTNAME= pygoocanvas-0.14.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygoocanvas/0.14/}
diff --git a/graphics/py-gtkglext/Makefile b/graphics/py-gtkglext/Makefile
index db2986b8fd5..4a13e0f1a8d 100644
--- a/graphics/py-gtkglext/Makefile
+++ b/graphics/py-gtkglext/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/02/22 12:10:59 obache Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:42 wiz Exp $
#
DISTNAME= pygtkglext-1.1.0
PKGNAME= ${PYPKGPREFIX}-pygtkglext-1.1.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkglext/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index fbd9a47c19e..04c8ef61e38 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2010/05/17 16:22:59 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:42 wiz Exp $
#
DISTNAME= matplotlib-0.99.1.2
PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.99.1.2
+PKGREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile
index 5142ba35e37..185ce76396a 100644
--- a/graphics/py-matplotlib-tk/Makefile
+++ b/graphics/py-matplotlib-tk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/05/17 16:22:59 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:43 wiz Exp $
#
DISTNAME= matplotlib-0.99.1.2
PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-0.99.1.2
+PKGREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index c1252a8c635..2726ca134d1 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/05/17 16:22:59 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:42 wiz Exp $
#
DISTNAME= matplotlib-0.99.1.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo
index 0c937cc1df9..494ae7551c8 100644
--- a/graphics/py-matplotlib/distinfo
+++ b/graphics/py-matplotlib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2010/05/17 16:22:59 drochner Exp $
+$NetBSD: distinfo,v 1.11 2010/06/13 22:44:42 wiz Exp $
SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15
RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7
Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes
SHA1 (patch-aa) = 1f900684fec67a895fc1999f72d5c164376b40a6
+SHA1 (patch-ab) = fb7b689a2766c6221a994882fbf9b8942a4f94f9
diff --git a/graphics/py-matplotlib/patches/patch-ab b/graphics/py-matplotlib/patches/patch-ab
new file mode 100644
index 00000000000..ad54e2964df
--- /dev/null
+++ b/graphics/py-matplotlib/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2010/06/13 22:44:42 wiz Exp $
+
+--- src/_png.cpp.orig 2009-08-01 19:14:01.000000000 +0000
++++ src/_png.cpp
+@@ -290,7 +290,7 @@ _png_module::read_png(const Py::Tuple& a
+
+ //free the png memory
+ png_read_end(png_ptr, info_ptr);
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+ for (row = 0; row < height; row++)
+ delete [] row_pointers[row];
diff --git a/graphics/qcamview/Makefile b/graphics/qcamview/Makefile
index 75eec8d2158..7792cb7a305 100644
--- a/graphics/qcamview/Makefile
+++ b/graphics/qcamview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2010/02/03 22:28:35 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:43 wiz Exp $
#
DISTNAME= qce-ga-0.40d
PKGNAME= qcamview-0.4
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qce-ga/}
diff --git a/graphics/qimageblitz/Makefile b/graphics/qimageblitz/Makefile
index 97c9bd2641e..24f2317afe0 100644
--- a/graphics/qimageblitz/Makefile
+++ b/graphics/qimageblitz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:43 wiz Exp $
DISTNAME= qimageblitz-0.0.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qimageblitz/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/qimageblitz/buildlink3.mk b/graphics/qimageblitz/buildlink3.mk
index ec6fcbc5719..9dd84481fa7 100644
--- a/graphics/qimageblitz/buildlink3.mk
+++ b/graphics/qimageblitz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:43 wiz Exp $
BUILDLINK_TREE+= qimageblitz
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qimageblitz
QIMAGEBLITZ_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qimageblitz+= qimageblitz>=0.0.4
-BUILDLINK_ABI_DEPENDS.qimageblitz?= qimageblitz>=0.0.4nb2
+BUILDLINK_ABI_DEPENDS.qimageblitz?= qimageblitz>=0.0.4nb3
BUILDLINK_PKGSRCDIR.qimageblitz?= ../../graphics/qimageblitz
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index c743797d9bc..0337034995b 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/02/07 19:30:35 snj Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:43 wiz Exp $
DISTNAME= qiv-2.2.3
+PKGREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= http://spiegl.de/qiv/download/
EXTRACT_SUFX= .tgz
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 4fb958e651a..6242f259b1e 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:43 wiz Exp $
DISTNAME= rayshade.4.0
PKGNAME= rayshade-4.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics
MASTER_SITES= ftp://graphics.stanford.edu/pub/rayshade/
EXTRACT_SUFX= .tar.Z
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index 72932b74919..9c9ef4dbbf7 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/09/03 08:43:49 martin Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:43 wiz Exp $
#
DISTNAME= ristretto-0.0.22
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://goodies.xfce.org/releases/ristretto/
diff --git a/graphics/ruby-RMagick/Makefile b/graphics/ruby-RMagick/Makefile
index 187371917e5..b047e623be0 100644
--- a/graphics/ruby-RMagick/Makefile
+++ b/graphics/ruby-RMagick/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2010/01/18 09:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2010/06/13 22:44:43 wiz Exp $
DISTNAME= rmagick-2.12.2
-PKGREVISION= 3
+PKGREVISION= 4
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/rmagick/RMagick/}
CATEGORIES= graphics
diff --git a/graphics/ruby-clutter-cairo/Makefile b/graphics/ruby-clutter-cairo/Makefile
index 567f728a3d0..6a39a2de8ba 100644
--- a/graphics/ruby-clutter-cairo/Makefile
+++ b/graphics/ruby-clutter-cairo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/10/26 08:39:36 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:43 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-clutter-cairo-${VERSION}
COMMENT= Ruby binding for Clutter Cairo library
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/ruby-clutter-core/Makefile b/graphics/ruby-clutter-core/Makefile
index e96d707645f..719e52de391 100644
--- a/graphics/ruby-clutter-core/Makefile
+++ b/graphics/ruby-clutter-core/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/10/26 08:37:27 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:43 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-clutter-core-${VERSION}
COMMENT= Ruby binding for Clutter Core library
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/ruby-clutter-gtk/Makefile b/graphics/ruby-clutter-gtk/Makefile
index 09cf44615b7..bf83f17eef3 100644
--- a/graphics/ruby-clutter-gtk/Makefile
+++ b/graphics/ruby-clutter-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/10/26 08:38:33 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:43 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-clutter-gtk-${VERSION}
COMMENT= Ruby binding for Clutter GTK+ widget
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index a031285b5ce..af7bb0329b6 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:43 wiz Exp $
DISTNAME= ruby-gd-0.8.0
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/graphics/ruby-gnome2-gdkpixbuf/Makefile b/graphics/ruby-gnome2-gdkpixbuf/Makefile
index f1430f8031e..2eec8556883 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/Makefile
+++ b/graphics/ruby-gnome2-gdkpixbuf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/10/12 03:09:31 obache Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:44 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf-${VERSION}
COMMENT= Ruby binding of GdkPixbuf-2.x
+PKGREVISION= 1
CATEGORIES= graphics devel
CONFLICTS+= ruby-gnome2-gdkpixbuf-[0-9]*
diff --git a/graphics/ruby-gnome2-gnomecanvas/Makefile b/graphics/ruby-gnome2-gnomecanvas/Makefile
index f71dcbfa393..cf9423b2145 100644
--- a/graphics/ruby-gnome2-gnomecanvas/Makefile
+++ b/graphics/ruby-gnome2-gnomecanvas/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2009/10/12 03:09:31 obache Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:44 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnomecanvas-${VERSION}
COMMENT= Ruby binding of GnomeCanvas-2.x
+PKGREVISION= 1
CATEGORIES= graphics gnome
CONFLICTS+= ruby-gnome2-gnomecanvas-[0-9]*
diff --git a/graphics/ruby-gnome2-goocanvas/Makefile b/graphics/ruby-gnome2-goocanvas/Makefile
index b6f811819ca..009b6560870 100644
--- a/graphics/ruby-gnome2-goocanvas/Makefile
+++ b/graphics/ruby-gnome2-goocanvas/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/10/12 03:09:33 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:44 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-goocanvas-${VERSION}
COMMENT= Ruby binding of GooCanvas
+PKGREVISION= 1
CATEGORIES= graphics gnome
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/ruby-gnome2-gtkglext/Makefile b/graphics/ruby-gnome2-gtkglext/Makefile
index e74eeb2a37b..3cacfc67715 100644
--- a/graphics/ruby-gnome2-gtkglext/Makefile
+++ b/graphics/ruby-gnome2-gtkglext/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/10/12 03:09:32 obache Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:44 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtkglext-${VERSION}
COMMENT= Ruby binding of gtkglext
+PKGREVISION= 1
CATEGORIES= graphics
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/ruby-gnome2-libart/Makefile b/graphics/ruby-gnome2-libart/Makefile
index 95c785761e5..240c9d21785 100644
--- a/graphics/ruby-gnome2-libart/Makefile
+++ b/graphics/ruby-gnome2-libart/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:44 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-libart-${VERSION}
COMMENT= Ruby binding of Libart_lgpl
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
CONFLICTS+= ruby-gnome2-libart-[0-9]*
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index 35f91d8f14c..0f966648cfc 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2009/10/12 03:09:32 obache Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:44 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
COMMENT= Ruby binding of librsvg
+PKGREVISION= 1
CATEGORIES= graphics
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index 12d1d7ec0d8..d747a324a9d 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:44 wiz Exp $
DISTNAME= imlib2-ruby-0.5.2
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://pablotron.org/files/gems/
diff --git a/graphics/ruby-rcairo/Makefile b/graphics/ruby-rcairo/Makefile
index 6f701d0d665..315063b0fce 100644
--- a/graphics/ruby-rcairo/Makefile
+++ b/graphics/ruby-rcairo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/05/25 04:39:46 obache Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:44 wiz Exp $
DISTNAME= rcairo-1.8.1
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
diff --git a/graphics/ruby-rcairo/buildlink3.mk b/graphics/ruby-rcairo/buildlink3.mk
index 465a513bb13..5deba6eba26 100644
--- a/graphics/ruby-rcairo/buildlink3.mk
+++ b/graphics/ruby-rcairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/05/27 05:47:44 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:44 wiz Exp $
BUILDLINK_TREE+= ruby-rcairo
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= ruby-rcairo
RUBY_RCAIRO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ruby-rcairo+= ${RUBY_PKGPREFIX}-rcairo>=1.6.0
+BUILDLINK_ABI_DEPENDS.ruby-rcairo?= ruby18-rcairo>=1.8.1nb2
BUILDLINK_PKGSRCDIR.ruby-rcairo?= ../../graphics/ruby-rcairo
.include "../../graphics/cairo/buildlink3.mk"
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index bacc52f3024..788ff74d5c9 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:44:44 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
DISTNAME= sane-frontends-${SANE_VERSION}
SANE_MICRO= 14
-PKGREVISION= 7
+PKGREVISION= 8
COMMENT= Frontends for access to scanners, digital cameras, frame grabbers etc
diff --git a/graphics/scidavis/Makefile b/graphics/scidavis/Makefile
index 95f61823cd3..ab3ae35c56c 100644
--- a/graphics/scidavis/Makefile
+++ b/graphics/scidavis/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/02/10 19:17:39 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:44 wiz Exp $
#
DISTNAME= scidavis-0.2.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scidavis/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 5dae75decf6..d2624102575 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2010/02/25 21:41:11 drochner Exp $
+# $NetBSD: Makefile,v 1.49 2010/06/13 22:44:44 wiz Exp $
#
DISTNAME= scigraphica-2.1.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/}
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index e696f6c5267..e4192d42a13 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:44 wiz Exp $
DISTNAME= scrot-0.8
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= graphics
MASTER_SITES= http://linuxbrit.co.uk/downloads/
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 8eeabc4b791..98f141bbda5 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/02/03 22:24:30 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:45 wiz Exp $
#
DISTNAME= showimg-0.9.5
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= kde graphics x11
MASTER_SITES= http://www.jalix.org/projects/showimg/download/0.9.5/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index dba30b34136..0d07d51950c 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:45 wiz Exp $
DISTNAME= simage-1.6.1
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.coin3d.org/pub/coin/src/
diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk
index 68a4fc8dc35..deff954c936 100644
--- a/graphics/simage/buildlink3.mk
+++ b/graphics/simage/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:45 wiz Exp $
BUILDLINK_TREE+= simage
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= simage
SIMAGE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.simage+= simage>=1.6.1
-BUILDLINK_ABI_DEPENDS.simage+= simage>=1.6.1nb7
+BUILDLINK_ABI_DEPENDS.simage+= simage>=1.6.1nb8
BUILDLINK_PKGSRCDIR.simage?= ../../graphics/simage
.include "../../audio/libsndfile/buildlink3.mk"
diff --git a/graphics/snx101view/Makefile b/graphics/snx101view/Makefile
index 56941d59aa3..3c72e83eac7 100644
--- a/graphics/snx101view/Makefile
+++ b/graphics/snx101view/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/02/03 22:16:14 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:45 wiz Exp $
#
DISTNAME= snx101util-0.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics x11
MASTER_SITES= http://www.medias.ne.jp/~takam/bsd/
diff --git a/graphics/spcaview/Makefile b/graphics/spcaview/Makefile
index 7580546498d..9e61e46b692 100644
--- a/graphics/spcaview/Makefile
+++ b/graphics/spcaview/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2010/02/15 17:21:20 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:45 wiz Exp $
#
DISTNAME= spca5xx-20060402
PKGNAME= spcaview-0.6b
#PKGREVISION= 1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics x11
MASTER_SITES= http://mxhaard.free.fr/spca50x/Download/oldrelease/
diff --git a/graphics/tango-icon-theme/Makefile b/graphics/tango-icon-theme/Makefile
index ca461f1b379..20fa1fb5cd4 100644
--- a/graphics/tango-icon-theme/Makefile
+++ b/graphics/tango-icon-theme/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:45 wiz Exp $
DISTNAME= tango-icon-theme-0.8.90
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://tango.freedesktop.org/releases/
diff --git a/graphics/tuxpaint-config/Makefile b/graphics/tuxpaint-config/Makefile
index 5bf8d5e32a4..4a2b9f34a23 100644
--- a/graphics/tuxpaint-config/Makefile
+++ b/graphics/tuxpaint-config/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/02/03 22:13:09 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:45 wiz Exp $
#
DISTNAME= tuxpaint-config-0.0.8
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/tuxpaint/config/
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 8822fa78b9b..ad089bda536 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2010/02/03 22:13:09 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:45 wiz Exp $
#
DISTNAME= tuxpaint-0.9.17
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
diff --git a/graphics/ucview/Makefile b/graphics/ucview/Makefile
index 26fa686c07b..f17da6f3aee 100644
--- a/graphics/ucview/Makefile
+++ b/graphics/ucview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:51 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:45 wiz Exp $
DISTNAME= ucview-0.22
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://unicap-imaging.org/downloads/
diff --git a/graphics/unicap/Makefile b/graphics/unicap/Makefile
index 6d597f4e76e..bd2d60a0579 100644
--- a/graphics/unicap/Makefile
+++ b/graphics/unicap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:51 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:45 wiz Exp $
DISTNAME= unicap-0.9.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://unicap-imaging.org/downloads/
diff --git a/graphics/unicap/distinfo b/graphics/unicap/distinfo
index 83cf0853373..42f1e9d3d80 100644
--- a/graphics/unicap/distinfo
+++ b/graphics/unicap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2009/11/26 15:04:03 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/06/13 22:44:45 wiz Exp $
SHA1 (unicap-0.9.3.tar.gz) = b9d1580a9e10d15a8ab86400a0200b72e582dc4d
RMD160 (unicap-0.9.3.tar.gz) = dd2b687197ac81534d2adbc5db8dcc2bdc3e3aad
@@ -16,7 +16,8 @@ SHA1 (patch-aj) = c04fa9aeb3c6fc93524019b1d69f6b3da6b62bc6
SHA1 (patch-ak) = 41025b0d650d8e06a2f4950b5113414f5a4d6ec1
SHA1 (patch-al) = cc6b286f54b902907e49028797e644af9eaff132
SHA1 (patch-am) = 32c85d4c7353a9f2130a7105067f555365fcc883
-SHA1 (patch-ap) = f80854eb8708e950384e18cad0d04fda66ca5267
+SHA1 (patch-an) = 8167ed1f1f3a7882f3c07feaddaf429a90bf1902
+SHA1 (patch-ap) = 29cb7f81e4e56c0178c453fe80f2c576eefeb6c6
SHA1 (patch-aq) = 396dae0f7695bd816479117b50f577d67aa6efbc
SHA1 (patch-ar) = d0a2b4411ca9df52b0041cd532779ccb9fc1efdf
SHA1 (patch-as) = 56db81f3a643f3c15d1c7572c63af23728c4b4eb
diff --git a/graphics/unicap/patches/patch-an b/graphics/unicap/patches/patch-an
new file mode 100644
index 00000000000..1bf5d27ae39
--- /dev/null
+++ b/graphics/unicap/patches/patch-an
@@ -0,0 +1,58 @@
+$NetBSD: patch-an,v 1.3 2010/06/13 22:44:45 wiz Exp $
+
+--- libucil/ucil_png.c.orig 2008-06-12 15:25:11.000000000 +0000
++++ libucil/ucil_png.c
+@@ -77,7 +77,7 @@ static int read_png(FILE *fp, unsigned i
+ if (info_ptr == NULL)
+ {
+ fclose(fp);
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return( -1 );
+ }
+
+@@ -89,7 +89,7 @@ static int read_png(FILE *fp, unsigned i
+ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+ /* If we get here, we had a problem reading the file */
+ return( -1 );
+@@ -109,7 +109,7 @@ static int read_png(FILE *fp, unsigned i
+ * adjustment), then you can read the entire image (including
+ * pixels) into the info structure with this call:
+ */
+- png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, png_voidp_NULL);
++ png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
+
+ /* At this point you have read the entire image */
+
+@@ -174,7 +174,7 @@ static int read_png(FILE *fp, unsigned i
+ }
+
+ /* clean up after the read, and free any memory allocated - REQUIRED */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ /* close the file */
+ fclose(fp);
+@@ -230,7 +230,7 @@ static int read_png(FILE *fp, unsigned i
+ /* if (info_ptr == NULL) */
+ /* { */
+ /* fclose(fp); */
+-/* png_destroy_write_struct(&png_ptr, png_infopp_NULL); */
++/* png_destroy_write_struct(&png_ptr, NULL); */
+ /* return( -1 ); */
+ /* } */
+
+@@ -252,7 +252,7 @@ static int read_png(FILE *fp, unsigned i
+ /* * image info living info in the structure. You could "|" many */
+ /* * PNG_TRANSFORM flags into the png_transforms integer here. */
+ /* *\/ */
+-/* png_write_png( png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, png_voidp_NULL ); */
++/* png_write_png( png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL ); */
+
+ /* /\* If you png_malloced a palette, free it here (don't free info_ptr->palette, */
+ /* as recommended in versions 1.0.5m and earlier of this example; if */
diff --git a/graphics/unicap/patches/patch-ap b/graphics/unicap/patches/patch-ap
index 2619d1640ec..8f88ec3a8e5 100644
--- a/graphics/unicap/patches/patch-ap
+++ b/graphics/unicap/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 2009/01/08 01:08:37 jmcneill Exp $
+$NetBSD: patch-ap,v 1.3 2010/06/13 22:44:45 wiz Exp $
--- configure.orig 2008-10-01 12:15:58.000000000 -0400
@@ -138,15 +138,6 @@ $NetBSD: patch-ap,v 1.2 2009/01/08 01:08:37 jmcneill Exp $
cat >>confdefs.h <<\_ACEOF
#define UNICAP_THREADS 1
-@@ -26728,6 +26728,8 @@ do
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+ : Avoid regenerating within pkgsrc
-+ exit 0
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
@@ -27969,7 +27971,7 @@ if test x$VID21394_VISCA = xyes; then
VID21394="$VID21394 with visca support"
fi
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index dbb8d95d8fc..fe1f1fe565f 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2010/06/13 22:44:45 wiz Exp $
DISTNAME= urt
PKGNAME= urt-3.1b1
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.iastate.edu/pub/utah-raster/
DISTFILES= urt-3.1b.tar.Z urt-doc.tar.Z urt-img.tar.Z
diff --git a/graphics/urt/buildlink3.mk b/graphics/urt/buildlink3.mk
index 16b896a4c52..c5fc6b676e3 100644
--- a/graphics/urt/buildlink3.mk
+++ b/graphics/urt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:45 wiz Exp $
BUILDLINK_TREE+= urt
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= urt
URT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.urt+= urt>=3.1b1nb5
-BUILDLINK_ABI_DEPENDS.urt+= urt>=3.1b1nb10
+BUILDLINK_ABI_DEPENDS.urt+= urt>=3.1b1nb11
BUILDLINK_PKGSRCDIR.urt?= ../../graphics/urt
.include "../../graphics/netpbm/buildlink3.mk"
diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile
index 7b8d35cac32..c2457f72761 100644
--- a/graphics/vid/Makefile
+++ b/graphics/vid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:46 wiz Exp $
#
DISTNAME= vid-1.0.1
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= graphics
MASTER_SITES= http://members.home.com/housel/
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index db10757401b..8884039bd79 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:46 wiz Exp $
#
DISTNAME= vigra1.6.0
PKGNAME= ${DISTNAME:C/^[[:alpha:]]+/&-/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/
diff --git a/graphics/vigra/distinfo b/graphics/vigra/distinfo
index 60cfabd1d3d..a5edee37a94 100644
--- a/graphics/vigra/distinfo
+++ b/graphics/vigra/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/08/25 18:17:56 bjs Exp $
+$NetBSD: distinfo,v 1.2 2010/06/13 22:44:46 wiz Exp $
SHA1 (vigra1.6.0.tar.gz) = 9714a0c4efb77726a1140329e98e5db057f9a69f
RMD160 (vigra1.6.0.tar.gz) = cc9f6626801182a0ee71ec9eb8fa34c38f8777a7
Size (vigra1.6.0.tar.gz) = 16525605 bytes
SHA1 (patch-aa) = 612e0284ba4ff531ad376586a125a4139d1bdbff
+SHA1 (patch-ab) = 3b8f1d37db04377ab76287a01a3e1d436f60b04e
diff --git a/graphics/vigra/patches/patch-ab b/graphics/vigra/patches/patch-ab
new file mode 100644
index 00000000000..2443fc6bf56
--- /dev/null
+++ b/graphics/vigra/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2010/06/13 22:44:46 wiz Exp $
+
+--- src/impex/png.cxx.orig 2008-08-13 13:15:45.000000000 +0000
++++ src/impex/png.cxx
+@@ -270,8 +270,8 @@ namespace vigra {
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+ if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+- png_set_gray_1_2_4_to_8(png);
++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++ png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+ }
+
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index 8d1a3e8ea08..93e07090f4b 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:46 wiz Exp $
#
DISTNAME= vp-1.5
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://math.smsu.edu/~erik/files/
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 999bee8c541..a073c983088 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/05/07 17:58:30 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:46 wiz Exp $
#
DISTNAME= wxsvg-1.0.4
PKGNAME= wxsvg-1.0.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxsvg/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk
index 5251c5de9f2..f8166cb29ca 100644
--- a/graphics/wxsvg/buildlink3.mk
+++ b/graphics/wxsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:46 wiz Exp $
BUILDLINK_TREE+= wxsvg
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= wxsvg
WXSVG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.wxsvg+= wxsvg>=1.0beta5
-BUILDLINK_ABI_DEPENDS.wxsvg?= wxsvg>=1.0nb2
+BUILDLINK_ABI_DEPENDS.wxsvg?= wxsvg>=1.0.4nb1
BUILDLINK_PKGSRCDIR.wxsvg?= ../../graphics/wxsvg
.include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index d059726e841..bb88d69442b 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2010/06/13 22:44:46 wiz Exp $
#
DISTNAME= xart19980415
PKGNAME= xart-19980415
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= graphics x11
MASTER_SITES= http://linux01.gwdg.de/~rhohen/linux/
EXTRACT_SUFX= .tgz
diff --git a/graphics/xart/distinfo b/graphics/xart/distinfo
index 4f8aac690eb..ee54cd0f246 100644
--- a/graphics/xart/distinfo
+++ b/graphics/xart/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2006/08/09 17:13:58 darcy Exp $
+$NetBSD: distinfo,v 1.13 2010/06/13 22:44:46 wiz Exp $
SHA1 (xart19980415.tgz) = d4445392e33a5dcf5ae951babac82394e7cdd65c
RMD160 (xart19980415.tgz) = 99077c23a798d8c0026bd53450052b1a8cf6ff6f
Size (xart19980415.tgz) = 343909 bytes
SHA1 (patch-aa) = 7d8ae61d9a624cc537396f406b496f28376cf7b5
SHA1 (patch-ab) = b0f00e29560ce786e37a8ba62fef82dae80c4ee9
-SHA1 (patch-ac) = d8d359dec9e440a821b7af79e810f5f067f3ab6f
+SHA1 (patch-ac) = 618003b6d192e85a1aa5f64b0f8eccfec991012e
SHA1 (patch-ad) = 08059ca068d156be0e31283180c5deaebb99f7bd
SHA1 (patch-ae) = d0d87fe957cbec5979e635270d2ad05b294f7530
SHA1 (patch-af) = 2ee00a7b02d14a5962ac0f561ede6423c4d45801
diff --git a/graphics/xart/patches/patch-ac b/graphics/xart/patches/patch-ac
index 33d5c25c792..b2a27fc175e 100644
--- a/graphics/xart/patches/patch-ac
+++ b/graphics/xart/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2006/04/19 17:04:31 wiz Exp $
+$NetBSD: patch-ac,v 1.8 2010/06/13 22:44:46 wiz Exp $
--- Local.config.orig 1998-04-01 02:58:05.000000000 +0200
+++ Local.config
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.7 2006/04/19 17:04:31 wiz Exp $
#ifdef HavePNG
-PNG_LIB = -L/usr/local/lib -lpng -lz
-PNG_INCLUDE = -I/usr/local/include/png
-+PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng12 -lz -lm
++PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng -lz -lm
+PNG_INCLUDE = -I${LOCALBASE}/include
#endif
diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk
index cbafd7ee4ac..732edd05e7c 100644
--- a/graphics/xfce4-icon-theme/buildlink3.mk
+++ b/graphics/xfce4-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/09/16 01:15:33 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:46 wiz Exp $
BUILDLINK_TREE+= xfce4-icon-theme
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= xfce4-icon-theme
XFCE4_ICON_THEME_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.4.3
+BUILDLINK_ABI_DEPENDS.xfce4-icon-theme?= xfce4-icon-theme>=4.4.3
BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 80ef88e4925..c0401d7fb11 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2010/06/13 22:44:46 wiz Exp $
DISTNAME= xfig.3.2.5b.full
PKGNAME= xfig-3.2.5b
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcj/}
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 9f7b928d2ec..e1eff09b0f7 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:46 wiz Exp $
DISTNAME= xli-2005-02-27
PKGNAME= xli-1.17.0
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= graphics x11
MASTER_SITES= http://pantransit.reptiles.org/prog/xli/
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index bc9cdd61e7a..878de024d9a 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:44:46 wiz Exp $
DISTNAME= xpaint-2.7.8.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index bbe29ec7bde..0a8be33812e 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2010/06/13 22:44:47 wiz Exp $
DISTNAME= xsane-0.994
PKGNAME= xsane-0.99.4
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://www.xsane.org/download/old/ \
ftp://ftp.u-aizu.ac.jp/pub/misc/device/scsi/scanner/sane/xsane/ \
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 8223299a952..873c01d540f 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2010/03/30 09:51:30 obache Exp $
+# $NetBSD: Makefile,v 1.81 2010/06/13 22:44:47 wiz Exp $
DISTNAME= xv-3.10a
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= graphics x11
MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/
DISTFILES= ${DEFAULT_DISTFILES} ${JUMBO_PATCHES}
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 53eb80acdaf..89fe3110152 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2009/08/26 19:57:52 sno Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:47 wiz Exp $
#
DISTNAME= xzgv-0.9
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xzgv/}
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index 33d57792edf..bd949926015 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/05/15 12:57:04 obache Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:47 wiz Exp $
#
DISTNAME= zphoto-1.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://0xcc.net/zphoto/
diff --git a/ham/fl_logbook/Makefile b/ham/fl_logbook/Makefile
index e94b49a92aa..50c22efd57d 100644
--- a/ham/fl_logbook/Makefile
+++ b/ham/fl_logbook/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/04/07 17:08:11 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:47 wiz Exp $
#
DISTNAME= fl_logbook.121.src
PKGNAME= fl_logbook-1.21
+PKGREVISION= 1
CATEGORIES= ham
MASTER_SITES= http://www.w1hkj.com/LinuxApps/
diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index a976d5c6856..fdb2b9b3ab1 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:47 wiz Exp $
#
DISTNAME= fldigi-3.03
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= ham
MASTER_SITES= http://www.w1hkj.com/fldigi-distro/
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index e1d0b5f327e..5939e8a9eb3 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/02/15 19:41:10 joerg Exp $
+$NetBSD: distinfo,v 1.3 2010/06/13 22:44:47 wiz Exp $
SHA1 (fldigi-3.03.tar.gz) = fcdc0f34fe62b6857c5e02bb8e7a8ecbe6e7050c
RMD160 (fldigi-3.03.tar.gz) = 30fa50eee0b00c2a332f8c48999e0183df88f60a
Size (fldigi-3.03.tar.gz) = 711226 bytes
SHA1 (patch-aa) = 122d936e7f8bda5466dc252ffe17f501c0f341e8
-SHA1 (patch-ab) = cfca39f1e32e8cd4e15d994a2af4dd5a72e87ab9
+SHA1 (patch-ab) = 5934eab7879ef2928e23f91a7c71b65484dab7fa
SHA1 (patch-ac) = def1ee6e6c3f60a2febb029560f3ad7f9c5a3364
diff --git a/ham/fldigi/patches/patch-ab b/ham/fldigi/patches/patch-ab
index 7a317986e19..42395360a10 100644
--- a/ham/fldigi/patches/patch-ab
+++ b/ham/fldigi/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/10/23 08:07:09 wulf Exp $
+$NetBSD: patch-ab,v 1.2 2010/06/13 22:44:47 wiz Exp $
---- src/widgets/picture.cxx.orig 2008-10-23 15:59:18.000000000 +1030
-+++ src/widgets/picture.cxx 2008-10-23 15:54:17.000000000 +1030
+--- src/widgets/picture.cxx.orig 2008-09-14 13:26:15.000000000 +0000
++++ src/widgets/picture.cxx
@@ -31,8 +31,10 @@
#include <FL/fl_ask.H>
@@ -13,3 +13,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/10/23 08:07:09 wulf Exp $
#endif
#if USE_LIBPNG
# include <png.h>
+@@ -317,7 +319,7 @@ int picture::save_png(const char* filena
+ return -1;
+ }
+ if ((info = png_create_info_struct(png)) == NULL) {
+- png_destroy_write_struct(&png, png_infopp_NULL);
++ png_destroy_write_struct(&png, NULL);
+ fclose(fp);
+ return -1;
+ }
diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile
index a011da4faa6..d050d4e5751 100644
--- a/ham/gmfsk/Makefile
+++ b/ham/gmfsk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:47 wiz Exp $
#
DISTNAME= gmfsk-0.6
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= ham
MASTER_SITES= http://gmfsk.connect.fi/
diff --git a/ham/gnuradio-examples/Makefile b/ham/gnuradio-examples/Makefile
index 0db3fd23216..7d9961263a8 100644
--- a/ham/gnuradio-examples/Makefile
+++ b/ham/gnuradio-examples/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:47 wiz Exp $
PKGNAME= gnuradio-examples-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= GUI framework for GNU Radio based on wxPython
COMMENT= Examples for GNU Radio
diff --git a/ham/gnuradio-radio-astronomy/Makefile b/ham/gnuradio-radio-astronomy/Makefile
index 873b265a7be..ad820494d7c 100644
--- a/ham/gnuradio-radio-astronomy/Makefile
+++ b/ham/gnuradio-radio-astronomy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/03/24 19:43:24 asau Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:47 wiz Exp $
PKGNAME= gnuradio-radio-astronomy-${VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
COMMENT= GNU Radio module for radio astronomy
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile
index a6626c9f41a..74340ef3a9e 100644
--- a/ham/gnuradio-wxgui/Makefile
+++ b/ham/gnuradio-wxgui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:47 wiz Exp $
PKGNAME= gnuradio-wxgui-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= GUI framework for GNU Radio based on wxPython
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/ham/gnuradio-wxgui/buildlink3.mk b/ham/gnuradio-wxgui/buildlink3.mk
index 13f854d6baa..41419fb9757 100644
--- a/ham/gnuradio-wxgui/buildlink3.mk
+++ b/ham/gnuradio-wxgui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:47 wiz Exp $
BUILDLINK_TREE+= gnuradio-wxgui
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnuradio-wxgui
GNURADIO_WXGUI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-wxgui+= gnuradio-wxgui>=3.0.4
-BUILDLINK_ABI_DEPENDS.gnuradio-wxgui?= gnuradio-wxgui>=3.2nb2
+BUILDLINK_ABI_DEPENDS.gnuradio-wxgui?= gnuradio-wxgui>=3.2nb3
BUILDLINK_PKGSRCDIR.gnuradio-wxgui?= ../../ham/gnuradio-wxgui
.include "../../ham/gnuradio-core/buildlink3.mk"
diff --git a/ham/gpredict/Makefile b/ham/gpredict/Makefile
index 665bb5449c9..834dac42527 100644
--- a/ham/gpredict/Makefile
+++ b/ham/gpredict/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2010/06/11 09:57:01 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:48 wiz Exp $
DISTNAME= gpredict-0.8.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= ham
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=groundstation/}
diff --git a/ham/grig/Makefile b/ham/grig/Makefile
index 7ca914b5e14..dfdeaa95e24 100644
--- a/ham/grig/Makefile
+++ b/ham/grig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 19:57:53 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= grig-0.7.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= ham
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=groundstation/}
diff --git a/ham/linpsk/Makefile b/ham/linpsk/Makefile
index 61217680a2d..6fa426c55d9 100644
--- a/ham/linpsk/Makefile
+++ b/ham/linpsk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/01/29 23:46:10 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= linpsk-0.8.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= ham
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=linpsk/}
diff --git a/ham/xdx/Makefile b/ham/xdx/Makefile
index e15c2526535..9cc404d7cca 100644
--- a/ham/xdx/Makefile
+++ b/ham/xdx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2009/08/26 19:57:53 sno Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= xdx-2.4.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= ham
MASTER_SITES= http://www.qsl.net/pg4i/download/
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index 179319baa4c..1c5f63e8097 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= xlog-1.5
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= ham
MASTER_SITES= http://www.qsl.net/pg4i/download/
diff --git a/inputmethod/ami/Makefile b/inputmethod/ami/Makefile
index 278791cd8d7..513a27b4bf4 100644
--- a/inputmethod/ami/Makefile
+++ b/inputmethod/ami/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= ami-1.0.11
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= korean inputmethod
MASTER_SITES= http://kldp.net/frs/download.php/942/
# http://kldp.net/frs/download.php/942/ami-1.2.3.tar.gz
diff --git a/inputmethod/im-ja/Makefile b/inputmethod/im-ja/Makefile
index 5ff44a40597..bd36a049fe3 100644
--- a/inputmethod/im-ja/Makefile
+++ b/inputmethod/im-ja/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/20 08:18:00 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= im-ja-1.5
+PKGREVISION= 1
CATEGORIES= inputmethod japanese
MASTER_SITES= http://im-ja.sourceforge.net/
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 0176d351907..9113ab33c4b 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= imhangul_status_applet-0.3
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= korean inputmethod
MASTER_SITES= http://download.kldp.net/imhangul/imhangul_status_applet/0.3/
diff --git a/inputmethod/kasumi/Makefile b/inputmethod/kasumi/Makefile
index 5bf001247b8..78d8a960f64 100644
--- a/inputmethod/kasumi/Makefile
+++ b/inputmethod/kasumi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/05/08 13:33:17 obache Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:48 wiz Exp $
DISTNAME= kasumi-2.5
+PKGREVISION= 1
CATEGORIES= inputmethod japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=kasumi/41436/}
diff --git a/inputmethod/kimera-tomoe-gtk/Makefile b/inputmethod/kimera-tomoe-gtk/Makefile
index 073527a7bee..01efecfedf1 100644
--- a/inputmethod/kimera-tomoe-gtk/Makefile
+++ b/inputmethod/kimera-tomoe-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/05/28 08:34:29 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= kimera-tomoe-gtk-0.5
+PKGREVISION= 1
CATEGORIES= inputmethod japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=kimera/24906/}
diff --git a/inputmethod/kimera/Makefile b/inputmethod/kimera/Makefile
index 0f2f7cf7931..86dac086fa2 100644
--- a/inputmethod/kimera/Makefile
+++ b/inputmethod/kimera/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/20 07:46:41 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= kimera-2.11
+PKGREVISION= 1
CATEGORIES= inputmethod japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=kimera/37271/}
diff --git a/inputmethod/m17n-im-config/Makefile b/inputmethod/m17n-im-config/Makefile
index 3d92f1906d9..16e9bdfea6c 100644
--- a/inputmethod/m17n-im-config/Makefile
+++ b/inputmethod/m17n-im-config/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:48 wiz Exp $
#
DISTNAME= m17n-im-config-0.9.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= inputmethod devel
MASTER_SITES= http://www.m17n.org/m17n-lib-download/
diff --git a/inputmethod/m17n-im-config/buildlink3.mk b/inputmethod/m17n-im-config/buildlink3.mk
index 665af9fb00a..2f10d008da6 100644
--- a/inputmethod/m17n-im-config/buildlink3.mk
+++ b/inputmethod/m17n-im-config/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:48 wiz Exp $
BUILDLINK_TREE+= m17n-im-config
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= m17n-im-config
M17N_IM_CONFIG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.m17n-im-config+= m17n-im-config>=0.9.0
-BUILDLINK_ABI_DEPENDS.m17n-im-config?= m17n-im-config>=0.9.0nb2
+BUILDLINK_ABI_DEPENDS.m17n-im-config?= m17n-im-config>=0.9.0nb3
BUILDLINK_PKGSRCDIR.m17n-im-config?= ../../inputmethod/m17n-im-config
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/inputmethod/nabi/Makefile b/inputmethod/nabi/Makefile
index 4106674efa1..c6f98f50ff9 100644
--- a/inputmethod/nabi/Makefile
+++ b/inputmethod/nabi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/08/26 19:57:54 sno Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= nabi-0.99.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= korean inputmethod
MASTER_SITES= http://kldp.net/frs/download.php/4929/
diff --git a/inputmethod/novel-pinyin/Makefile b/inputmethod/novel-pinyin/Makefile
index 4413819743b..ae54b4162c0 100644
--- a/inputmethod/novel-pinyin/Makefile
+++ b/inputmethod/novel-pinyin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/06/02 12:35:44 adam Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:49 wiz Exp $
DISTNAME= novel-pinyin-0.2.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=novel-pinyin/}
diff --git a/inputmethod/scim-anthy/Makefile b/inputmethod/scim-anthy/Makefile
index 58ca1476fac..9e5835805be 100644
--- a/inputmethod/scim-anthy/Makefile
+++ b/inputmethod/scim-anthy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/12/12 06:22:08 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-anthy-1.2.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/37309/}
diff --git a/inputmethod/scim-array/Makefile b/inputmethod/scim-array/Makefile
index ccd34f88f49..b88fdd30136 100644
--- a/inputmethod/scim-array/Makefile
+++ b/inputmethod/scim-array/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:48:43 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-array-1.0.1
+PKGREVISION= 1
CATEGORIES= inputmethod chinese
MASTER_SITES= http://of.openfoundry.org/download/scimarray/1.0.1/
diff --git a/inputmethod/scim-bridge/Makefile b/inputmethod/scim-bridge/Makefile
index 8a7b1ec54b4..9a201431d9f 100644
--- a/inputmethod/scim-bridge/Makefile
+++ b/inputmethod/scim-bridge/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/11/26 12:30:12 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-bridge-0.4.16
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
diff --git a/inputmethod/scim-canna/Makefile b/inputmethod/scim-canna/Makefile
index 458b70731e5..1bae6912d62 100644
--- a/inputmethod/scim-canna/Makefile
+++ b/inputmethod/scim-canna/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/05/15 11:32:47 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-canna-1.0.1
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/29155/}
diff --git a/inputmethod/scim-ccinput/Makefile b/inputmethod/scim-ccinput/Makefile
index 0e88d53138b..0dcd1527547 100644
--- a/inputmethod/scim-ccinput/Makefile
+++ b/inputmethod/scim-ccinput/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/05/15 11:39:29 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-ccinput-0.3.1
+PKGREVISION= 1
CATEGORIES= inputmethod chinese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
EXTRACT_SUFX= .tar.bz2
diff --git a/inputmethod/scim-chewing/Makefile b/inputmethod/scim-chewing/Makefile
index 60c8fdceac0..dba2d334222 100644
--- a/inputmethod/scim-chewing/Makefile
+++ b/inputmethod/scim-chewing/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/05/15 11:37:22 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-chewing-0.3.3
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= http://chewing.csie.net/download/scim/
EXTRACT_SUFX= .tar.bz2
diff --git a/inputmethod/scim-fcitx/Makefile b/inputmethod/scim-fcitx/Makefile
index c625bce1212..f9798227aec 100644
--- a/inputmethod/scim-fcitx/Makefile
+++ b/inputmethod/scim-fcitx/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:53:35 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-fcitx.3.1.1
PKGNAME= scim-fcitx-3.1.1
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
EXTRACT_SUFX= .tar.bz2
diff --git a/inputmethod/scim-hangul/Makefile b/inputmethod/scim-hangul/Makefile
index c4aa60f68ac..a26e7ddad4d 100644
--- a/inputmethod/scim-hangul/Makefile
+++ b/inputmethod/scim-hangul/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:54:35 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-hangul-0.3.2
+PKGREVISION= 1
CATEGORIES= inputmethod korean
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
diff --git a/inputmethod/scim-input-pad/Makefile b/inputmethod/scim-input-pad/Makefile
index f742d5eb64e..7439b4bc429 100644
--- a/inputmethod/scim-input-pad/Makefile
+++ b/inputmethod/scim-input-pad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:59:49 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-input-pad-0.1.2
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
diff --git a/inputmethod/scim-m17n/Makefile b/inputmethod/scim-m17n/Makefile
index fa8087547ba..14c7d7d9b07 100644
--- a/inputmethod/scim-m17n/Makefile
+++ b/inputmethod/scim-m17n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-m17n-0.2.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
diff --git a/inputmethod/scim-pinyin/Makefile b/inputmethod/scim-pinyin/Makefile
index 41ef10ca46c..b74b00d3568 100644
--- a/inputmethod/scim-pinyin/Makefile
+++ b/inputmethod/scim-pinyin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:03:45 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-pinyin-0.5.91
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
diff --git a/inputmethod/scim-prime/Makefile b/inputmethod/scim-prime/Makefile
index 929662b10e2..1bc62cac307 100644
--- a/inputmethod/scim-prime/Makefile
+++ b/inputmethod/scim-prime/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:04:46 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-prime-1.0.1
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/29156/}
diff --git a/inputmethod/scim-sinhala/Makefile b/inputmethod/scim-sinhala/Makefile
index 245f6480e88..71c2d33c0bb 100644
--- a/inputmethod/scim-sinhala/Makefile
+++ b/inputmethod/scim-sinhala/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:05:45 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-sinhala-0.1.0
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/16666/}
diff --git a/inputmethod/scim-skk/Makefile b/inputmethod/scim-skk/Makefile
index 3e15a31e500..cc5ecc84396 100644
--- a/inputmethod/scim-skk/Makefile
+++ b/inputmethod/scim-skk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:06:33 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-skk-0.5.2
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=scim-imengine/18121/}
diff --git a/inputmethod/scim-tables/Makefile b/inputmethod/scim-tables/Makefile
index 5fbba7ff7a1..8fd784c96b2 100644
--- a/inputmethod/scim-tables/Makefile
+++ b/inputmethod/scim-tables/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:07:34 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-tables-0.5.9
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
diff --git a/inputmethod/scim-thai/Makefile b/inputmethod/scim-thai/Makefile
index a58b2c517a5..0ac8d02972e 100644
--- a/inputmethod/scim-thai/Makefile
+++ b/inputmethod/scim-thai/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/11/30 09:20:45 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-thai-0.1.1
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/ \
ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
diff --git a/inputmethod/scim-tomoe/Makefile b/inputmethod/scim-tomoe/Makefile
index 1e2953417be..42f1012e643 100644
--- a/inputmethod/scim-tomoe/Makefile
+++ b/inputmethod/scim-tomoe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/05/28 09:31:35 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-tomoe-0.6.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tomoe/}
diff --git a/inputmethod/scim-uim/Makefile b/inputmethod/scim-uim/Makefile
index aab0f3b56a7..b8082772015 100644
--- a/inputmethod/scim-uim/Makefile
+++ b/inputmethod/scim-uim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:10:25 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-uim-0.2.0
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
diff --git a/inputmethod/scim-unikey/Makefile b/inputmethod/scim-unikey/Makefile
index d5ea145a3b7..7672bab3619 100644
--- a/inputmethod/scim-unikey/Makefile
+++ b/inputmethod/scim-unikey/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:11:39 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= scim-unikey-0.3.1
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= http://scim-unikey.googlecode.com/files/
diff --git a/inputmethod/scim/Makefile b/inputmethod/scim/Makefile
index 897b2be10ad..f2c0b5bb6a8 100644
--- a/inputmethod/scim/Makefile
+++ b/inputmethod/scim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:49 wiz Exp $
#
DISTNAME= scim-1.4.9
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
diff --git a/inputmethod/scim/buildlink3.mk b/inputmethod/scim/buildlink3.mk
index e95942acdac..d486ca38e06 100644
--- a/inputmethod/scim/buildlink3.mk
+++ b/inputmethod/scim/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:49 wiz Exp $
BUILDLINK_TREE+= scim
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= scim
SCIM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.scim+= scim>=1.4.7
+BUILDLINK_ABI_DEPENDS.scim?= scim>=1.4.9nb1
BUILDLINK_PKGSRCDIR.scim?= ../../inputmethod/scim
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/inputmethod/tomoe-gtk/Makefile b/inputmethod/tomoe-gtk/Makefile
index b91d0667a87..d207d925b00 100644
--- a/inputmethod/tomoe-gtk/Makefile
+++ b/inputmethod/tomoe-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/05/15 13:06:00 obache Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= tomoe-gtk-0.6.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tomoe/}
diff --git a/inputmethod/tomoe-gtk/buildlink3.mk b/inputmethod/tomoe-gtk/buildlink3.mk
index acf52358d2f..70575d7d756 100644
--- a/inputmethod/tomoe-gtk/buildlink3.mk
+++ b/inputmethod/tomoe-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/05/14 11:02:20 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:44:50 wiz Exp $
BUILDLINK_TREE+= tomoe-gtk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= tomoe-gtk
TOMOE_GTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.tomoe-gtk+= tomoe-gtk>=0.6.0
-BUILDLINK_ABI_DEPENDS.tomoe-gtk+= tomoe-gtk>=0.6.0nb3
+BUILDLINK_ABI_DEPENDS.tomoe-gtk+= tomoe-gtk>=0.6.0nb4
BUILDLINK_PKGSRCDIR.tomoe-gtk?= ../../inputmethod/tomoe-gtk
.include "../../inputmethod/tomoe/buildlink3.mk"
diff --git a/inputmethod/uim-tomoe-gtk/Makefile b/inputmethod/uim-tomoe-gtk/Makefile
index 44514f9801b..bc0edb4e0a6 100644
--- a/inputmethod/uim-tomoe-gtk/Makefile
+++ b/inputmethod/uim-tomoe-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/05/15 12:55:01 obache Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:50 wiz Exp $
#
DISTNAME= uim-tomoe-gtk-0.6.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tomoe/}
diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile
index 21c571b757b..679e34512c8 100644
--- a/lang/classpath-gui/Makefile
+++ b/lang/classpath-gui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 19:57:54 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:51 wiz Exp $
.include "../../lang/classpath/Makefile.common"
PKGNAME= ${DISTNAME:S/classpath/classpath-gui/}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT+= (GUI libraries)
DEPENDS+= classpath>=0.93:../../lang/classpath
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index 749f3d219e2..fdad8548738 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2009/12/12 21:12:43 asau Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:44:51 wiz Exp $
#
DISTNAME= coq-8.2pl1
+PKGREVISION= 1
CATEGORIES= lang math
MASTER_SITES= http://coq.inria.fr/distrib/V8.2pl1/files/
diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile
index 4ec129723a0..b5153f9565f 100644
--- a/lang/kaffe-x11/Makefile
+++ b/lang/kaffe-x11/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:51 wiz Exp $
#
.include "../../lang/kaffe/Makefile.common"
PKGNAME= ${DISTNAME:S/kaffe/kaffe-x11/}
-PKGREVISION= 4
+PKGREVISION= 5
COMMENT+= (AWT support through X11)
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index ac89991d32f..749a0923e15 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/05/22 17:09:55 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:51 wiz Exp $
DISTNAME= openjdk-7-ea-src-b92-06_may_2010
PKGNAME= openjdk7-1.7.0.92.20100521
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
EXTRACT_SUFX= .tar.bz2
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 94d87ab0849..b275d1eeb02 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.77 2010/03/27 06:23:13 taca Exp $
+$NetBSD: distinfo,v 1.78 2010/06/13 22:44:51 wiz Exp $
SHA1 (php-5.2.13/php-5.2.13.tar.bz2) = 7127a21f1b493e3cd43f45cadecdb46b623eb1fb
RMD160 (php-5.2.13/php-5.2.13.tar.bz2) = 9e21d32a7b757d25ed827834b26235ea1eebfcc8
@@ -11,7 +11,7 @@ SHA1 (patch-af) = 68c5a31dccf1854ba1aff653e4c524767d6a64f6
SHA1 (patch-ag) = 5e3e822657925a77fbccaca63f283863a1cc6d94
SHA1 (patch-ah) = a25cb7fa3d1f5b9fb99493a4348fdba69d3d4728
SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
-SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50
+SHA1 (patch-al) = 3945eef039ed285e623273cdde4c51c4c6bc978b
SHA1 (patch-an) = 8f4174627b8cb5f8bfbc59413c95f71e26b9e602
SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce
SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df
diff --git a/lang/php5/patches/patch-al b/lang/php5/patches/patch-al
index be353de85a2..f04664be2b4 100644
--- a/lang/php5/patches/patch-al
+++ b/lang/php5/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.3 2007/02/20 20:46:20 jdolecek Exp $
+$NetBSD: patch-al,v 1.4 2010/06/13 22:44:51 wiz Exp $
---- ext/gd/config.m4.orig 2007-02-20 21:14:31.000000000 +0100
+--- ext/gd/config.m4.orig 2007-07-03 17:25:43.000000000 +0000
+++ ext/gd/config.m4
@@ -48,18 +48,7 @@ dnl Checks for the configure options
dnl
@@ -30,3 +30,34 @@ $NetBSD: patch-al,v 1.3 2007/02/20 20:46:20 jdolecek Exp $
])
AC_DEFUN([PHP_GD_JPEG],[
+@@ -100,11 +88,11 @@ AC_DEFUN([PHP_GD_PNG],[
+ if test "$PHP_PNG_DIR" != "no"; then
+
+ for i in $PHP_PNG_DIR /usr/local /usr; do
+- test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
++ test -f $i/$PHP_LIBDIR/libpng14.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng14.a && GD_PNG_DIR=$i && break
+ done
+
+ if test -z "$GD_PNG_DIR"; then
+- AC_MSG_ERROR([libpng.(a|so) not found.])
++ AC_MSG_ERROR([libpng14.(a|so) not found.])
+ fi
+
+ if test "$PHP_ZLIB_DIR" = "no"; then
+@@ -115,13 +103,13 @@ AC_DEFUN([PHP_GD_PNG],[
+ AC_MSG_ERROR([png.h not found.])
+ fi
+
+- PHP_CHECK_LIBRARY(png,png_write_image,
++ PHP_CHECK_LIBRARY(png14,png_write_image,
+ [
+ PHP_ADD_INCLUDE($GD_PNG_DIR/include)
+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(png14, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+ ],[
+- AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
++ AC_MSG_ERROR([Problem with libpng14.(a|so) or libz.(a|so). Please check config.log for more information.])
+ ],[
+ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
+ ])
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 502c902c166..8a65ef0e52a 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2010/05/28 15:31:04 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:44:51 wiz Exp $
SHA1 (php-5.3.2/php-5.3.2.tar.bz2) = 79ea4ee3da3a7542d1e348ac963a5b38bcbb4b6b
RMD160 (php-5.3.2/php-5.3.2.tar.bz2) = 60a8aac0d51511ecaf8dcad9d31bdf072c0c99cf
@@ -8,7 +8,7 @@ RMD160 (php-5.3.2/suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 64d8b7ec2ec91fd7a43b0c
Size (php-5.3.2/suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 40847 bytes
SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09
SHA1 (patch-ab) = 07c1a5463a302ea155aba10da0d6b0ee0aee43a8
-SHA1 (patch-ac) = f1a0c3ebe65bc3c486c44411b384bc882288b55d
+SHA1 (patch-ac) = a896371d3343c07a5cf46c79d9ca9e1b2164797a
SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
SHA1 (patch-af) = 6e903ea7ff501226601fa73ce74c272d44d7346b
diff --git a/lang/php53/patches/patch-ac b/lang/php53/patches/patch-ac
index a76a602da46..d5da9e97de3 100644
--- a/lang/php53/patches/patch-ac
+++ b/lang/php53/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+$NetBSD: patch-ac,v 1.2 2010/06/13 22:44:51 wiz Exp $
--- ext/gd/config.m4.orig 2009-05-27 08:18:24.000000000 +0000
+++ ext/gd/config.m4
@@ -30,3 +30,34 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
])
AC_DEFUN([PHP_GD_JPEG],[
+@@ -97,11 +85,11 @@ AC_DEFUN([PHP_GD_PNG],[
+ if test "$PHP_PNG_DIR" != "no"; then
+
+ for i in $PHP_PNG_DIR /usr/local /usr; do
+- test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
++ test -f $i/$PHP_LIBDIR/libpng14.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng14.a && GD_PNG_DIR=$i && break
+ done
+
+ if test -z "$GD_PNG_DIR"; then
+- AC_MSG_ERROR([libpng.(a|so) not found.])
++ AC_MSG_ERROR([libpng14.(a|so) not found.])
+ fi
+
+ if test "$PHP_ZLIB_DIR" = "no"; then
+@@ -112,13 +100,13 @@ AC_DEFUN([PHP_GD_PNG],[
+ AC_MSG_ERROR([png.h not found.])
+ fi
+
+- PHP_CHECK_LIBRARY(png,png_write_image,
++ PHP_CHECK_LIBRARY(png14,png_write_image,
+ [
+ PHP_ADD_INCLUDE($GD_PNG_DIR/include)
+ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
++ PHP_ADD_LIBRARY_WITH_PATH(png14, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+ ],[
+- AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
++ AC_MSG_ERROR([Problem with libpng14.(a|so) or libz.(a|so). Please check config.log for more information.])
+ ],[
+ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
+ ])
diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile
index 934f542acd2..9db36cd841a 100644
--- a/lang/sablevm-classpath-gui/Makefile
+++ b/lang/sablevm-classpath-gui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:57:54 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:51 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../lang/sablevm-classpath/Makefile.common"
PKGNAME= ${DISTNAME:S/classpath/classpath-gui/}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT+= (GUI libraries)
DEPENDS+= sablevm-classpath>=1.13nb1:../../lang/sablevm-classpath
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 7a0f2c80ead..7501a62610e 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2010/04/09 01:54:20 obache Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:44:51 wiz Exp $
DISTNAME= smalltalk-3.1
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=smalltalk/}
diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile
index f0d79df2aa6..9b510ef19f0 100644
--- a/lang/squeak-vm/Makefile
+++ b/lang/squeak-vm/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:51 wiz Exp $
#
SQUEAK_VERSION= 3.11.3.2135
DISTNAME= Squeak-$(SQUEAK_VERSION)-src
PKGNAME= squeak-vm-$(SQUEAK_VERSION:C/-/./)
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://ftp.squeak.org/3.10/unix-linux/ \
http://squeakvm.org/unix/release/
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 81828f2af07..2456c915a79 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/05/07 08:34:22 ahoka Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:52 wiz Exp $
#
DISTNAME= vala-0.7.10
+PKGREVISION= 1
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vala/0.7/}
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/akonadi/Makefile b/mail/akonadi/Makefile
index 02911ad69e3..b317233cc89 100644
--- a/mail/akonadi/Makefile
+++ b/mail/akonadi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/05/15 07:29:26 adam Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:52 wiz Exp $
DISTNAME= akonadi-1.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://download.akonadi-project.org/
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/akonadi/buildlink3.mk b/mail/akonadi/buildlink3.mk
index 15cd5861950..0894e8c40df 100644
--- a/mail/akonadi/buildlink3.mk
+++ b/mail/akonadi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:52 wiz Exp $
BUILDLINK_TREE+= akonadi
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= akonadi
AKONADI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.akonadi+= akonadi>=0.82.0
-BUILDLINK_ABI_DEPENDS.akonadi?= akonadi>=1.2.1nb1
+BUILDLINK_ABI_DEPENDS.akonadi?= akonadi>=1.3.1nb2
BUILDLINK_PKGSRCDIR.akonadi?= ../../mail/akonadi
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index c0976e5fa35..cf9a2f94455 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2010/06/13 22:44:52 wiz Exp $
DISTNAME= balsa-2.3.26
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= mail gnome
MASTER_SITES= http://balsa.gnome.org/
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile
index 34ab81d99cd..17b56b1ad3e 100644
--- a/mail/claws-mail-archive/Makefile
+++ b/mail/claws-mail-archive/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/05/17 17:58:13 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:52 wiz Exp $
#
DISTNAME= archive-0.6.7
PKGNAME= claws-mail-archive-0.6.7
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index a54a09370b1..7db2b45956a 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:52 wiz Exp $
#
DISTNAME= attachwarner-0.2.19
PKGNAME= claws-mail-attachwarner-0.2.19
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 8cb3338e6d7..7b010993eb9 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:52 wiz Exp $
#
DISTNAME= att_remover-1.0.12
PKGNAME= claws-mail-att_remover-1.0.12
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 24fe2ec559f..af124148df6 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:52 wiz Exp $
#
DISTNAME= cachesaver-0.10.9
PKGNAME= claws-mail-cachesaver-0.10.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-dillo-viewer/Makefile b/mail/claws-mail-dillo-viewer/Makefile
index a5928b97812..a326c308236 100644
--- a/mail/claws-mail-dillo-viewer/Makefile
+++ b/mail/claws-mail-dillo-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/09/15 10:28:29 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:52 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,6 +6,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
PLUGIN_NAME= dillo_viewer
.include "../../mail/claws-mail/plugins.mk"
+PKGREVISION= 1
+
MAINTAINER= smb@NetBSD.org
COMMENT= Plugin to use the Dillo web browser for html rendering
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 719256ea7b2..d820e0139d0 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:52 wiz Exp $
#
DISTNAME= fetchinfo-plugin-0.4.24
PKGNAME= claws-mail-fetchinfo-plugin-0.4.24
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index ca7235e62f9..32c77a2cd83 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:52 wiz Exp $
#
DISTNAME= gtkhtml2_viewer-0.27
PKGNAME= claws-mail-gtkhtml2_viewer-0.27
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 72ad34c2390..058001670c4 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:53 wiz Exp $
#
DISTNAME= mailmbox-1.14.4
PKGNAME= claws-mail-mailmbox-1.14.4
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 025d1b5776d..21411496f95 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:53 wiz Exp $
#
DISTNAME= newmail-0.0.15
PKGNAME= claws-mail-newmail-0.0.15
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index fa0d185403c..f161fc26c37 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:53 wiz Exp $
#
DISTNAME= notification_plugin-0.25
PKGNAME= claws-mail-notification-0.25
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-pgpcore/buildlink3.mk b/mail/claws-mail-pgpcore/buildlink3.mk
index 1d7cf577410..ea789b0f4a0 100644
--- a/mail/claws-mail-pgpcore/buildlink3.mk
+++ b/mail/claws-mail-pgpcore/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/08/26 19:56:58 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:53 wiz Exp $
BUILDLINK_TREE+= claws-mail-pgpcore
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= claws-mail-pgpcore
CLAWS_MAIL_PGPCORE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.claws-mail-pgpcore+= claws-mail-pgpcore>=3.7.0
-BUILDLINK_ABI_DEPENDS.claws-mail-pgpcore?= claws-mail-pgpcore>=3.7.0nb1
+BUILDLINK_ABI_DEPENDS.claws-mail-pgpcore?= claws-mail-pgpcore>=3.7.6
BUILDLINK_PKGSRCDIR.claws-mail-pgpcore?= ../../mail/claws-mail-pgpcore
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index 6af466798ce..0db1b9de22f 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2009/09/15 10:28:29 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:53 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
PLUGIN_NAME= pgpinline
.include "../../mail/claws-mail/plugins.mk"
+PKGREVISION= 1
+
MAINTAINER= smb@NetBSD.org
COMMENT= Handles PGP/Inline signed and/or encrypted mails
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index 8decb8f579f..5a82aca1bd6 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2009/09/15 10:28:29 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:53 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
PLUGIN_NAME= pgpmime
.include "../../mail/claws-mail/plugins.mk"
+PKGREVISION= 1
+
MAINTAINER= smb@NetBSD.org
COMMENT= Handles PGP/MIME signed and/or encrypted mails
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 094df5c072b..36c3d5a8a61 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:54 wiz Exp $
#
DISTNAME= rssyl-0.27
PKGNAME= claws-mail-rssyl-0.27
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 105fca24e8e..9b51d9de721 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2009/09/15 10:28:29 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:54 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
PLUGIN_NAME= smime
.include "../../mail/claws-mail/plugins.mk"
+PKGREVISION= 1
+
MAINTAINER= smb@NetBSD.org
COMMENT= This plugin handles S/MIME signed and/or encrypted mails
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 531a384f7d8..162a828753c 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:54 wiz Exp $
#
DISTNAME= spam_report-0.3.11
PKGNAME= claws-mail-spam_report-0.3.11
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 96481864d84..bdf9f4a2dfe 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/05/17 17:58:14 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:54 wiz Exp $
#
DISTNAME= synce_plugin-0.7.5
PKGNAME= claws-mail-synce_plugin-0.7.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 0a2b1546075..ac21ecd81bb 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2010/05/17 17:58:15 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:54 wiz Exp $
#
DISTNAME= tnef_parse-0.3.8
PKGNAME= claws-mail-tnef-0.3.8
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 554d9425a11..8c73b7ea5c1 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/05/17 17:58:15 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:54 wiz Exp $
#
DISTNAME= vcalendar-2.0.8
PKGNAME= claws-mail-vcalendar-2.0.8
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index c8efc80782f..91fd1d9daf1 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2010/06/02 12:53:49 adam Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:52 wiz Exp $
-PKGREVISION= 1
+PKGREVISION= 3
PKG_DESTDIR_SUPPORT= user-destdir
INSTALLATION_DIRS+= ${EGDIR}
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 5afe2e5127b..7e947bff8ce 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2010/06/02 13:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.99 2010/06/13 22:44:54 wiz Exp $
DISTNAME= evolution-data-server-2.28.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-data-server/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index c31fc121685..f3bcc30b8d6 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2010/06/02 13:03:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2010/06/13 22:44:54 wiz Exp $
BUILDLINK_TREE+= evolution-data-server
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= evolution-data-server
EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.evolution-data-server+= evolution-data-server>=1.8.0
-BUILDLINK_ABI_DEPENDS.evolution-data-server+= evolution-data-server>=2.22.3nb1
+BUILDLINK_ABI_DEPENDS.evolution-data-server+= evolution-data-server>=2.28.3.1nb2
BUILDLINK_PKGSRCDIR.evolution-data-server?= ../../mail/evolution-data-server
BDB_ACCEPTED?= db4 db5
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 74a8a31eab8..dd1fe46806a 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2010/06/03 06:50:25 obache Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:44:54 wiz Exp $
#
DISTNAME= evolution-exchange-2.28.1
EE_VER= 2.28
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-exchange/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile
index eb8d0e478ee..97c61a43a52 100644
--- a/mail/evolution-sharp/Makefile
+++ b/mail/evolution-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/04 16:35:52 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:55 wiz Exp $
#
DISTNAME= evolution-sharp-0.20.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-sharp/0.20/}
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index c7120b6985f..288b4dfb088 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.159 2010/06/03 06:50:25 obache Exp $
+# $NetBSD: Makefile,v 1.160 2010/06/13 22:44:54 wiz Exp $
DISTNAME= evolution-2.28.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= mail time gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
index d7b8744b85d..c47d1afeee0 100644
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2010/06/13 22:44:54 wiz Exp $
BUILDLINK_TREE+= evolution
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= evolution
EVOLUTION_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.evolution+= evolution>=2.8.0
-BUILDLINK_ABI_DEPENDS.evolution?= evolution>=2.28.2nb2
+BUILDLINK_ABI_DEPENDS.evolution?= evolution>=2.28.2nb5
BUILDLINK_PKGSRCDIR.evolution?= ../../mail/evolution
.include "../../devel/libbonoboui/buildlink3.mk"
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 3485eca7ae8..2b3b7a67979 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:55 wiz Exp $
DISTNAME= kbiff-3.9
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kbiff/}
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 958e7345eee..719d6ff57ca 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2010/01/18 09:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:44:55 wiz Exp $
#
DISTNAME= mail-notification-5.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail gnome
MASTER_SITES= http://savannah.nongnu.org/download/mailnotify/
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/netbiff/Makefile b/mail/netbiff/Makefile
index bb5c3724ada..3df52572da0 100644
--- a/mail/netbiff/Makefile
+++ b/mail/netbiff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:55 wiz Exp $
#
DISTNAME= netbiff-0.9.18
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://www.cs.virginia.edu/~jrk3g/netbiff/
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index adbc85f1cd1..a0d22f54df2 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.124 2010/04/09 09:45:26 tnn Exp $
+# $NetBSD: Makefile,v 1.125 2010/06/13 22:44:55 wiz Exp $
DISTNAME= sylpheed-3.0.2
+PKGREVISION= 1
CATEGORIES= mail news x11
MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v3.0/
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index ef45ad0d0cb..be82ed5eb34 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2010/02/04 14:24:29 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:55 wiz Exp $
DISTNAME= wmbiff-0.4.26
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= mail x11 windowmaker
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wmbiff/}
diff --git a/math/R/Makefile b/math/R/Makefile
index f2134d390b6..ae74ddd45ea 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2010/05/06 07:33:40 adam Exp $
+# $NetBSD: Makefile,v 1.108 2010/06/13 22:44:55 wiz Exp $
DISTNAME= R-2.11.0
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-2/}
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 335dd838c1a..d49f52fa62c 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:58 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:55 wiz Exp $
#
DISTNAME= calcoo-1.3.18
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calcoo/}
diff --git a/math/euler/Makefile b/math/euler/Makefile
index 0a29fd36806..8b9148ed65e 100644
--- a/math/euler/Makefile
+++ b/math/euler/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2009/08/26 19:57:58 sno Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:55 wiz Exp $
DISTNAME= euler-1.61.0
PKGNAME= euler-1.61
EXTRACT_SUFX= .tgz
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=euler/}
diff --git a/math/extcalc/Makefile b/math/extcalc/Makefile
index cfb7915ae89..d163c3e6e71 100644
--- a/math/extcalc/Makefile
+++ b/math/extcalc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/05/20 17:48:59 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:55 wiz Exp $
#
DISTNAME= extcalc-0.9.3-1
PKGNAME= extcalc-0.9.3
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=extcalc-linux/}
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 5f7513ec344..ee23dc5d458 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/05/15 07:12:00 adam Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:55 wiz Exp $
DISTNAME= fityk-0.9.2
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fityk/}
EXTRACT_SUFX= .tar.bz2
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index 811170574d3..6b1f36f934c 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:57:58 sno Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:55 wiz Exp $
#
DISTNAME= galculator-1.3.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galculator/}
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index f3a5dc9c6b8..4850d42f442 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2009/12/16 17:56:53 drochner Exp $
+# $NetBSD: Makefile,v 1.87 2010/06/13 22:44:56 wiz Exp $
#
DISTNAME= gcalctool-5.28.2
+PKGREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcalctool/5.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/math/genius/Makefile b/math/genius/Makefile
index ad4a4df438e..d55969ce288 100644
--- a/math/genius/Makefile
+++ b/math/genius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2010/03/24 19:43:26 asau Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:44:56 wiz Exp $
#
DISTNAME= genius-1.0.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= http://ftp.5z.com/pub/genius/
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index a8aa4f32270..bee403753fc 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.141 2010/02/10 19:17:41 joerg Exp $
+# $NetBSD: Makefile,v 1.142 2010/06/13 22:44:56 wiz Exp $
#
DISTNAME= gnumeric-1.8.4
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.8/}
EXTRACT_SUFX= .tar.bz2
diff --git a/math/gnumeric110/Makefile b/math/gnumeric110/Makefile
index 84deee35d36..11fab006f55 100644
--- a/math/gnumeric110/Makefile
+++ b/math/gnumeric110/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/05/17 16:30:12 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:56 wiz Exp $
#
DISTNAME= gnumeric-1.10.3
+PKGREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.10/}
EXTRACT_SUFX= .tar.bz2
diff --git a/math/grace/Makefile b/math/grace/Makefile
index f93f04eb2ed..7483cb65c32 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2010/01/18 09:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:44:56 wiz Exp $
#
DISTNAME= grace-5.1.22
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= math graphics x11
MASTER_SITES= ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/ \
ftp://ftp.fu-berlin.de/unix/graphics/grace/src/stable/ \
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 322878d2c8d..a9040f56588 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2009/11/26 17:35:53 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:56 wiz Exp $
#
DISTNAME= grpn
PKGNAME= grpn-1.2
DIST_SUBDIR= grpn-1.2
+PKGREVISION= 1
CATEGORIES= math
#MASTER_SITES= http://lashwhip.com/grpn/
MASTER_SITES= http://www.getreu.net/public/downloads/
diff --git a/math/gtklife/Makefile b/math/gtklife/Makefile
index 1b8d94b6562..46cfab8212f 100644
--- a/math/gtklife/Makefile
+++ b/math/gtklife/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2009/12/12 20:49:21 asau Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:56 wiz Exp $
DISTNAME= gtklife-5.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= http://ironphoenix.org/tril/gtklife/
diff --git a/math/kseg/Makefile b/math/kseg/Makefile
index ae011349924..96b2227916d 100644
--- a/math/kseg/Makefile
+++ b/math/kseg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/03/14 16:37:07 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:56 wiz Exp $
#
DISTNAME= kseg-0.403
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= http://www.mit.edu/~ibaran/
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 775ca8ef383..01919592668 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:44:56 wiz Exp $
DISTNAME= octave-forge-2006.03.17
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=octave/}
diff --git a/math/qalculate-bases/Makefile b/math/qalculate-bases/Makefile
index 1e9876ae78c..c44f524cd38 100644
--- a/math/qalculate-bases/Makefile
+++ b/math/qalculate-bases/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/09/06 15:24:38 asau Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:56 wiz Exp $
DISTNAME= qalculate-bases-0.9.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
diff --git a/math/qalculate-currency/Makefile b/math/qalculate-currency/Makefile
index 223c73a7ac1..e8529ddd19f 100644
--- a/math/qalculate-currency/Makefile
+++ b/math/qalculate-currency/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/09/06 15:29:53 asau Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:56 wiz Exp $
DISTNAME= qalculate-currency-0.9.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index 78c98c8e438..899bfb87edf 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2010/04/13 17:28:34 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:44:57 wiz Exp $
DISTNAME= qalculate-gtk-0.9.7
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
diff --git a/math/qalculate-kde/Makefile b/math/qalculate-kde/Makefile
index 90ab538d4fd..bf10e29164b 100644
--- a/math/qalculate-kde/Makefile
+++ b/math/qalculate-kde/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:44:57 wiz Exp $
DISTNAME= qalculate-kde-0.9.5
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
diff --git a/math/qalculate-units/Makefile b/math/qalculate-units/Makefile
index 3205e162f6d..aaaba63fac4 100644
--- a/math/qalculate-units/Makefile
+++ b/math/qalculate-units/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/09/06 15:46:38 asau Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:57 wiz Exp $
DISTNAME= qalculate-units-0.9.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile
index ddbebd364cd..44c340c427d 100644
--- a/math/speedcrunch/Makefile
+++ b/math/speedcrunch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/03 14:09:17 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:57 wiz Exp $
#
DISTNAME= speedcrunch-0.10.1
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= http://speedcrunch.googlecode.com/files/
diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index b1f6a0c7c40..8366ebb7a56 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:57 wiz Exp $
META_PACKAGE= yes
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-extras-${XFCE4_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= meta-pkgs
COMMENT= Xfce extras
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 518a91880ec..d1051bfa416 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.41 2010/01/18 09:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2010/06/13 22:44:57 wiz Exp $
META_PACKAGE= yes
.include "Makefile.common"
DISTNAME= xfce4-${XFCE4_VERSION}
-PKGREVISION= 2
+PKGREVISION= 4
CATEGORIES= meta-pkgs
COMMENT= Xfce
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
index 6a149759ce2..9fecff7a90b 100644
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2010/01/18 09:59:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:44:57 wiz Exp $
BUILDLINK_TREE+= xfce4
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4
XFCE4_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.6.0
-BUILDLINK_ABI_DEPENDS.xfce4+= xfce4>=4.6.1nb2
+BUILDLINK_ABI_DEPENDS.xfce4+= xfce4>=4.6.1nb4
BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4
.include "../../audio/xfce4-mixer/buildlink3.mk"
diff --git a/misc/attica/Makefile b/misc/attica/Makefile
index 0fb9f198d13..b8abaec3844 100644
--- a/misc/attica/Makefile
+++ b/misc/attica/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/05/02 14:12:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:57 wiz Exp $
DISTNAME= attica-0.1.3
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_KDE:=attica/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/attica/buildlink3.mk b/misc/attica/buildlink3.mk
index 5926926bbdb..40b1214f860 100644
--- a/misc/attica/buildlink3.mk
+++ b/misc/attica/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/04/09 23:43:12 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:57 wiz Exp $
BUILDLINK_TREE+= attica
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= attica
ATTICA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.attica+= attica>=0.1.2
+BUILDLINK_ABI_DEPENDS.attica?= attica>=0.1.3nb1
BUILDLINK_PKGSRCDIR.attica?= ../../misc/attica
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/misc/basket/Makefile b/misc/basket/Makefile
index ab2cc5d7cb7..81bad6a5dcc 100644
--- a/misc/basket/Makefile
+++ b/misc/basket/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:57 wiz Exp $
DISTNAME= basket-1.0.2
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= misc
MASTER_SITES= http://basket.kde.org/downloads/
diff --git a/misc/blccc/Makefile b/misc/blccc/Makefile
index b7e137f3738..9e929a813af 100644
--- a/misc/blccc/Makefile
+++ b/misc/blccc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:58:00 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:57 wiz Exp $
#
DISTNAME= blccc-1.99
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= misc
MASTER_SITES= http://sven.gimp.org/blinkenlights/
diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 6096da686ff..7c7fc6db6b2 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/02/25 14:30:23 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:57 wiz Exp $
#
DISTNAME= calibre-0.6.24
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= misc
MASTER_SITES= http://calibre.kovidgoyal.net/downloads/
diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile
index bdec1e02682..39ae4458377 100644
--- a/misc/celestia/Makefile
+++ b/misc/celestia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:58 wiz Exp $
DISTNAME= celestia-1.4.1
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= misc x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=celestia/}
diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo
index a6be7b88dab..996c4b69f28 100644
--- a/misc/celestia/distinfo
+++ b/misc/celestia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2007/01/26 04:25:46 markd Exp $
+$NetBSD: distinfo,v 1.17 2010/06/13 22:44:58 wiz Exp $
SHA1 (celestia-1.4.1.tar.gz) = 37863498c43d3078b41027706bfa033bccd949a9
RMD160 (celestia-1.4.1.tar.gz) = c66c2540e329613dace12e5b12b2dae2a4c679e0
@@ -18,3 +18,4 @@ SHA1 (patch-al) = f998727c986145d3f298295bed1760221a686245
SHA1 (patch-am) = 34a83573294e6ca41d817a19aef3e7d3e4f14945
SHA1 (patch-an) = 80bd712a8ae3f4dee0d908882deadbe2ad319abf
SHA1 (patch-ao) = ed7be1b0ac2d6a1bbf1c9ef8e66816124a7e8a99
+SHA1 (patch-ap) = 4ceb4c2df10821bf4ab02a3d76231df98101bbc9
diff --git a/misc/celestia/patches/patch-ap b/misc/celestia/patches/patch-ap
new file mode 100644
index 00000000000..c7c56ce5193
--- /dev/null
+++ b/misc/celestia/patches/patch-ap
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1 2010/06/13 22:44:58 wiz Exp $
+
+--- src/celengine/image.cpp.orig 2005-07-19 20:30:54.000000000 +0000
++++ src/celengine/image.cpp
+@@ -78,7 +78,7 @@ using namespace std;
+ // Define various expansion transformations for old versions of libpng
+ #if PNG_LIBPNG_VER < 10004
+ #define png_set_palette_to_rgb(p) png_set_expand(p)
+-#define png_set_gray_1_2_4_to_8(p) png_set_expand(p)
++#define png_set_expand_gray_1_2_4_to_8(p) png_set_expand(p)
+ #define png_set_tRNS_to_alpha(p) png_set_expand(p)
+ #endif // PNG_LIBPNG_VER < 10004
+
+@@ -720,7 +720,7 @@ Image* LoadPNGImage(const string& filena
+
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+ {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index 5f10998f71b..9c2f5a13bda 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/02/10 19:17:41 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:58 wiz Exp $
#
DISTNAME= deskbar-applet-2.28.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/deskbar-applet/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/fbreader/Makefile b/misc/fbreader/Makefile
index 7a5eb4027be..cddb830624b 100644
--- a/misc/fbreader/Makefile
+++ b/misc/fbreader/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/04/05 18:50:48 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:58 wiz Exp $
#
DISTNAME= fbreader-sources-0.10.7
PKGNAME= ${DISTNAME:S/-sources//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://www.fbreader.org/
EXTRACT_SUFX= .tgz
diff --git a/misc/gelemental/Makefile b/misc/gelemental/Makefile
index cd107f61ad1..e4f39ab0afc 100644
--- a/misc/gelemental/Makefile
+++ b/misc/gelemental/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:00 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:58 wiz Exp $
#
DISTNAME= gelemental-1.2.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= http://www.kdau.com/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/gkrellm-flynn/Makefile b/misc/gkrellm-flynn/Makefile
index ffda6315e65..c52b7122bd3 100644
--- a/misc/gkrellm-flynn/Makefile
+++ b/misc/gkrellm-flynn/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2010/01/17 12:02:27 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:58 wiz Exp $
#
DISTNAME= gkrellflynn-0.8
PKGNAME= ${DISTNAME:S/gkrell/gkrellm-/}
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= misc
MASTER_SITES= http://bax.comlab.uni-rostock.de/fileadmin/downloads/
diff --git a/misc/gkrellm-launch/Makefile b/misc/gkrellm-launch/Makefile
index f18c3330d35..7d76a879f4d 100644
--- a/misc/gkrellm-launch/Makefile
+++ b/misc/gkrellm-launch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2010/01/17 12:02:27 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:58 wiz Exp $
#
DISTNAME= gkrellmlaunch-0.5
PKGNAME= ${DISTNAME:S/gkrellm/gkrellm-/}
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellmlaunch/}
diff --git a/misc/gkrellm-leds/Makefile b/misc/gkrellm-leds/Makefile
index 67fc1eb8432..b281a106f84 100644
--- a/misc/gkrellm-leds/Makefile
+++ b/misc/gkrellm-leds/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2010/01/17 12:02:27 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:58 wiz Exp $
#
DISTNAME= gkleds-0.8.2
PKGNAME= ${DISTNAME:S/^gk/gkrellm-/}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= misc
MASTER_SITES= http://heim.ifi.uio.no/~oyvinha/files/files/
diff --git a/misc/gkrellm-moon/Makefile b/misc/gkrellm-moon/Makefile
index 5b0680c7234..71b767f8868 100644
--- a/misc/gkrellm-moon/Makefile
+++ b/misc/gkrellm-moon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2010/01/17 12:02:27 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:44:58 wiz Exp $
#
DISTNAME= gkrellmoon-0.6
PKGNAME= gkrellm-moon-0.6
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/}
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index 3fc0b571ec2..6bdd3804bec 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/01/17 12:02:27 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:44:58 wiz Exp $
DISTNAME= gkrellweather-2.0.7
PKGNAME= gkrellm-weather-2.0.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= misc
MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
EXTRACT_SUFX= .tgz
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 4278297e4f7..f87d299fe87 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2010/01/19 20:08:32 drochner Exp $
+# $NetBSD: Makefile,v 1.99 2010/06/13 22:44:59 wiz Exp $
#
DISTNAME= gnome-utils-2.28.3
+PKGREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-utils/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/goffice0.6/Makefile b/misc/goffice0.6/Makefile
index 0ee82f52fe8..3ab464332ce 100644
--- a/misc/goffice0.6/Makefile
+++ b/misc/goffice0.6/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:59 wiz Exp $
#
DISTNAME= goffice-0.6.6
PKGNAME= goffice0.6-0.6.6
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goffice/0.6/}
diff --git a/misc/goffice0.6/buildlink3.mk b/misc/goffice0.6/buildlink3.mk
index 976a48edb1a..ebdc853a755 100644
--- a/misc/goffice0.6/buildlink3.mk
+++ b/misc/goffice0.6/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/01/18 09:59:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:59 wiz Exp $
BUILDLINK_TREE+= goffice0.6
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= goffice0.6
GOFFICE0.6_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.goffice0.6+= goffice0.6>=0.6.1
-BUILDLINK_ABI_DEPENDS.goffice0.6?= goffice0.6>=0.6.6nb4
+BUILDLINK_ABI_DEPENDS.goffice0.6?= goffice0.6>=0.6.6nb5
BUILDLINK_PKGSRCDIR.goffice0.6?= ../../misc/goffice0.6
#.include "../../converters/libiconv/buildlink3.mk"
diff --git a/misc/goffice0.8/Makefile b/misc/goffice0.8/Makefile
index a9b81f6373c..4e88923a94e 100644
--- a/misc/goffice0.8/Makefile
+++ b/misc/goffice0.8/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/05/17 16:25:43 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:59 wiz Exp $
#
DISTNAME= goffice-0.8.3
PKGNAME= goffice0.8-0.8.3
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goffice/0.8/}
diff --git a/misc/goffice0.8/buildlink3.mk b/misc/goffice0.8/buildlink3.mk
index 8ac9f577150..7a33a13f916 100644
--- a/misc/goffice0.8/buildlink3.mk
+++ b/misc/goffice0.8/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/02/18 20:48:56 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:59 wiz Exp $
BUILDLINK_TREE+= goffice0.6
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= goffice0.6
GOFFICE0.6_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.goffice0.6+= goffice0.8>=0.8.0
-BUILDLINK_ABI_DEPENDS.goffice0.6?= goffice0.8>=0.8.0
+BUILDLINK_ABI_DEPENDS.goffice0.6?= goffice0.8>=0.8.3nb1
BUILDLINK_PKGSRCDIR.goffice0.6?= ../../misc/goffice0.8
#.include "../../converters/libiconv/buildlink3.mk"
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 2f174ca1dd1..4aa172a220f 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2009/12/15 21:58:38 joerg Exp $
+# $NetBSD: Makefile,v 1.67 2010/06/13 22:44:59 wiz Exp $
#
DISTNAME= gok-2.28.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gok/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index 6eeeaacfc15..4cdd2330f95 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2009/08/26 19:58:01 sno Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:44:59 wiz Exp $
DISTNAME= gperiodic-2.0.8
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc x11
MASTER_SITES= # http://www.frantz.fi/software/
diff --git a/misc/gwaei/Makefile b/misc/gwaei/Makefile
index 7a3252cced5..c7c2fc578f2 100644
--- a/misc/gwaei/Makefile
+++ b/misc/gwaei/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/01/17 12:02:27 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:59 wiz Exp $
#
DISTNAME= gwaei-1.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwaei/}
diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index a7be5676835..f6deada567d 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2009/08/26 19:58:01 sno Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:59 wiz Exp $
#
DISTNAME= gxmame-0.35beta1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gxmame/}
diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile
index e6d4f4efef3..953073a714c 100644
--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2010/02/11 19:24:10 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:59 wiz Exp $
#
DISTNAME= kanjipad-2.0.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= misc
MASTER_SITES= http://fishsoup.net/software/kanjipad/
diff --git a/misc/kchm/Makefile b/misc/kchm/Makefile
index 28044dfc2a6..b5fd1c7c5b6 100644
--- a/misc/kchm/Makefile
+++ b/misc/kchm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/02/11 19:29:38 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:59 wiz Exp $
#
DISTNAME= kchm-0.6.5
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= kde misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kchmnew/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile
index 7e93c1a9733..2c4a93c5335 100644
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/05/02 11:29:23 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:59 wiz Exp $
#
DISTNAME= kchmviewer-5.2
+PKGREVISION= 1
CATEGORIES= misc x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kchmviewer/}
diff --git a/misc/kdeaccessibility3/Makefile b/misc/kdeaccessibility3/Makefile
index b29001668be..9b148c10fdf 100644
--- a/misc/kdeaccessibility3/Makefile
+++ b/misc/kdeaccessibility3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:59 wiz Exp $
DISTNAME= kdeaccessibility-${_KDE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc
COMMENT= Accessibility support for the KDE integrated X11 desktop
diff --git a/misc/kdeaccessibility4/Makefile b/misc/kdeaccessibility4/Makefile
index e544c81c9f8..7d18e058149 100644
--- a/misc/kdeaccessibility4/Makefile
+++ b/misc/kdeaccessibility4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 10:38:39 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:59 wiz Exp $
DISTNAME= kdeaccessibility-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Accessibility support for the KDE integrated X11 desktop
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 779837e4c7a..dda1dbf4a9e 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2010/01/18 09:59:14 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdeaddons-${_KDE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc
COMMENT= Add ons for the KDE integrated X11 desktop
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index 3edc17c2058..c4de4bd182f 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2010/01/18 09:59:14 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdeadmin-${_KDE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc
COMMENT= System administration tools for the KDE integrated X11 desktop
diff --git a/misc/kdeadmin4/Makefile b/misc/kdeadmin4/Makefile
index dce68e2e973..0cbc7d3a8a9 100644
--- a/misc/kdeadmin4/Makefile
+++ b/misc/kdeadmin4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 10:38:39 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdeadmin-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= System administration tools for the KDE integrated X11 desktop
diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile
index 0719544e8f6..bda5ce3629e 100644
--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2010/04/07 17:52:04 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdeartwork-${_KDE_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= misc
COMMENT= Artwork for the KDE integrated X11 desktop
diff --git a/misc/kdeartwork4/Makefile b/misc/kdeartwork4/Makefile
index cd32c13a545..5c004d8349f 100644
--- a/misc/kdeartwork4/Makefile
+++ b/misc/kdeartwork4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/04/10 02:45:03 markd Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdeartwork-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Artwork for the KDE integrated X11 desktop
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index b664f8c3c91..573b677657b 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2010/01/18 09:59:14 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdeedu-${_KDE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc
COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop
diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index 89646a4e9be..30aa8d54005 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/04/10 02:45:03 markd Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdeedu-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop
diff --git a/misc/kdeedu4/buildlink3.mk b/misc/kdeedu4/buildlink3.mk
index fac10b3dbe7..96fa81ea517 100644
--- a/misc/kdeedu4/buildlink3.mk
+++ b/misc/kdeedu4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:00 wiz Exp $
BUILDLINK_TREE+= kdeedu4
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdeedu4
KDEEDU4_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdeedu4+= kdeedu4>=4.1.1
-BUILDLINK_ABI_DEPENDS.kdeedu4?= kdeedu4>=4.3.4nb2
+BUILDLINK_ABI_DEPENDS.kdeedu4?= kdeedu4>=4.4.4nb1
BUILDLINK_PKGSRCDIR.kdeedu4?= ../../misc/kdeedu4
.include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/misc/kdepim-runtime4/Makefile b/misc/kdepim-runtime4/Makefile
index a808fa19091..489569375ad 100644
--- a/misc/kdepim-runtime4/Makefile
+++ b/misc/kdepim-runtime4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/04/10 02:45:03 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdepim-runtime-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Runtime requirements for the KDE PIM tools
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index abb0b2ae020..d9f089cc2aa 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2010/01/18 09:59:14 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdepim-${_KDE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc
COMMENT= Personal Information Management tools for the KDE desktop
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index a09f7671f9e..762b03ec1ac 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2010/01/18 09:59:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2010/06/13 22:45:00 wiz Exp $
BUILDLINK_TREE+= kdepim
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdepim
KDEPIM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdepim+= kdepim>=3.5.0nb1
-BUILDLINK_ABI_DEPENDS.kdepim?= kdepim>=3.5.10nb4
+BUILDLINK_ABI_DEPENDS.kdepim?= kdepim>=3.5.10nb5
BUILDLINK_PKGSRCDIR.kdepim?= ../../misc/kdepim3
pkgbase := kdepim
diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 911ad913394..99537443a13 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/04/10 02:45:03 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:00 wiz Exp $
DISTNAME= kdepim-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Personal Information Management tools for the KDE desktop
diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 29147b195db..2956dcb9419 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/06/02 10:14:15 markd Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:01 wiz Exp $
DISTNAME= kdepimlibs-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Support libraries for PIM for the KDE integrated X11 desktop
diff --git a/misc/kdepimlibs4/buildlink3.mk b/misc/kdepimlibs4/buildlink3.mk
index cfe2bf7d5a2..1bdf2501b02 100644
--- a/misc/kdepimlibs4/buildlink3.mk
+++ b/misc/kdepimlibs4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:01 wiz Exp $
BUILDLINK_TREE+= kdepimlibs
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdepimlibs
KDEPIMLIBS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdepimlibs+= kdepimlibs4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdepimlibs?= kdepimlibs4>=4.3.4nb3
+BUILDLINK_ABI_DEPENDS.kdepimlibs?= kdepimlibs4>=4.4.4nb1
BUILDLINK_PKGSRCDIR.kdepimlibs?= ../../misc/kdepimlibs4
.include "../../databases/openldap-client/buildlink3.mk"
diff --git a/misc/kdeplasma-addons4/Makefile b/misc/kdeplasma-addons4/Makefile
index d38cecae5a1..3ec25cc0bae 100644
--- a/misc/kdeplasma-addons4/Makefile
+++ b/misc/kdeplasma-addons4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/04/10 02:45:03 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:01 wiz Exp $
DISTNAME= kdeplasma-addons-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Plasmoids
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index a19d15c1c02..3197bac29af 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2010/03/24 19:43:27 asau Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:01 wiz Exp $
DISTNAME= kdeutils-${_KDE_VERSION}
-PKGREVISION= 8
+PKGREVISION= 9
COMMENT= Utilities for the KDE integrated X11 desktop
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 98606920b78..4302f62abbb 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/04/10 02:45:04 markd Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:01 wiz Exp $
DISTNAME= kdeutils-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Utilities for the KDE integrated X11 desktop
diff --git a/misc/kodos/Makefile b/misc/kodos/Makefile
index d0227501d9b..a95c0dce9cb 100644
--- a/misc/kodos/Makefile
+++ b/misc/kodos/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/02/10 19:17:41 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:01 wiz Exp $
DISTNAME= kodos-2.4.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= misc python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kodos/}
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index b47693897e8..675eaa0c794 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.118 2010/05/29 08:04:17 joerg Exp $
+# $NetBSD: Makefile,v 1.119 2010/06/13 22:45:01 wiz Exp $
DISTNAME= koffice-1.6.3
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.6.3/src/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 328dd95ca84..e5cd5a30036 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2009/11/03 19:02:26 markd Exp $
+$NetBSD: distinfo,v 1.46 2010/06/13 22:45:01 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,6 +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-ab) = b7cb13d120764011b3b1d32cdc1ec805ddac59d8
SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
diff --git a/misc/koffice/patches/patch-aa b/misc/koffice/patches/patch-aa
new file mode 100644
index 00000000000..426291ae539
--- /dev/null
+++ b/misc/koffice/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.13 2010/06/13 22:45:01 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
+@@ -785,7 +785,7 @@ void KisPNGConverter::cancel()
+
+ 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;
+ // setProgress(row_number);
+ }
+
diff --git a/misc/mnemosyne/Makefile b/misc/mnemosyne/Makefile
index b33000f3976..f0cbb111d2b 100644
--- a/misc/mnemosyne/Makefile
+++ b/misc/mnemosyne/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/03/20 12:37:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:01 wiz Exp $
#
DISTNAME= mnemosyne-1.2.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mnemosyne-proj/}
EXTRACT_SUFX= .tgz
diff --git a/misc/most/Makefile b/misc/most/Makefile
index 2ef0ba1d8eb..f835fe37c69 100644
--- a/misc/most/Makefile
+++ b/misc/most/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2008/08/09 21:32:39 bjs Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:01 wiz Exp $
DISTNAME= most-5.0.0a
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ftp://space.mit.edu/pub/davis/most/
diff --git a/misc/mousetweaks/Makefile b/misc/mousetweaks/Makefile
index 9bad2114d27..92364bd0413 100644
--- a/misc/mousetweaks/Makefile
+++ b/misc/mousetweaks/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:15 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:01 wiz Exp $
#
DISTNAME= mousetweaks-2.28.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/mousetweaks/2.28/}
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index b75e77c5b4b..9be1a03015a 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.78 2010/06/02 13:25:53 adam Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/13 22:45:02 wiz Exp $
#
OO_VER= 2.4.3
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice2-${OO_VER}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
DIST_SUBDIR= ${DISTNAME}
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index dc56c02e410..50fd03d11ec 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.42 2010/06/02 13:26:49 adam Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:02 wiz Exp $
OO_VER= 3.1.1
OO_TAG= OOO310_m19
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice3-${OO_VER}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
DIST_SUBDIR= ${DISTNAME}
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index 7616051b62f..346d31984fa 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/02/10 19:17:42 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:02 wiz Exp $
#
DISTNAME= orca-2.28.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/orca/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index 174ae441fac..6df2181a6ce 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:15 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:02 wiz Exp $
DISTNAME= qbrew-0.3.5
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= misc
MASTER_SITES= http://www.usermode.org/code/
diff --git a/misc/root/Makefile b/misc/root/Makefile
index 8ff524e5dfd..84157d30b24 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2010/02/26 10:56:38 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:02 wiz Exp $
DISTNAME= root_v5.26.00b.source
PKGNAME= root-5.26
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ftp://root.cern.ch/root/
diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile
index c32167b1c82..1e0ba85ee5d 100644
--- a/misc/stellarium/Makefile
+++ b/misc/stellarium/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/06/13 22:15:30 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:02 wiz Exp $
DISTNAME= stellarium-0.10.5
-#PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=stellarium/}
diff --git a/misc/taskjuggler/Makefile b/misc/taskjuggler/Makefile
index 34683fb74f5..e6004d20219 100644
--- a/misc/taskjuggler/Makefile
+++ b/misc/taskjuggler/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:15 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:02 wiz Exp $
#
DISTNAME= taskjuggler-2.4.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://www.taskjuggler.org/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/tellico-kde3/Makefile b/misc/tellico-kde3/Makefile
index 3edce6f7d06..8ff6cf54fc7 100644
--- a/misc/tellico-kde3/Makefile
+++ b/misc/tellico-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/15 14:52:45 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:02 wiz Exp $
#
DISTNAME= tellico-1.3.6
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= misc
MASTER_SITES= http://www.periapsis.org/tellico/download/
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index 17172b1fcd6..8262fd06496 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/04/10 02:54:35 markd Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:02 wiz Exp $
#
DISTNAME= tellico-2.2
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://tellico-project.org/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/vym/Makefile b/misc/vym/Makefile
index 8d0e6af0471..4724c9da074 100644
--- a/misc/vym/Makefile
+++ b/misc/vym/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/02/04 17:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:02 wiz Exp $
#
DISTNAME= vym-1.12.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vym/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/xchm/Makefile b/misc/xchm/Makefile
index 0859eef3668..d4fc6171e01 100644
--- a/misc/xchm/Makefile
+++ b/misc/xchm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:02 wiz Exp $
#
DISTNAME= xchm-1.17
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xchm/}
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 8618f2f1700..a9372247cf8 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/02/04 16:53:14 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:03 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 0.6.2
DISTNAME= xfce4-weather-plugin-${XFCE4_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-weather-plugin/
COMMENT= Xfce weather plugin
diff --git a/misc/xfce4-weather-plugin/buildlink3.mk b/misc/xfce4-weather-plugin/buildlink3.mk
index 53a25513da5..7dbab595a42 100644
--- a/misc/xfce4-weather-plugin/buildlink3.mk
+++ b/misc/xfce4-weather-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:03 wiz Exp $
BUILDLINK_TREE+= xfce4-weather-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-weather-plugin
XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-weather-plugin+= xfce4-weather-plugin>=0.6.2
-BUILDLINK_ABI_DEPENDS.xfce4-weather-plugin?= xfce4-weather-plugin>=0.6.2nb1
+BUILDLINK_ABI_DEPENDS.xfce4-weather-plugin?= xfce4-weather-plugin>=0.6.2nb3
BUILDLINK_PKGSRCDIR.xfce4-weather-plugin?= ../../misc/xfce4-weather-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 96edb306c3c..8bb742c79a7 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2010/02/13 12:26:15 tnn Exp $
+# $NetBSD: Makefile,v 1.89 2010/06/13 22:45:03 wiz Exp $
#
DISTNAME= yelp-2.28.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile
index 7ec85f31b74..f7e785770de 100644
--- a/misc/zyGrib/Makefile
+++ b/misc/zyGrib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/03/14 16:32:16 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:03 wiz Exp $
#
DISTNAME= zyGrib-3.5.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://www.zygrib.org/files/
EXTRACT_SUFX= .tgz
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index f8ff38fef3a..55b5835e67c 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.226 2010/05/21 22:21:06 schwarz Exp $
+# $NetBSD: replace.mk,v 1.227 2010/06/13 22:45:03 wiz Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -310,7 +310,7 @@ TOOLS_PATH.chrpath= ${TOOLS_PREFIX.chrpath}/bin/chrpath
. if !empty(PKGPATH:Mdevel/cmake)
MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
-TOOLS_DEPENDS.${_t_}?= cmake>=2.4.6nb3:../../devel/cmake
+TOOLS_DEPENDS.${_t_}?= cmake>=2.8.1nb1:../../devel/cmake
TOOLS_CREATE+= ${_t_}
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=cmake
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile
index 556eb138bcb..d3739835940 100644
--- a/multimedia/alevt/Makefile
+++ b/multimedia/alevt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:03 wiz Exp $
DISTNAME= alevt-1.6.1
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://www.goron.de/~froese/alevt/
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index b935c5a6c41..7881d4e0edc 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2009/08/26 19:58:04 sno Exp $
+# $NetBSD: Makefile,v 1.58 2010/06/13 22:45:03 wiz Exp $
#
DISTNAME= avidemux_2.4.4
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://download.berlios.de/avidemux/
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index d6b2a0c7e51..d8e0bbd10f0 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/03/11 04:07:58 obache Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:03 wiz Exp $
#
DISTNAME= clutter-gst-1.0.0
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://www.clutter-project.org/sources/clutter-gst/1.0/
diff --git a/multimedia/clutter-gst/buildlink3.mk b/multimedia/clutter-gst/buildlink3.mk
index 21f5f4b8a7d..32f2ac308f4 100644
--- a/multimedia/clutter-gst/buildlink3.mk
+++ b/multimedia/clutter-gst/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/03/11 04:07:58 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:03 wiz Exp $
#
BUILDLINK_TREE+= clutter-gst
@@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter-gst
CLUTTER_GST_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.clutter-gst+= clutter-gst>=1.0.0
+BUILDLINK_ABI_DEPENDS.clutter-gst?= clutter-gst>=1.0.0nb1
BUILDLINK_PKGSRCDIR.clutter-gst?= ../../multimedia/clutter-gst
.include "../../graphics/clutter/buildlink3.mk"
diff --git a/multimedia/clutter08-gst/Makefile b/multimedia/clutter08-gst/Makefile
index 7d352695fe5..93d6ee6c066 100644
--- a/multimedia/clutter08-gst/Makefile
+++ b/multimedia/clutter08-gst/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/26 08:35:18 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:03 wiz Exp $
#
DISTNAME= clutter-gst-0.8.0
PKGNAME= ${DISTNAME:S/clutter/clutter08/}
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://www.clutter-project.org/sources/clutter-gst/0.8/
diff --git a/multimedia/clutter08-gst/buildlink3.mk b/multimedia/clutter08-gst/buildlink3.mk
index f7216ac7fe4..b9e9c15fe29 100644
--- a/multimedia/clutter08-gst/buildlink3.mk
+++ b/multimedia/clutter08-gst/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/26 08:35:18 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:03 wiz Exp $
#
BUILDLINK_TREE+= clutter08-gst
@@ -7,6 +7,7 @@ BUILDLINK_TREE+= clutter08-gst
CLUTTER08_GST_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.clutter08-gst+= clutter08-gst>=0.8.0
+BUILDLINK_ABI_DEPENDS.clutter08-gst?= clutter08-gst>=0.8.0nb1
BUILDLINK_PKGSRCDIR.clutter08-gst?= ../../multimedia/clutter08-gst
.include "../../graphics/clutter08/buildlink3.mk"
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index ba50e461484..b06791d5593 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/05/08 16:11:06 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:03 wiz Exp $
DISTNAME= dvdauthor-0.6.18
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index eb84972812e..8e6161059b5 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/05/07 18:02:53 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:03 wiz Exp $
#
DISTNAME= DVDStyler-1.8.0.2
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/dvdview/Makefile b/multimedia/dvdview/Makefile
index 956d7fdec01..9e443401085 100644
--- a/multimedia/dvdview/Makefile
+++ b/multimedia/dvdview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/02/11 19:55:00 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:03 wiz Exp $
DISTNAME= dvdview-1.2.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= http://rachmaninoff.informatik.uni-mannheim.de/dvdview/data/
diff --git a/multimedia/farsight2/Makefile b/multimedia/farsight2/Makefile
index 0fbc31a2517..e44b801329e 100644
--- a/multimedia/farsight2/Makefile
+++ b/multimedia/farsight2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/05/05 21:51:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:04 wiz Exp $
#
DISTNAME= farsight2-0.0.17
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= chat multimedia
MASTER_SITES= http://farsight.freedesktop.org/releases/farsight2/
diff --git a/multimedia/farsight2/buildlink3.mk b/multimedia/farsight2/buildlink3.mk
index 78190b4b89c..16ef85b66cd 100644
--- a/multimedia/farsight2/buildlink3.mk
+++ b/multimedia/farsight2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:04 wiz Exp $
BUILDLINK_TREE+= farsight2
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= farsight2
FARSIGHT2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.farsight2+= farsight2>=0.0.14
-BUILDLINK_ABI_DEPENDS.farsight2?= farsight2>=0.0.17nb1
+BUILDLINK_ABI_DEPENDS.farsight2?= farsight2>=0.0.17nb4
BUILDLINK_PKGSRCDIR.farsight2?= ../../multimedia/farsight2
# unsure which are needed exactly
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 822c5ae3749..4a375f772ed 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:04 wiz Exp $
#
DISTNAME= ffmpegthumbnailer-1.5.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://ffmpegthumbnailer.googlecode.com/files/
diff --git a/multimedia/fuppes/Makefile b/multimedia/fuppes/Makefile
index 806b8baec6c..bec42d1fbda 100644
--- a/multimedia/fuppes/Makefile
+++ b/multimedia/fuppes/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:04 wiz Exp $
#
DISTNAME= fuppes-0.640
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuppes/}
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 09307ffbb9a..cecf1f01d98 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:04 wiz Exp $
DISTNAME= fxtv-1.03
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= multimedia
MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tgz
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 13adf663430..6197aaf4e86 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:04 wiz Exp $
#
DISTNAME= gmencoder-0.1.0
-PKGREVISION= 26
+PKGREVISION= 27
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gmencoder/}
EXTRACT_SUFX= .tgz
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index 2eb144726f4..fe3fd46593d 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2010/01/24 13:26:11 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2010/06/13 22:45:04 wiz Exp $
#
# NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
#
PKGNAME= gmplayer-${MPLAYER_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
http://www2.mplayerhq.hu/MPlayer/skins/ \
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 18abb636305..704f723f60c 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:04 wiz Exp $
#
DISTNAME= gnash-${VER}
VER= 0.8.3
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${VER}/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index 1bf9a0c2257..56dddc22672 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/04/11 09:50:47 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:04 wiz Exp $
DISTNAME= gnome-media-2.28.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-media/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/gnome-media/buildlink3.mk b/multimedia/gnome-media/buildlink3.mk
index 98d3e61e5bd..2b0a107b02c 100644
--- a/multimedia/gnome-media/buildlink3.mk
+++ b/multimedia/gnome-media/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/10/22 17:48:39 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:45:04 wiz Exp $
BUILDLINK_TREE+= gnome-media
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-media
GNOME_MEDIA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-media+= gnome-media>=2.12.0nb1
-BUILDLINK_ABI_DEPENDS.gnome-media?= gnome-media>=2.26.0nb2
+BUILDLINK_ABI_DEPENDS.gnome-media?= gnome-media>=2.28.5nb2
BUILDLINK_PKGSRCDIR.gnome-media?= ../../multimedia/gnome-media
.include "../../devel/GConf-ui/buildlink3.mk"
diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile
index 6970a54bdba..7a05235d553 100644
--- a/multimedia/goggles/Makefile
+++ b/multimedia/goggles/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/02/11 20:17:18 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:04 wiz Exp $
#
DISTNAME= goggles-0.9.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= http://www.fifthplanet.net/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 0df03f55023..e9cd4fa1c38 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/08/26 19:58:05 sno Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:04 wiz Exp $
#
DISTNAME= gopchop-1.1.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gopchop/} \
http://outflux.net/unix/software/GOPchop/download/
diff --git a/multimedia/gpac/Makefile b/multimedia/gpac/Makefile
index 4b65be43e8b..f7a99d5fad6 100644
--- a/multimedia/gpac/Makefile
+++ b/multimedia/gpac/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:05 wiz Exp $
#
DISTNAME= gpac-0.4.5
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpac/}
diff --git a/multimedia/gpac/distinfo b/multimedia/gpac/distinfo
index 7f890504d60..cd375cf8a96 100644
--- a/multimedia/gpac/distinfo
+++ b/multimedia/gpac/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/23 14:54:23 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2010/06/13 22:45:05 wiz Exp $
SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8
RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f
@@ -6,3 +6,4 @@ Size (gpac-0.4.5.tar.gz) = 4269054 bytes
SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9
SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4
SHA1 (patch-ac) = 25f8b92a308b6a70fb160980fe86e7d3e3f3f0ac
+SHA1 (patch-ad) = 5d50a3477f3a4459825f19c848454f6cdfb8a1fd
diff --git a/multimedia/gpac/patches/patch-ad b/multimedia/gpac/patches/patch-ad
new file mode 100644
index 00000000000..deaf3f15223
--- /dev/null
+++ b/multimedia/gpac/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 22:45:05 wiz Exp $
+
+--- src/media_tools/img.c.orig 2008-12-01 17:39:36.000000000 +0000
++++ src/media_tools/img.c
+@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
+ /* Allocate/initialize the image information data. REQUIRED */
+ info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL) {
+- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++ png_destroy_write_struct(&png_ptr, NULL);
+ return GF_IO_ERR;
+ }
+
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index bfc1631e74c..8788bd579d9 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2010/02/14 13:22:37 zafer Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:45:05 wiz Exp $
DISTNAME= gxine-0.5.905
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 059f399462a..03a05aa4625 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/01/08 17:33:24 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:05 wiz Exp $
#
DISTNAME= HandBrake-0.9.3
PKGNAME= ${DISTNAME:S/HandBrake/handbrake/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://download.m0k.org/handbrake/releases/ \
http://download.m0k.org/handbrake/contrib/
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index b6482034f96..d22b120961e 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:05 wiz Exp $
#
DISTNAME= kaffeine-0.8.3
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kaffeine/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 661cbfc836f..9438d852c69 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2010/06/13 22:45:05 wiz Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= multimedia
COMMENT= Multimedia tools for the KDE integrated X11 desktop
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
index aaf0abc20f0..57286abd5be 100644
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2010/06/13 22:45:05 wiz Exp $
BUILDLINK_TREE+= kdemultimedia
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdemultimedia
KDEMULTIMEDIA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdemultimedia+= kdemultimedia>=3.5.0nb2
-BUILDLINK_ABI_DEPENDS.kdemultimedia?= kdemultimedia>=3.5.10nb6
+BUILDLINK_ABI_DEPENDS.kdemultimedia?= kdemultimedia>=3.5.10nb7
BUILDLINK_PKGSRCDIR.kdemultimedia?= ../../multimedia/kdemultimedia3
.include "../../audio/arts/buildlink3.mk"
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 50407fb1ed1..4c4e89d1c9f 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/04/10 02:45:04 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:05 wiz Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= multimedia
COMMENT= Multimedia tools for the KDE integrated X11 desktop
diff --git a/multimedia/kmplayer-kde3/Makefile b/multimedia/kmplayer-kde3/Makefile
index 66b4b399981..e57677597b1 100644
--- a/multimedia/kmplayer-kde3/Makefile
+++ b/multimedia/kmplayer-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/10 04:04:21 markd Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:05 wiz Exp $
#
DISTNAME= kmplayer-0.10.0c
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= multimedia kde
MASTER_SITES= http://kmplayer.kde.org/pkgs/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 0b601719f3f..9165210e82a 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2010/04/10 04:09:21 markd Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:05 wiz Exp $
#
DISTNAME= kmplayer-0.11.2a
+PKGREVISION= 1
CATEGORIES= multimedia kde
MASTER_SITES= http://kmplayer.kde.org/pkgs/
EXTRACT_SUFX= .tar.bz2
@@ -10,11 +11,12 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://kmplayer.kde.org/
COMMENT= KDE frontend to mplayer
-PKG_DESTDIR_SUPPORT= user-destdir
-
+BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
DEPENDS+= mplayer>=1.0rc3:../../multimedia/mplayer
DEPENDS+= mencoder>=1.0rc3:../../multimedia/mencoder
+PKG_DESTDIR_SUPPORT= user-destdir
+
USE_CMAKE= yes
USE_TOOLS+= msgfmt perl pkg-config
USE_LANGUAGES= c c++
diff --git a/multimedia/ming/Makefile b/multimedia/ming/Makefile
index b226eb93ee6..ed66c1aa062 100644
--- a/multimedia/ming/Makefile
+++ b/multimedia/ming/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/04/09 01:33:43 obache Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:05 wiz Exp $
#
.include "Makefile.common"
+PKGREVISION= 1
CATEGORIES= multimedia
MAINTAINER= obache@NetBSD.org
diff --git a/multimedia/ming/buildlink3.mk b/multimedia/ming/buildlink3.mk
index 15e06182899..b9a11f520ad 100644
--- a/multimedia/ming/buildlink3.mk
+++ b/multimedia/ming/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/04/09 01:33:43 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:45:05 wiz Exp $
BUILDLINK_TREE+= ming
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= ming
MING_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ming+= ming>=0.4.3
+BUILDLINK_ABI_DEPENDS.ming?= ming>=0.4.3nb1
BUILDLINK_PKGSRCDIR.ming?= ../../multimedia/ming
.include "../../devel/zlib/buildlink3.mk"
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 49c5e6c1fa7..80e232eba21 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:05 wiz Exp $
DISTNAME= mjpegtools-1.9.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 5b02866bb17..ba0e6ecea17 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/05/15 07:32:30 adam Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:06 wiz Exp $
DISTNAME= mkvtoolnix-2.9.8
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/mplayer-plugin/Makefile b/multimedia/mplayer-plugin/Makefile
index 787e8a61ac6..41855c45021 100644
--- a/multimedia/mplayer-plugin/Makefile
+++ b/multimedia/mplayer-plugin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:06 wiz Exp $
#
DISTNAME= mplayerplug-in-3.55
PKGNAME= mplayer-plugin-3.55
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index 619edbe88ec..3c1cccd5290 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:58:07 sno Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:06 wiz Exp $
DISTNAME= ogle_gui-0.9.2
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= multimedia
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index beda4218f32..666e9b79e5f 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/04/10 00:18:13 markd Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:06 wiz Exp $
DISTNAME= phonon-4.4.0
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.4.0/}
EXTRACT_SUFX= .tgz
diff --git a/multimedia/phonon/buildlink3.mk b/multimedia/phonon/buildlink3.mk
index 13bb7fc9020..50735532b2f 100644
--- a/multimedia/phonon/buildlink3.mk
+++ b/multimedia/phonon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:06 wiz Exp $
BUILDLINK_TREE+= phonon
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= phonon
PHONON_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.phonon+= phonon>=4.1.83
-BUILDLINK_ABI_DEPENDS.phonon?= phonon>=4.3.1nb2
+BUILDLINK_ABI_DEPENDS.phonon?= phonon>=4.4.0nb1
BUILDLINK_PKGSRCDIR.phonon?= ../../multimedia/phonon
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/multimedia/php-ming/Makefile b/multimedia/php-ming/Makefile
index 43a950a4c03..5e6a7224dca 100644
--- a/multimedia/php-ming/Makefile
+++ b/multimedia/php-ming/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/04/29 04:55:25 obache Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:06 wiz Exp $
MODNAME= ming
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES+= multimedia
MAINTAINER= obache@NetBSD.org
diff --git a/multimedia/pspvc/Makefile b/multimedia/pspvc/Makefile
index 80c505fadf8..07bf0657b6e 100644
--- a/multimedia/pspvc/Makefile
+++ b/multimedia/pspvc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:58:07 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:06 wiz Exp $
#
DISTNAME= pspvc-install-0.3
PSPVCVER= pspvc-0.3
PKGNAME= ${PSPVCVER}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pspvc/}
diff --git a/multimedia/py-clutter-gst/Makefile b/multimedia/py-clutter-gst/Makefile
index d86a523d2a5..5befaf3ce59 100644
--- a/multimedia/py-clutter-gst/Makefile
+++ b/multimedia/py-clutter-gst/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/11 06:26:59 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:06 wiz Exp $
#
DISTNAME= pyclutter-gst-1.0.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.clutter-project.org/sources/pyclutter-gst/1.0/
diff --git a/multimedia/py-ming/Makefile b/multimedia/py-ming/Makefile
index 9202715d4bf..e726540a38e 100644
--- a/multimedia/py-ming/Makefile
+++ b/multimedia/py-ming/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2010/04/09 01:35:47 obache Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:06 wiz Exp $
#
.include "../../multimedia/ming/Makefile.common"
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= multimedia
MAINTAINER= obache@NetBSD.org
diff --git a/multimedia/ruby-clutter-gst/Makefile b/multimedia/ruby-clutter-gst/Makefile
index ea9fa211879..16c6d537062 100644
--- a/multimedia/ruby-clutter-gst/Makefile
+++ b/multimedia/ruby-clutter-gst/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/12/17 11:17:14 obache Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:06 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-clutter-gst-${VERSION}
COMMENT= Ruby binding for Clutter GStreamer library
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= multimedia
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/multimedia/ruby-ming/Makefile b/multimedia/ruby-ming/Makefile
index 4a1d6ddc249..99d4e57b8d6 100644
--- a/multimedia/ruby-ming/Makefile
+++ b/multimedia/ruby-ming/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/04/09 01:36:34 obache Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:06 wiz Exp $
DISTNAME= ming-ruby-${VER}
PKGNAME= ${RUBY_PKGPREFIX}-ming-${VER}
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://rubyforge.org/frs/download.php/44137/
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index 08c226880e7..7708c9fc708 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/12/16 15:37:52 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:06 wiz Exp $
#
DISTNAME= subtitleeditor-0.30.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://download.gna.org/subtitleeditor/0.30/
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index da11df69b17..5cce6cbd95a 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/11/15 21:24:35 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:07 wiz Exp $
#
DISTNAME= swfdec-gnome-2.28.0
+PKGREVISION= 1
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/swfdec-gnome/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/swfdec-mozilla/Makefile b/multimedia/swfdec-mozilla/Makefile
index 5577a60e27d..3260a5466b3 100644
--- a/multimedia/swfdec-mozilla/Makefile
+++ b/multimedia/swfdec-mozilla/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:07 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:07 wiz Exp $
#
DISTNAME= swfdec-mozilla-0.8.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/
diff --git a/multimedia/swfdec/Makefile b/multimedia/swfdec/Makefile
index 63899b7563a..ba95d7fe240 100644
--- a/multimedia/swfdec/Makefile
+++ b/multimedia/swfdec/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2010/01/20 19:09:00 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:06 wiz Exp $
#
DISTNAME= swfdec-0.8.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= multimedia
MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.8/
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
index a1a26515472..cdbd33a0b21 100644
--- a/multimedia/swfdec/buildlink3.mk
+++ b/multimedia/swfdec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/01/20 19:09:00 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:06 wiz Exp $
BUILDLINK_TREE+= swfdec
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= swfdec
SWFDEC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.swfdec+= swfdec>=0.8.2
-BUILDLINK_ABI_DEPENDS.swfdec?= swfdec>=0.8.4nb2
+BUILDLINK_ABI_DEPENDS.swfdec?= swfdec>=0.8.4nb3
BUILDLINK_PKGSRCDIR.swfdec?= ../../multimedia/swfdec
pkgbase := swfdec
diff --git a/multimedia/totem-browser-plugin/Makefile b/multimedia/totem-browser-plugin/Makefile
index 06b39967f70..b91a34f3f84 100644
--- a/multimedia/totem-browser-plugin/Makefile
+++ b/multimedia/totem-browser-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/03/27 12:45:34 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:07 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= gst-plugins0.10-soup-[0-9]*:../../net/gst-plugins0.10-soup
PKGNAME= ${DISTNAME:S/totem/totem-browser-plugin/}
-PKGREVISION= 3
+PKGREVISION= 4
# override Makefile.common
PLIST_SRC= ${.CURDIR}/PLIST
diff --git a/multimedia/totem-nautilus/Makefile b/multimedia/totem-nautilus/Makefile
index 1a5b56c168a..2acdad2d31a 100644
--- a/multimedia/totem-nautilus/Makefile
+++ b/multimedia/totem-nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/02/10 19:17:43 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:07 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../multimedia/totem/Makefile.common"
PKGNAME= ${DISTNAME:S/totem/totem-nautilus/}
-PKGREVISION= 1
+PKGREVISION= 2
# override Makefile.common
PLIST_SRC= ${.CURDIR}/PLIST
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 23e2700d642..8386271a2fa 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/05/23 11:19:26 obache Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:07 wiz Exp $
#
DISTNAME= totem-pl-parser-2.28.3
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/totem-pl-parser/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/totem-pl-parser/buildlink3.mk b/multimedia/totem-pl-parser/buildlink3.mk
index 262653117fe..d3102db74eb 100644
--- a/multimedia/totem-pl-parser/buildlink3.mk
+++ b/multimedia/totem-pl-parser/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/03/20 12:43:29 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:45:07 wiz Exp $
BUILDLINK_TREE+= totem-pl-parser
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= totem-pl-parser
TOTEM_PL_PARSER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.totem-pl-parser+= totem-pl-parser>=2.22.1
-BUILDLINK_ABI_DEPENDS.totem-pl-parser?= totem-pl-parser>=2.28.2nb1
+BUILDLINK_ABI_DEPENDS.totem-pl-parser?= totem-pl-parser>=2.28.3nb1
BUILDLINK_PKGSRCDIR.totem-pl-parser?= ../../multimedia/totem-pl-parser
.include "../../devel/glib2/buildlink3.mk"
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index a6d31655636..14c5604b9bd 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2010/05/14 16:45:17 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:45:07 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
+PKGREVISION= 1
DEPENDS+= gst-plugins0.10-soup-[0-9]*:../../net/gst-plugins0.10-soup
diff --git a/multimedia/totem/buildlink3.mk b/multimedia/totem/buildlink3.mk
index 23be089b053..7efe2f7cf30 100644
--- a/multimedia/totem/buildlink3.mk
+++ b/multimedia/totem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/10/21 18:56:15 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:07 wiz Exp $
BUILDLINK_TREE+= totem
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= totem
TOTEM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.totem+= {totem,totem-xine}>=1.4.0
-BUILDLINK_ABI_DEPENDS.totem+= totem>=2.26.3nb1
+BUILDLINK_ABI_DEPENDS.totem+= totem>=2.28.6nb1
BUILDLINK_PKGSRCDIR.totem?= ../../multimedia/totem
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 27d0ffdfc1c..ce04750251f 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2010/06/03 19:33:33 gls Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/13 22:45:07 wiz Exp $
DISTNAME= transcode-1.1.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= multimedia
MASTER_SITES= http://download.berlios.de/tcforge/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/tvtime/Makefile b/multimedia/tvtime/Makefile
index 6378d04ab5c..829368c06b7 100644
--- a/multimedia/tvtime/Makefile
+++ b/multimedia/tvtime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/09/17 23:00:05 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:07 wiz Exp $
DISTNAME= tvtime-1.0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tvtime/}
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index f656ccb8803..ac5902d5187 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2010/06/13 22:45:07 wiz Exp $
BUILDLINK_TREE+= vlc
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= vlc
VLC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.vlc?= vlc>=1.0.0
-BUILDLINK_ABI_DEPENDS.vlc?= vlc>=1.0.4nb1
+BUILDLINK_ABI_DEPENDS.vlc?= vlc>=1.0.6
BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc
pkgbase:= vlc
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 217464deb4c..8f5b7f5aac1 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.35 2010/05/04 18:30:10 drochner Exp $
+$NetBSD: distinfo,v 1.36 2010/06/13 22:45:07 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
diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
new file mode 100644
index 00000000000..4397e7585ad
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.5 2010/06/13 22:45:07 wiz Exp $
+
+--- modules/codec/png.c.orig 2010-03-07 18:38:01.000000000 +0000
++++ modules/codec/png.c
+@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t
+ p_info = png_create_info_struct( p_png );
+ if( p_info == NULL )
+ {
+- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
++ png_destroy_read_struct( &p_png, NULL, NULL );
+ block_Release( p_block ); *pp_block = NULL;
+ return NULL;
+ }
+@@ -163,7 +163,7 @@ static picture_t *DecodeBlock( decoder_t
+ p_end_info = png_create_info_struct( p_png );
+ if( p_end_info == NULL )
+ {
+- png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
++ png_destroy_read_struct( &p_png, &p_info, NULL );
+ block_Release( p_block ); *pp_block = NULL;
+ return NULL;
+ }
diff --git a/multimedia/vlc08/Makefile b/multimedia/vlc08/Makefile
index 00a325a6517..a1bcec02957 100644
--- a/multimedia/vlc08/Makefile
+++ b/multimedia/vlc08/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2009/10/31 14:46:51 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:07 wiz Exp $
#
DISTNAME= vlc-${VLC_VER}
PKGNAME= vlc08-${VLC_VER}
VLC_VER= 0.8.6i
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= multimedia
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/vlc08/buildlink3.mk b/multimedia/vlc08/buildlink3.mk
index af0bdeb5ce0..c3afa3ffd63 100644
--- a/multimedia/vlc08/buildlink3.mk
+++ b/multimedia/vlc08/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/10/31 14:46:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:07 wiz Exp $
BUILDLINK_TREE+= vlc08
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= vlc08
VLC08_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.vlc08+= vlc08>=0.8.6d
-BUILDLINK_ABI_DEPENDS.vlc08?= vlc08>=0.8.6inb7
+BUILDLINK_ABI_DEPENDS.vlc08?= vlc08>=0.8.6inb8
BUILDLINK_PKGSRCDIR.vlc08?= ../../multimedia/vlc08
pkgbase:= vlc08
diff --git a/multimedia/xfce4-mpc-plugin/Makefile b/multimedia/xfce4-mpc-plugin/Makefile
index 71ab3365db1..dfc6329642a 100644
--- a/multimedia/xfce4-mpc-plugin/Makefile
+++ b/multimedia/xfce4-mpc-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:07 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 0.3.2
DISTNAME= xfce4-mpc-plugin-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-mpc-plugin/
EXTRACT_SUFX= .tar.gz
diff --git a/multimedia/xfce4-mpc-plugin/buildlink3.mk b/multimedia/xfce4-mpc-plugin/buildlink3.mk
index 9e2c664ab70..25634d95d54 100644
--- a/multimedia/xfce4-mpc-plugin/buildlink3.mk
+++ b/multimedia/xfce4-mpc-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:07 wiz Exp $
BUILDLINK_TREE+= xfce4-mpc-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-mpc-plugin
XFCE4_MPC_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-mpc-plugin+= xfce4-mpc-plugin>=0.3.2
-BUILDLINK_ABI_DEPENDS.xfce4-mpc-plugin?= xfce4-mpc-plugin>=0.3.2nb1
+BUILDLINK_ABI_DEPENDS.xfce4-mpc-plugin?= xfce4-mpc-plugin>=0.3.2nb2
BUILDLINK_PKGSRCDIR.xfce4-mpc-plugin?= ../../multimedia/xfce4-mpc-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile
index 9921fb709d3..5996744f345 100644
--- a/multimedia/xfmedia/Makefile
+++ b/multimedia/xfmedia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2010/02/11 20:20:38 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:08 wiz Exp $
#
DISTNAME= xfmedia-0.9.2
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://spuriousinterrupt.org/projects/xfmedia/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index f03aef2452d..dab7a67fcb7 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.78 2010/04/19 15:31:19 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/13 22:45:08 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Multimedia player library
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index a39f767c7eb..88cbc186a35 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/05/07 17:46:24 drochner Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:08 wiz Exp $
#
DISTNAME= xine-ui-0.99.6
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile
index 9350e4c7fc4..f297eeba05a 100644
--- a/multimedia/xvid4conf/Makefile
+++ b/multimedia/xvid4conf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:58:08 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:08 wiz Exp $
DISTNAME= xvid4conf-1.12
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= multimedia
MASTER_SITES= #
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 6955963c888..df9cd6c8354 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2010/03/30 13:06:53 obache Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:08 wiz Exp $
DISTNAME= aMule-2.2.6
PKGNAME= ${DISTNAME:S/aMule/amule/}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 0a8af590520..8a2ce04c247 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/12/01 18:53:54 tonio Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:08 wiz Exp $
DISTNAME= avahi-0.6.25
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= http://avahi.org/download/
diff --git a/net/avahi/buildlink3.mk b/net/avahi/buildlink3.mk
index e590d2bfdf6..90ef5dfeff9 100644
--- a/net/avahi/buildlink3.mk
+++ b/net/avahi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:58 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:08 wiz Exp $
BUILDLINK_TREE+= avahi
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= avahi
AVAHI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.avahi+= avahi>=0.6.23
-BUILDLINK_ABI_DEPENDS.avahi?= avahi>=0.6.25nb1
+BUILDLINK_ABI_DEPENDS.avahi?= avahi>=0.6.25nb3
BUILDLINK_PKGSRCDIR.avahi?= ../../net/avahi
pkgbase := avahi
diff --git a/net/bittornado-gui/Makefile b/net/bittornado-gui/Makefile
index 5a2fec4ded3..1bf756ca8d2 100644
--- a/net/bittornado-gui/Makefile
+++ b/net/bittornado-gui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2010/02/10 19:17:43 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:08 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../net/bittornado/Makefile.common"
PKGNAME= ${DISTNAME:S/Tornado/Tornado-gui/}
-PKGREVISION= 4
+PKGREVISION= 5
COMMENT+= (wxGTK GUI)
diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile
index e092b2b11fc..c7c164d90ac 100644
--- a/net/bittorrent-gui/Makefile
+++ b/net/bittorrent-gui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2010/02/10 19:17:43 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:08 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../net/bittorrent/Makefile.common"
PKGNAME= ${DISTNAME:S/BitTorrent/bittorrent-gui/}
-PKGREVISION= 6
+PKGREVISION= 7
COMMENT+= (GTK+ GUI)
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 95878df7f23..d9e04b488bb 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2009/08/26 19:58:08 sno Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/13 22:45:08 wiz Exp $
#
DISTNAME= bug-buddy-2.26.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/bug-buddy/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index a7774d625f5..947e106c25a 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2010/06/02 13:08:22 adam Exp $
+# $NetBSD: Makefile,v 1.49 2010/06/13 22:45:08 wiz Exp $
DISTNAME= dc_gui2-0.80
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://ac2i.homelinux.com/dctc/
diff --git a/net/dcsharp/Makefile b/net/dcsharp/Makefile
index 55dc54abbf2..ae8243e2715 100644
--- a/net/dcsharp/Makefile
+++ b/net/dcsharp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/02/11 20:41:53 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:08 wiz Exp $
DISTNAME= dcsharp-0.11.1
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= net
MASTER_SITES= http://dcsharp.googlecode.com/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/dhcpcd-gtk/Makefile b/net/dhcpcd-gtk/Makefile
index 40a824e6365..a6a6d1e289b 100644
--- a/net/dhcpcd-gtk/Makefile
+++ b/net/dhcpcd-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/05/24 21:12:53 roy Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:09 wiz Exp $
#
DISTNAME= dhcpcd-ui-0.5.0
PKGNAME= dhcpcd-gtk-0.5.0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://roy.marples.name/pub/dhcpcd/
MASTER_SITES+= http://roy.aydogan.net/dhcpcd/
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index 1d6afbf921a..51e5a746a7f 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2009/08/26 19:58:09 sno Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:09 wiz Exp $
DISTNAME= ed2k-gtk-gui-0.6.3
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ed2k-gtk-gui/}
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 82642bfc614..0cd961cbf35 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:09 wiz Exp $
#
DISTNAME= ekiga-3.2.6
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net comms
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ekiga/3.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 9e6862464f7..199a4b4e497 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2010/01/19 20:51:48 drochner Exp $
+# $NetBSD: Makefile,v 1.54 2010/06/13 22:45:09 wiz Exp $
DISTNAME= etherape-0.9.9
+PKGREVISION= 1
CATEGORIES= gnome net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/}
diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index 5cd11631071..22cd718c00e 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2010/03/23 22:28:55 zafer Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:09 wiz Exp $
#
VERSION= 3.3.2.1
DISTNAME= FileZilla_${VERSION}_src
PKGNAME= filezilla-${VERSION}
+PKGREVISION= 1
CATEGORIES= net x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=filezilla/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile
index f226515a56a..b9d0e62a434 100644
--- a/net/gkrellm-multiping/Makefile
+++ b/net/gkrellm-multiping/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/01/17 12:02:31 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:09 wiz Exp $
#
DISTNAME= gkrellm-multiping-2.0.8
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= net
MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
EXTRACT_SUFX= .tgz
diff --git a/net/gkrellm-snmp/Makefile b/net/gkrellm-snmp/Makefile
index ef595af6f07..dd514c501be 100644
--- a/net/gkrellm-snmp/Makefile
+++ b/net/gkrellm-snmp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/01/17 12:02:31 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:09 wiz Exp $
#
DISTNAME= gkrellm_snmp-0.21
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= net
MASTER_SITES= http://triq.net/gkrellm/
diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index 5e21e962a31..521103588f0 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/01/17 12:02:31 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:09 wiz Exp $
DISTNAME= gkrellmwireless-2.0.3
PKGNAME= ${DISTNAME:S/gkrellm/gkrellm-/}
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= net sysutils
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index e03b68c8228..64118a76cfc 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2010/06/13 22:45:09 wiz Exp $
#
DISTNAME= gnome-netstatus-2.26.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-netstatus/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 47056d424be..f45b145e193 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/08/26 19:58:09 sno Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:09 wiz Exp $
#
DISTNAME= gnome-nettool-2.26.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-nettool/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile
index c6b02105dc4..ad02dce35ea 100644
--- a/net/gssdp/Makefile
+++ b/net/gssdp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/05/02 11:11:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:09 wiz Exp $
#
DISTNAME= gssdp-0.7.2
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.gupnp.org/sources/gssdp/
diff --git a/net/gssdp/buildlink3.mk b/net/gssdp/buildlink3.mk
index 23c6b7ac79b..1b436bd2f3d 100644
--- a/net/gssdp/buildlink3.mk
+++ b/net/gssdp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/20 13:44:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:09 wiz Exp $
BUILDLINK_TREE+= gssdp
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= gssdp
GSSDP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gssdp+= gssdp>=0.7.1
+BUILDLINK_ABI_DEPENDS.gssdp?= gssdp>=0.7.2nb1
BUILDLINK_PKGSRCDIR.gssdp?= ../../net/gssdp
.include "../../devel/glib2/buildlink3.mk"
diff --git a/net/gst-plugins0.10-soup/Makefile b/net/gst-plugins0.10-soup/Makefile
index 686f3047010..8f43a79d683 100644
--- a/net/gst-plugins0.10-soup/Makefile
+++ b/net/gst-plugins0.10-soup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/17 11:30:38 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:10 wiz Exp $
#
GST_PLUGINS0.10_NAME= soup
@@ -8,5 +8,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../multimedia/gst-plugins0.10-good/Makefile.common"
+PKGREVISION= 1
+
.include "../../net/libsoup24/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 03eb189bdb5..bfad674eb55 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/21 17:05:59 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:10 wiz Exp $
#
DISTNAME= gtk-vnc-0.3.10
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-vnc/0.3/}
diff --git a/net/gtk-vnc/buildlink3.mk b/net/gtk-vnc/buildlink3.mk
index 1dbef2cceb1..4f1cefde130 100644
--- a/net/gtk-vnc/buildlink3.mk
+++ b/net/gtk-vnc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/21 17:05:59 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:10 wiz Exp $
BUILDLINK_TREE+= gtk-vnc
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtk-vnc
GTK_VNC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtk-vnc+= gtk-vnc>=0.3.7
-BUILDLINK_ABI_DEPENDS.gtk-vnc?= gtk-vnc>=0.3.8nb2
+BUILDLINK_ABI_DEPENDS.gtk-vnc?= gtk-vnc>=0.3.10nb1
BUILDLINK_PKGSRCDIR.gtk-vnc?= ../../net/gtk-vnc
pkgbase := gtk-vnc
diff --git a/net/gupnp-av/Makefile b/net/gupnp-av/Makefile
index e745686ce29..5cc1180f1fd 100644
--- a/net/gupnp-av/Makefile
+++ b/net/gupnp-av/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 15:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:10 wiz Exp $
#
DISTNAME= gupnp-av-0.5.4
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.gupnp.org/sources/gupnp-av/
diff --git a/net/gupnp-av/buildlink3.mk b/net/gupnp-av/buildlink3.mk
index 48516c0df15..74447e7887c 100644
--- a/net/gupnp-av/buildlink3.mk
+++ b/net/gupnp-av/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/02/16 15:29:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:10 wiz Exp $
BUILDLINK_TREE+= gupnp-av
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= gupnp-av
GUPNP_AV_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gupnp-av+= gupnp-av>=0.5.4
+BUILDLINK_ABI_DEPENDS.gupnp-av?= gupnp-av>=0.5.4nb1
BUILDLINK_PKGSRCDIR.gupnp-av?= ../../net/gupnp-av
.include "../../net/gupnp/buildlink3.mk"
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index 1c3961c0b31..5606b4212bb 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/02/10 19:17:43 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:10 wiz Exp $
#
DISTNAME= gupnp-igd-0.1.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net devel
MASTER_SITES= http://www.gupnp.org/sources/gupnp-igd/
diff --git a/net/gupnp-igd/buildlink3.mk b/net/gupnp-igd/buildlink3.mk
index 59ea3d108a1..3ffbded0478 100644
--- a/net/gupnp-igd/buildlink3.mk
+++ b/net/gupnp-igd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:10 wiz Exp $
BUILDLINK_TREE+= gupnp-igd
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gupnp-igd
GUPNP_IGD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gupnp-igd+= gupnp-igd>=0.1.3
-BUILDLINK_ABI_DEPENDS.gupnp-igd?= gupnp-igd>=0.1.6
+BUILDLINK_ABI_DEPENDS.gupnp-igd?= gupnp-igd>=0.1.6nb2
BUILDLINK_PKGSRCDIR.gupnp-igd?= ../../net/gupnp-igd
.include "../../net/gupnp/buildlink3.mk"
diff --git a/net/gupnp-tools/Makefile b/net/gupnp-tools/Makefile
index 72b81bc341e..349605ffd70 100644
--- a/net/gupnp-tools/Makefile
+++ b/net/gupnp-tools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/02/16 15:33:02 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:10 wiz Exp $
#
DISTNAME= gupnp-tools-0.8
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.gupnp.org/sources/gupnp-tools/
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 75afad79001..b830e0b2256 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/05/02 11:20:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:10 wiz Exp $
#
DISTNAME= gupnp-0.13.3
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.gupnp.org/sources/gupnp/
diff --git a/net/gupnp/buildlink3.mk b/net/gupnp/buildlink3.mk
index f627a765843..75942397bf1 100644
--- a/net/gupnp/buildlink3.mk
+++ b/net/gupnp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:10 wiz Exp $
BUILDLINK_TREE+= gupnp
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gupnp
GUPNP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gupnp+= gupnp>=0.13.2
-BUILDLINK_ABI_DEPENDS.gupnp?= gupnp>=0.13.2
+BUILDLINK_ABI_DEPENDS.gupnp?= gupnp>=0.13.3nb1
BUILDLINK_PKGSRCDIR.gupnp?= ../../net/gupnp
.include "../../devel/glib2/buildlink3.mk"
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index 1538104da20..eb0983e21c1 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/02/06 13:58:06 spz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:10 wiz Exp $
#
DISTNAME= hobbit-4.0-beta6
PKGNAME= hobbit-4.0b6
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
diff --git a/net/jigdo/Makefile b/net/jigdo/Makefile
index 02e18ea615a..eddfc868db6 100644
--- a/net/jigdo/Makefile
+++ b/net/jigdo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/01/17 12:02:32 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:10 wiz Exp $
DISTNAME= jigdo-0.7.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= http://atterer.net/jigdo/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 412cd24fe05..27e9089df94 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:10 wiz Exp $
DISTNAME= kdenetwork-${_KDE_VERSION}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= net
COMMENT= Network modules for the KDE integrated X11 desktop
diff --git a/net/kdenetwork3/buildlink3.mk b/net/kdenetwork3/buildlink3.mk
index a8fcf986a17..2bca3a28289 100644
--- a/net/kdenetwork3/buildlink3.mk
+++ b/net/kdenetwork3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:10 wiz Exp $
BUILDLINK_TREE+= kdenetwork
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdenetwork
KDENETWORK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdenetwork+= kdenetwork>=3.5.0nb1
-BUILDLINK_ABI_DEPENDS.kdenetwork?= kdenetwork>=3.5.10nb6
+BUILDLINK_ABI_DEPENDS.kdenetwork?= kdenetwork>=3.5.10nb7
BUILDLINK_PKGSRCDIR.kdenetwork?= ../../net/kdenetwork3
.include "../../converters/uulib/buildlink3.mk"
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index fcde9c979b3..8a4c8e18914 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/06/02 10:14:15 markd Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:10 wiz Exp $
DISTNAME= kdenetwork-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= net
COMMENT= Network modules for the KDE integrated X11 desktop
diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile
index d8d850d57c6..1ef32a84178 100644
--- a/net/kftpgrabber/Makefile
+++ b/net/kftpgrabber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:10 wiz Exp $
DISTNAME= kftpgrabber-0.8.1
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= net kde
MASTER_SITES= http://www.kftp.org/uploads/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 4d02ac35cc9..099279bfe8f 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:11 wiz Exp $
DISTNAME= kiax-0.8.51-src
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= comms net audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kiax/}
diff --git a/net/kmldonkey-kde3/Makefile b/net/kmldonkey-kde3/Makefile
index fa3639ec223..ca68244a6cf 100644
--- a/net/kmldonkey-kde3/Makefile
+++ b/net/kmldonkey-kde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/02/15 15:31:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:11 wiz Exp $
DISTNAME= kmldonkey-0.11
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_KDE:=apps/KDE3.x/network/}
diff --git a/net/kmldonkey/Makefile b/net/kmldonkey/Makefile
index e9aa52ebd04..b001b68ede5 100644
--- a/net/kmldonkey/Makefile
+++ b/net/kmldonkey/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/04/10 03:04:47 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:11 wiz Exp $
#
DISTNAME= kmldonkey-2.0.2-kde4.4.0
PKGNAME= ${DISTNAME:S/-kde/./}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_KDE:=4.4.0/src/extragear/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index 92ccc2111cd..e748ceebc5b 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:11 wiz Exp $
DISTNAME= kphone-4.2
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= net comms
MASTER_SITES= http://www.wirlab.net/kphone/
diff --git a/net/ktorrent-kde3/Makefile b/net/ktorrent-kde3/Makefile
index 4614aec4c6c..87443db948d 100644
--- a/net/ktorrent-kde3/Makefile
+++ b/net/ktorrent-kde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/03/24 19:43:28 asau Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:11 wiz Exp $
DISTNAME= ktorrent-${KTORRENT_VER}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= net kde
MASTER_SITES= http://ktorrent.org/downloads/${KTORRENT_VER}/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index 96c0514a909..d6f223083f0 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/05/01 09:56:46 abs Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:11 wiz Exp $
DISTNAME= ktorrent-${KTORRENT_VER}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= net kde
MASTER_SITES= http://ktorrent.org/downloads/${KTORRENT_VER}/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/libgdata/Makefile b/net/libgdata/Makefile
index 54ceb9241e2..86c212983d0 100644
--- a/net/libgdata/Makefile
+++ b/net/libgdata/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/05/14 16:40:07 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:11 wiz Exp $
#
DISTNAME= libgdata-0.5.2
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgdata/0.5/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/libgdata/buildlink3.mk b/net/libgdata/buildlink3.mk
index 39000b7fdc7..155d12c1d64 100644
--- a/net/libgdata/buildlink3.mk
+++ b/net/libgdata/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/21 18:48:21 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:11 wiz Exp $
BUILDLINK_TREE+= libgdata
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= libgdata
LIBGDATA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgdata+= libgdata>=0.1.1
+BUILDLINK_ABI_DEPENDS.libgdata?= libgdata>=0.5.2nb1
BUILDLINK_PKGSRCDIR.libgdata?= ../../net/libgdata
diff --git a/net/libnice/Makefile b/net/libnice/Makefile
index b099a6a45ac..e8b8e4f9ab9 100644
--- a/net/libnice/Makefile
+++ b/net/libnice/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/05/02 11:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:11 wiz Exp $
#
DISTNAME= libnice-0.0.11
+PKGREVISION= 1
CATEGORIES= net devel
MASTER_SITES= http://nice.freedesktop.org/releases/
diff --git a/net/libnice/buildlink3.mk b/net/libnice/buildlink3.mk
index a126f3e020b..b03e546756b 100644
--- a/net/libnice/buildlink3.mk
+++ b/net/libnice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:11 wiz Exp $
BUILDLINK_TREE+= libnice
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libnice
LIBNICE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libnice+= libnice>=0.0.9
-BUILDLINK_ABI_DEPENDS.libnice?= libnice>=0.0.10nb1
+BUILDLINK_ABI_DEPENDS.libnice?= libnice>=0.0.11nb1
BUILDLINK_PKGSRCDIR.libnice?= ../../net/libnice
.include "../../devel/glib2/buildlink3.mk"
diff --git a/net/libsoup24/buildlink3.mk b/net/libsoup24/buildlink3.mk
index 7db10a363fb..a4de49a003d 100644
--- a/net/libsoup24/buildlink3.mk
+++ b/net/libsoup24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2010/03/27 01:40:22 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2010/06/13 22:45:11 wiz Exp $
BUILDLINK_TREE+= libsoup24
@@ -7,7 +7,7 @@ LIBSOUP24_BUILDLINK3_MK:=
# API 2.4.0 but 2.28.0 due to buildlink dependency change
BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.28.0
-BUILDLINK_ABI_DEPENDS.libsoup24?= libsoup24>=2.26.0
+BUILDLINK_ABI_DEPENDS.libsoup24?= libsoup24>=2.30.1
BUILDLINK_PKGSRCDIR.libsoup24?= ../../net/libsoup24
.include "../../databases/sqlite3/buildlink3.mk"
diff --git a/net/logjam/Makefile b/net/logjam/Makefile
index 7bb71fb8ca3..d2cf5a82c7d 100644
--- a/net/logjam/Makefile
+++ b/net/logjam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/17 12:02:33 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:11 wiz Exp $
#
DISTNAME= logjam-4.5.3
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= net
MASTER_SITES= http://logjam.danga.com/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 42b42ce9bf6..6dd3616da1e 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:45:11 wiz Exp $
#
.include "Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
RCD_SCRIPTS= mldonkey
diff --git a/net/monsoon/Makefile b/net/monsoon/Makefile
index 1c1e3d6f195..090921a855e 100644
--- a/net/monsoon/Makefile
+++ b/net/monsoon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:12 wiz Exp $
DISTNAME= monsoon-0.20
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.monsoon-project.org/jaws/data/files/
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 2ec98303f6c..29301cd2683 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2010/03/20 21:32:41 adrianp Exp $
+# $NetBSD: Makefile,v 1.97 2010/06/13 22:45:12 wiz Exp $
DISTNAME= mrtg-2.16.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net
MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \
http://oss.oetiker.ch/mrtg/pub/old/
diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 6861d4dbc9b..40bbfd0cbb4 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:12 wiz Exp $
#
DISTNAME= nagios-3.1.2
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
diff --git a/net/nagstamon/Makefile b/net/nagstamon/Makefile
index 347e47e66a9..370303514ad 100644
--- a/net/nagstamon/Makefile
+++ b/net/nagstamon/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/11 09:24:20 imil Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:12 wiz Exp $
#
VERSION= 0.9.2
DISTNAME= nagstamon_${VERSION}
PKGNAME= ${DISTNAME:S/_/-/}
+PKGREVISION= 1
CATEGORIES= net python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagstamon/}
diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index 2e9cb774f39..6e0ff6cf32f 100644
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/02/11 22:18:47 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:12 wiz Exp $
#
DISTNAME= nfdump-1.5.7
#PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nfdump/}
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index bc44125acf0..87049412da2 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2009/08/26 19:58:11 sno Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:12 wiz Exp $
#
DISTNAME= nicotine-1.0.8
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= net audio x11
MASTER_SITES= http://nicotine.thegraveyard.org/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 2e93293d383..501f8d2d1f5 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2010/02/11 22:24:33 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:45:12 wiz Exp $
DISTNAME= ntop-3.3.10
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ntop/}
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index a67bce8aa80..6dc0e2cf958 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:45:12 wiz Exp $
#
DISTNAME= tsclient-0.132
-PKGREVISION= 24
+PKGREVISION= 25
CATEGORIES= net
MASTER_SITES= http://www.gnomepro.com/tsclient/
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index 94fb6b433c3..2d35422b5a0 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/12/21 20:34:06 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:12 wiz Exp $
#
DISTNAME= twitux-0.69
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=twitux/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/urlgfe/Makefile b/net/urlgfe/Makefile
index 5164a0696a1..3d43530e7d6 100644
--- a/net/urlgfe/Makefile
+++ b/net/urlgfe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:12 wiz Exp $
#
DISTNAME= urlgfe-1.0.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=urlget/}
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 8d1a4781bfe..ad64c0c122c 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/19 20:02:40 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:13 wiz Exp $
#
DISTNAME= vinagre-2.28.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vinagre/2.28/}
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 8371ba4c11b..fa5f89976d5 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/21 18:20:43 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:13 wiz Exp $
DISTNAME= vino-2.28.1
+PKGREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vino/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/wistumbler2-gtk/Makefile b/net/wistumbler2-gtk/Makefile
index 5944bd579ef..579b64d1115 100644
--- a/net/wistumbler2-gtk/Makefile
+++ b/net/wistumbler2-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:58:11 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:13 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../net/wistumbler2/Makefile.common"
PKGNAME= ${DISTNAME:S/wistumbler2-/wistumbler2-gtk-/}
-PKGREVISION= 4
+PKGREVISION= 5
CONFLICTS+= wistumbler2-[0-9]*
diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index 62498adaba3..efd0003be4f 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:13 wiz Exp $
DISTNAME= wpa_supplicant-0.6.9
PKGNAME= ${DISTNAME:S/supplicant/gui/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= http://hostap.epitest.fi/releases/
diff --git a/net/xfce4-wavelan-plugin/Makefile b/net/xfce4-wavelan-plugin/Makefile
index c091e18a385..8247483feba 100644
--- a/net/xfce4-wavelan-plugin/Makefile
+++ b/net/xfce4-wavelan-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:13 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.5.4
DISTNAME= xfce4-wavelan-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-wavelan-plugin/
EXTRACT_SUFX= .tar.gz
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
index 8172235a4d4..f9729ac60a9 100644
--- a/net/xfce4-wavelan-plugin/buildlink3.mk
+++ b/net/xfce4-wavelan-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:13 wiz Exp $
BUILDLINK_TREE+= xfce4-wavelan-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-wavelan-plugin
XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+= xfce4-wavelan-plugin>=0.5.3
-BUILDLINK_ABI_DEPENDS.xfce4-wavelan-plugin?= xfce4-wavelan-plugin>=0.5.4nb1
+BUILDLINK_ABI_DEPENDS.xfce4-wavelan-plugin?= xfce4-wavelan-plugin>=0.5.4nb2
BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?= ../../net/xfce4-wavelan-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/net/xymon/Makefile b/net/xymon/Makefile
index c8e3571fc01..f8fc511b92a 100644
--- a/net/xymon/Makefile
+++ b/net/xymon/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/04/14 19:50:48 spz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:13 wiz Exp $
#
DISTNAME= xymon-4.3.0-beta2
PKGNAME= xymon-4.3.0b2
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 09124d9bcb0..c3511aea6f7 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:45:13 wiz Exp $
DISTNAME= knews-1.0b.1
PKGNAME= knews-1.0
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= news x11
MASTER_SITES= http://www.matematik.su.se/~kjj/
diff --git a/news/lottanzb/Makefile b/news/lottanzb/Makefile
index 896f8a2afca..bd7fd4c8917 100644
--- a/news/lottanzb/Makefile
+++ b/news/lottanzb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/09/12 21:07:01 snj Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:13 wiz Exp $
DISTNAME= lottanzb-0.4.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= news
MASTER_SITES= http://www.lottanzb.org/releases/
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 83c4f6a0c11..2857a70dd4f 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2009/08/26 19:58:12 sno Exp $
+# $NetBSD: Makefile,v 1.57 2010/06/13 22:45:13 wiz Exp $
#
DISTNAME= pan-0.133
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= news
MASTER_SITES= http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/source/
EXTRACT_SUFX= .tar.bz2
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 5bb6329df87..093806009ba 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2010/01/21 23:32:10 heinz Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:45:13 wiz Exp $
DISTNAME= slrn-0.9.9p1
+PKGREVISION= 1
CATEGORIES= news
MASTER_SITES= ftp://space.mit.edu/pub/davis/slrn/
EXTRACT_SUFX= .tar.gz
diff --git a/parallel/ganglia-monitor-core/Makefile b/parallel/ganglia-monitor-core/Makefile
index 577eee644a0..c6902f04346 100644
--- a/parallel/ganglia-monitor-core/Makefile
+++ b/parallel/ganglia-monitor-core/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2009/12/03 13:06:56 asau Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:13 wiz Exp $
#
DISTNAME= ganglia-3.1.2
PKGNAME= ganglia-monitor-core-3.1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net parallel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/}
diff --git a/pkgtools/gnome-packagekit/Makefile b/pkgtools/gnome-packagekit/Makefile
index d7baecd93c6..77c5140dd7c 100644
--- a/pkgtools/gnome-packagekit/Makefile
+++ b/pkgtools/gnome-packagekit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/06/11 08:55:35 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:14 wiz Exp $
#
DISTNAME= gnome-packagekit-0.4.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= pkgtools gnome
MASTER_SITES= http://www.packagekit.org/releases/
diff --git a/pkgtools/packagekit/Makefile b/pkgtools/packagekit/Makefile
index 2c394d282ae..0b251a2f656 100644
--- a/pkgtools/packagekit/Makefile
+++ b/pkgtools/packagekit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/02/10 19:17:44 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:14 wiz Exp $
#
DISTNAME= PackageKit-0.4.0
-PKGREVISION= 5
+PKGREVISION= 6
PKGNAME= ${DISTNAME:S/PackageKit/packagekit/}
CATEGORIES= pkgtools
MASTER_SITES= http://www.packagekit.org/releases/
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 4964d77a713..4c8b5d836c5 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:14 wiz Exp $
DISTNAME= advi-1.6.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= print
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/
EXTRACT_SUFX= .tgz
diff --git a/print/bg5pdf/Makefile b/print/bg5pdf/Makefile
index cf22b3aa073..46a0bde07b4 100644
--- a/print/bg5pdf/Makefile
+++ b/print/bg5pdf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/02/10 19:17:44 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:14 wiz Exp $
DISTNAME= bg5pdf-1.0.0
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= print chinese
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/print/cups-drivers-Magicolor5440DL/Makefile b/print/cups-drivers-Magicolor5440DL/Makefile
index ac9ca52381f..2807f309762 100644
--- a/print/cups-drivers-Magicolor5440DL/Makefile
+++ b/print/cups-drivers-Magicolor5440DL/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/01 00:38:36 jym Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:14 wiz Exp $
#
DISTNAME= 5440DL_lin64bit_1_2_1
PKGNAME= cups-drivers-Magicolor5440DL-1.2.1
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://printer.konicaminolta.net/drivers/linux/
EXTRACT_SUFX= .zip
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 8bb85ed54ce..8a13e369bf8 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2010/06/10 10:28:35 gdt Exp $
+# $NetBSD: Makefile,v 1.166 2010/06/13 22:45:14 wiz Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -8,7 +8,7 @@ DISTNAME= cups-${DIST_VERS}-source
PKGNAME= cups-${DIST_VERS:S/-/./g}
BASE_VERS= 1.4.3
DIST_VERS= ${BASE_VERS}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= print
MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
index 4f7dd2657eb..6be8b912ea8 100644
--- a/print/cups/buildlink3.mk
+++ b/print/cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2010/06/13 22:45:14 wiz Exp $
BUILDLINK_TREE+= cups
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= cups
CUPS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cups+= cups>=1.1.19nb3
-BUILDLINK_ABI_DEPENDS.cups+= cups>=1.3.11nb3
+BUILDLINK_ABI_DEPENDS.cups+= cups>=1.4.3nb5
BUILDLINK_PKGSRCDIR.cups?= ../../print/cups
pkgbase := cups
diff --git a/print/diffpdf/Makefile b/print/diffpdf/Makefile
index 1f4b5ee3e44..d79014afbeb 100644
--- a/print/diffpdf/Makefile
+++ b/print/diffpdf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/20 17:19:15 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:14 wiz Exp $
#
DISTNAME= diffpdf-1.0.0
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.qtrac.eu/
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index ebb70cb6cc1..40b8afd463e 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/02/06 00:59:50 minskim Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:14 wiz Exp $
DISTNAME= texlive-20091011-source
PKGNAME= dvipdfmx-20090708
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print converters
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
EXTRACT_SUFX= .tar.xz
diff --git a/print/epdfview/Makefile b/print/epdfview/Makefile
index 28753587ac1..fa222f8ff7f 100644
--- a/print/epdfview/Makefile
+++ b/print/epdfview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:14 wiz Exp $
#
DISTNAME= epdfview-0.1.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print
MASTER_SITES= http://trac.emma-soft.com/epdfview/chrome/site/releases/
EXTRACT_SUFX= .tar.bz2
diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index 3ab1803fba6..998bd6bcfb4 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:45:14 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../print/evince/Makefile.common"
PKGNAME= ${DISTNAME:S/evince/evince-nautilus/}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= File properties plugin for evince files
.include "options.mk"
diff --git a/print/evince/Makefile b/print/evince/Makefile
index 2e03d177b7f..bc47117c415 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.58 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:45:14 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../print/evince/Makefile.common"
-PKGREVISION= 2
+PKGREVISION= 4
COMMENT= Document viewer
GCONF_SCHEMAS= evince.schemas
@@ -18,14 +18,13 @@ CONFIGURE_ARGS+= --enable-comics
CONFIGURE_ARGS+= --disable-nautilus
GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas
-BUILDLINK_DEPMETHOD.libXt?= build
-
.include "../../devel/GConf/schemas.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../security/gnome-keyring/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.70
.include "../../sysutils/dbus-glib/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
diff --git a/print/evince/buildlink3.mk b/print/evince/buildlink3.mk
index e38795867c7..a9792d04a2d 100644
--- a/print/evince/buildlink3.mk
+++ b/print/evince/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:14 wiz Exp $
BUILDLINK_TREE+= evince
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= evince
EVINCE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.evince+= evince>=2.26.0
-BUILDLINK_ABI_DEPENDS.evince?= evince>=2.26.2nb1
+BUILDLINK_ABI_DEPENDS.evince?= evince>=2.28.2nb4
BUILDLINK_PKGSRCDIR.evince?= ../../print/evince
.include "../../devel/glib2/buildlink3.mk"
diff --git a/print/flpsed/Makefile b/print/flpsed/Makefile
index 7e1e9e2532d..6277be437ef 100644
--- a/print/flpsed/Makefile
+++ b/print/flpsed/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/02/11 23:58:34 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:15 wiz Exp $
DISTNAME= flpsed-0.3.9
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.ecademix.com/JohannesHofmann/
diff --git a/print/foomatic4-filters/Makefile b/print/foomatic4-filters/Makefile
index 536861be6f8..a6336657fba 100644
--- a/print/foomatic4-filters/Makefile
+++ b/print/foomatic4-filters/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/03/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:15 wiz Exp $
DISTNAME= foomatic-filters-4.0.4
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.linuxprinting.org/download/foomatic/
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 4b5d2e25ebc..2c3507413ff 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2010/04/09 22:04:22 tron Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/13 22:45:15 wiz Exp $
DISTNAME= ghostscript-8.71
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
MASTER_SITES+= http://ghostscript.com/releases/
diff --git a/print/ghostscript/buildlink3.mk b/print/ghostscript/buildlink3.mk
index 6a0d6972c79..d0fef39f44c 100644
--- a/print/ghostscript/buildlink3.mk
+++ b/print/ghostscript/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:15 wiz Exp $
BUILDLINK_TREE+= ghostscript
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ghostscript
GHOSTSCRIPT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ghostscript+= ghostscript>=8.63nb1
-BUILDLINK_ABI_DEPENDS.ghostscript?= ghostscript>=8.70nb3
+BUILDLINK_ABI_DEPENDS.ghostscript?= ghostscript>=8.71nb3
BUILDLINK_PKGSRCDIR.ghostscript?= ../../print/ghostscript
.include "../../graphics/png/buildlink3.mk"
diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index 6f07e09ab06..764c72b895a 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2010/04/09 19:39:06 drochner Exp $
+$NetBSD: distinfo,v 1.33 2010/06/13 22:45:15 wiz Exp $
SHA1 (ghostscript-8.71.tar.gz) = 629299140f612fac32f6289be0904107dfd1b555
RMD160 (ghostscript-8.71.tar.gz) = efce74cf22cf99b2b1a145df466e79a86e3dfefb
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = b1f71dc446f433be0b07b0511dc1028e8e3b77f3
SHA1 (patch-ad) = 8b3b743b2d6405ea35bfb16970942ecd55702401
SHA1 (patch-af) = 13aa7b5159cbd5413353b48380d5665ed879fe64
SHA1 (patch-ag) = bdfbe40c849537d84ac2b3def4a0a3a87ecc152f
-SHA1 (patch-ah) = 8cdf9cc1a62e3eb34ca8edf7bbaf9d542b612519
+SHA1 (patch-ah) = 2007d42df0bf1d93af90dedaadc882da9fc3e5bc
SHA1 (patch-ai) = ad69ddd4a4bd50cf2263ac6c6d17a59798ef3124
SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
diff --git a/print/ghostscript/patches/patch-ah b/print/ghostscript/patches/patch-ah
index 0479e726f4a..501801c6c37 100644
--- a/print/ghostscript/patches/patch-ah
+++ b/print/ghostscript/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2010/02/23 20:31:26 drochner Exp $
+$NetBSD: patch-ah,v 1.5 2010/06/13 22:45:15 wiz Exp $
--- configure.orig 2010-02-10 20:31:30.000000000 +0000
+++ configure
@@ -11,6 +11,61 @@ $NetBSD: patch-ah,v 1.4 2010/02/23 20:31:26 drochner Exp $
cat >>confdefs.h <<\_ACEOF
#define USE_LIBPAPER 1
+@@ -8739,9 +8739,9 @@ $as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-$as_echo_n "checking for png_check_sig in -lpng... " >&6; }
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++ { $as_echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
++$as_echo_n "checking for png_sig_cmp in -lpng... " >&6; }
++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -8759,11 +8759,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char png_check_sig ();
++char png_sig_cmp ();
+ int
+ main ()
+ {
+-return png_check_sig ();
++return png_sig_cmp ();
+ ;
+ return 0;
+ }
+@@ -8789,12 +8789,12 @@ $as_echo "$ac_try_echo") >&5
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+- ac_cv_lib_png_png_check_sig=yes
++ ac_cv_lib_png_png_sig_cmp=yes
+ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_cv_lib_png_png_check_sig=no
++ ac_cv_lib_png_png_sig_cmp=no
+ fi
+
+ rm -rf conftest.dSYM
+@@ -8802,9 +8802,9 @@ rm -f core conftest.err conftest.$ac_obj
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-$as_echo "$ac_cv_lib_png_png_check_sig" >&6; }
+-if test "x$ac_cv_lib_png_png_check_sig" = x""yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
++$as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; }
++if test "x$ac_cv_lib_png_png_sig_cmp" = x""yes; then
+
+
+ for ac_header in png.h
@@ -9203,7 +9203,7 @@ done
fi
diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index 1a88fb7a2fd..b6da41044bb 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:15 wiz Exp $
DISTNAME= gimp-print-4.2.7
PKGNAME= gimp-print-cups-4.2.7
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index e5307c51cdf..a9a12452d54 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:45:15 wiz Exp $
DISTNAME= gimp-print-4.2.7
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 7dc7f13ee1f..162f8225bfe 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/04/28 18:40:55 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:15 wiz Exp $
#
DISTNAME= glabels-2.2.8
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=glabels/}
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 90b60db904e..47c1d315497 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:15 wiz Exp $
#
DISTNAME= gtklp-1.2.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtklp/}
EXTRACT_SUFX= .src.tar.gz
diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 45434c0066b..cb6d81f0e37 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/02/27 01:15:13 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:15 wiz Exp $
VERSION= 5.2.5
DISTNAME= gutenprint-${VERSION}
PKGNAME= gutenprint-lib-${VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
EXTRACT_SUFX= .tar.bz2
diff --git a/print/img2eps/Makefile b/print/img2eps/Makefile
index 25a05e678ab..4cbdb606521 100644
--- a/print/img2eps/Makefile
+++ b/print/img2eps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:15 wiz Exp $
#
DISTNAME= img2eps-0.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= print graphics
MASTER_SITES= http://www.nih.at/img2eps/
diff --git a/print/imposter/Makefile b/print/imposter/Makefile
index 4ccc6cbd5bd..4d98978565d 100644
--- a/print/imposter/Makefile
+++ b/print/imposter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:58:14 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:15 wiz Exp $
#
DISTNAME= imposter-0.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=imposter/}
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index af013df1e10..de62163bc56 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2010/01/17 12:02:38 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:16 wiz Exp $
DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS}
PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xdvi/} # not xdvik
diff --git a/print/kbibtex/Makefile b/print/kbibtex/Makefile
index e6cc2c74324..1cc4ee19ef3 100644
--- a/print/kbibtex/Makefile
+++ b/print/kbibtex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:16 wiz Exp $
DISTNAME= kbibtex-0.2.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= print kde
MASTER_SITES= http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index acd0e05bd7d..d06661ecd00 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:16 wiz Exp $
#
DISTNAME= libgnomecups-0.2.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecups/0.2/}
diff --git a/print/libgnomecups/buildlink3.mk b/print/libgnomecups/buildlink3.mk
index aec6206d5cd..040264ec5f7 100644
--- a/print/libgnomecups/buildlink3.mk
+++ b/print/libgnomecups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:45:16 wiz Exp $
BUILDLINK_TREE+= libgnomecups
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomecups
LIBGNOMECUPS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnomecups+= libgnomecups>=0.2.0
-BUILDLINK_ABI_DEPENDS.libgnomecups?= libgnomecups>=0.2.3nb3
+BUILDLINK_ABI_DEPENDS.libgnomecups?= libgnomecups>=0.2.3nb4
BUILDLINK_PKGSRCDIR.libgnomecups?= ../../print/libgnomecups
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index f1205c846c9..709f118de9d 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2010/06/13 22:45:16 wiz Exp $
#
DISTNAME= libgnomeprint-2.18.6
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprint/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 6505f7df1ae..72e3c9ef5ac 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:45:16 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -8,7 +8,7 @@ BUILDLINK_TREE+= libgnomeprint
LIBGNOMEPRINT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.0
-BUILDLINK_ABI_DEPENDS.libgnomeprint+= libgnomeprint>=2.18.6nb3
+BUILDLINK_ABI_DEPENDS.libgnomeprint+= libgnomeprint>=2.18.6nb4
BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index ff86e352a3e..37116b8f017 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2010/06/13 22:45:16 wiz Exp $
#
DISTNAME= libgnomeprintui-2.18.4
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index b2c16847ffb..5928e056dc3 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:45:16 wiz Exp $
BUILDLINK_TREE+= libgnomeprintui
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgnomeprintui
LIBGNOMEPRINTUI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.8.0
-BUILDLINK_ABI_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.18.4nb3
+BUILDLINK_ABI_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.18.4nb4
BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
.include "../../devel/GConf/buildlink3.mk"
diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile
index 19d3377fc84..ba115021e6c 100644
--- a/print/libspectre/Makefile
+++ b/print/libspectre/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/05/02 11:53:14 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:16 wiz Exp $
DISTNAME= libspectre-0.2.5
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://libspectre.freedesktop.org/releases/
diff --git a/print/libspectre/buildlink3.mk b/print/libspectre/buildlink3.mk
index 0e3bb82c16f..c044f574475 100644
--- a/print/libspectre/buildlink3.mk
+++ b/print/libspectre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:16 wiz Exp $
BUILDLINK_TREE+= libspectre
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libspectre
LIBSPECTRE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libspectre+= libspectre>=0.2.1
-BUILDLINK_ABI_DEPENDS.libspectre?= libspectre>=0.2.3nb2
+BUILDLINK_ABI_DEPENDS.libspectre?= libspectre>=0.2.5nb1
BUILDLINK_PKGSRCDIR.libspectre?= ../../print/libspectre
.include "../../print/ghostscript/buildlink3.mk"
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 0a7a8300a63..09cae77c864 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2010/03/24 19:43:28 asau Exp $
+# $NetBSD: Makefile,v 1.63 2010/06/13 22:45:16 wiz Exp $
#
DISTNAME= lilypond-2.12.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= http://lilypond.org/download/sources/v2.12/
diff --git a/print/luatex/Makefile b/print/luatex/Makefile
index 35ed6620215..f58d5199df5 100644
--- a/print/luatex/Makefile
+++ b/print/luatex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/16 03:19:07 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:16 wiz Exp $
DISTNAME= luatex-beta-0.40.6
PKGNAME= ${DISTNAME:S/-beta//}
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://foundry.supelec.fr/gf/download/frsrelease/348/1318/
EXTRACT_SUFX= .tar.bz2
diff --git a/print/p5-Net-CUPS/Makefile b/print/p5-Net-CUPS/Makefile
index 7f448a918c9..042d1ef6762 100644
--- a/print/p5-Net-CUPS/Makefile
+++ b/print/p5-Net-CUPS/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/04 12:51:51 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:16 wiz Exp $
DISTNAME= Net-CUPS-0.61
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= print net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Net/}
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index d1d4a401b59..d7eb80c0975 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:16 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
PKGNAME= pdflib-${PDFLIB_BASE_VERS}
-PKGREVISION= 9
+PKGREVISION= 10
COMMENT= C library to produce PDF files
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/print/pdflib/buildlink3.mk b/print/pdflib/buildlink3.mk
index 870f2f3cbda..9fff5cd64d6 100644
--- a/print/pdflib/buildlink3.mk
+++ b/print/pdflib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:45:16 wiz Exp $
BUILDLINK_TREE+= pdflib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= pdflib
PDFLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.pdflib+= pdflib>=4.0.3nb2
-BUILDLINK_ABI_DEPENDS.pdflib+= pdflib>=4.0.3nb9
+BUILDLINK_ABI_DEPENDS.pdflib+= pdflib>=4.0.3nb10
BUILDLINK_PKGSRCDIR.pdflib?= ../../print/pdflib
.include "../../graphics/png/buildlink3.mk"
diff --git a/print/php-pdflib/Makefile b/print/php-pdflib/Makefile
index c1fb42e443a..386d022dfb8 100644
--- a/print/php-pdflib/Makefile
+++ b/print/php-pdflib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2010/06/02 15:22:01 adam Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:16 wiz Exp $
MODNAME= pdflib
PKGMODNAME= pdf
+PKGREVISION= 1
PECL_VERSION= 2.1.8
CATEGORIES+= print
COMMENT= PHP extension for PDFlib on-the-fly PDF generation
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index 8d1a5a2e744..f769e550743 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2010/02/23 20:13:40 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:17 wiz Exp $
#
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-glib-${POPPLER_VERS}
+PKGREVISION= 1
COMMENT= PDF rendering library (GLib wrapper)
MAINTAINER= reed@reedmedia.net
diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk
index 05d2f64152d..6321ceb18e4 100644
--- a/print/poppler-glib/buildlink3.mk
+++ b/print/poppler-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:45:17 wiz Exp $
BUILDLINK_TREE+= poppler-glib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler-glib
POPPLER_GLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.12.3nb1
+BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.12.4nb1
BUILDLINK_PKGSRCDIR.poppler-glib?= ../../print/poppler-glib
.include "../../devel/glib2/buildlink3.mk"
diff --git a/print/poppler-includes/Makefile b/print/poppler-includes/Makefile
index 1a8590d1b35..2e6fd3cd144 100644
--- a/print/poppler-includes/Makefile
+++ b/print/poppler-includes/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2009/09/09 19:57:06 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:17 wiz Exp $
#
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-includes-${POPPLER_VERS}
+PKGREVISION= 1
COMMENT= Poppler Xpdf includes (unsupported)
MAINTAINER= dillo@NetBSD.org
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index 0fb3a2a81cb..5cdf23caace 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2010/02/23 20:13:40 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:17 wiz Exp $
#
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-qt-${POPPLER_VERS}
+PKGREVISION= 1
COMMENT= PDF rendering library (QT wrapper)
MAINTAINER= reed@reedmedia.net
diff --git a/print/poppler-qt4/Makefile b/print/poppler-qt4/Makefile
index cf606d845b6..af691e8e623 100644
--- a/print/poppler-qt4/Makefile
+++ b/print/poppler-qt4/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2010/02/23 20:13:40 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:17 wiz Exp $
#
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-qt4-${POPPLER_VERS}
+PKGREVISION= 1
COMMENT= PDF rendering library (QT4 wrapper)
MAINTAINER= reed@reedmedia.net
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile
index ccfd675dfb8..621664877c1 100644
--- a/print/poppler-utils/Makefile
+++ b/print/poppler-utils/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2010/02/23 20:13:40 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:17 wiz Exp $
#
.include "../../print/poppler/Makefile.common"
PKGNAME= poppler-utils-${POPPLER_VERS}
+PKGREVISION= 1
COMMENT= PDF utilities (from poppler)
MAINTAINER= reed@reedmedia.net
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 144366700fb..98f8f3e302f 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2010/02/23 20:11:58 drochner Exp $
+# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:16 wiz Exp $
#
.include "../../print/poppler/Makefile.common"
+PKGREVISION= 1
COMMENT= PDF rendering library
MAINTAINER= reed@reedmedia.net
diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 85d1d2a63f7..8eefe18fa95 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2010/02/15 16:20:06 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:17 wiz Exp $
DISTNAME= pycups-${VERSION}
PKGNAME= ${PYPKGPREFIX}-cups-${VERSION}
VERSION= 1.9.47
+PKGREVISION= 1
CATEGORIES= print python
MASTER_SITES= http://cyberelk.net/tim/data/pycups/
EXTRACT_SUFX= .tar.bz2
diff --git a/print/py-cups/buildlink3.mk b/print/py-cups/buildlink3.mk
index 79c31278944..3cf887b4833 100644
--- a/print/py-cups/buildlink3.mk
+++ b/print/py-cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:45:17 wiz Exp $
BUILDLINK_TREE+= py-cups
@@ -8,7 +8,7 @@ PY_CUPS_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.py-cups+= ${PYPKGPREFIX}-cups>=1.9.44
-BUILDLINK_ABI_DEPENDS.py-cups?= ${PYPKGPREFIX}-cups>=1.9.46nb3
+BUILDLINK_ABI_DEPENDS.py-cups?= ${PYPKGPREFIX}-cups>=1.9.47nb1
BUILDLINK_PKGSRCDIR.py-cups?= ../../print/py-cups
#.include "../../print/cups/buildlink3.mk"
diff --git a/print/ruby-gnome2-gnomeprint/Makefile b/print/ruby-gnome2-gnomeprint/Makefile
index be202aa5f86..bfcf3951908 100644
--- a/print/ruby-gnome2-gnomeprint/Makefile
+++ b/print/ruby-gnome2-gnomeprint/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:17 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnomeprint-${VERSION}
COMMENT= Ruby binding of libgnomeprint
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/print/ruby-gnome2-gnomeprintui/Makefile b/print/ruby-gnome2-gnomeprintui/Makefile
index 6a9da86e147..2337f6e9bfd 100644
--- a/print/ruby-gnome2-gnomeprintui/Makefile
+++ b/print/ruby-gnome2-gnomeprintui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:17 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnomeprintui-${VERSION}
COMMENT= Ruby binding of libgnomeprintui
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/print/ruby-gnome2-poppler/Makefile b/print/ruby-gnome2-poppler/Makefile
index 1a7f26443f3..e3188aff899 100644
--- a/print/ruby-gnome2-poppler/Makefile
+++ b/print/ruby-gnome2-poppler/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:17 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-poppler-${VERSION}
COMMENT= Ruby binding of poppler-glib
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 20ccbce09c2..2336cd2e32a 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2010/02/12 08:35:28 adam Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/13 22:45:17 wiz Exp $
DISTNAME= scribus-1.3.3.14
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/}
EXTRACT_SUFX= .tar.bz2
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index be41ddcff64..0fd1b5c4fd8 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2010/01/27 22:18:35 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:17 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../print/pdflib/Makefile.common"
PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS}
-PKGREVISION= 9
+PKGREVISION= 10
COMMENT= Tcl interface to PDFlib for generating PDF files
BUILDLINK_API_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS}
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index ac15da62c72..ad945e10db8 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2010/02/19 18:19:44 minskim Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:45:18 wiz Exp $
DISTNAME= tetex-src-3.0
PKGNAME= ${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION= 43
+PKGREVISION= 44
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index f4b139d6492..b12220929ad 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2009/12/23 14:19:58 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:18 wiz Exp $
DISTNAME= transfig.3.2.5
PKGNAME= transfig-3.2.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics print
MASTER_SITES= ftp://epb.lbl.gov/xfig/alpha/
diff --git a/print/transfig/buildlink3.mk b/print/transfig/buildlink3.mk
index 413e8e005ed..a7232feb3c3 100644
--- a/print/transfig/buildlink3.mk
+++ b/print/transfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:45:18 wiz Exp $
BUILDLINK_TREE+= transfig
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= transfig
TRANSFIG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.transfig+= transfig>=3.2.4
-BUILDLINK_ABI_DEPENDS.transfig?= transfig>=3.2.5alpha7nb2
+BUILDLINK_ABI_DEPENDS.transfig?= transfig>=3.2.5nb3
BUILDLINK_PKGSRCDIR.transfig?= ../../print/transfig
.include "../../graphics/png/buildlink3.mk"
diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index 0ed9fab9667..837272c8cce 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/16 03:15:38 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:18 wiz Exp $
DISTNAME= texlive-20091011-source
PKGNAME= web2c-2009
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
EXTRACT_SUFX= .tar.xz
diff --git a/print/xetex/Makefile b/print/xetex/Makefile
index c1e02a1110e..68ab24f2259 100644
--- a/print/xetex/Makefile
+++ b/print/xetex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/01/16 03:21:45 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:18 wiz Exp $
DISTNAME= texlive-20091011-source
PKGNAME= xetex-0.9995.2
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
EXTRACT_SUFX= .tar.xz
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 47d9267aeee..75f3981f0d3 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:18 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
PKGNAME= xfce4-print-${XFCE4_VERSION}
DISTNAME= xfprint-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= print
COMMENT= Xfce print dialog
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index 555388cc25a..f7876087f92 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2010/01/17 12:02:39 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2010/06/13 22:45:18 wiz Exp $
BUILDLINK_TREE+= xfce4-print
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-print
XFCE4_PRINT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-print+= xfce4-print>=4.6.0
-BUILDLINK_ABI_DEPENDS.xfce4-print+= xfce4-print>=4.6.1
+BUILDLINK_ABI_DEPENDS.xfce4-print+= xfce4-print>=4.6.1nb1
BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print
.include "../../devel/glib2/buildlink3.mk"
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 69671637e96..c6d3bef150a 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2010/01/27 16:47:08 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2010/06/13 22:45:18 wiz Exp $
DISTNAME= xpp-1.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= print x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cups/}
diff --git a/security/fprint-demo/Makefile b/security/fprint-demo/Makefile
index 344cd65296f..170dd874f9c 100644
--- a/security/fprint-demo/Makefile
+++ b/security/fprint-demo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/24 13:26:12 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:18 wiz Exp $
DISTNAME= fprint_demo-0.4
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fprint/}
EXTRACT_SUFX= .tar.bz2
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 5a0ad6039e1..f8dd1933d0d 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/27 22:13:13 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:18 wiz Exp $
DISTNAME= fwbuilder-2.0.12
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
diff --git a/security/fwbuilder21/Makefile b/security/fwbuilder21/Makefile
index a8459e49ca5..33deae7c5c3 100644
--- a/security/fwbuilder21/Makefile
+++ b/security/fwbuilder21/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/27 22:13:02 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:18 wiz Exp $
DISTNAME= fwbuilder-2.1.19
PKGNAME= fwbuilder21-2.1.19
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index fb47e60e900..d0443267c62 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:18 wiz Exp $
#
DISTNAME= gnome-keyring-manager-2.20.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring-manager/2.20/}
EXTRACT_SUFX= .tar.bz2
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index d47193a71d1..e99da48d5ab 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2010/06/11 13:45:50 drochner Exp $
+# $NetBSD: Makefile,v 1.54 2010/06/13 22:45:18 wiz Exp $
DISTNAME= gnome-keyring-2.30.1
+PKGREVISION= 1
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.30/}
EXTRACT_SUFX= .tar.bz2
diff --git a/security/gnome-keyring/buildlink3.mk b/security/gnome-keyring/buildlink3.mk
index 584294db1e8..44d6b66a9e0 100644
--- a/security/gnome-keyring/buildlink3.mk
+++ b/security/gnome-keyring/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/06/11 13:45:50 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:18 wiz Exp $
BUILDLINK_TREE+= gnome-keyring
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-keyring
GNOME_KEYRING_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-keyring+= gnome-keyring>=0.4.0
-BUILDLINK_ABI_DEPENDS.gnome-keyring?= gnome-keyring>=2.26.3nb1
+BUILDLINK_ABI_DEPENDS.gnome-keyring?= gnome-keyring>=2.30.1nb1
BUILDLINK_PKGSRCDIR.gnome-keyring?= ../../security/gnome-keyring
# XXX see Makefile
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index b542344b8df..9149e7857d0 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/01/04 15:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:18 wiz Exp $
#
DISTNAME= gpa-0.7.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11 security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/alpha/gpa/
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index 5b7fb4bd3d8..9bdd8900cd6 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:19 wiz Exp $
#
DISTNAME= gpass-0.4.4
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpass/}
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index b6547c63632..bace1a14f84 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 17:28:34 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:19 wiz Exp $
#
DISTNAME= KeePassX-0.2.2
PKGNAME= ${DISTNAME:S/KeePassX/keepassx/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=keepassx/}
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 6a06008e6aa..1d7d7fae913 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/01/27 22:03:53 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:45:19 wiz Exp $
#
DISTNAME= kssh-0.7
-PKGREVISION= 22
+PKGREVISION= 23
CATEGORIES= security kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kssh/}
diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile
index 8472bd75d6f..9d1df5a5637 100644
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:19 wiz Exp $
DISTNAME= libfprint-0.0.6
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= security devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fprint/}
EXTRACT_SUFX= .tar.bz2
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 012d3a1cc4a..f8097f215d4 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2010/01/27 21:50:27 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:19 wiz Exp $
DISTNAME= libfwbuilder-2.0.12
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index 01ce226cfa9..f2883b7e760 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:19 wiz Exp $
BUILDLINK_TREE+= libfwbuilder
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libfwbuilder
LIBFWBUILDER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libfwbuilder+= libfwbuilder>=2.0.12
-BUILDLINK_ABI_DEPENDS.libfwbuilder+= libfwbuilder>=2.0.12nb2
+BUILDLINK_ABI_DEPENDS.libfwbuilder+= libfwbuilder>=2.0.12nb3
BUILDLINK_PKGSRCDIR.libfwbuilder?= ../../security/libfwbuilder
.include "../../devel/glib2/buildlink3.mk"
diff --git a/security/libfwbuilder21/Makefile b/security/libfwbuilder21/Makefile
index 211cb349caf..8d9b2be0a37 100644
--- a/security/libfwbuilder21/Makefile
+++ b/security/libfwbuilder21/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/27 21:47:00 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:19 wiz Exp $
DISTNAME= libfwbuilder-2.1.19
PKGNAME= libfwbuilder21-2.1.19
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
diff --git a/security/libfwbuilder21/buildlink3.mk b/security/libfwbuilder21/buildlink3.mk
index b3940980a58..3bad93b5622 100644
--- a/security/libfwbuilder21/buildlink3.mk
+++ b/security/libfwbuilder21/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:45:19 wiz Exp $
BUILDLINK_TREE+= libfwbuilder21
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libfwbuilder21
LIBFWBUILDER21_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libfwbuilder21+= libfwbuilder21>=2.1.16
-BUILDLINK_ABI_DEPENDS.libfwbuilder21+= libfwbuilder21>=2.1.19nb2
+BUILDLINK_ABI_DEPENDS.libfwbuilder21+= libfwbuilder21>=2.1.19nb3
BUILDLINK_PKGSRCDIR.libfwbuilder21?= ../../security/libfwbuilder21
.include "../../devel/glib2/buildlink3.mk"
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index 8d5589faaa6..22f35b35bb3 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2010/01/17 12:02:41 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:19 wiz Exp $
.include "../../security/nessus/Makefile.common"
DISTNAME= nessus-core-${VERS}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= Core module of the Nessus Network Security Scanner
diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk
index 1f3e7c5627c..2a8bbe9138d 100644
--- a/security/nessus-core/buildlink3.mk
+++ b/security/nessus-core/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/01/17 12:02:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:19 wiz Exp $
BUILDLINK_TREE+= nessus-core
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= nessus-core
NESSUS_CORE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.nessus-core+= nessus-core>=2.2.11
-BUILDLINK_ABI_DEPENDS.nessus-core?= nessus-core>=2.2.11nb3
+BUILDLINK_ABI_DEPENDS.nessus-core?= nessus-core>=2.2.11nb4
BUILDLINK_PKGSRCDIR.nessus-core?= ../../security/nessus-core
.include "../../security/libnasl/buildlink3.mk"
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 63d59628a98..3deff89c8f1 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2010/01/17 12:02:42 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:19 wiz Exp $
.include "../../security/nessus/Makefile.common"
DISTNAME= nessus-plugins-GPL-${VERS}
PKGNAME= nessus-plugins-${VERS}
-PKGREVISION= 3
+PKGREVISION= 4
# nmap.nasl was removed from the pack,
# http://www.nessus.org/documentation/?doc=nmap-usage
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} nmap.nasl
diff --git a/security/openvas-client/Makefile b/security/openvas-client/Makefile
index 88c20707faf..f72b2ca57e0 100644
--- a/security/openvas-client/Makefile
+++ b/security/openvas-client/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/17 12:02:42 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:19 wiz Exp $
#
DISTNAME= openvas-client-2.0.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/552/
diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile
index ffbfd00db65..d28e75ac379 100644
--- a/security/pinentry-gtk2/Makefile
+++ b/security/pinentry-gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/02/22 17:20:39 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:19 wiz Exp $
#
DISTNAME= pinentry-0.7.6
PKGNAME= pinentry-gtk2-0.7.6
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
diff --git a/security/pinentry-qt/Makefile b/security/pinentry-qt/Makefile
index daf0da8bdf7..0d3df30358b 100644
--- a/security/pinentry-qt/Makefile
+++ b/security/pinentry-qt/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/02/22 17:20:39 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:19 wiz Exp $
#
DISTNAME= pinentry-0.7.6
PKGNAME= pinentry-qt-0.7.6
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
diff --git a/security/pinentry-qt4/Makefile b/security/pinentry-qt4/Makefile
index 5ae438353cd..98c56f08055 100644
--- a/security/pinentry-qt4/Makefile
+++ b/security/pinentry-qt4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2010/02/25 11:30:03 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:19 wiz Exp $
#
DISTNAME= pinentry-0.7.6
PKGNAME= pinentry-qt4-0.7.6
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
diff --git a/security/policykit-gnome/Makefile b/security/policykit-gnome/Makefile
index a2637a3dd6a..39b93ef8690 100644
--- a/security/policykit-gnome/Makefile
+++ b/security/policykit-gnome/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2010/06/12 14:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:20 wiz Exp $
#
POLICYKIT_GNOME_VER= 0.9.2
DISTNAME= PolicyKit-gnome-${POLICYKIT_GNOME_VER}
PKGNAME= policykit-gnome-${POLICYKIT_GNOME_VER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= http://hal.freedesktop.org/releases/
EXTRACT_SUFX= .tar.bz2
diff --git a/security/policykit-gnome/PLIST b/security/policykit-gnome/PLIST
index 3b0d36ab8d2..876e9b2cd88 100644
--- a/security/policykit-gnome/PLIST
+++ b/security/policykit-gnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:13:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/06/13 22:45:20 wiz Exp $
bin/polkit-gnome-authorization
bin/polkit-gnome-example
include/PolicyKit/polkit-gnome/polkit-gnome-action.h
@@ -15,9 +15,6 @@ share/dbus-1/services/gnome-org.freedesktop.PolicyKit.AuthenticationAgent.servic
share/dbus-1/services/org.gnome.PolicyKit.AuthorizationManager.service
share/dbus-1/services/org.gnome.PolicyKit.service
share/gconf/schemas/polkit-gnome.schemas
-share/gtk-doc/html/polkit-gnome/PolKitGnomeAction.html
-share/gtk-doc/html/polkit-gnome/PolKitGnomeContext.html
-share/gtk-doc/html/polkit-gnome/PolKitGnomeToggleAction.html
share/gtk-doc/html/polkit-gnome/auth-details.png
share/gtk-doc/html/polkit-gnome/auth-retain-always.png
share/gtk-doc/html/polkit-gnome/auth-retain-session.png
@@ -30,10 +27,13 @@ share/gtk-doc/html/polkit-gnome/index.html
share/gtk-doc/html/polkit-gnome/index.sgml
share/gtk-doc/html/polkit-gnome/left.png
share/gtk-doc/html/polkit-gnome/license.html
+share/gtk-doc/html/polkit-gnome/polkit-gnome-Authentication-Dialogs.html
share/gtk-doc/html/polkit-gnome/polkit-gnome-example-auth-dialog-twiddle.png
share/gtk-doc/html/polkit-gnome/polkit-gnome-example-screenshot-authorized.png
share/gtk-doc/html/polkit-gnome/polkit-gnome-example-screenshot.png
-share/gtk-doc/html/polkit-gnome/polkit-gnome-polkit-gnome-auth.html
+share/gtk-doc/html/polkit-gnome/polkit-gnome-polkit-gnome-action.html
+share/gtk-doc/html/polkit-gnome/polkit-gnome-polkit-gnome-context.html
+share/gtk-doc/html/polkit-gnome/polkit-gnome-polkit-gnome-toggle-action.html
share/gtk-doc/html/polkit-gnome/polkit-gnome.devhelp
share/gtk-doc/html/polkit-gnome/polkit-gnome.devhelp2
share/gtk-doc/html/polkit-gnome/ref-auth-daemon.html
diff --git a/security/polkit-qt/Makefile b/security/polkit-qt/Makefile
index cb74cbaec41..4c2faaa5464 100644
--- a/security/polkit-qt/Makefile
+++ b/security/polkit-qt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/04/09 23:47:19 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:20 wiz Exp $
DISTNAME= polkit-qt-0.9.3
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_KDE:=apps/KDE4.x/admin/}
EXTRACT_SUFX= .tar.bz2
diff --git a/security/polkit-qt/buildlink3.mk b/security/polkit-qt/buildlink3.mk
index 54bd3affa26..cfc382b5d89 100644
--- a/security/polkit-qt/buildlink3.mk
+++ b/security/polkit-qt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:20 wiz Exp $
BUILDLINK_TREE+= polkit-qt
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= polkit-qt
POLKIT_QT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.polkit-qt+= polkit-qt>=0.9.2
-BUILDLINK_ABI_DEPENDS.polkit-qt?= polkit-qt>=0.9.2nb1
+BUILDLINK_ABI_DEPENDS.polkit-qt?= polkit-qt>=0.9.3nb1
BUILDLINK_PKGSRCDIR.polkit-qt?= ../../security/polkit-qt
.include "../../security/policykit/buildlink3.mk"
diff --git a/security/putty-devel/Makefile b/security/putty-devel/Makefile
index 18853e2e9d3..012a29d738d 100644
--- a/security/putty-devel/Makefile
+++ b/security/putty-devel/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/06/10 21:18:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:20 wiz Exp $
#
DISTNAME= putty-0.60-2009-09-06
PKGNAME= putty-0.6.20090906
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/ahoka/dist/
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index c8f6e078d19..27641fbc019 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:20 wiz Exp $
DISTNAME= qca-tls-1.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= security
MASTER_SITES= http://delta.affinix.com/download/qca/
EXTRACT_SUFX= .tar.bz2
diff --git a/security/qca/Makefile b/security/qca/Makefile
index c3f51cad80c..4892c94e790 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/27 17:07:18 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:20 wiz Exp $
DISTNAME= qca-1.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= security
MASTER_SITES= http://delta.affinix.com/download/qca/
EXTRACT_SUFX= .tar.bz2
diff --git a/security/qca/buildlink3.mk b/security/qca/buildlink3.mk
index cba3dbfdea8..9172d6ad5aa 100644
--- a/security/qca/buildlink3.mk
+++ b/security/qca/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:20 wiz Exp $
#
BUILDLINK_TREE+= qca
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= qca
QCA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qca+= qca>=1.0
-BUILDLINK_ABI_DEPENDS.qca?= qca>=1.0nb5
+BUILDLINK_ABI_DEPENDS.qca?= qca>=1.0nb6
BUILDLINK_PKGSRCDIR.qca?= ../../security/qca
.include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/security/qca2-ossl/Makefile b/security/qca2-ossl/Makefile
index e5a1026a6ab..5915a935466 100644
--- a/security/qca2-ossl/Makefile
+++ b/security/qca2-ossl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/27 17:10:30 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:20 wiz Exp $
DISTNAME= qca-ossl-2.0.0-beta3
PKGNAME= qca2-ossl-${DISTNAME:S/-beta/beta/:C/.*-//}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= security
MASTER_SITES= http://delta.affinix.com/download/qca/2.0/plugins/
EXTRACT_SUFX= .tar.bz2
diff --git a/security/qca2/Makefile b/security/qca2/Makefile
index ad8b5f5079c..1abfc98ea8c 100644
--- a/security/qca2/Makefile
+++ b/security/qca2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:20 wiz Exp $
DISTNAME= qca-2.0.2
PKGNAME= qca2-${DISTNAME:C/.*-//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= http://delta.affinix.com/download/qca/2.0/
EXTRACT_SUFX= .tar.bz2
diff --git a/security/qca2/buildlink3.mk b/security/qca2/buildlink3.mk
index 4d7eae753a8..b36863563a8 100644
--- a/security/qca2/buildlink3.mk
+++ b/security/qca2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:20 wiz Exp $
#
BUILDLINK_TREE+= qca2
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= qca2
QCA2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qca2+= qca2>=2.0.0
-BUILDLINK_ABI_DEPENDS.qca2?= qca2>=2.0.2nb2
+BUILDLINK_ABI_DEPENDS.qca2?= qca2>=2.0.2nb3
BUILDLINK_PKGSRCDIR.qca2?= ../../security/qca2
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index 37d64f6f901..15b30e5e0e9 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:20 wiz Exp $
DISTNAME= seahorse-plugins-2.28.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse-plugins/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index f4bb13b9342..c055cb15d8d 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2010/01/15 20:11:34 drochner Exp $
+# $NetBSD: Makefile,v 1.87 2010/06/13 22:45:20 wiz Exp $
DISTNAME= seahorse-2.28.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk
index c210710a0b6..a449a6901fa 100644
--- a/security/seahorse/buildlink3.mk
+++ b/security/seahorse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/08/26 19:56:58 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:20 wiz Exp $
BUILDLINK_TREE+= seahorse
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= seahorse
SEAHORSE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.seahorse+= seahorse>=2.24.1
-BUILDLINK_ABI_DEPENDS.seahorse?= seahorse>=2.26.2nb1
+BUILDLINK_ABI_DEPENDS.seahorse?= seahorse>=2.28.1nb2
BUILDLINK_PKGSRCDIR.seahorse?= ../../security/seahorse
.include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/sysutils/bacula-qt-console/Makefile b/sysutils/bacula-qt-console/Makefile
index a8b922cfbe2..cce52c0acfd 100644
--- a/sysutils/bacula-qt-console/Makefile
+++ b/sysutils/bacula-qt-console/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/03/09 07:06:01 adam Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:20 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-qt-console-/}
+PKGREVISION= 1
COMMENT= Qt-based console for Bacula - The Network Backup Solution
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/sysutils/bacula-tray-monitor/Makefile b/sysutils/bacula-tray-monitor/Makefile
index d3142565a7c..3c44b7b9233 100644
--- a/sysutils/bacula-tray-monitor/Makefile
+++ b/sysutils/bacula-tray-monitor/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/10/28 09:30:22 adam Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:20 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-tray-monitor-/}
+PKGREVISION= 1
COMMENT= System tray monitor for Bacula - The Network Backup Solution
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile
index 14138176c30..8318dcd7909 100644
--- a/sysutils/bacula-wx-console/Makefile
+++ b/sysutils/bacula-wx-console/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/03/09 07:06:01 adam Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:21 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-wx-console-/}
+PKGREVISION= 1
COMMENT= wxWindows-based console for Bacula - The Network Backup Solution
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/sysutils/brasero-nautilus/Makefile b/sysutils/brasero-nautilus/Makefile
index 45e83035a70..b9ee5d8d58c 100644
--- a/sysutils/brasero-nautilus/Makefile
+++ b/sysutils/brasero-nautilus/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/12/16 17:26:48 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:21 wiz Exp $
#
DISTNAME= brasero-2.28.3
PKGNAME= brasero-nautilus-2.28.3
+PKGREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/brasero/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 12aec78add5..a35344c5353 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/04/09 19:47:32 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:21 wiz Exp $
#
DISTNAME= brasero-2.28.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/brasero/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/brasero/buildlink3.mk b/sysutils/brasero/buildlink3.mk
index 9cbf391ed35..4718bf76845 100644
--- a/sysutils/brasero/buildlink3.mk
+++ b/sysutils/brasero/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/12/09 19:01:05 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:21 wiz Exp $
BUILDLINK_TREE+= brasero
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= brasero
BRASERO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.brasero+= brasero>=2.26.0
-BUILDLINK_ABI_DEPENDS.brasero?= brasero>=2.26.3nb1
+BUILDLINK_ABI_DEPENDS.brasero?= brasero>=2.28.3nb3
BUILDLINK_PKGSRCDIR.brasero?= ../../sysutils/brasero
.include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/btpin-qt/Makefile b/sysutils/btpin-qt/Makefile
index 8262893fa1f..2f63b4e9b05 100644
--- a/sysutils/btpin-qt/Makefile
+++ b/sysutils/btpin-qt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:21 wiz Exp $
DISTNAME= btpin-qt-1.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://homepages.rya-online.net/plunky/
diff --git a/sysutils/bubblemon/Makefile b/sysutils/bubblemon/Makefile
index 2f892687e1a..3ea5c880ccd 100644
--- a/sysutils/bubblemon/Makefile
+++ b/sysutils/bubblemon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/05/30 20:43:35 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:21 wiz Exp $
#
DISTNAME= bubblemon-dockapp-1.46
PKGNAME= ${DISTNAME:S/-dockapp//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/
diff --git a/sysutils/dbus-qt3/Makefile b/sysutils/dbus-qt3/Makefile
index ab4233edd20..5e76abffbc9 100644
--- a/sysutils/dbus-qt3/Makefile
+++ b/sysutils/dbus-qt3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:21 wiz Exp $
#
DISTNAME= dbus-qt3-0.70
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/dbus-qt3/buildlink3.mk b/sysutils/dbus-qt3/buildlink3.mk
index 676df3ec5e8..6bcfd0f7e23 100644
--- a/sysutils/dbus-qt3/buildlink3.mk
+++ b/sysutils/dbus-qt3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:21 wiz Exp $
BUILDLINK_TREE+= dbus-qt3
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= dbus-qt3
DBUS_QT3_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.dbus-qt3+= dbus-qt3>=0.70
-BUILDLINK_ABI_DEPENDS.dbus-qt3?= dbus-qt3>=0.70nb2
+BUILDLINK_ABI_DEPENDS.dbus-qt3?= dbus-qt3>=0.70nb3
BUILDLINK_PKGSRCDIR.dbus-qt3?= ../../sysutils/dbus-qt3
.include "../../sysutils/dbus/buildlink3.mk"
diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile
index 329d88305b4..f18dd41c9cf 100644
--- a/sysutils/dvdisaster/Makefile
+++ b/sysutils/dvdisaster/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:58:17 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:21 wiz Exp $
#
DISTNAME= dvdisaster-0.70.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdisaster/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index bc3e5464360..07912c28e74 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/04/30 08:12:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:21 wiz Exp $
#
DISTNAME= filelight-1.0
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= sysutils
MASTER_SITES= http://www.methylblue.com/filelight/packages/
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 826c808e124..fe9285c03b4 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:21 wiz Exp $
DISTNAME= FSViewer.app-0.2.5
PKGNAME= FSViewer-0.2.5
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= sysutils x11 windowmaker
MASTER_SITES= http://www.bayernline.de/~gscholz/linux/fsviewer/
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index 2522f9e999d..bbbc664f3ab 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:21 wiz Exp $
#
DISTNAME= ftwin-0.8.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://download.meroware.org/ftwin/
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 971eee9aade..22de612343c 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.46 2010/05/19 18:22:14 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:45:21 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../sysutils/cdrdao/Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
PKGNAME= gcdmaster-${CDRDAO_VER}
COMMENT= Gnome UI frontend to cdrdao
diff --git a/sysutils/gkrellm-est/Makefile b/sysutils/gkrellm-est/Makefile
index d19f4c6091a..db673111a47 100644
--- a/sysutils/gkrellm-est/Makefile
+++ b/sysutils/gkrellm-est/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/27 18:57:54 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gkrellm-est-20040710
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://cubidou.nerim.net/gkrellm-est/
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index b085c862c9d..a566ec52bef 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.60 2010/06/13 22:45:22 wiz Exp $
.include "Makefile.common"
-PKGREVISION= 2
+PKGREVISION= 3
GKRELLM_PKGBASE= gkrellm
WRKSRC= ${GKRELLM_SRCDIR}
diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk
index 9d389d35899..11390f1a743 100644
--- a/sysutils/gkrellm/buildlink3.mk
+++ b/sysutils/gkrellm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:22 wiz Exp $
BUILDLINK_TREE+= gkrellm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gkrellm
GKRELLM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gkrellm+= gkrellm>=2.1.22
-BUILDLINK_ABI_DEPENDS.gkrellm?= gkrellm>=2.2.10nb2
+BUILDLINK_ABI_DEPENDS.gkrellm?= gkrellm>=2.2.10nb3
BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm
.include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/gnome-commander/Makefile b/sysutils/gnome-commander/Makefile
index b55b48b4dcf..39c5ee5de48 100644
--- a/sysutils/gnome-commander/Makefile
+++ b/sysutils/gnome-commander/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/02/24 18:45:43 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gnome-commander-1.2.8.5
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-commander/1.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
index 030e1732603..def611b6191 100644
--- a/sysutils/gnome-device-manager/Makefile
+++ b/sysutils/gnome-device-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 19:03:58 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gnome-device-manager-0.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 79530c06fdc..0ddcdfa25ff 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gnome-mount-0.8
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/gnome-mount/buildlink3.mk b/sysutils/gnome-mount/buildlink3.mk
index 549e2820f9a..3bc62026bd0 100644
--- a/sysutils/gnome-mount/buildlink3.mk
+++ b/sysutils/gnome-mount/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:22 wiz Exp $
BUILDLINK_TREE+= gnome-mount
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-mount
GNOME_MOUNT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-mount+= gnome-mount>=0.8nb1
-BUILDLINK_ABI_DEPENDS.gnome-mount?= gnome-mount>=0.8nb2
+BUILDLINK_ABI_DEPENDS.gnome-mount?= gnome-mount>=0.8nb3
BUILDLINK_PKGSRCDIR.gnome-mount?= ../../sysutils/gnome-mount
#.include "../../security/gnome-keyring/buildlink3.mk"
diff --git a/sysutils/gnome-nds-thumbnailer/Makefile b/sysutils/gnome-nds-thumbnailer/Makefile
index 55896cb338d..f9eeeac9aff 100644
--- a/sysutils/gnome-nds-thumbnailer/Makefile
+++ b/sysutils/gnome-nds-thumbnailer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:58:18 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gnome-nds-thumbnailer-1.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils graphics emulators
MASTER_SITES= http://download.gnome.org/sources/gnome-nds-thumbnailer/1.2/
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index ed017d05f18..8947d84b267 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gnome-pkgview-1.0.6
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 770261f37df..2439fea8307 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gnome-power-manager-2.24.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-power-manager/2.24/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 0bec7945a9f..db55e0ff67e 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gnome-settings-daemon-2.28.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 8d205104fa4..019c570a6a6 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:58:18 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gnome-system-monitor-2.26.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 8da036b0b29..4afcdf93f89 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:19 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:22 wiz Exp $
#
DISTNAME= gnome-system-tools-2.22.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-system-tools/2.22/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-vfs-monikers/Makefile b/sysutils/gnome-vfs-monikers/Makefile
index a9dcae73102..2db3fc8923a 100644
--- a/sysutils/gnome-vfs-monikers/Makefile
+++ b/sysutils/gnome-vfs-monikers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:23 wiz Exp $
#
DISTNAME= gnome-vfs-monikers-2.15.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs-monikers/2.15/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index b83c150cd87..f3993a99693 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2010/06/11 13:25:27 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/13 22:45:22 wiz Exp $
+
+PKGREVISION= 1
PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in
PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index 8ae9be506b5..6349bbbf4f7 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/12/13 09:34:33 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:45:23 wiz Exp $
BUILDLINK_TREE+= gnome-vfs
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-vfs
GNOME_VFS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.0
-BUILDLINK_ABI_DEPENDS.gnome-vfs+= gnome-vfs>=2.20.1nb1
+BUILDLINK_ABI_DEPENDS.gnome-vfs+= gnome-vfs>=2.24.3nb1
BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs
.include "../../devel/GConf/buildlink3.mk"
diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile
index 33ac4b22b65..88614f1e71e 100644
--- a/sysutils/gnome-vfsmm/Makefile
+++ b/sysutils/gnome-vfsmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/03/22 10:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:23 wiz Exp $
DISTNAME= gnome-vfsmm-2.26.0
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfsmm/2.26/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-vfsmm/buildlink3.mk b/sysutils/gnome-vfsmm/buildlink3.mk
index 2491b8c62d5..8a5f453fe02 100644
--- a/sysutils/gnome-vfsmm/buildlink3.mk
+++ b/sysutils/gnome-vfsmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:23 wiz Exp $
BUILDLINK_TREE+= gnome-vfsmm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-vfsmm
GNOME_VFSMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-vfsmm+= gnome-vfsmm>=2.10.0
-BUILDLINK_ABI_DEPENDS.gnome-vfsmm+= gnome-vfsmm>=2.20.0nb1
+BUILDLINK_ABI_DEPENDS.gnome-vfsmm+= gnome-vfsmm>=2.26.0nb1
BUILDLINK_PKGSRCDIR.gnome-vfsmm?= ../../sysutils/gnome-vfsmm
.include "../../devel/glibmm/buildlink3.mk"
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index 9c3338095b4..b199f44748a 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:23 wiz Exp $
#
DISTNAME= gnome-volume-manager-2.24.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-volume-manager/2.24/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index c83c267ae35..e4b4fe5e1e5 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/08/26 20:22:49 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:23 wiz Exp $
DISTNAME= grun-0.9.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= http://grun.googlecode.com/files/
diff --git a/sysutils/gst-plugins0.10-gnomevfs/Makefile b/sysutils/gst-plugins0.10-gnomevfs/Makefile
index ec889819179..6591125b6de 100644
--- a/sysutils/gst-plugins0.10-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.10-gnomevfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/06/20 01:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:23 wiz Exp $
#
GST_PLUGINS0.10_NAME= gnomevfs
@@ -9,5 +9,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../multimedia/gst-plugins0.10-base/Makefile.common"
+PKGREVISION= 1
+
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile
index 6a19fcc873e..357b8f3151b 100644
--- a/sysutils/gtk-send-pr/Makefile
+++ b/sysutils/gtk-send-pr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/01/27 19:07:31 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:23 wiz Exp $
#
DISTNAME= gtk-send-pr-0.4.9
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://download.berlios.de/gtk-send-pr/
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index 123f273d588..9f496faf45d 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/06/11 13:53:02 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:23 wiz Exp $
#
DISTNAME= gvfs-1.6.2
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index 31974d13746..3231e1feadb 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/27 19:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:23 wiz Exp $
#
DISTNAME= idesk-0.7.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= sysutils x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=idesk/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 1fade2f6b33..14726f72af1 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:45:23 wiz Exp $
#
DISTNAME= k3b-1.0.5
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 276a020b1bc..daaf02e6171 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:23 wiz Exp $
DISTNAME= kdirstat-2.4.4
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= sysutils kde
MASTER_SITES= http://kdirstat.sourceforge.net/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile
index 03e8b3cec8b..ca78cca6477 100644
--- a/sysutils/krusader/Makefile
+++ b/sysutils/krusader/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/01/27 19:27:08 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:23 wiz Exp $
#
DISTNAME= krusader-1.90.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= kde sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=krusader/}
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 491f5d1d13f..c743adc26dd 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 19:12:29 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:24 wiz Exp $
#
DISTNAME= libgksu-2.0.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://people.debian.org/~kov/gksu/
diff --git a/sysutils/libgksu/buildlink3.mk b/sysutils/libgksu/buildlink3.mk
index 749ac08e5a8..e16b53849eb 100644
--- a/sysutils/libgksu/buildlink3.mk
+++ b/sysutils/libgksu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:24 wiz Exp $
BUILDLINK_TREE+= libgksu
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgksu
LIBGKSU_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgksu+= libgksu>=2.0.7
-BUILDLINK_ABI_DEPENDS.libgksu?= libgksu>=2.0.7nb2
+BUILDLINK_ABI_DEPENDS.libgksu?= libgksu>=2.0.7nb3
BUILDLINK_PKGSRCDIR.libgksu?= ../../sysutils/libgksu
.include "../../security/gnome-keyring/buildlink3.mk"
diff --git a/sysutils/libnotify/Makefile b/sysutils/libnotify/Makefile
index 8d9ac8fe980..ec2fb98b737 100644
--- a/sysutils/libnotify/Makefile
+++ b/sysutils/libnotify/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:56:56 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:24 wiz Exp $
#
DISTNAME= libnotify-0.4.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.galago-project.org/files/releases/source/libnotify/
diff --git a/sysutils/libnotify/buildlink3.mk b/sysutils/libnotify/buildlink3.mk
index d6e31dc2fc9..cb8175e529b 100644
--- a/sysutils/libnotify/buildlink3.mk
+++ b/sysutils/libnotify/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/10/30 16:54:07 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:45:24 wiz Exp $
BUILDLINK_TREE+= libnotify
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libnotify
LIBNOTIFY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libnotify+= libnotify>=0.3.2
-BUILDLINK_ABI_DEPENDS.libnotify?= libnotify>=0.4.5nb1
+BUILDLINK_ABI_DEPENDS.libnotify?= libnotify>=0.4.5nb2
BUILDLINK_PKGSRCDIR.libnotify?= ../../sysutils/libnotify
.include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 47eb0c7dd89..a2305e8d1ef 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2010/06/13 22:45:24 wiz Exp $
#
DISTNAME= nautilus-cd-burner-2.24.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.24/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/nautilus-sendto/Makefile b/sysutils/nautilus-sendto/Makefile
index 4f7d8f59b3c..9653f86f653 100644
--- a/sysutils/nautilus-sendto/Makefile
+++ b/sysutils/nautilus-sendto/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:24 wiz Exp $
#
DISTNAME= nautilus-sendto-1.1.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus-sendto/1.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index ce7271eacb3..ac19d304d98 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2010/06/11 08:40:03 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2010/06/13 22:45:24 wiz Exp $
#
DISTNAME= nautilus-2.28.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index 02ce8429222..f9e076d2c80 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2009/08/26 19:56:54 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2010/06/13 22:45:24 wiz Exp $
BUILDLINK_TREE+= nautilus
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= nautilus
NAUTILUS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.nautilus+= nautilus>=2.12.1nb1
-BUILDLINK_ABI_DEPENDS.nautilus?= nautilus>=2.26.3nb2
+BUILDLINK_ABI_DEPENDS.nautilus?= nautilus>=2.28.4nb2
BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus
.include "../../devel/GConf/buildlink3.mk"
diff --git a/sysutils/notification-daemon/Makefile b/sysutils/notification-daemon/Makefile
index 396495b5b93..88fbf566660 100644
--- a/sysutils/notification-daemon/Makefile
+++ b/sysutils/notification-daemon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:58:20 sno Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:24 wiz Exp $
#
DISTNAME= notification-daemon-0.4.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/
diff --git a/sysutils/pcmanfm/Makefile b/sysutils/pcmanfm/Makefile
index 7b86d1915a0..d98add2488e 100644
--- a/sysutils/pcmanfm/Makefile
+++ b/sysutils/pcmanfm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:58:20 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:24 wiz Exp $
#
DISTNAME= pcmanfm-0.1.8.9
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pcmanfm/}
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index a160b0cd91e..29ebd9adcf1 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/05/25 21:05:22 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:24 wiz Exp $
DISTNAME= pfstat-2.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils net
MASTER_SITES= http://www.benzedrine.cx/
diff --git a/sysutils/py-notify/Makefile b/sysutils/py-notify/Makefile
index ccf90c4d3ca..508e8eb3b1f 100644
--- a/sysutils/py-notify/Makefile
+++ b/sysutils/py-notify/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2010/02/10 21:09:05 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:25 wiz Exp $
#
DISTNAME= notify-python-0.1.1
PKGNAME= ${PYPKGPREFIX}-notify-0.1.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= \
http://www.galago-project.org/files/releases/source/notify-python/
diff --git a/sysutils/py-notify/buildlink3.mk b/sysutils/py-notify/buildlink3.mk
index fb32f49cde1..3a102e65b8f 100644
--- a/sysutils/py-notify/buildlink3.mk
+++ b/sysutils/py-notify/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:25 wiz Exp $
BUILDLINK_TREE+= py-notify
@@ -8,7 +8,7 @@ PY_NOTIFY_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.py-notify+= ${PYPKGPREFIX}-notify>=0.1.1
-BUILDLINK_ABI_DEPENDS.py-notify?= ${PYPKGPREFIX}-notify>=0.1.1nb2
+BUILDLINK_ABI_DEPENDS.py-notify?= ${PYPKGPREFIX}-notify>=0.1.1nb4
BUILDLINK_PKGSRCDIR.py-notify?= ../../sysutils/py-notify
.include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index ccc6065df80..c9a6114fb20 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2009/12/10 16:28:44 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2010/06/13 22:45:25 wiz Exp $
#
DISTNAME= rox-filer-2.10
PKGNAME= rox-2.10
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/ruby-gnome2-gnomevfs/Makefile b/sysutils/ruby-gnome2-gnomevfs/Makefile
index 30282dce2e4..1b409a329b7 100644
--- a/sysutils/ruby-gnome2-gnomevfs/Makefile
+++ b/sysutils/ruby-gnome2-gnomevfs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/10/28 13:43:58 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:25 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnomevfs-${VERSION}
COMMENT= Ruby binding of gnomevfs
+PKGREVISION= 1
CATEGORIES= sysutils
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/sysutils/screentest/Makefile b/sysutils/screentest/Makefile
index 1a6f6985e1f..00e6665e0c2 100644
--- a/sysutils/screentest/Makefile
+++ b/sysutils/screentest/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2009/12/03 19:10:49 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:25 wiz Exp $
DISTNAME= screentest-2.0
+PKGREVISION= 1
CATEGORIES= sysutils x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=screentest/}
diff --git a/sysutils/strigi/Makefile b/sysutils/strigi/Makefile
index 9508a845846..14695f01685 100644
--- a/sysutils/strigi/Makefile
+++ b/sysutils/strigi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:25 wiz Exp $
DISTNAME= strigi-0.6.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=strigi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index 3f287a47335..697d25d0451 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2010/02/17 15:39:02 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:25 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../sysutils/ups-nut/Makefile.common"
PKGNAME= ${DISTNAME:S/nut/ups-nut-cgi/}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Network UPS Tools CGI scripts
DEPENDS+= ups-nut-2.*:../../sysutils/ups-nut
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 46ccd860bda..75cf7b60785 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2009/08/26 19:58:20 sno Exp $
+# $NetBSD: Makefile,v 1.53 2010/06/13 22:45:25 wiz Exp $
DISTNAME= xcdroast-${DIST_VER}
PKGNAME= xcdroast-${DIST_VER:S/alpha/a/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/}
diff --git a/sysutils/xfce4-appfinder/Makefile b/sysutils/xfce4-appfinder/Makefile
index 2c9d6b76689..6f1bb0ae4b5 100644
--- a/sysutils/xfce4-appfinder/Makefile
+++ b/sysutils/xfce4-appfinder/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:25 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-appfinder-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= Xfce application finder
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index ff1a6981749..2d9de4dfacc 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/03/22 15:46:02 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:25 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 0.5.1
DISTNAME= xfce4-battery-plugin-${XFCE4_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-battery-plugin/
COMMENT= Xfce battey monitor plugin
diff --git a/sysutils/xfce4-battery-plugin/buildlink3.mk b/sysutils/xfce4-battery-plugin/buildlink3.mk
index 80faadb95da..6fcbb00f7f9 100644
--- a/sysutils/xfce4-battery-plugin/buildlink3.mk
+++ b/sysutils/xfce4-battery-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:25 wiz Exp $
BUILDLINK_TREE+= xfce4-battery-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-battery-plugin
XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-battery-plugin+= xfce4-battery-plugin>=0.5.0nb2
-BUILDLINK_ABI_DEPENDS.xfce4-battery-plugin?= xfce4-battery-plugin>=0.5.1nb2
+BUILDLINK_ABI_DEPENDS.xfce4-battery-plugin?= xfce4-battery-plugin>=0.5.1nb3
BUILDLINK_PKGSRCDIR.xfce4-battery-plugin?= ../../sysutils/xfce4-battery-plugin
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 7db114e91a8..793ce1168a4 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:25 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.3.0
DISTNAME= xfce4-cpugraph-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-cpugraph-plugin/
COMMENT= Xfce CPU load plugin
diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
index c4a8a2ecfcc..ead42d83dd6 100644
--- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
+++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:25 wiz Exp $
BUILDLINK_TREE+= xfce4-cpugraph-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-cpugraph-plugin
XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+= xfce4-cpugraph-plugin>=0.3.0
-BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin?= xfce4-cpugraph-plugin>=0.3.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin?= xfce4-cpugraph-plugin>=0.3.0nb2
BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?= ../../sysutils/xfce4-cpugraph-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index 32c789f1c39..28e312a1c21 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:25 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 2.1.0
DISTNAME= xfce4-diskperf-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-diskperf-plugin/
COMMENT= Xfce disk performance plugin
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
index 92732a2395e..8332614713f 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk
+++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:25 wiz Exp $
BUILDLINK_TREE+= xfce4-diskperf-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-diskperf-plugin
XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+= xfce4-diskperf-plugin>=2.1.0
-BUILDLINK_ABI_DEPENDS.xfce4-diskperf-plugin?= xfce4-diskperf-plugin>=2.1.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-diskperf-plugin?= xfce4-diskperf-plugin>=2.1.0nb2
BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?= ../../sysutils/xfce4-diskperf-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index c00a7949fa7..5f80806a421 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:26 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.4.0
DISTNAME= xfce4-fsguard-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-fsguard-plugin/
COMMENT= Xfce disk space plugin
diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
index a43463132fd..fe11beda500 100644
--- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk
+++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:26 wiz Exp $
BUILDLINK_TREE+= xfce4-fsguard-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-fsguard-plugin
XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+= xfce4-fsguard-plugin>=0.4.0
-BUILDLINK_ABI_DEPENDS.xfce4-fsguard-plugin?= xfce4-fsguard-plugin>=0.4.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-fsguard-plugin?= xfce4-fsguard-plugin>=0.4.0nb2
BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?= ../../sysutils/xfce4-fsguard-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 9d7ef228805..42af189fb19 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:26 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 3.1
DISTNAME= xfce4-genmon-plugin-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-genmon-plugin/
COMMENT= Xfce general purpose monitor plugin
diff --git a/sysutils/xfce4-genmon-plugin/buildlink3.mk b/sysutils/xfce4-genmon-plugin/buildlink3.mk
index d50f1f308d1..82568ae2f63 100644
--- a/sysutils/xfce4-genmon-plugin/buildlink3.mk
+++ b/sysutils/xfce4-genmon-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:26 wiz Exp $
BUILDLINK_TREE+= xfce4-genmon-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-genmon-plugin
XFCE4_GENMON_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-genmon-plugin+= xfce4-genmon-plugin>=3.1
-BUILDLINK_ABI_DEPENDS.xfce4-genmon-plugin?= xfce4-genmon-plugin>=3.1nb1
+BUILDLINK_ABI_DEPENDS.xfce4-genmon-plugin?= xfce4-genmon-plugin>=3.1nb2
BUILDLINK_PKGSRCDIR.xfce4-genmon-plugin?= ../../sysutils/xfce4-genmon-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 9d9c22c9c30..68d9622f273 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:26 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.4.0
DISTNAME= xfce4-netload-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-netload-plugin/
COMMENT= Xfce network load plugin
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
index bcb7257b29d..da5bd6557d7 100644
--- a/sysutils/xfce4-netload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:26 wiz Exp $
BUILDLINK_TREE+= xfce4-netload-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-netload-plugin
XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-netload-plugin+= xfce4-netload-plugin>=0.4.0
-BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin?= xfce4-netload-plugin>=0.4.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin?= xfce4-netload-plugin>=0.4.0nb2
BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?= ../../sysutils/xfce4-netload-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-quicklauncher-plugin/Makefile b/sysutils/xfce4-quicklauncher-plugin/Makefile
index 5bdec38353c..b64eb77638a 100644
--- a/sysutils/xfce4-quicklauncher-plugin/Makefile
+++ b/sysutils/xfce4-quicklauncher-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:26 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 1.9.4
DISTNAME= xfce4-quicklauncher-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-quicklauncher-plugin/
COMMENT= Xfce quicklaunch plugin
diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
index d25d7b146d9..81bcb6a3322 100644
--- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
+++ b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:26 wiz Exp $
BUILDLINK_TREE+= xfce4-quicklauncher-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-quicklauncher-plugin
XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+= xfce4-quicklauncher-plugin>=1.9.4
-BUILDLINK_ABI_DEPENDS.xfce4-quicklauncher-plugin?= xfce4-quicklauncher-plugin>=1.9.4nb1
+BUILDLINK_ABI_DEPENDS.xfce4-quicklauncher-plugin?= xfce4-quicklauncher-plugin>=1.9.4nb2
BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?= ../../sysutils/xfce4-quicklauncher-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 20dcd92403c..c8872e4a01c 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:26 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.4.2
DISTNAME= xfce4-systemload-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-systemload-plugin/
COMMENT= Xfce system load plugin
diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk
index a8768d68120..00cc60bfddc 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:26 wiz Exp $
BUILDLINK_TREE+= xfce4-systemload-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-systemload-plugin
XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+= xfce4-systemload-plugin>=0.4.2
-BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin?= xfce4-systemload-plugin>=0.4.2nb1
+BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin?= xfce4-systemload-plugin>=0.4.2nb2
BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?= ../../sysutils/xfce4-systemload-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-thunar/Makefile b/sysutils/xfce4-thunar/Makefile
index 755429ab4fd..7d7c2206e0a 100644
--- a/sysutils/xfce4-thunar/Makefile
+++ b/sysutils/xfce4-thunar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:26 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,6 +8,7 @@ XFCE4_VERSION= 1.0.1
DISTNAME= Thunar-${XFCE4_VERSION}
PKGNAME= xfce4-thunar-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= Xfce file manager
diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk
index 4e164ec81b0..e44d4aa5a90 100644
--- a/sysutils/xfce4-thunar/buildlink3.mk
+++ b/sysutils/xfce4-thunar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:45:26 wiz Exp $
BUILDLINK_TREE+= xfce4-thunar
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= xfce4-thunar
XFCE4_THUNAR_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-thunar+= xfce4-thunar>=1.0.0
+BUILDLINK_ABI_DEPENDS.xfce4-thunar?= xfce4-thunar>=1.0.1nb1
BUILDLINK_PKGSRCDIR.xfce4-thunar?= ../../sysutils/xfce4-thunar
pkgbase := xfce4-thunar
diff --git a/sysutils/xfce4-volman/Makefile b/sysutils/xfce4-volman/Makefile
index b9261d1b693..fd9753426db 100644
--- a/sysutils/xfce4-volman/Makefile
+++ b/sysutils/xfce4-volman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/11/05 20:15:40 reinoud Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:26 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.2.0
DISTNAME= thunar-volman-${XFCE4_VERSION}
PKGNAME= ${DISTNAME:S/thunar/xfce4/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/thunar-volman/
COMMENT= Thunar volume manager
diff --git a/sysutils/xfce4-xarchiver/Makefile b/sysutils/xfce4-xarchiver/Makefile
index 804c40791cb..07866946ac3 100644
--- a/sysutils/xfce4-xarchiver/Makefile
+++ b/sysutils/xfce4-xarchiver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:26 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.5.2
DISTNAME= xarchiver-${XFCE4_VERSION}
PKGNAME= xfce4-xarchiver-${XFCE4_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xarchiver/}
COMMENT= Xfce archiver handler
diff --git a/sysutils/xfce4-xarchiver/buildlink3.mk b/sysutils/xfce4-xarchiver/buildlink3.mk
index 14dbea76d04..c210f5c26de 100644
--- a/sysutils/xfce4-xarchiver/buildlink3.mk
+++ b/sysutils/xfce4-xarchiver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:26 wiz Exp $
BUILDLINK_TREE+= xfce4-xarchiver
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-xarchiver
XFCE4_XARCHIVER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-xarchiver+= xfce4-xarchiver>=0.5.2nb1
-BUILDLINK_ABI_DEPENDS.xfce4-xarchiver?= xfce4-xarchiver>=0.5.2nb2
+BUILDLINK_ABI_DEPENDS.xfce4-xarchiver?= xfce4-xarchiver>=0.5.2nb3
BUILDLINK_PKGSRCDIR.xfce4-xarchiver?= ../../sysutils/xfce4-xarchiver
.include "../../x11/libxfce4gui/buildlink3.mk"
diff --git a/sysutils/xfce4-xkb-plugin/Makefile b/sysutils/xfce4-xkb-plugin/Makefile
index 9999cf7522a..9ae3da0fc86 100644
--- a/sysutils/xfce4-xkb-plugin/Makefile
+++ b/sysutils/xfce4-xkb-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:26 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.4.3
DISTNAME= xfce4-xkb-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-xkb-plugin/
COMMENT= Xfce Keyboard plugin
diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk
index 834294e2c0e..06c4fb8c3e4 100644
--- a/sysutils/xfce4-xkb-plugin/buildlink3.mk
+++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:26 wiz Exp $
BUILDLINK_TREE+= xfce4-xkb-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-xkb-plugin
XFCE4_XKB_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+= xfce4-xkb-plugin>=0.4.3
-BUILDLINK_ABI_DEPENDS.xfce4-xkb-plugin?= xfce4-xkb-plugin>=0.4.3nb1
+BUILDLINK_ABI_DEPENDS.xfce4-xkb-plugin?= xfce4-xkb-plugin>=0.4.3nb2
BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?= ../../sysutils/xfce4-xkb-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index 65350a2d4f2..491972b1de7 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:45:27 wiz Exp $
DISTNAME= xfe-1.04
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xfe/}
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 7b22f4cd190..d54d9145ffd 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:27 wiz Exp $
DISTNAME= xnc-5.0.4.src
PKGNAME= xnc-5.0.4
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= sysutils x11
MASTER_SITES= http://www.xnc.dubna.su/src-5/
diff --git a/textproc/OdfConverter/Makefile b/textproc/OdfConverter/Makefile
index b86c2aec9cc..b9beb836396 100644
--- a/textproc/OdfConverter/Makefile
+++ b/textproc/OdfConverter/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/05/28 16:18:23 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:27 wiz Exp $
#
DISTNAME= OdfAddinForOffice-src-3.0
PKGNAME= OdfConverter-3.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= converters textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=odf-converter/}
EXTRACT_SUFX= .zip
diff --git a/textproc/ebview/Makefile b/textproc/ebview/Makefile
index 00482357717..4d40e74e819 100644
--- a/textproc/ebview/Makefile
+++ b/textproc/ebview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:21 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:27 wiz Exp $
DISTNAME= ebview-0.3.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ebview/}
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 5f638556d42..f5892ec0948 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:27 wiz Exp $
DISTNAME= gnome-spell-1.0.8
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-spell/1.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk
index eebefe7f705..22c1912f253 100644
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:45:27 wiz Exp $
BUILDLINK_TREE+= gnome-spell
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-spell
GNOME_SPELL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-spell+= gnome-spell>=1.0.5
-BUILDLINK_ABI_DEPENDS.gnome-spell+= gnome-spell>=1.0.8nb3
+BUILDLINK_ABI_DEPENDS.gnome-spell+= gnome-spell>=1.0.8nb4
BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell
.include "../../devel/libbonobo/buildlink3.mk"
diff --git a/textproc/gnome-subtitles/Makefile b/textproc/gnome-subtitles/Makefile
index 4911dc94108..b8ed4374d59 100644
--- a/textproc/gnome-subtitles/Makefile
+++ b/textproc/gnome-subtitles/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/01/23 08:51:13 obache Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:27 wiz Exp $
DISTNAME= gnome-subtitles-0.9.1
+PKGREVISION= 1
CATEGORIES= multimedia textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnome-subtitles/}
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index cafce1d621b..2b628312486 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:27 wiz Exp $
DISTNAME= gtkspell-2.0.15
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc devel
MASTER_SITES= http://gtkspell.sourceforge.net/download/
diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk
index 58a9e44e113..784c70c5725 100644
--- a/textproc/gtkspell/buildlink3.mk
+++ b/textproc/gtkspell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:27 wiz Exp $
BUILDLINK_TREE+= gtkspell
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtkspell
GTKSPELL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtkspell+= gtkspell>=2.0.13
-BUILDLINK_ABI_DEPENDS.gtkspell?= gtkspell>=2.0.15nb1
+BUILDLINK_ABI_DEPENDS.gtkspell?= gtkspell>=2.0.15nb2
BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell
.include "../../textproc/enchant/buildlink3.mk"
diff --git a/textproc/py-gdick/Makefile b/textproc/py-gdick/Makefile
index 1b0917f7b66..3cd99f5bf64 100644
--- a/textproc/py-gdick/Makefile
+++ b/textproc/py-gdick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 19:58:21 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:27 wiz Exp $
DISTNAME= gdick-0.9.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gdick/}
EXTRACT_SUFX= .tar.bz2
diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index 18a5f5859a3..29e99d84442 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/04/10 00:02:03 markd Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:27 wiz Exp $
DISTNAME= soprano-2.4.1
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=soprano/}
EXTRACT_SUFX= .tar.bz2
diff --git a/textproc/soprano/buildlink3.mk b/textproc/soprano/buildlink3.mk
index 7226e6e66ba..cb6f36c36c8 100644
--- a/textproc/soprano/buildlink3.mk
+++ b/textproc/soprano/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:27 wiz Exp $
BUILDLINK_TREE+= soprano
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= soprano
SOPRANO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.soprano+= soprano>=2.0.3
-BUILDLINK_ABI_DEPENDS.soprano?= soprano>=2.3.0nb4
+BUILDLINK_ABI_DEPENDS.soprano?= soprano>=2.4.1nb1
BUILDLINK_PKGSRCDIR.soprano?= ../../textproc/soprano
.include "../../textproc/libclucene/buildlink3.mk"
diff --git a/textproc/subtitleripper/Makefile b/textproc/subtitleripper/Makefile
index f033972ac25..c8276b8438f 100644
--- a/textproc/subtitleripper/Makefile
+++ b/textproc/subtitleripper/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:27 wiz Exp $
#
DISTNAME= subtitleripper-0.3-4
PKGNAME= subtitleripper-0.3.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= textproc graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=subtitleripper/}
EXTRACT_SUFX= .tgz
diff --git a/textproc/tex2page/Makefile b/textproc/tex2page/Makefile
index ede683f2d3e..2fcf729e55f 100644
--- a/textproc/tex2page/Makefile
+++ b/textproc/tex2page/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:27 wiz Exp $
#
DISTNAME= tex2page
DIST_SUBDIR= tex2page-20060131
PKGNAME= tex2page-20060131
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= textproc
MASTER_SITES= http://www.ccs.neu.edu/home/dorai/tex2page/
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index 842606ec9fc..588d2098800 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:28 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 0.2.1
DISTNAME= xfce4-dict-plugin-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-dict-plugin/
COMMENT= Xfce dictionary server plugin
diff --git a/textproc/xfce4-dict-plugin/buildlink3.mk b/textproc/xfce4-dict-plugin/buildlink3.mk
index a721061793f..5110382fca6 100644
--- a/textproc/xfce4-dict-plugin/buildlink3.mk
+++ b/textproc/xfce4-dict-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:28 wiz Exp $
BUILDLINK_TREE+= xfce4-dict-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-dict-plugin
XFCE4_DICT_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-dict-plugin+= xfce4-dict-plugin>=0.2.1
-BUILDLINK_ABI_DEPENDS.xfce4-dict-plugin?= xfce4-dict-plugin>=0.2.1nb1
+BUILDLINK_ABI_DEPENDS.xfce4-dict-plugin?= xfce4-dict-plugin>=0.2.1nb2
BUILDLINK_PKGSRCDIR.xfce4-dict-plugin?= ../../textproc/xfce4-dict-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/textproc/xml2doc/Makefile b/textproc/xml2doc/Makefile
index 15d8a01e910..74c88dc9111 100644
--- a/textproc/xml2doc/Makefile
+++ b/textproc/xml2doc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:28 wiz Exp $
#
DISTNAME= xml2doc-20030510
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= textproc
MASTER_SITES= http://xml2doc.sourceforge.net/src/
EXTRACT_SUFX= .tgz
diff --git a/time/cairo-clock/Makefile b/time/cairo-clock/Makefile
index 8776888009e..86bc4721406 100644
--- a/time/cairo-clock/Makefile
+++ b/time/cairo-clock/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:58:21 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:28 wiz Exp $
#
DISTNAME= cairo-clock_0.3.3-1
PKGNAME= cairo-clock-0.3.3
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= time
MASTER_SITES= http://macslow.thepimp.net/projects/cairo-clock/
diff --git a/time/evolution-webcal/Makefile b/time/evolution-webcal/Makefile
index 01fbe7e4083..fdbe760e372 100644
--- a/time/evolution-webcal/Makefile
+++ b/time/evolution-webcal/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2009/10/26 09:58:51 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:45:28 wiz Exp $
#
DISTNAME= evolution-webcal-2.28.0
+PKGREVISION= 1
CATEGORIES= time gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-webcal/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/time/gchore/Makefile b/time/gchore/Makefile
index 645780ebd8f..cecac7613dd 100644
--- a/time/gchore/Makefile
+++ b/time/gchore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:58:22 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:28 wiz Exp $
#
DISTNAME= gchore-1.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11 time
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gchore/}
diff --git a/time/gdeskcal/Makefile b/time/gdeskcal/Makefile
index 9eef5a70c87..75cb239e457 100644
--- a/time/gdeskcal/Makefile
+++ b/time/gdeskcal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2010/02/10 19:17:46 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:28 wiz Exp $
#
DISTNAME= gDeskCal-0_57_1
PKGNAME= gdeskcal-0.57.1
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= time
MASTER_SITES= http://www.pycage.de/download/
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 877edd70ceb..b989a2028e4 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/03/24 19:43:29 asau Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:28 wiz Exp $
DISTNAME= gnotime-2.3.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= time gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gttr/}
diff --git a/time/gtodo-applet/Makefile b/time/gtodo-applet/Makefile
index e6a73428ab9..7cf5a06f042 100644
--- a/time/gtodo-applet/Makefile
+++ b/time/gtodo-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:28 wiz Exp $
#
DISTNAME= gtodo-applet-0.1
-PKGREVISION= 18
+PKGREVISION= 19
CATEGORIES= time gnome
MASTER_SITES= # http://download.qballcow.nl/programs/gtodo/
diff --git a/time/gtodo/Makefile b/time/gtodo/Makefile
index c2b283656cb..5b03e9b541b 100644
--- a/time/gtodo/Makefile
+++ b/time/gtodo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2009/08/26 19:58:22 sno Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:28 wiz Exp $
#
DISTNAME= gtodo-0.14
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= time gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtodo/}
diff --git a/time/hamster-applet/Makefile b/time/hamster-applet/Makefile
index 00b47cb6db9..f97ae1b4ea8 100644
--- a/time/hamster-applet/Makefile
+++ b/time/hamster-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/02/10 19:17:46 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:28 wiz Exp $
#
DISTNAME= hamster-applet-2.28.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= time
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/hamster-applet/2.28/}
diff --git a/time/planner/Makefile b/time/planner/Makefile
index 8766ee57491..70258d7a59d 100644
--- a/time/planner/Makefile
+++ b/time/planner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:28 wiz Exp $
#
DISTNAME= planner-0.14.4
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= time x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/planner/0.14/}
EXTRACT_SUFX= .tar.bz2
diff --git a/time/ptimetracker/Makefile b/time/ptimetracker/Makefile
index e37b864f9ef..7b73e529fab 100644
--- a/time/ptimetracker/Makefile
+++ b/time/ptimetracker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:28 wiz Exp $
DISTNAME= ptimetracker-1.7.3
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= time kde
MASTER_SITES= http://www.eggtart.plus.com/ptt/prog/
diff --git a/time/rsibreak-kde3/Makefile b/time/rsibreak-kde3/Makefile
index b6f2b39cec5..aa249b38302 100644
--- a/time/rsibreak-kde3/Makefile
+++ b/time/rsibreak-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/10 22:07:56 markd Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:29 wiz Exp $
DISTNAME= rsibreak-0.8.0
PKGNAME= rsibreak-0.8.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= time kde
MASTER_SITES= http://www.rsibreak.org/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/time/rsibreak/Makefile b/time/rsibreak/Makefile
index 7505b0092ef..f82d9f7240c 100644
--- a/time/rsibreak/Makefile
+++ b/time/rsibreak/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/04/10 22:10:46 markd Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:29 wiz Exp $
DISTNAME= rsibreak-0.10
+PKGREVISION= 1
CATEGORIES= time kde
MASTER_SITES= http://www.rsibreak.org/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/time/xfce4-datetime-plugin/Makefile b/time/xfce4-datetime-plugin/Makefile
index e7729444d3c..8b1e23b6434 100644
--- a/time/xfce4-datetime-plugin/Makefile
+++ b/time/xfce4-datetime-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/09/16 02:25:35 reed Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:29 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,6 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 0.6.1
DISTNAME= xfce4-datetime-plugin-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= time
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-datetime-plugin/
EXTRACT_SUFX= .tar.bz2
diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk
index 399c01017bf..c2933b1b414 100644
--- a/time/xfce4-datetime-plugin/buildlink3.mk
+++ b/time/xfce4-datetime-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:29 wiz Exp $
BUILDLINK_TREE+= xfce4-datetime-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-datetime-plugin
XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+= xfce4-datetime-plugin>=0.4.1
-BUILDLINK_ABI_DEPENDS.xfce4-datetime-plugin?= xfce4-datetime-plugin>=0.5.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-datetime-plugin?= xfce4-datetime-plugin>=0.6.1nb1
BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?= ../../time/xfce4-datetime-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/time/xfce4-orage/Makefile b/time/xfce4-orage/Makefile
index 2fdfc55523f..4dc123506ae 100644
--- a/time/xfce4-orage/Makefile
+++ b/time/xfce4-orage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:29 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
DISTNAME= orage-${XFCE4_VERSION}
PKGNAME= xfce4-orage-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= time
COMMENT= Xfce time managing application
diff --git a/time/xfce4-timer-plugin/Makefile b/time/xfce4-timer-plugin/Makefile
index 8272b224966..6686aecd0eb 100644
--- a/time/xfce4-timer-plugin/Makefile
+++ b/time/xfce4-timer-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:29 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 0.5.1
DISTNAME= xfce4-timer-plugin-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= time
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-timer-plugin/
COMMENT= Xfce4 timer plugin
diff --git a/time/xfce4-timer-plugin/buildlink3.mk b/time/xfce4-timer-plugin/buildlink3.mk
index fdb7a657e1f..81f8f0bf7bc 100644
--- a/time/xfce4-timer-plugin/buildlink3.mk
+++ b/time/xfce4-timer-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:29 wiz Exp $
BUILDLINK_TREE+= xfce4-timer-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-timer-plugin
XFCE4_TIMER_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-timer-plugin+= xfce4-timer-plugin>=0.5.1
-BUILDLINK_ABI_DEPENDS.xfce4-timer-plugin?= xfce4-timer-plugin>=0.5.1nb1
+BUILDLINK_ABI_DEPENDS.xfce4-timer-plugin?= xfce4-timer-plugin>=0.5.1nb2
BUILDLINK_PKGSRCDIR.xfce4-timer-plugin?= ../../time/xfce4-timer-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/time/xonclock/Makefile b/time/xonclock/Makefile
index d161e975963..13c630bc9b8 100644
--- a/time/xonclock/Makefile
+++ b/time/xonclock/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:29 wiz Exp $
#
DISTNAME= xonclock-0.0.9.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= time
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xonclock/}
diff --git a/time/xtide/Makefile b/time/xtide/Makefile
index 92aac222f88..6f44249d519 100644
--- a/time/xtide/Makefile
+++ b/time/xtide/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/14 16:39:24 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:29 wiz Exp $
DISTNAME= xtide-2.8.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc x11
MASTER_SITES= ftp://ftp.flaterco.com/xtide/
DISTFILES= ${DISTNAME}.tar.bz2 ${HARMONICS_FILE}.bz2
diff --git a/wm/3ddesktop/Makefile b/wm/3ddesktop/Makefile
index 11cfd8ffcff..ab7475eeb7a 100644
--- a/wm/3ddesktop/Makefile
+++ b/wm/3ddesktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:29 wiz Exp $
#
DISTNAME= 3ddesktop-0.2.9
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=desk3d/}
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index 613950973c5..5c2e27b2be2 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:29 wiz Exp $
DISTNAME= AfterStep-2.1.2
PKGNAME= ${DISTNAME:S/AfterStep/afterstep/}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= wm
MASTER_SITES= ftp://ftp.afterstep.org/stable/v2.1/
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index fd1f43c7833..c39412538cb 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:29 wiz Exp $
#
DISTNAME= awesome-2.3.6
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= wm
MASTER_SITES= http://awesome.naquadah.org/download/
diff --git a/wm/compiz-fusion-plugins-extra/Makefile b/wm/compiz-fusion-plugins-extra/Makefile
index 012e043a605..8f2d8eccdfe 100644
--- a/wm/compiz-fusion-plugins-extra/Makefile
+++ b/wm/compiz-fusion-plugins-extra/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:29 wiz Exp $
#
PKGVER= 0.8.4
PKGNAME= compiz-fusion-plugins-extra-${PKGVER}
DISTNAME= compiz-plugins-extra-${PKGVER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wm x11
MASTER_SITES= http://releases.compiz.org/${PKGVER}/
diff --git a/wm/compiz-fusion-plugins-main/Makefile b/wm/compiz-fusion-plugins-main/Makefile
index f20dcfb8b87..c887be18770 100644
--- a/wm/compiz-fusion-plugins-main/Makefile
+++ b/wm/compiz-fusion-plugins-main/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:30 wiz Exp $
#
PKGVER= 0.8.4
PKGNAME= compiz-fusion-plugins-main-${PKGVER}
DISTNAME= compiz-plugins-main-${PKGVER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wm x11
MASTER_SITES= http://releases.compiz.org/${PKGVER}/
diff --git a/wm/compiz-fusion-plugins-main/buildlink3.mk b/wm/compiz-fusion-plugins-main/buildlink3.mk
index c735863fa70..a3940167f06 100644
--- a/wm/compiz-fusion-plugins-main/buildlink3.mk
+++ b/wm/compiz-fusion-plugins-main/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:30 wiz Exp $
BUILDLINK_TREE+= compiz-fusion-plugins-main
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= compiz-fusion-plugins-main
COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.compiz-fusion-plugins-main+= compiz-fusion-plugins-main>=0.6.0nb1
-BUILDLINK_ABI_DEPENDS.compiz-fusion-plugins-main?= compiz-fusion-plugins-main>=0.6.0nb3
+BUILDLINK_ABI_DEPENDS.compiz-fusion-plugins-main?= compiz-fusion-plugins-main>=0.8.4nb2
BUILDLINK_PKGSRCDIR.compiz-fusion-plugins-main?= ../../wm/compiz-fusion-plugins-main
.include "../../wm/compiz/buildlink3.mk"
diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 8fd18865aa0..9e219749967 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:29 wiz Exp $
#
PKGVER= 0.8.4
DISTNAME= compiz-${PKGVER}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= wm x11
MASTER_SITES= http://releases.compiz.org/${PKGVER}/
diff --git a/wm/compiz/buildlink3.mk b/wm/compiz/buildlink3.mk
index 2f6c23a5219..ac5c298e28a 100644
--- a/wm/compiz/buildlink3.mk
+++ b/wm/compiz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:29 wiz Exp $
BUILDLINK_TREE+= compiz
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= compiz
COMPIZ_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.compiz+= compiz>=0.6.2
-BUILDLINK_ABI_DEPENDS.compiz?= compiz>=0.6.2nb5
+BUILDLINK_ABI_DEPENDS.compiz?= compiz>=0.8.4nb4
BUILDLINK_PKGSRCDIR.compiz?= ../../wm/compiz
.include "../../devel/libwnck/buildlink3.mk"
diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index 732a87a8e23..79d6d4bc614 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/08/26 19:58:23 sno Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:30 wiz Exp $
#
DISTNAME= e16menuedit2-0.0.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 2a96687df9b..38a019243d6 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:30 wiz Exp $
DISTNAME= e16-0.16.8.8
PKGNAME= ${DISTNAME:S/e16/enlightenment/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
diff --git a/wm/fluxconf/Makefile b/wm/fluxconf/Makefile
index 54edc8ca611..a3393e68dfe 100644
--- a/wm/fluxconf/Makefile
+++ b/wm/fluxconf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:23 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:30 wiz Exp $
#
DISTNAME= fluxconf-0.9.9
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= wm
MASTER_SITES= http://devaux.fabien.free.fr/flux/
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index aa1c4d8a67d..20e21928ca9 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/07/07 20:04:17 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:30 wiz Exp $
#
DISTNAME= flwm-1.02
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= http://flwm.sourceforge.net/
EXTRACT_SUFX= .tgz
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index ba574bbc9f8..d69586be563 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/05/28 09:33:12 martti Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:45:30 wiz Exp $
DISTNAME= fvwm-${FVWM_VER}
#PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/icecc/Makefile b/wm/icecc/Makefile
index ca0d3c90841..c28e717cb7a 100644
--- a/wm/icecc/Makefile
+++ b/wm/icecc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:30 wiz Exp $
# Package version reflects icecc version, with PKGREVISION incremented
# for any tool updates, according to the authors scheme.
DISTNAME= icecc-2.9
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icecc/}
DISTFILES= icecc-2.9.tar.bz2 \
diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile
index a1b20b5dbea..b325880ed9e 100644
--- a/wm/icewm-imlib/Makefile
+++ b/wm/icewm-imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:45:30 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-imlib-/}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= Small, fast and light-weight window manager (imlib version)
CONFLICTS+= icewm-[0-9]* icewm-gnome-[0-9]*
diff --git a/wm/matchbox-wm/Makefile b/wm/matchbox-wm/Makefile
index 779002f3a5c..2a3cef8542e 100644
--- a/wm/matchbox-wm/Makefile
+++ b/wm/matchbox-wm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2010/02/12 20:37:53 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:30 wiz Exp $
#
DISTNAME= matchbox-window-manager-1.1
PKGNAME= ${DISTNAME:S/window-manager/wm/}
+PKGREVISION= 1
CATEGORIES= wm x11
MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 89b75f528c5..77ae9d420b1 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2010/02/11 18:19:13 drochner Exp $
+# $NetBSD: Makefile,v 1.86 2010/06/13 22:45:30 wiz Exp $
#
DISTNAME= metacity-2.28.1
+PKGREVISION= 1
CATEGORIES= wm x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index 6f1e4e6ed59..d327e01f0fa 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/06/13 22:45:30 wiz Exp $
BUILDLINK_TREE+= metacity
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= metacity
METACITY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.metacity+= metacity>=2.8.5
-BUILDLINK_ABI_DEPENDS.metacity+= metacity>=2.26.0nb1
+BUILDLINK_ABI_DEPENDS.metacity+= metacity>=2.28.1nb1
BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/metisse/Makefile b/wm/metisse/Makefile
index 8226ab3ebac..459ce20aed1 100644
--- a/wm/metisse/Makefile
+++ b/wm/metisse/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:30 wiz Exp $
#
DISTNAME= metisse-0.4.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= wm x11
MASTER_SITES= http://insitu.lri.fr/metisse/download/metisse/
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/metisse/distinfo b/wm/metisse/distinfo
index 7b214672783..90c807ff1ed 100644
--- a/wm/metisse/distinfo
+++ b/wm/metisse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2009/07/24 12:10:18 obache Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:45:30 wiz Exp $
SHA1 (metisse-0.4.1.tar.bz2) = acf97b125905d91988955560a9b14b06a530eed6
RMD160 (metisse-0.4.1.tar.bz2) = 7487322f22a3655d756b5d3d3cc59afbf277d137
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = 6c8f66b54c96f18b3e835fea490d5eb444514b52
SHA1 (patch-ae) = eab55e17f7e3518434d4ad42e7637c18cef5bf72
SHA1 (patch-af) = 45cf852490bd30d17cac341916d83b0688f7bce0
SHA1 (patch-ag) = b7159e56a1d1f1b5b12ea99ca60de0071bcf5294
+SHA1 (patch-ah) = 6afe0c047a67f83149a4130b4eae55612e437ad0
diff --git a/wm/metisse/patches/patch-ah b/wm/metisse/patches/patch-ah
new file mode 100644
index 00000000000..3824b8d41ad
--- /dev/null
+++ b/wm/metisse/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2010/06/13 22:45:30 wiz Exp $
+
+--- fvwm-insitu/libs/Fpng.h.orig 2008-12-09 12:52:20.000000000 +0000
++++ fvwm-insitu/libs/Fpng.h
+@@ -444,7 +444,7 @@ typedef Fpng_struct **Fpng_structpp;
+ #define Fpng_set_packing(a) png_set_packing(a)
+ #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a)
+ #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b)
+-#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a)
++#define Fpng_set_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a)
+ #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c)
+ #define Fpng_read_end(a,b) png_read_end(a,b)
+ #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a)
diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile
index bd7970b9e31..d482c152ad9 100644
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/05/31 23:11:57 dholland Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:31 wiz Exp $
DISTNAME= obconf-2.0.3
-PKGREVISION= 3
+PKGREVISION= 4
DIST_SUBDIR= obconf-2.0.3.orig
CATEGORIES= wm
MASTER_SITES= http://openbox.org/dist/obconf/
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 346990b722a..efb038e25b8 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2010/06/05 11:43:51 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2010/06/13 22:45:31 wiz Exp $
DISTNAME= openbox-3.4.11.2
+PKGREVISION= 1
CATEGORIES= wm x11
MASTER_SITES= http://openbox.org/dist/openbox/
diff --git a/wm/oroborox/Makefile b/wm/oroborox/Makefile
index edfb5f52126..87394d4b294 100644
--- a/wm/oroborox/Makefile
+++ b/wm/oroborox/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:31 wiz Exp $
#
DISTNAME= OroboROX-0.9.8
PKGNAME= oroborox-0.9.8
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= wm
MASTER_SITES= http://roxos.sunsite.dk/dev-contrib/guido/
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index a65fcdbc271..5ecd1e0e76e 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2010/04/17 10:07:17 gls Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:31 wiz Exp $
#
DISTNAME= pekwm-0.1.12
+PKGREVISION= 1
CATEGORIES= wm
MASTER_SITES= http://www.pekwm.org/projects/pekwm/files/
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index 577d17ca87e..bd8ae4d851a 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:31 wiz Exp $
#
DISTNAME= qvwm-1.1.12
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= wm
MASTER_SITES= http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \
ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index aa00841a666..e5a789195ba 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2010/03/24 19:43:29 asau Exp $
+# $NetBSD: Makefile,v 1.54 2010/06/13 22:45:31 wiz Exp $
#
DISTNAME= sawfish-1.5.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sawmill/}
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/selectwm/Makefile b/wm/selectwm/Makefile
index 7116c1c09c5..0cff4d7c0ce 100644
--- a/wm/selectwm/Makefile
+++ b/wm/selectwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:58:24 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:31 wiz Exp $
#
DISTNAME= selectwm-0.4.1
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= wm
MASTER_SITES= http://ordiluc.net/selectwm/
diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile
index 1bb83edafd3..60db84504d8 100644
--- a/wm/skippy/Makefile
+++ b/wm/skippy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:31 wiz Exp $
#
DISTNAME= skippy-0.5.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= wm
MASTER_SITES= http://thegraveyard.org/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 666dbf25ae6..914a6885ef4 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:31 wiz Exp $
#
DISTNAME= waimea-0.4.0
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=waimea/}
diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index d46789b2833..738db6213b0 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:31 wiz Exp $
#
DISTNAME= whiteBOX-0.5
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= wm x11
MASTER_SITES= http://whitebox.sourceforge.net/dist/
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index a610931be51..9b603f4fc27 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2010/04/21 05:43:28 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/13 22:45:31 wiz Exp $
DISTNAME= WindowMaker-0.92.0
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= x11 wm windowmaker
MASTER_SITES= http://windowmaker.info/pub/source/release/ \
ftp://ftp.dti.ad.jp/pub/X/WindowMaker/source/release/
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index be5c84003ad..34e88bd26fd 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:31 wiz Exp $
BUILDLINK_TREE+= windowmaker
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= windowmaker
WINDOWMAKER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.windowmaker+= windowmaker>=0.80.2nb3
-BUILDLINK_ABI_DEPENDS.windowmaker+= windowmaker>=0.92.0nb10
+BUILDLINK_ABI_DEPENDS.windowmaker+= windowmaker>=0.92.0nb12
BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index a3dfd3284bf..1403e93dc78 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2010/02/12 20:31:32 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:45:31 wiz Exp $
DISTNAME= wmakerconf-2.11
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= x11 wm windowmaker
MASTER_SITES= http://starplot.org/wmakerconf/
diff --git a/wm/wmdrawer/Makefile b/wm/wmdrawer/Makefile
index 3b70000c5cc..297454bbd97 100644
--- a/wm/wmdrawer/Makefile
+++ b/wm/wmdrawer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:32 wiz Exp $
#
DISTNAME= wmdrawer-0.10.5
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= misc
MASTER_SITES= http://people.easter-eggs.org/~valos/wmdrawer/
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index 21e79c3a3cc..1b4b3775fb2 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:45:32 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
DISTNAME= xfwm4-${XFCE4_VERSION}
PKGNAME= xfce4-wm-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= wm
COMMENT= Xfce window manager
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 5fe6a9bdf4b..50efea94e15 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2010/06/13 22:45:32 wiz Exp $
DISTNAME= amaya-fullsrc-10.0.1
PKGNAME= ${DISTNAME:S/-fullsrc//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \
ftp://ftp.w3.org/pub/amaya/ \
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 0e1bec0f2d1..1dbcb5c35d7 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2008/09/11 04:22:50 dholland Exp $
+$NetBSD: distinfo,v 1.20 2010/06/13 22:45:32 wiz Exp $
SHA1 (amaya-fullsrc-10.0.1.tgz) = a2dcceedaa2c0256f04aaa86e3dc319d4ff26ade
RMD160 (amaya-fullsrc-10.0.1.tgz) = d1a20a03a18ef3b06cf9dcbab907fb412de0ad6b
@@ -15,5 +15,5 @@ SHA1 (patch-al) = 172ab5106ecdc8fac825bcca8e57202010c980a3
SHA1 (patch-am) = 152800baf4b750dbfe1bfa731313222b471d28ab
SHA1 (patch-an) = 5d2e98d7046394960d7c172ed7d491ecb0f0992e
SHA1 (patch-ao) = 34f6b0fe289d966c2a7553799be8bf59426091b4
-SHA1 (patch-ap) = d4ba3426bbeffc5f9f8f30002d4bb75e0c3816c6
+SHA1 (patch-ap) = 9d0eaa0bc05dc61f5d29cd78644fb854076590ce
SHA1 (patch-aq) = 3885a77d86fa1c3892a6aab7c9538d119951cd4a
diff --git a/www/amaya/patches/patch-ap b/www/amaya/patches/patch-ap
index 4d3543350ed..d55dc7b901f 100644
--- a/www/amaya/patches/patch-ap
+++ b/www/amaya/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1 2008/09/11 04:22:50 dholland Exp $
+$NetBSD: patch-ap,v 1.2 2010/06/13 22:45:32 wiz Exp $
---- ../../wxWidgets/configure.orig 2007-05-14 05:08:25.000000000 -0400
-+++ ../../wxWidgets/configure 2008-09-08 06:27:09.000000000 -0400
+--- ../../wxWidgets/configure.orig 2007-05-14 09:08:25.000000000 +0000
++++ ../../wxWidgets/configure
@@ -23470,43 +23470,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -78,6 +78,59 @@ $NetBSD: patch-ap,v 1.1 2008/09/11 04:22:50 dholland Exp $
do
if test -f "$ac_dir/X11/Intrinsic.h"; then
ac_find_includes=$ac_dir
+@@ -24916,9 +24881,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
+
+
+ if test "$ac_cv_header_png_h" = "yes"; then
+- echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++ echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
++echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -24936,11 +24901,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char png_check_sig ();
++char png_sig_cmp ();
+ int
+ main ()
+ {
+-png_check_sig ();
++png_sig_cmp ();
+ ;
+ return 0;
+ }
+@@ -24966,20 +24931,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_png_png_check_sig=yes
++ ac_cv_lib_png_png_sig_cmp=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_png_png_check_sig=no
++ac_cv_lib_png_png_sig_cmp=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
+-if test $ac_cv_lib_png_png_check_sig = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
++echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
++if test $ac_cv_lib_png_png_sig_cmp = yes; then
+ PNG_LINK=" -lpng -lz"
+ fi
+
@@ -30134,7 +30099,7 @@ echo "$as_me: error: Unicode configurati
echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6
diff --git a/www/ap22-dnssd/Makefile b/www/ap22-dnssd/Makefile
index 5b88940b104..ead74feb509 100644
--- a/www/ap22-dnssd/Makefile
+++ b/www/ap22-dnssd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:58:25 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:32 wiz Exp $
#
DISTNAME= mod_dnssd-0.5
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= http://0pointer.de/lennart/projects/mod_dnssd/
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 174fc462b80..4f160fc3408 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/13 22:45:32 wiz Exp $
DISTNAME= bluefish-1.0.7
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= www
MASTER_SITES= http://bluefish.mrball.net/stable/source/ \
http://www.bennewitz.com/bluefish/stable/source/
diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index 1421f691390..35743398659 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:32 wiz Exp $
#
DISTNAME= browser-bookmarks-menu-0.6
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=browserbookapp/}
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 026a984d4ca..8c9a3d05cb6 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:32 wiz Exp $
#
DISTNAME= chimera-2.0a19
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= www
MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera-alpha/
diff --git a/www/chimera/distinfo b/www/chimera/distinfo
index f52170eca82..c3e8ef790fe 100644
--- a/www/chimera/distinfo
+++ b/www/chimera/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2008/04/04 13:45:02 obache Exp $
+$NetBSD: distinfo,v 1.7 2010/06/13 22:45:32 wiz Exp $
SHA1 (chimera-2.0a19.tar.gz) = c69b70b11cf12837e260eaa20e548bf9eb9ce309
RMD160 (chimera-2.0a19.tar.gz) = d3f4d2ff3328c3bf5020490ed851b281e0492fe2
Size (chimera-2.0a19.tar.gz) = 248431 bytes
-SHA1 (patch-aa) = 8e1f95a295f67f7357b2eb367e24492fd2d4d467
+SHA1 (patch-aa) = fb77753229ef9f2b9ef1424818ce704cdead18e0
SHA1 (patch-ab) = 1fc2f5f97f46403359a00e42cc25f4cbf9bc5331
SHA1 (patch-ac) = 5f18afd9a1452bfba010fe3eb4e773f5395789c6
-SHA1 (patch-ad) = 400a047e978ccb0c4ebcf69a93117b4c7ecfdddb
+SHA1 (patch-ad) = fcfc16397954269a8493017ca06707f043a0cf06
SHA1 (patch-ae) = 8b8e1bc50791b635e5e87860302d0e758d159ed9
SHA1 (patch-af) = 76256ccb4b5183a8d30a46a89a0cd75b113122fc
diff --git a/www/chimera/patches/patch-aa b/www/chimera/patches/patch-aa
index 1b116a9020b..1f53b694041 100644
--- a/www/chimera/patches/patch-aa
+++ b/www/chimera/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2008/04/04 13:45:02 obache Exp $
+$NetBSD: patch-aa,v 1.5 2010/06/13 22:45:32 wiz Exp $
--- Common.tmpl.dist.orig 1999-05-30 21:43:52.000000000 +0000
+++ Common.tmpl.dist
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.4 2008/04/04 13:45:02 obache Exp $
-PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
-*/
+PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT) -Wl,-R$(PNGDIR)/lib
-+PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a
++PNGDEPLIB = $(PNGDIR)/lib/libpng14$(IMGLEXT).a
+
/* Tells Imakefile to set the flags for debugging. Comment for -O. */
diff --git a/www/chimera/patches/patch-ad b/www/chimera/patches/patch-ad
index 3179b09d1d1..f9077ca4c62 100644
--- a/www/chimera/patches/patch-ad
+++ b/www/chimera/patches/patch-ad
@@ -1,8 +1,26 @@
-$NetBSD: patch-ad,v 1.3 2002/03/15 00:07:37 fredb Exp $
+$NetBSD: patch-ad,v 1.4 2010/06/13 22:45:32 wiz Exp $
---- image/png.c.orig Mon Mar 29 03:23:46 1999
+--- image/png.c.orig 1999-03-29 02:23:46.000000000 +0000
+++ image/png.c
-@@ -222,17 +222,11 @@
+@@ -126,7 +126,7 @@ lf_info_callback(png_struct *state, png_
+
+ val = 0;
+ for (i = 0; i < info->num_trans; ++i) {
+- if (info->trans[i] < info->trans[val])
++ if (info->trans_alpha[i] < info->trans_alpha[val])
+ val = i;
+ }
+ png->image->transparent = val;
+@@ -154,7 +154,7 @@ lf_info_callback(png_struct *state, png_
+ png->image->rgb.used = maxval + 1;
+
+ if (info->valid & PNG_INFO_tRNS)
+- png->image->transparent = info->trans_values.gray;
++ png->image->transparent = info->trans_color.gray;
+ } else {
+ png->image = newTrueImage(info->width, info->height);
+ if (!png->image) {
+@@ -222,17 +222,11 @@ pngDestroy(void *pointer)
if (setjmp(png->state->jmpbuf))
return;
@@ -22,7 +40,7 @@ $NetBSD: patch-ad,v 1.3 2002/03/15 00:07:37 fredb Exp $
if (png->image) {
freeImage(png->image);
png->image = 0;
-@@ -275,27 +269,21 @@
+@@ -275,28 +269,22 @@ pngInit(void (*lineProc)(void *, int, in
memset(png, 0, sizeof(pngState));
png->lineProc = lineProc;
png->closure = closure;
@@ -49,9 +67,10 @@ $NetBSD: patch-ad,v 1.3 2002/03/15 00:07:37 fredb Exp $
+ png_destroy_read_struct(&png->state, &png->info, (png_info **)NULL);
return;
}
--
+
- png_info_init(png->info);
- png_read_init(png->state);
-
+-
png_set_progressive_read_fn(png->state, (void *) png, lf_info_callback,
lf_row_callback, lf_end_callback);
+ png->done = image_need_data;
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 47881a75f08..0cbf491b9c4 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2010/02/14 20:19:24 snj Exp $
+# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:32 wiz Exp $
DISTNAME= dillo-2.2
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.dillo.org/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index cc5e22fd2ef..d9804962c70 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:32 wiz Exp $
#
DISTNAME= drivel-2.0.3
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=drivel/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 2076f51ce9c..db1f18bbba0 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2010/06/13 22:45:33 wiz Exp $
#
DISTNAME= epiphany-extensions-2.28.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 88e5678b20e..f5454271d4d 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2010/06/11 08:33:00 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2010/06/13 22:45:33 wiz Exp $
#
DISTNAME= epiphany-2.28.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/2.28/}
EXTRACT_SUFX= .tar.bz2
@@ -21,6 +21,7 @@ USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE= data/epiphany-2.28.pc
+# needed for epiphany-2.28 and gtk2-2.20 -- remove on next update
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 6ba20b897b5..b9e4c2c429d 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2010/06/13 22:45:33 wiz Exp $
#
BUILDLINK_TREE+= epiphany
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= epiphany
EPIPHANY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.epiphany+= epiphany>=2.28
-BUILDLINK_ABI_DEPENDS.epiphany?= epiphany>=2.28.2nb1
+BUILDLINK_ABI_DEPENDS.epiphany?= epiphany>=2.28.2nb2
BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany
.include "../../mk/bsd.fast.prefs.mk"
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index e84ed2b04bc..d499e461fb7 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2010/04/02 20:28:24 tnn Exp $
+# $NetBSD: Makefile,v 1.74 2010/06/13 22:45:33 wiz Exp $
.include "../../devel/xulrunner/dist.mk"
PKGNAME= firefox-${FIREFOX_VER}
+PKGREVISION= 1
CATEGORIES= www
MAINTAINER= tnn@NetBSD.org
diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index 41d3e073387..b482e786eb6 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2010/06/05 11:34:29 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:33 wiz Exp $
#
# PKGNAME derives from the supported API (still from
# release 3.14). See also PLIST.
@@ -6,6 +6,7 @@
DISTNAME= gtkhtml-3.30.1
PKGNAME= ${DISTNAME:S/gtkhtml/gtkhtml314/}
+PKGREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkhtml/3.30/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index 81e6bc4b89f..db24d6faa79 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:33 wiz Exp $
# This section contains variables that might be overridden.
PKGNAME?= ${PKGNAME_BASE}
@@ -7,7 +7,7 @@ COMMENT?= Converts HTML to indexed HTML, PDF and/or PostScript
# Normal package Makefile contents follow.
DISTNAME= htmldoc-1.8.27-source
PKGNAME_BASE= ${DISTNAME:S/-source//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tar.bz2
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index e44ff3764ff..4e9bda341a8 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/06/11 09:40:27 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:33 wiz Exp $
#
-
DISTNAME= kazehakase-0.5.8
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/43802/}
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index 0bd426459bb..cc026734714 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:33 wiz Exp $
DISTNAME= kdewebdev-${_KDE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= www
COMMENT= HTML editor and tools suitable for experienced web developers
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 870d0a93450..ff3417c5f6f 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 10:38:40 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:33 wiz Exp $
DISTNAME= kdewebdev-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= www
COMMENT= HTML editor and tools suitable for experienced web developers
diff --git a/www/konq-plugins/Makefile b/www/konq-plugins/Makefile
index dfd43ef4298..23bac952c2e 100644
--- a/www/konq-plugins/Makefile
+++ b/www/konq-plugins/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/04/10 03:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:33 wiz Exp $
#
DISTNAME= konq-plugins-4.4.0
+PKGREVISION= 1
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_KDE:=4.4.0/src/extragear/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 7d987816748..aaf5521ab08 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:33 wiz Exp $
#
DISTNAME= libgtkhtml-2.6.3
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= www devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index ab3bc9844c4..079a40a17b4 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2010/06/13 22:45:33 wiz Exp $
BUILDLINK_TREE+= libgtkhtml
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgtkhtml
LIBGTKHTML_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.0
-BUILDLINK_ABI_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.3nb12
+BUILDLINK_ABI_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.3nb13
BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/www/liferea-current/Makefile b/www/liferea-current/Makefile
index 4f1ff434093..2bb519ac352 100644
--- a/www/liferea-current/Makefile
+++ b/www/liferea-current/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/02/24 18:37:09 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:34 wiz Exp $
DISTNAME= liferea-1.6.3
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=liferea/}
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 95aa3e63aa3..b9efc0e1d43 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2010/06/13 22:45:34 wiz Exp $
DISTNAME= liferea-1.4.28
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=liferea/}
diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index 829cf1e7a2a..7c58ff1c525 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2010/01/18 09:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2010/06/13 22:45:34 wiz Exp $
#
PKGNAME= ${DISTNAME:S/links/&-gui/:S/pre/.0./}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= Lynx-like text and graphics WWW browser
CONFLICTS+= links-[0-9]* elinks-0.3*
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index 6431569f3b3..0651abf4f42 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:34 wiz Exp $
#
DISTNAME= mMosaic-3.7.2
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= www
MASTER_SITES= ftp://ftp.enst.fr/pub/mbone/mMosaic/
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 89ca25de2e9..1735e026ceb 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/05/19 18:01:29 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:34 wiz Exp $
DISTNAME= midori-0.2.5
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://archive.xfce.org/src/apps/midori/0.2/
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 0c0e70b6176..cd4fe0955f7 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/06/11 09:42:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:34 wiz Exp $
#
DISTNAME= netsurf-1.2-src
PKGNAME= ${DISTNAME:S/-src$//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.netsurf-browser.org/downloads/releases/
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index 18e363f19bf..0936df39c8e 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/01/30 23:08:00 heinz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:34 wiz Exp $
#
DISTNAME= nspluginwrapper-1.2.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index c4ea0f0a324..9b7eb13fb7a 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2010/02/16 15:22:45 sno Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:34 wiz Exp $
#
DISTNAME= Apache-Gallery-0.9.1
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 10
+PKGREVISION= 11
SVR4_PKGNAME= p5aga
CATEGORIES= www graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/}
diff --git a/www/ruby-gnome2-gtkhtml2/Makefile b/www/ruby-gnome2-gtkhtml2/Makefile
index 0d5b55c2b17..9970d117e81 100644
--- a/www/ruby-gnome2-gtkhtml2/Makefile
+++ b/www/ruby-gnome2-gtkhtml2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/10/12 03:09:32 obache Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:34 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtkhtml2-${VERSION}
COMMENT= Ruby binding of gtkhtml2
+PKGREVISION= 1
CATEGORIES= www
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/www/ruby-gnome2-gtkmozembed/Makefile b/www/ruby-gnome2-gtkmozembed/Makefile
index 4424cb39c3a..370a7f2db21 100644
--- a/www/ruby-gnome2-gtkmozembed/Makefile
+++ b/www/ruby-gnome2-gtkmozembed/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:34 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtkmozembed-${VERSION}
COMMENT= Ruby binding of gtkmozembed
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 408159cdc0f..c71a0a50f26 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:34 wiz Exp $
DISTNAME= sarg-2.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sarg/}
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index 257e1d5e38c..f7d7a7c4ac2 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:35 wiz Exp $
DISTNAME= skipstone-0.9.6
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= ${HOMEPAGE}
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index d3f3d033642..aaf91b592cc 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2010/06/02 13:13:14 adam Exp $
+# $NetBSD: Makefile,v 1.50 2010/06/13 22:45:35 wiz Exp $
DISTNAME= webalizer-2.21-02-src
PKGNAME= webalizer-2.21.2
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \
http://webalizer.linux-mirror.org/pub/webalizer/ \
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index cb31ceeb6cc..16cec10ba11 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2010/05/19 17:54:24 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:35 wiz Exp $
DISTNAME= webkit-1.2.1
PKGNAME= ${DISTNAME:S/webkit/webkit-gtk/}
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.webkitgtk.org/
diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk
index 2bf04eb9805..940acd4a20f 100644
--- a/www/webkit-gtk/buildlink3.mk
+++ b/www/webkit-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:45:35 wiz Exp $
BUILDLINK_TREE+= webkit-gtk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= webkit-gtk
WEBKIT_GTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=1.1.3
-BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=1.1.15.4nb2
+BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=1.2.1nb1
BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk
.include "../../databases/sqlite3/buildlink3.mk"
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index b6830369ecf..e1d4cd038a7 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/03/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:35 wiz Exp $
#
DISTNAME= XaoS-3.4
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xaos/}
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index bf1ae64a5d8..0f2359593bd 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:45:35 wiz Exp $
#
DISTNAME= XmHTML-1.1.7
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= x11
MASTER_SITES= http://www.xs4all.nl/~ripley/XmHTML/dist/
diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk
index 527b0384053..a326b7c6672 100644
--- a/x11/XmHTML/buildlink3.mk
+++ b/x11/XmHTML/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:35 wiz Exp $
BUILDLINK_TREE+= XmHTML
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= XmHTML
XMHTML_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.XmHTML+= XmHTML>=1.1.7nb2
-BUILDLINK_ABI_DEPENDS.XmHTML+= XmHTML>=1.1.7nb8
+BUILDLINK_ABI_DEPENDS.XmHTML+= XmHTML>=1.1.7nb9
BUILDLINK_PKGSRCDIR.XmHTML?= ../../x11/XmHTML
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/acidlaunch/Makefile b/x11/acidlaunch/Makefile
index 8e2dbe8a9ac..1526d34a41b 100644
--- a/x11/acidlaunch/Makefile
+++ b/x11/acidlaunch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:35 wiz Exp $
#
DISTNAME= acidlaunch-0.5
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= x11
MASTER_SITES= http://linuxgamers.net/download/
diff --git a/x11/alacarte/Makefile b/x11/alacarte/Makefile
index 99717905ce4..91d902f5f78 100644
--- a/x11/alacarte/Makefile
+++ b/x11/alacarte/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/02/10 19:17:48 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:35 wiz Exp $
#
DISTNAME= alacarte-0.12.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/alacarte/0.12/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/antiright/Makefile b/x11/antiright/Makefile
index de510c87b56..4a721daa165 100644
--- a/x11/antiright/Makefile
+++ b/x11/antiright/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/08/26 19:58:28 sno Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:35 wiz Exp $
#
DISTNAME= antiright-3.4
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://download.savannah.nongnu.org/releases/antiright/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 1fc7530426f..c8099fe1125 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:45:35 wiz Exp $
#
DISTNAME= aterm-1.0.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aterm/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile
index 2623cf645ea..64aeaa64ec7 100644
--- a/x11/deskmenu/Makefile
+++ b/x11/deskmenu/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:58:28 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:35 wiz Exp $
#
VERSION= 1.4.2
DISTNAME= deskmenu_${VERSION}
PKGNAME= deskmenu-${VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.oroborus.org/debian/dists/sid/main/source/x11/
diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile
index aa16239376c..b9d3a81238f 100644
--- a/x11/devilspie/Makefile
+++ b/x11/devilspie/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2009/08/26 19:58:29 sno Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:35 wiz Exp $
DISTNAME= devilspie-0.22
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.burtonini.com/computing/
diff --git a/x11/dfm/Makefile b/x11/dfm/Makefile
index 47edd1d9a20..57a1c840a1c 100644
--- a/x11/dfm/Makefile
+++ b/x11/dfm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:36 wiz Exp $
#
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= x11
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/x11/driconf/Makefile b/x11/driconf/Makefile
index 98bfbaefd3b..c59e5eeca4f 100644
--- a/x11/driconf/Makefile
+++ b/x11/driconf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/27 08:46:24 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:36 wiz Exp $
#
DISTNAME= driconf-0.9.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/x11/ede/Makefile b/x11/ede/Makefile
index 77b1fe45cbc..e6dd5942c15 100644
--- a/x11/ede/Makefile
+++ b/x11/ede/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:36 wiz Exp $
#
DISTNAME= ede-1.0.4
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ede/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/efltk/Makefile b/x11/efltk/Makefile
index 8442c9fab54..5519c4fb59d 100644
--- a/x11/efltk/Makefile
+++ b/x11/efltk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:36 wiz Exp $
#
DISTNAME= efltk-2.0.5
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ede/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk
index 6a9867ab4f6..5ae31347152 100644
--- a/x11/efltk/buildlink3.mk
+++ b/x11/efltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:36 wiz Exp $
BUILDLINK_TREE+= efltk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= efltk
EFLTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.efltk+= efltk>=2.0.5nb1
-BUILDLINK_ABI_DEPENDS.efltk?= efltk>=2.0.5nb9
+BUILDLINK_ABI_DEPENDS.efltk?= efltk>=2.0.5nb10
BUILDLINK_PKGSRCDIR.efltk?= ../../x11/efltk
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index a80b427f9e0..0e4bdba088e 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2010/06/13 22:45:36 wiz Exp $
DISTNAME= Eterm-0.9.5
PKGNAME= ${DISTNAME:S/^E/e/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eterm/}
DISTFILES= ${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/Eterm-/Eterm-bg-/}
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index a33a9fb8683..80a3c90cee4 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:36 wiz Exp $
#
DISTNAME= fast-user-switch-applet-2.24.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/fast-user-switch-applet/2.24/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 8af6f1cb296..b6c3414ae53 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:36 wiz Exp $
#
DISTNAME= fbdesk-1.4.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 wm
MASTER_SITES= http://fluxbox.sourceforge.net/download/
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 5fac5d641e3..929ca9890e1 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.71 2010/04/09 13:35:41 obache Exp $
+# $NetBSD: Makefile,v 1.72 2010/06/13 22:45:36 wiz Exp $
DISTNAME= fltk-1.1.10-source
PKGNAME= ${DISTNAME:S/-source//}
VERS= ${DISTNAME:S/fltk-//:S/-source//}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://ftp.easysw.com/pub/fltk/${VERS}/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index f3c277560a8..94f7265a085 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/03/12 09:23:41 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:36 wiz Exp $
BUILDLINK_TREE+= fltk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= fltk
FLTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.fltk+= fltk>=1.1.5rc1
-BUILDLINK_ABI_DEPENDS.fltk+= fltk>=1.1.7nb1
+BUILDLINK_ABI_DEPENDS.fltk+= fltk>=1.1.10nb1
BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk
BUILDLINK_FILES.fltk+= include/Fl/*
diff --git a/x11/fltk2/Makefile b/x11/fltk2/Makefile
index 4b573255b12..b41bc1c65bb 100644
--- a/x11/fltk2/Makefile
+++ b/x11/fltk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:36 wiz Exp $
VERS= 6129
-PKGREVISION= 3
+PKGREVISION= 4
DISTNAME= fltk-2.0.x-r${VERS}
PKGNAME= fltk2-2.0pre${VERS}
CATEGORIES= x11
diff --git a/x11/fltk2/buildlink3.mk b/x11/fltk2/buildlink3.mk
index 64b0fd4c0a8..c747c02a271 100644
--- a/x11/fltk2/buildlink3.mk
+++ b/x11/fltk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:36 wiz Exp $
BUILDLINK_TREE+= fltk2
@@ -7,7 +7,7 @@ FLTK2_BUILDLINK3_MK:=
BUILDLINK_DEPMETHOD.fltk2?= build
BUILDLINK_API_DEPENDS.fltk2+= fltk2>=2.0pre6129
-BUILDLINK_ABI_DEPENDS.fltk2?= fltk2>=2.0pre6129nb3
+BUILDLINK_ABI_DEPENDS.fltk2?= fltk2>=2.0pre6129nb4
BUILDLINK_PKGSRCDIR.fltk2?= ../../x11/fltk2
.include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index dfb1b9c1cc2..0ce8a777e9c 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:36 wiz Exp $
DISTNAME= fox-1.6.33
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://www.fox-toolkit.org/ftp/
diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index ed437b50305..6f7fe3c69d5 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:45:36 wiz Exp $
BUILDLINK_TREE+= fox
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= fox
FOX_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.fox+= fox>=1.6.25
-BUILDLINK_ABI_DEPENDS.fox?= fox>=1.6.33nb2
+BUILDLINK_ABI_DEPENDS.fox?= fox>=1.6.33nb3
BUILDLINK_PKGSRCDIR.fox?= ../../x11/fox
BUILDLINK_INCDIRS.fox?= include/fox-1.6
diff --git a/x11/ftmenu/Makefile b/x11/ftmenu/Makefile
index 9c92407a5c7..565ee41a769 100644
--- a/x11/ftmenu/Makefile
+++ b/x11/ftmenu/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:29 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:36 wiz Exp $
#
DISTNAME= ftmenu-0.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ftmenu/}
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 483684724ca..36afbdda553 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.156 2010/02/08 09:47:06 tnn Exp $
+# $NetBSD: Makefile,v 1.157 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gdm-2.20.10
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 457347d727d..16ac40e680c 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gnome-applets-2.28.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index 4336e5fcc01..3337169713e 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gnome-control-center-2.28.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-control-center/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-control-center/buildlink3.mk b/x11/gnome-control-center/buildlink3.mk
index d570715a621..d014cb493d2 100644
--- a/x11/gnome-control-center/buildlink3.mk
+++ b/x11/gnome-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:45:37 wiz Exp $
BUILDLINK_TREE+= gnome-control-center
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-control-center
GNOME_CONTROL_CENTER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-control-center+= gnome-control-center>=2.20.0.1
-BUILDLINK_ABI_DEPENDS.gnome-control-center?= gnome-control-center>=2.28.1nb2
+BUILDLINK_ABI_DEPENDS.gnome-control-center?= gnome-control-center>=2.28.1nb4
BUILDLINK_PKGSRCDIR.gnome-control-center?= ../../x11/gnome-control-center
.include "../../sysutils/gnome-menus/buildlink3.mk"
diff --git a/x11/gnome-desktop-sharp/Makefile b/x11/gnome-desktop-sharp/Makefile
index 46828b4a1c6..f1832b271ee 100644
--- a/x11/gnome-desktop-sharp/Makefile
+++ b/x11/gnome-desktop-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gnome-desktop-sharp-2.26.0
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop-sharp/2.26/}
diff --git a/x11/gnome-desktop-sharp/buildlink3.mk b/x11/gnome-desktop-sharp/buildlink3.mk
index 0f72bee1f77..c33080c7776 100644
--- a/x11/gnome-desktop-sharp/buildlink3.mk
+++ b/x11/gnome-desktop-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2010/06/13 22:45:37 wiz Exp $
BUILDLINK_TREE+= gnome-desktop-sharp
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-desktop-sharp
GNOME_DESKTOP_SHARP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-desktop-sharp+= gnome-desktop-sharp>=2.24.0
-BUILDLINK_ABI_DEPENDS.gnome-desktop-sharp?= gnome-desktop-sharp>=2.26.0nb11
+BUILDLINK_ABI_DEPENDS.gnome-desktop-sharp?= gnome-desktop-sharp>=2.26.0nb12
BUILDLINK_PKGSRCDIR.gnome-desktop-sharp?= ../../x11/gnome-desktop-sharp
.include "../../devel/libwnck/buildlink3.mk"
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 656543d239e..3baea25d981 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.99 2010/02/10 19:17:48 joerg Exp $
+# $NetBSD: Makefile,v 1.100 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gnome-desktop-2.28.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index de613596abc..214edc9eaa6 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2010/06/13 22:45:37 wiz Exp $
BUILDLINK_TREE+= gnome-desktop
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-desktop
GNOME_DESKTOP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-desktop+= gnome-desktop>=2.25.3
-BUILDLINK_ABI_DEPENDS.gnome-desktop?= gnome-desktop>=2.26.3nb1
+BUILDLINK_ABI_DEPENDS.gnome-desktop?= gnome-desktop>=2.28.2nb2
BUILDLINK_PKGSRCDIR.gnome-desktop?= ../../x11/gnome-desktop
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index fabfa8f3da0..c64faf0651f 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2010/06/05 11:17:40 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gnome-mag-0.16.1
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-mag/0.16/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
index 2ddb0d8292e..e969e9cf802 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:37 wiz Exp $
BUILDLINK_TREE+= gnome-mag
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-mag
GNOME_MAG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-mag+= gnome-mag>=0.12.0
-BUILDLINK_ABI_DEPENDS.gnome-mag?= gnome-mag>=0.15.8nb1
+BUILDLINK_ABI_DEPENDS.gnome-mag?= gnome-mag>=0.16.1nb1
BUILDLINK_PKGSRCDIR.gnome-mag?= ../../x11/gnome-mag
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 36ef8c38f17..d1d3bd7dc0f 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.119 2010/02/14 11:12:21 drochner Exp $
+# $NetBSD: Makefile,v 1.120 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gnome-panel-2.28.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index cd433041cfc..4a8e1edeb77 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2010/06/13 22:45:37 wiz Exp $
BUILDLINK_TREE+= gnome-panel
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-panel
GNOME_PANEL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.12.1nb3
-BUILDLINK_ABI_DEPENDS.gnome-panel?= gnome-panel>=2.28.0nb1
+BUILDLINK_ABI_DEPENDS.gnome-panel?= gnome-panel>=2.28.0nb3
BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel
pkgbase:= gnome-panel
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 069fb7a1ba6..a66cec32103 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2010/02/18 20:44:19 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gnome-screensaver-2.28.3
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index b46dc8a6aea..12c557a8e13 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.117 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gnome-session-2.26.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.26/}
SITES.gnome-splash-2.16.0.png= ${MASTER_SITE_LOCAL:=gnome-splash/}
diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile
index f6ebe7675f6..3306fb8cac0 100644
--- a/x11/gnome-sharp/Makefile
+++ b/x11/gnome-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:37 wiz Exp $
#
DISTNAME= gnome-sharp-2.24.1
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-sharp/2.24/}
diff --git a/x11/gnome-sharp/buildlink3.mk b/x11/gnome-sharp/buildlink3.mk
index 6a0b6a802b3..d9cbbea9638 100644
--- a/x11/gnome-sharp/buildlink3.mk
+++ b/x11/gnome-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:45:37 wiz Exp $
BUILDLINK_TREE+= gnome-sharp
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-sharp
GNOME_SHARP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-sharp+= gnome-sharp>=2.24.0
-BUILDLINK_ABI_DEPENDS.gnome-sharp?= gnome-sharp>=2.24.1nb6
+BUILDLINK_ABI_DEPENDS.gnome-sharp?= gnome-sharp>=2.24.1nb7
BUILDLINK_PKGSRCDIR.gnome-sharp?= ../../x11/gnome-sharp
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 839d82d0596..30395301cc5 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/06/12 12:50:44 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:38 wiz Exp $
#
DISTNAME= gnome-terminal-2.28.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index ae1e1dc71b3..781bdec6a04 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:38 wiz Exp $
#
DISTNAME= gnome-themes-extras-2.22.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-themes-extras/2.22/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 312b2fd6dde..1eb5b598671 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2009/10/24 12:52:32 drochner Exp $
+# $NetBSD: Makefile,v 1.76 2010/06/13 22:45:38 wiz Exp $
#
DISTNAME= gnome-themes-2.28.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-themes/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index a2a67918c6c..d44c6b1417e 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2010/06/13 22:45:38 wiz Exp $
#
DISTNAME= gnopernicus-1.1.1
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnopernicus/1.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 71335f76788..8f8adf75def 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:38 wiz Exp $
DISTNAME= gnustep-gui-0.16.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
diff --git a/x11/grandr_applet/Makefile b/x11/grandr_applet/Makefile
index 23bc3cd0cae..066ba2b01ae 100644
--- a/x11/grandr_applet/Makefile
+++ b/x11/grandr_applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:38 wiz Exp $
#
DISTNAME= grandr_applet-0.4
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://dekorte.homeip.net/download/grandr-applet/
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 43b94f84bf1..98f7246b3cd 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:58:30 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:38 wiz Exp $
#
DISTNAME= gromit-20041213
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://www.home.unix-ag.org/simon/gromit/
diff --git a/x11/gselt/Makefile b/x11/gselt/Makefile
index fa0188b276c..88665595fa5 100644
--- a/x11/gselt/Makefile
+++ b/x11/gselt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/22 22:30:40 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:38 wiz Exp $
#
DISTNAME= gselt-1.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://offog.org/files/
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 9a80198e5eb..6831ef226d4 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:38 wiz Exp $
DISTNAME= gtk-engines-0.12
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-engines/0.12/}
diff --git a/x11/gtk-sharp/Makefile b/x11/gtk-sharp/Makefile
index c23f04ab2bd..89212765630 100644
--- a/x11/gtk-sharp/Makefile
+++ b/x11/gtk-sharp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/03/16 19:33:37 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:38 wiz Exp $
#
DISTNAME= gtk-sharp-2.12.10
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-sharp/2.12/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtk2+extra/Makefile b/x11/gtk2+extra/Makefile
index f9f6493bca7..59ef6a72cc2 100644
--- a/x11/gtk2+extra/Makefile
+++ b/x11/gtk2+extra/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/04/13 17:44:30 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:39 wiz Exp $
#
DISTNAME= gtk+extra-2.1.2
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkextra/}
diff --git a/x11/gtk2+extra/buildlink3.mk b/x11/gtk2+extra/buildlink3.mk
index fb2a61b983a..b9ee2446fa7 100644
--- a/x11/gtk2+extra/buildlink3.mk
+++ b/x11/gtk2+extra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:45:39 wiz Exp $
BUILDLINK_TREE+= gtk2+extra
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtk2+extra
GTK2_EXTRA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtk2+extra+= gtk2+extra>=2.1.1
-BUILDLINK_ABI_DEPENDS.gtk2+extra?= gtk2+extra>=2.1.1nb4
+BUILDLINK_ABI_DEPENDS.gtk2+extra?= gtk2+extra>=2.1.2nb1
BUILDLINK_PKGSRCDIR.gtk2+extra?= ../../x11/gtk2+extra
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile
index c58b0751bf8..605ebaebad7 100644
--- a/x11/gtk2-chtheme/Makefile
+++ b/x11/gtk2-chtheme/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:58:31 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:39 wiz Exp $
#
DISTNAME= gtk-chtheme-0.3.1
PKGNAME= gtk2-chtheme-0.3.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://plasmasturm.org/code/gtk-chtheme/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile
index 78cbed3acd4..ece043350a0 100644
--- a/x11/gtk2-engines-bluecurve/Makefile
+++ b/x11/gtk2-engines-bluecurve/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2009/08/26 19:58:31 sno Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:39 wiz Exp $
#
DISTNAME= GTK2-Wonderland-Engine-1.0
PKGNAME= gtk2-engines-bluecurve-1.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=teams/art.gnome.org/themes/gtk2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtk2-engines-murrine/Makefile b/x11/gtk2-engines-murrine/Makefile
index 81c19a3a6cd..e09fcaae9b0 100644
--- a/x11/gtk2-engines-murrine/Makefile
+++ b/x11/gtk2-engines-murrine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/09/08 14:39:27 ahoka Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:39 wiz Exp $
DISTNAME= murrine-0.90.3
PKGNAME= ${DISTNAME:S/^/gtk2-engines-/}
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/murrine/0.90/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 287899c9e47..0cce9c2066a 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2010/01/18 18:31:09 drochner Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/13 22:45:39 wiz Exp $
DISTNAME= gtk-engines-2.18.5
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-engines/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 599813007a8..b4c86fc1818 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:39 wiz Exp $
BUILDLINK_TREE+= gtk2-engines
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtk2-engines
GTK2_ENGINES_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtk2-engines+= gtk2-engines>=2.6.0
-BUILDLINK_ABI_DEPENDS.gtk2-engines?= gtk2-engines>=2.18.2nb2
+BUILDLINK_ABI_DEPENDS.gtk2-engines?= gtk2-engines>=2.18.5nb1
BUILDLINK_PKGSRCDIR.gtk2-engines?= ../../x11/gtk2-engines
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index afe6a9645f4..cdd3d30881a 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2009/08/26 19:58:31 sno Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:39 wiz Exp $
#
DISTNAME= gtk-theme-switch-2.0.0rc2
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11
MASTER_SITES= http://www.muhri.net/
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index dd6702ec987..7b59ccab583 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.202 2010/06/01 13:26:31 drochner Exp $
+# $NetBSD: Makefile,v 1.203 2010/06/13 22:45:39 wiz Exp $
DISTNAME= gtk+-2.20.1
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.20/ \
${MASTER_SITE_GNOME:=sources/gtk+/2.20/}
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 544405470f2..7297994d816 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.43 2009/09/07 18:42:39 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2010/06/13 22:45:39 wiz Exp $
BUILDLINK_TREE+= gtk2
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtk2
GTK2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0
-BUILDLINK_ABI_DEPENDS.gtk2+= gtk2+>=2.16.5nb1
+BUILDLINK_ABI_DEPENDS.gtk2+= gtk2+>=2.20.1nb1
BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2
.include "../../mk/bsd.fast.prefs.mk"
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index eee7b1f0df1..3d449b6693a 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.128 2010/05/31 18:32:41 wiz Exp $
+$NetBSD: distinfo,v 1.129 2010/06/13 22:45:39 wiz Exp $
SHA1 (gtk+-2.20.1.tar.bz2) = a80953b4e81c6a5bc2a986852f7fe60c8704cc02
RMD160 (gtk+-2.20.1.tar.bz2) = bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361
Size (gtk+-2.20.1.tar.bz2) = 19089076 bytes
SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3
SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
-SHA1 (patch-af) = 54408034519f752de662567ea9d65056f2d27d95
+SHA1 (patch-af) = eb3eb3033d7fb3b8fba92a965072786da2f18e19
SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index 1f5d063fdda..21b35e6fa94 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,8 +1,28 @@
-$NetBSD: patch-af,v 1.17 2010/03/16 08:40:15 wiz Exp $
+$NetBSD: patch-af,v 1.18 2010/06/13 22:45:39 wiz Exp $
---- configure.orig 2010-03-15 22:37:29.000000000 +0000
+--- configure.orig 2010-05-02 23:55:05.000000000 +0000
+++ configure
-@@ -23073,7 +23073,7 @@ _ACEOF
+@@ -21748,14 +21748,14 @@ $as_echo "$as_me: WARNING: *** JPEG load
+ fi
+
+ if test x$with_libpng != xno && test -z "$LIBPNG"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5
+-$as_echo_n "checking for libpng12... " >&6; }
+- if $PKG_CONFIG --exists libpng12 ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
++$as_echo_n "checking for libpng... " >&6; }
++ if $PKG_CONFIG --exists libpng ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ PNG='png'
+- PNG_DEP_CFLAGS_PACKAGES=libpng12
+- LIBPNG=`$PKG_CONFIG --libs libpng12`
++ PNG_DEP_CFLAGS_PACKAGES=libpng
++ LIBPNG=`$PKG_CONFIG --libs libpng`
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -23098,7 +23098,7 @@ _ACEOF
if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
diff --git a/x11/gtkmm-utils/Makefile b/x11/gtkmm-utils/Makefile
index 1658b92eaa6..a33b2a98568 100644
--- a/x11/gtkmm-utils/Makefile
+++ b/x11/gtkmm-utils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/30 10:17:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:39 wiz Exp $
#
DISTNAME= gtkmm-utils-0.4.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://gtkmm-utils.googlecode.com/files/
diff --git a/x11/gtkmm-utils/buildlink3.mk b/x11/gtkmm-utils/buildlink3.mk
index 60809d54dc9..22363893c63 100644
--- a/x11/gtkmm-utils/buildlink3.mk
+++ b/x11/gtkmm-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/04/30 10:18:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:39 wiz Exp $
BUILDLINK_TREE+= gtkmm-utils
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= gtkmm-utils
GTKMM_UTILS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtkmm-utils+= gtkmm-utils>=0.4.1
+BUILDLINK_ABI_DEPENDS.gtkmm-utils?= gtkmm-utils>=0.4.1nb1
BUILDLINK_PKGSRCDIR.gtkmm-utils?= ../../x11/gtkmm-utils
.include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index b6ef368ec99..773306f614a 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2010/06/02 16:45:41 adam Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/13 22:45:39 wiz Exp $
DISTNAME= gtkmm-2.20.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkmm/2.20/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk
index c93e0968cc4..44ae17e1e9a 100644
--- a/x11/gtkmm/buildlink3.mk
+++ b/x11/gtkmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/06/02 16:45:41 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:39 wiz Exp $
BUILDLINK_TREE+= gtkmm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtkmm
GTKMM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtkmm+= gtkmm>=2.20.3
-BUILDLINK_ABI_DEPENDS.gtkmm+= gtkmm>=2.20.3
+BUILDLINK_ABI_DEPENDS.gtkmm+= gtkmm>=2.20.3nb1
BUILDLINK_PKGSRCDIR.gtkmm?= ../../x11/gtkmm
.include "../../devel/pangomm/buildlink3.mk"
diff --git a/x11/gtksourceview-sharp2/Makefile b/x11/gtksourceview-sharp2/Makefile
index 904a300c47b..09fb6f9ceac 100644
--- a/x11/gtksourceview-sharp2/Makefile
+++ b/x11/gtksourceview-sharp2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:40 wiz Exp $
DISTNAME= gtksourceview-sharp-2.0-0.12
PKGNAME= ${DISTNAME:S/-2.0-/2-/}
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= x11
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/gtksourceview-sharp2/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index aeda548dba1..a7ddeb80d4e 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:40 wiz Exp $
#
DISTNAME= gtksourceview-1.8.5
#PKGREVISION= 1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtksourceview/1.8/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index 7351edac7cd..caad4e65662 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:45:40 wiz Exp $
BUILDLINK_TREE+= gtksourceview
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtksourceview
GTKSOURCEVIEW_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtksourceview+= gtksourceview>=1.8.5
-BUILDLINK_ABI_DEPENDS.gtksourceview?= gtksourceview>=1.8.5nb3
+BUILDLINK_ABI_DEPENDS.gtksourceview?= gtksourceview>=1.8.5nb4
BUILDLINK_PKGSRCDIR.gtksourceview?= ../../x11/gtksourceview
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gtksourceview2/Makefile b/x11/gtksourceview2/Makefile
index 6c9fe16b53c..234e1a9b57d 100644
--- a/x11/gtksourceview2/Makefile
+++ b/x11/gtksourceview2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 18:26:42 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:40 wiz Exp $
#
DISTNAME= gtksourceview-${DISTVER}
PKGNAME= gtksourceview2-${DISTVER}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtksourceview/2.8/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtksourceview2/buildlink3.mk b/x11/gtksourceview2/buildlink3.mk
index 823f87fdaf3..60ca948b1c1 100644
--- a/x11/gtksourceview2/buildlink3.mk
+++ b/x11/gtksourceview2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:40 wiz Exp $
BUILDLINK_TREE+= gtksourceview2
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gtksourceview2
GTKSOURCEVIEW2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtksourceview2+= gtksourceview2>=2.0.2
-BUILDLINK_ABI_DEPENDS.gtksourceview2?= gtksourceview2>=2.6.2nb1
+BUILDLINK_ABI_DEPENDS.gtksourceview2?= gtksourceview2>=2.8.2nb1
BUILDLINK_PKGSRCDIR.gtksourceview2?= ../../x11/gtksourceview2
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 73466801256..8efa7b2ff46 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:58:31 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:40 wiz Exp $
DISTNAME= gtkterm2-0.2.3
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkterm/}
diff --git a/x11/hot-babe/Makefile b/x11/hot-babe/Makefile
index 6e16a0f25a0..1311b1ef9c1 100644
--- a/x11/hot-babe/Makefile
+++ b/x11/hot-babe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:40 wiz Exp $
DISTNAME= hot-babe-0.2.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://dindinx.net/hotbabe/downloads/
diff --git a/x11/hsetroot/Makefile b/x11/hsetroot/Makefile
index a3ce3c88bf0..3846f0765f4 100644
--- a/x11/hsetroot/Makefile
+++ b/x11/hsetroot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:40 wiz Exp $
#
DISTNAME= hsetroot-1.0.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= x11
MASTER_SITES= http://thegraveyard.org/files/
diff --git a/x11/kde3-i18n-af/Makefile b/x11/kde3-i18n-af/Makefile
index 2254501c58d..8eec549f1c5 100644
--- a/x11/kde3-i18n-af/Makefile
+++ b/x11/kde3-i18n-af/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:40 wiz Exp $
DISTNAME= kde-i18n-af-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ar/Makefile b/x11/kde3-i18n-ar/Makefile
index b3cde9d5d23..d3e98d37935 100644
--- a/x11/kde3-i18n-ar/Makefile
+++ b/x11/kde3-i18n-ar/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:40 wiz Exp $
DISTNAME= kde-i18n-ar-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-az/Makefile b/x11/kde3-i18n-az/Makefile
index 9ffeee1f24f..93de287e0fa 100644
--- a/x11/kde3-i18n-az/Makefile
+++ b/x11/kde3-i18n-az/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:40 wiz Exp $
DISTNAME= kde-i18n-az-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-bg/Makefile b/x11/kde3-i18n-bg/Makefile
index 7344afd5f70..6af0e2786dd 100644
--- a/x11/kde3-i18n-bg/Makefile
+++ b/x11/kde3-i18n-bg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:40 wiz Exp $
DISTNAME= kde-i18n-bg-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-bn/Makefile b/x11/kde3-i18n-bn/Makefile
index c436c9636c4..10681b0cd0e 100644
--- a/x11/kde3-i18n-bn/Makefile
+++ b/x11/kde3-i18n-bn/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:40 wiz Exp $
DISTNAME= kde-i18n-bn-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-br/Makefile b/x11/kde3-i18n-br/Makefile
index cfa3e5af0ca..b57caa576b5 100644
--- a/x11/kde3-i18n-br/Makefile
+++ b/x11/kde3-i18n-br/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-br-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-bs/Makefile b/x11/kde3-i18n-bs/Makefile
index 8a33731c1ef..576870404ea 100644
--- a/x11/kde3-i18n-bs/Makefile
+++ b/x11/kde3-i18n-bs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-bs-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ca/Makefile b/x11/kde3-i18n-ca/Makefile
index adce046227c..d43f59fe63d 100644
--- a/x11/kde3-i18n-ca/Makefile
+++ b/x11/kde3-i18n-ca/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-ca-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-cs/Makefile b/x11/kde3-i18n-cs/Makefile
index 15da406a2b1..e2289f361c7 100644
--- a/x11/kde3-i18n-cs/Makefile
+++ b/x11/kde3-i18n-cs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-cs-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-cy/Makefile b/x11/kde3-i18n-cy/Makefile
index 7903b0640ac..c1af1a11438 100644
--- a/x11/kde3-i18n-cy/Makefile
+++ b/x11/kde3-i18n-cy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-cy-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-da/Makefile b/x11/kde3-i18n-da/Makefile
index f0e9950aa86..1a7302b7d4d 100644
--- a/x11/kde3-i18n-da/Makefile
+++ b/x11/kde3-i18n-da/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-da-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-de/Makefile b/x11/kde3-i18n-de/Makefile
index 00e3a68af8e..2944fbd424d 100644
--- a/x11/kde3-i18n-de/Makefile
+++ b/x11/kde3-i18n-de/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-de-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-el/Makefile b/x11/kde3-i18n-el/Makefile
index 9e28801f5b4..b5dadfc20b8 100644
--- a/x11/kde3-i18n-el/Makefile
+++ b/x11/kde3-i18n-el/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-el-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-en_GB/Makefile b/x11/kde3-i18n-en_GB/Makefile
index 789c7149d95..4a100951c52 100644
--- a/x11/kde3-i18n-en_GB/Makefile
+++ b/x11/kde3-i18n-en_GB/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-en_GB-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-eo/Makefile b/x11/kde3-i18n-eo/Makefile
index 889957a81bb..60a7f2a8508 100644
--- a/x11/kde3-i18n-eo/Makefile
+++ b/x11/kde3-i18n-eo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-eo-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-es/Makefile b/x11/kde3-i18n-es/Makefile
index 09f7cd55de2..736879359a1 100644
--- a/x11/kde3-i18n-es/Makefile
+++ b/x11/kde3-i18n-es/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
DISTNAME= kde-i18n-es-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-et/Makefile b/x11/kde3-i18n-et/Makefile
index 39dc775fe70..f0e6314cd52 100644
--- a/x11/kde3-i18n-et/Makefile
+++ b/x11/kde3-i18n-et/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-et-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-eu/Makefile b/x11/kde3-i18n-eu/Makefile
index fb19f240b53..051f9e66fa3 100644
--- a/x11/kde3-i18n-eu/Makefile
+++ b/x11/kde3-i18n-eu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-eu-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-fa/Makefile b/x11/kde3-i18n-fa/Makefile
index 09838e4b1d3..8dcf80fe88e 100644
--- a/x11/kde3-i18n-fa/Makefile
+++ b/x11/kde3-i18n-fa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-fa-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-fi/Makefile b/x11/kde3-i18n-fi/Makefile
index b80905f2189..9770a506842 100644
--- a/x11/kde3-i18n-fi/Makefile
+++ b/x11/kde3-i18n-fi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-fi-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-fr/Makefile b/x11/kde3-i18n-fr/Makefile
index 5002cbe645e..819b84f67ab 100644
--- a/x11/kde3-i18n-fr/Makefile
+++ b/x11/kde3-i18n-fr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-fr-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-fy/Makefile b/x11/kde3-i18n-fy/Makefile
index c54aa258263..45ed9632f75 100644
--- a/x11/kde3-i18n-fy/Makefile
+++ b/x11/kde3-i18n-fy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-fy-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ga/Makefile b/x11/kde3-i18n-ga/Makefile
index 2ca2d219fd5..83392483013 100644
--- a/x11/kde3-i18n-ga/Makefile
+++ b/x11/kde3-i18n-ga/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-ga-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-gl/Makefile b/x11/kde3-i18n-gl/Makefile
index e40acad54a5..c8c5902e5a2 100644
--- a/x11/kde3-i18n-gl/Makefile
+++ b/x11/kde3-i18n-gl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-gl-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-he/Makefile b/x11/kde3-i18n-he/Makefile
index 31c89c963fd..e1fce843683 100644
--- a/x11/kde3-i18n-he/Makefile
+++ b/x11/kde3-i18n-he/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-he-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-hi/Makefile b/x11/kde3-i18n-hi/Makefile
index 4ac09d61807..bd0087092c5 100644
--- a/x11/kde3-i18n-hi/Makefile
+++ b/x11/kde3-i18n-hi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-hi-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-hr/Makefile b/x11/kde3-i18n-hr/Makefile
index c4c809c33a6..c4d1f5e8cd8 100644
--- a/x11/kde3-i18n-hr/Makefile
+++ b/x11/kde3-i18n-hr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:42 wiz Exp $
DISTNAME= kde-i18n-hr-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-hu/Makefile b/x11/kde3-i18n-hu/Makefile
index 75142238b22..0d62e186dfe 100644
--- a/x11/kde3-i18n-hu/Makefile
+++ b/x11/kde3-i18n-hu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-hu-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-is/Makefile b/x11/kde3-i18n-is/Makefile
index 229538a989b..b03dbd8c65e 100644
--- a/x11/kde3-i18n-is/Makefile
+++ b/x11/kde3-i18n-is/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-is-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-it/Makefile b/x11/kde3-i18n-it/Makefile
index 35e5e153efd..822e19dc3c5 100644
--- a/x11/kde3-i18n-it/Makefile
+++ b/x11/kde3-i18n-it/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-it-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ja/Makefile b/x11/kde3-i18n-ja/Makefile
index a07bf1a72a7..2b93913c858 100644
--- a/x11/kde3-i18n-ja/Makefile
+++ b/x11/kde3-i18n-ja/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-ja-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-kk/Makefile b/x11/kde3-i18n-kk/Makefile
index daee90e7da2..8be3c34d024 100644
--- a/x11/kde3-i18n-kk/Makefile
+++ b/x11/kde3-i18n-kk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-kk-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-km/Makefile b/x11/kde3-i18n-km/Makefile
index 13327e3e28c..cb3d2736e45 100644
--- a/x11/kde3-i18n-km/Makefile
+++ b/x11/kde3-i18n-km/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-km-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ko/Makefile b/x11/kde3-i18n-ko/Makefile
index 707512a334b..b5bfb13d542 100644
--- a/x11/kde3-i18n-ko/Makefile
+++ b/x11/kde3-i18n-ko/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-ko-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-lt/Makefile b/x11/kde3-i18n-lt/Makefile
index 504a80e3bf1..a608446e959 100644
--- a/x11/kde3-i18n-lt/Makefile
+++ b/x11/kde3-i18n-lt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-lt-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-lv/Makefile b/x11/kde3-i18n-lv/Makefile
index ae7a3980fd2..7f9c5f95e7b 100644
--- a/x11/kde3-i18n-lv/Makefile
+++ b/x11/kde3-i18n-lv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-lv-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-mk/Makefile b/x11/kde3-i18n-mk/Makefile
index 2c1bd9f44e4..e8f8390abf6 100644
--- a/x11/kde3-i18n-mk/Makefile
+++ b/x11/kde3-i18n-mk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-mk-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-mn/Makefile b/x11/kde3-i18n-mn/Makefile
index a3ab14dc95d..2b26889ddb3 100644
--- a/x11/kde3-i18n-mn/Makefile
+++ b/x11/kde3-i18n-mn/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:43 wiz Exp $
DISTNAME= kde-i18n-mn-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ms/Makefile b/x11/kde3-i18n-ms/Makefile
index b3df14edec1..12c4ccd4b03 100644
--- a/x11/kde3-i18n-ms/Makefile
+++ b/x11/kde3-i18n-ms/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-ms-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-nb/Makefile b/x11/kde3-i18n-nb/Makefile
index 62a6758ae02..7879f28d737 100644
--- a/x11/kde3-i18n-nb/Makefile
+++ b/x11/kde3-i18n-nb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-nb-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-nds/Makefile b/x11/kde3-i18n-nds/Makefile
index 7a7be6ccc94..bfd1f46c8cb 100644
--- a/x11/kde3-i18n-nds/Makefile
+++ b/x11/kde3-i18n-nds/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-nds-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-nl/Makefile b/x11/kde3-i18n-nl/Makefile
index c91b048e099..91499af8720 100644
--- a/x11/kde3-i18n-nl/Makefile
+++ b/x11/kde3-i18n-nl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-nl-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-nn/Makefile b/x11/kde3-i18n-nn/Makefile
index e43e66cd2c4..c911a5c25d5 100644
--- a/x11/kde3-i18n-nn/Makefile
+++ b/x11/kde3-i18n-nn/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-nn-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-pa/Makefile b/x11/kde3-i18n-pa/Makefile
index 2ea2e9bda4a..bd2cd318180 100644
--- a/x11/kde3-i18n-pa/Makefile
+++ b/x11/kde3-i18n-pa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-pa-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-pl/Makefile b/x11/kde3-i18n-pl/Makefile
index 6ed49a2ac19..88b61817abc 100644
--- a/x11/kde3-i18n-pl/Makefile
+++ b/x11/kde3-i18n-pl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-pl-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-pt/Makefile b/x11/kde3-i18n-pt/Makefile
index 98e0ac04965..7dd3539b1e6 100644
--- a/x11/kde3-i18n-pt/Makefile
+++ b/x11/kde3-i18n-pt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-pt-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-pt_BR/Makefile b/x11/kde3-i18n-pt_BR/Makefile
index 975017e442b..dffd31c0311 100644
--- a/x11/kde3-i18n-pt_BR/Makefile
+++ b/x11/kde3-i18n-pt_BR/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-pt_BR-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ro/Makefile b/x11/kde3-i18n-ro/Makefile
index d8264100307..8b817c2c131 100644
--- a/x11/kde3-i18n-ro/Makefile
+++ b/x11/kde3-i18n-ro/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-ro-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ru/Makefile b/x11/kde3-i18n-ru/Makefile
index e6bea423351..fa9a8ecd1a9 100644
--- a/x11/kde3-i18n-ru/Makefile
+++ b/x11/kde3-i18n-ru/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-ru-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-rw/Makefile b/x11/kde3-i18n-rw/Makefile
index 49a638df8e8..1ba599be343 100644
--- a/x11/kde3-i18n-rw/Makefile
+++ b/x11/kde3-i18n-rw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:44 wiz Exp $
DISTNAME= kde-i18n-rw-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-se/Makefile b/x11/kde3-i18n-se/Makefile
index c28207b6bd6..65d1cd5f31a 100644
--- a/x11/kde3-i18n-se/Makefile
+++ b/x11/kde3-i18n-se/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-se-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sk/Makefile b/x11/kde3-i18n-sk/Makefile
index 9fafb898929..a899e790e32 100644
--- a/x11/kde3-i18n-sk/Makefile
+++ b/x11/kde3-i18n-sk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-sk-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sl/Makefile b/x11/kde3-i18n-sl/Makefile
index d793c014a7b..b393a53f51b 100644
--- a/x11/kde3-i18n-sl/Makefile
+++ b/x11/kde3-i18n-sl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-sl-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sr/Makefile b/x11/kde3-i18n-sr/Makefile
index 5b7c93c0a42..1f46db18ffe 100644
--- a/x11/kde3-i18n-sr/Makefile
+++ b/x11/kde3-i18n-sr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-sr-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sr_Latn/Makefile b/x11/kde3-i18n-sr_Latn/Makefile
index c778a4bf9d7..b291c6b0838 100644
--- a/x11/kde3-i18n-sr_Latn/Makefile
+++ b/x11/kde3-i18n-sr_Latn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-sr@Latn-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/@/_/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ss/Makefile b/x11/kde3-i18n-ss/Makefile
index b8345168003..68d80a729d6 100644
--- a/x11/kde3-i18n-ss/Makefile
+++ b/x11/kde3-i18n-ss/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-ss-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sv/Makefile b/x11/kde3-i18n-sv/Makefile
index f3741f010bb..164d94457c9 100644
--- a/x11/kde3-i18n-sv/Makefile
+++ b/x11/kde3-i18n-sv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-sv-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ta/Makefile b/x11/kde3-i18n-ta/Makefile
index ad609784bdb..993918d60ed 100644
--- a/x11/kde3-i18n-ta/Makefile
+++ b/x11/kde3-i18n-ta/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-ta-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-tg/Makefile b/x11/kde3-i18n-tg/Makefile
index 94f6d476f9e..e5cc6ababfb 100644
--- a/x11/kde3-i18n-tg/Makefile
+++ b/x11/kde3-i18n-tg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-tg-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-tr/Makefile b/x11/kde3-i18n-tr/Makefile
index 7c371e33f36..69762237318 100644
--- a/x11/kde3-i18n-tr/Makefile
+++ b/x11/kde3-i18n-tr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-tr-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-uk/Makefile b/x11/kde3-i18n-uk/Makefile
index 7b9c1b1f8a4..21577e8092e 100644
--- a/x11/kde3-i18n-uk/Makefile
+++ b/x11/kde3-i18n-uk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
DISTNAME= kde-i18n-uk-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-uz/Makefile b/x11/kde3-i18n-uz/Makefile
index 7f141183c27..d561ed74d4c 100644
--- a/x11/kde3-i18n-uz/Makefile
+++ b/x11/kde3-i18n-uz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kde-i18n-uz-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-vi/Makefile b/x11/kde3-i18n-vi/Makefile
index 7d9efadef6a..d098cf31d27 100644
--- a/x11/kde3-i18n-vi/Makefile
+++ b/x11/kde3-i18n-vi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kde-i18n-vi-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-zh_CN/Makefile b/x11/kde3-i18n-zh_CN/Makefile
index ef9b44a5b5d..84643c8146b 100644
--- a/x11/kde3-i18n-zh_CN/Makefile
+++ b/x11/kde3-i18n-zh_CN/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kde-i18n-zh_CN-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-zh_TW/Makefile b/x11/kde3-i18n-zh_TW/Makefile
index 52d9dbceabf..6fb238760d6 100644
--- a/x11/kde3-i18n-zh_TW/Makefile
+++ b/x11/kde3-i18n-zh_TW/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kde-i18n-zh_TW-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kdebase-runtime4/Makefile b/x11/kdebase-runtime4/Makefile
index 6fa91a92472..1a253aac9f2 100644
--- a/x11/kdebase-runtime4/Makefile
+++ b/x11/kdebase-runtime4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/05/08 22:13:58 markd Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kdebase-runtime-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Runtime requirements for the KDE integrated X11 desktop
diff --git a/x11/kdebase-runtime4/buildlink3.mk b/x11/kdebase-runtime4/buildlink3.mk
index edcddc97307..7a0ea07cd10 100644
--- a/x11/kdebase-runtime4/buildlink3.mk
+++ b/x11/kdebase-runtime4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:46 wiz Exp $
BUILDLINK_TREE+= kdebase-runtime
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdebase-runtime
KDEBASE_RUNTIME_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdebase-runtime+= kdebase-runtime4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdebase-runtime?= kdebase-runtime4>=4.3.4nb2
+BUILDLINK_ABI_DEPENDS.kdebase-runtime?= kdebase-runtime4>=4.4.4nb1
BUILDLINK_PKGSRCDIR.kdebase-runtime?= ../../x11/kdebase-runtime4
.include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/x11/kdebase-workspace4/Makefile b/x11/kdebase-workspace4/Makefile
index 9158e2bf727..f66b5e17a48 100644
--- a/x11/kdebase-workspace4/Makefile
+++ b/x11/kdebase-workspace4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2010/05/08 22:13:58 markd Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kdebase-workspace-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= base workspace for the KDE 4 integrated X11 desktop
diff --git a/x11/kdebase-workspace4/buildlink3.mk b/x11/kdebase-workspace4/buildlink3.mk
index 3afcf6f8781..c8d82d09a0b 100644
--- a/x11/kdebase-workspace4/buildlink3.mk
+++ b/x11/kdebase-workspace4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:46 wiz Exp $
BUILDLINK_TREE+= kdebase-workspace
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdebase-workspace
KDEBASE_WORKSPACE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdebase-workspace+= kdebase-workspace4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdebase-workspace?= kdebase-workspace4>=4.3.4nb2
+BUILDLINK_ABI_DEPENDS.kdebase-workspace?= kdebase-workspace4>=4.4.4nb1
BUILDLINK_PKGSRCDIR.kdebase-workspace?= ../../x11/kdebase-workspace4
.include "../../graphics/qimageblitz/buildlink3.mk"
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 7242913cf09..0a45f8e2240 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.156 2010/02/19 20:23:01 joerg Exp $
+# $NetBSD: Makefile,v 1.157 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kdebase-${_KDE_VERSION}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index 36437c2cb3c..39432f75502 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2010/06/13 22:45:46 wiz Exp $
BUILDLINK_TREE+= kdebase
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdebase
KDEBASE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdebase+= kdebase>=3.5.0nb2
-BUILDLINK_ABI_DEPENDS.kdebase+= kdebase>=3.5.10nb8
+BUILDLINK_ABI_DEPENDS.kdebase+= kdebase>=3.5.10nb10
BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3
pkgbase := kdebase
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 62b277bd3a4..c22f5b55691 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/01/27 10:38:41 markd Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kdebase-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Base modules for the KDE 4 integrated X11 desktop
diff --git a/x11/kdebindings-ruby/Makefile b/x11/kdebindings-ruby/Makefile
index 5eeb1df8509..d3494846825 100644
--- a/x11/kdebindings-ruby/Makefile
+++ b/x11/kdebindings-ruby/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kdebindings-${_KDE_VERSION}
PKGNAME= kdebindings-ruby-${_KDE_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
COMMENT= Ruby bindings for the KDE integrated X11 desktop
diff --git a/x11/kdebindings-ruby/buildlink3.mk b/x11/kdebindings-ruby/buildlink3.mk
index 411bc726ed7..8e7aab664a1 100644
--- a/x11/kdebindings-ruby/buildlink3.mk
+++ b/x11/kdebindings-ruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:45:46 wiz Exp $
BUILDLINK_TREE+= kdebindings-ruby
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdebindings-ruby
KDEBINDINGS_RUBY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdebindings-ruby+= kdebindings-ruby>=3.5.5
-BUILDLINK_ABI_DEPENDS.kdebindings-ruby?= kdebindings-ruby>=3.5.10nb4
+BUILDLINK_ABI_DEPENDS.kdebindings-ruby?= kdebindings-ruby>=3.5.10nb5
BUILDLINK_PKGSRCDIR.kdebindings-ruby?= ../../x11/kdebindings-ruby
.include "../../lang/ruby/buildlink3.mk"
diff --git a/x11/kdebindings4-python/Makefile b/x11/kdebindings4-python/Makefile
index dfa4cd6f28f..dc902f5bffb 100644
--- a/x11/kdebindings4-python/Makefile
+++ b/x11/kdebindings4-python/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/05/08 22:13:58 markd Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:46 wiz Exp $
PKGNAME= kdebindings4-python-${_KDE_VERSION}
DISTNAME= kdebindings-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Python bindings for the KDE integrated X11 desktop
diff --git a/x11/kdelibdocs3/Makefile b/x11/kdelibdocs3/Makefile
index 33288d4dde4..a2bd2519547 100644
--- a/x11/kdelibdocs3/Makefile
+++ b/x11/kdelibdocs3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2010/06/13 22:45:46 wiz Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGNAME= kdelibdocs-${_KDE_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 devel
COMMENT= KDE library documentation
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index dc20236f2a7..422d76f7c27 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/05/08 22:13:58 markd Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:47 wiz Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
diff --git a/x11/kdelibs4/buildlink3.mk b/x11/kdelibs4/buildlink3.mk
index 6d1b9b4dfb0..6d6405526ef 100644
--- a/x11/kdelibs4/buildlink3.mk
+++ b/x11/kdelibs4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:47 wiz Exp $
BUILDLINK_TREE+= kdelibs
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= kdelibs
KDELIBS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdelibs+= kdelibs4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdelibs?= kdelibs4>=4.3.4nb2
+BUILDLINK_ABI_DEPENDS.kdelibs?= kdelibs4>=4.4.4nb1
BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs4
.include "../../archivers/bzip2/buildlink3.mk"
diff --git a/x11/kkbswitch/Makefile b/x11/kkbswitch/Makefile
index 97530a4294a..ef22b613903 100644
--- a/x11/kkbswitch/Makefile
+++ b/x11/kkbswitch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:47 wiz Exp $
#
DISTNAME= kkbswitch-1.4.3
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= kde x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kkbswitch/}
diff --git a/x11/kmessage/Makefile b/x11/kmessage/Makefile
index e406e08ae86..f8a7e788c07 100644
--- a/x11/kmessage/Makefile
+++ b/x11/kmessage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:47 wiz Exp $
DISTNAME= kmessage-0.1
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= x11 kde
MASTER_SITES= http://soliton.wins.uva.nl/~wijnhout/kmessage/
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 05eb67aac17..de4dd82f801 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2010/02/21 15:39:12 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:47 wiz Exp $
DISTNAME= kterm-6.2.0
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 480b070b8e4..97d0c849222 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2009/12/17 19:20:05 abs Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:47 wiz Exp $
#
DISTNAME= lablgtk-2.12.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index ad4c40f8916..73acc08b337 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:47 wiz Exp $
#
DISTNAME= libgnomekbd-2.28.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/libunique/Makefile b/x11/libunique/Makefile
index 05870672c3b..6abe3e7cfe5 100644
--- a/x11/libunique/Makefile
+++ b/x11/libunique/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/05/07 08:34:23 ahoka Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:47 wiz Exp $
#
DISTNAME= libunique-1.1.6
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libunique/1.1/}
diff --git a/x11/libunique/buildlink3.mk b/x11/libunique/buildlink3.mk
index 9c03f57e713..97df9dd52c8 100644
--- a/x11/libunique/buildlink3.mk
+++ b/x11/libunique/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:56 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:47 wiz Exp $
BUILDLINK_TREE+= libunique
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libunique
LIBUNIQUE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libunique+= libunique>=1.0.4
-BUILDLINK_ABI_DEPENDS.libunique?= libunique>=1.0.8nb1
+BUILDLINK_ABI_DEPENDS.libunique?= libunique>=1.1.6nb1
BUILDLINK_PKGSRCDIR.libunique?= ../../x11/libunique
pkgbase := libunique
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index ab203188af0..ae70caffab4 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:47 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
DISTNAME= libxfcegui4-${XFCE4_VERSION}
PKGNAME= libxfce4gui-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce widget library
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 7f7d2b6c3c5..1173a1ab18f 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2010/06/13 22:45:47 wiz Exp $
BUILDLINK_TREE+= libxfce4gui
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= libxfce4gui
LIBXFCE4GUI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.6.0
+BUILDLINK_ABI_DEPENDS.libxfce4gui?= libxfce4gui>=4.6.1nb1
BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui
.include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/libxfce4menu/buildlink3.mk b/x11/libxfce4menu/buildlink3.mk
index 4b7ef1c1b9b..600ee0980b2 100644
--- a/x11/libxfce4menu/buildlink3.mk
+++ b/x11/libxfce4menu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/09/16 01:05:31 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:47 wiz Exp $
BUILDLINK_TREE+= libxfce4menu
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= libxfce4menu
LIBXFCE4MENU_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libxfce4menu+= libxfce4menu>=4.6.0
+BUILDLINK_ABI_DEPENDS.libxfce4menu?= libxfce4menu>=4.6.1
BUILDLINK_PKGSRCDIR.libxfce4menu?= ../../x11/libxfce4menu
.include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/matchbox-common/Makefile b/x11/matchbox-common/Makefile
index 49a618e8466..b74c9c232bb 100644
--- a/x11/matchbox-common/Makefile
+++ b/x11/matchbox-common/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/07/16 21:39:51 zafer Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:47 wiz Exp $
#
DISTNAME= matchbox-common-0.9.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://matchbox-project.org/sources/matchbox-common/0.9/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/matchbox-desktop/Makefile b/x11/matchbox-desktop/Makefile
index bda3a155cdf..4c72097a394 100644
--- a/x11/matchbox-desktop/Makefile
+++ b/x11/matchbox-desktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/07/16 21:41:24 zafer Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:48 wiz Exp $
#
DISTNAME= matchbox-desktop-0.9.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://matchbox-project.org/sources/matchbox-desktop/0.9/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/matchbox-nest/Makefile b/x11/matchbox-nest/Makefile
index c6d5556bcc0..f82e8923518 100644
--- a/x11/matchbox-nest/Makefile
+++ b/x11/matchbox-nest/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/07/16 21:42:53 zafer Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:48 wiz Exp $
#
DISTNAME= matchbox-nest-0.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://matchbox-project.org/sources/matchbox-nest/0.3/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/matchbox-panel-manager/Makefile b/x11/matchbox-panel-manager/Makefile
index cd7f735abc8..e38100612c0 100644
--- a/x11/matchbox-panel-manager/Makefile
+++ b/x11/matchbox-panel-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2009/08/26 19:58:39 sno Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:48 wiz Exp $
#
DISTNAME= matchbox-panel-manager-0.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://matchbox-project.org/sources/matchbox-panel-manager/0.1/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile
index 98e027e7337..1b0fc0d33a0 100644
--- a/x11/matchbox-panel/Makefile
+++ b/x11/matchbox-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2009/12/17 18:29:05 abs Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:48 wiz Exp $
#
DISTNAME= matchbox-panel-0.9.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://matchbox-project.org/sources/matchbox-panel/0.9/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 592fc0ff7a9..0a506504ec7 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2009/08/26 19:58:39 sno Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:45:48 wiz Exp $
DISTNAME= mlterm-2.9.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/}
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index a74228f1851..5efc04f1667 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:48 wiz Exp $
#
DISTNAME= mrxvt-0.5.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=materm/}
PATCH_SITES= ${MASTER_SITES}
diff --git a/x11/nucleo/Makefile b/x11/nucleo/Makefile
index 309728ae72f..cda7a4d09f7 100644
--- a/x11/nucleo/Makefile
+++ b/x11/nucleo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/02/10 19:17:48 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:48 wiz Exp $
#
DISTNAME= nucleo-0.7.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://insitu.lri.fr/metisse/download/nucleo/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/nucleo/buildlink3.mk b/x11/nucleo/buildlink3.mk
index 7736ae6360b..3d8d8d8ef77 100644
--- a/x11/nucleo/buildlink3.mk
+++ b/x11/nucleo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:45:48 wiz Exp $
BUILDLINK_TREE+= nucleo
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= nucleo
NUCLEO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.nucleo+= nucleo>=0.6
-BUILDLINK_ABI_DEPENDS.nucleo?= nucleo>=0.7.5nb2
+BUILDLINK_ABI_DEPENDS.nucleo?= nucleo>=0.7.5nb4
BUILDLINK_PKGSRCDIR.nucleo?= ../../x11/nucleo
pkgbase:=nucleo
. include "../../mk/pkg-build-options.mk"
diff --git a/x11/nucleo/distinfo b/x11/nucleo/distinfo
index 0263fe29671..0fc62784459 100644
--- a/x11/nucleo/distinfo
+++ b/x11/nucleo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2009/07/14 20:23:16 hasso Exp $
+$NetBSD: distinfo,v 1.6 2010/06/13 22:45:48 wiz Exp $
SHA1 (nucleo-0.7.5.tar.bz2) = 9a32d7dd1c6ad6348efa6bdc691cb46207a148c0
RMD160 (nucleo-0.7.5.tar.bz2) = e997d319a425434b9aa32cc472d33e0d68917f8c
@@ -16,3 +16,4 @@ SHA1 (patch-aj) = f627182b2feec55f5d8fc60ac8c6e32b846e658a
SHA1 (patch-ak) = b88dcb5d6cbc7e23a9b299c6e41e8e605f0bb96f
SHA1 (patch-al) = 6684c1b1a3b85defaed2a7457fe4ef1f7c79c117
SHA1 (patch-am) = 1abd0f40ffe2c9ea42fde983bc784d3a10d1ec02
+SHA1 (patch-an) = 8f9c71660f4a4763a60b00eb6347d8e97d306e8a
diff --git a/x11/nucleo/patches/patch-an b/x11/nucleo/patches/patch-an
new file mode 100644
index 00000000000..6183b522c6b
--- /dev/null
+++ b/x11/nucleo/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.3 2010/06/13 22:45:48 wiz Exp $
+
+--- nucleo/image/encoding/PNGenc.cxx.orig 2008-06-05 12:52:33.000000000 +0000
++++ nucleo/image/encoding/PNGenc.cxx
+@@ -170,7 +170,7 @@ namespace nucleo {
+ &compression_type, &filter_type) ;
+
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ png_set_tRNS_to_alpha(png_ptr);
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index a355ee5ef81..3bb943d8c86 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/13 22:45:48 wiz Exp $
PKGVER= 2.3.1
DISTNAME= openmotif-${PKGVER}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://ftp.ics.com/openmotif/2.3/2.3.1/
MASTER_SITES+= ftp://ftp.ics.com/openmotif/2.3/2.3.1/
diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk
index 66176fbd250..45ae625b333 100644
--- a/x11/openmotif/buildlink3.mk
+++ b/x11/openmotif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:48 wiz Exp $
BUILDLINK_TREE+= openmotif
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= openmotif
OPENMOTIF_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.3.1
-BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.3.1nb3
+BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.3.1nb4
BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/p5-Alien-wxWidgets/Makefile b/x11/p5-Alien-wxWidgets/Makefile
index 74ca8e1f540..72bc15e83e0 100644
--- a/x11/p5-Alien-wxWidgets/Makefile
+++ b/x11/p5-Alien-wxWidgets/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:48 wiz Exp $
#
DISTNAME= Alien-wxWidgets-0.50
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Alien/}
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 631d6911404..5e86ed9584b 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2010/02/16 15:22:45 sno Exp $
+# $NetBSD: Makefile,v 1.66 2010/06/13 22:45:48 wiz Exp $
DISTNAME= Tk-804.028
PKGNAME= p5-Tk-804.028
-PKGREVISION= 4
+PKGREVISION= 5
SVR4_PKGNAME= p5tk
CATEGORIES= x11 tk perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/}
diff --git a/x11/p5-Wx-Perl-ProcessStream/Makefile b/x11/p5-Wx-Perl-ProcessStream/Makefile
index 8ee7721d56a..3b37b4b169e 100644
--- a/x11/p5-Wx-Perl-ProcessStream/Makefile
+++ b/x11/p5-Wx-Perl-ProcessStream/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/03/02 14:27:25 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:49 wiz Exp $
#
DISTNAME= Wx-Perl-ProcessStream-0.27
PKGNAME= p5-${DISTNAME}
#PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= x11 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Wx/}
diff --git a/x11/p5-Wx/Makefile b/x11/p5-Wx/Makefile
index c953ed21e02..cc9d11464e6 100644
--- a/x11/p5-Wx/Makefile
+++ b/x11/p5-Wx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/02/25 13:26:01 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:49 wiz Exp $
#
DISTNAME= Wx-0.9701
PKGNAME= p5-${DISTNAME:S/9701/97.01/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Wx/}
diff --git a/x11/p5-Wx/buildlink3.mk b/x11/p5-Wx/buildlink3.mk
index 0ca683b23a4..a4fdcfd7ab0 100644
--- a/x11/p5-Wx/buildlink3.mk
+++ b/x11/p5-Wx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2010/02/03 11:12:22 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:49 wiz Exp $
BUILDLINK_TREE+= p5-Wx
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= p5-Wx
P5_WX_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.p5-Wx+= p5-Wx>=0.91
+BUILDLINK_ABI_DEPENDS.p5-Wx?= p5-Wx>=0.97.01nb2
BUILDLINK_PKGSRCDIR.p5-Wx?= ../../x11/p5-Wx
BUILDLINK_INCDIRS.p5-Wx?= ${PERL5_SUB_INSTALLVENDORARCH}/auto/Wx
diff --git a/x11/p5-gtk2/Makefile b/x11/p5-gtk2/Makefile
index 4f882b5afd2..07731aa5df8 100644
--- a/x11/p5-gtk2/Makefile
+++ b/x11/p5-gtk2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:49 wiz Exp $
DISTNAME= Gtk2-${DIST_VER}
PKGNAME= p5-gtk2-${DIST_VER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
diff --git a/x11/p5-gtk2/buildlink3.mk b/x11/p5-gtk2/buildlink3.mk
index 58b04b9feda..7194b3c3d0e 100644
--- a/x11/p5-gtk2/buildlink3.mk
+++ b/x11/p5-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:49 wiz Exp $
BUILDLINK_TREE+= p5-gtk2
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= p5-gtk2
P5_GTK2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.p5-gtk2+= p5-gtk2>=1.182
-BUILDLINK_ABI_DEPENDS.p5-gtk2?= p5-gtk2>=1.220nb1
+BUILDLINK_ABI_DEPENDS.p5-gtk2?= p5-gtk2>=1.220nb2
BUILDLINK_PKGSRCDIR.p5-gtk2?= ../../x11/p5-gtk2
.include "../../devel/p5-glib2/buildlink3.mk"
diff --git a/x11/paragui/Makefile b/x11/paragui/Makefile
index e25215dbe96..d31a7479782 100644
--- a/x11/paragui/Makefile
+++ b/x11/paragui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:49 wiz Exp $
#
DISTNAME= paragui-1.0.4
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= x11
MASTER_SITES= http://savannah.nongnu.org/download/paragui/
diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk
index 8030b8d72d4..78e12d39b37 100644
--- a/x11/paragui/buildlink3.mk
+++ b/x11/paragui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:49 wiz Exp $
BUILDLINK_TREE+= paragui
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= paragui
PARAGUI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.paragui+= paragui>=1.0.4nb3
-BUILDLINK_ABI_DEPENDS.paragui+= paragui>=1.0.4nb15
+BUILDLINK_ABI_DEPENDS.paragui+= paragui>=1.0.4nb16
BUILDLINK_PKGSRCDIR.paragui?= ../../x11/paragui
.include "../../devel/SDL/buildlink3.mk"
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 3dc99e14706..add65e798d1 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2010/03/20 12:43:29 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:49 wiz Exp $
#
DISTNAME= gnome-python-desktop-2.28.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/py-gnome2-desktop/buildlink3.mk b/x11/py-gnome2-desktop/buildlink3.mk
index 9870f171c59..a71530bebd6 100644
--- a/x11/py-gnome2-desktop/buildlink3.mk
+++ b/x11/py-gnome2-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/27 18:53:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:49 wiz Exp $
BUILDLINK_TREE+= py-gnome2-desktop
@@ -8,7 +8,7 @@ PY_GNOME2_DESKTOP_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.py-gnome2-desktop+= ${PYPKGPREFIX}-gnome2-desktop>=2.16.0
-BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?= ${PYPKGPREFIX}-gnome2-desktop>=2.26.0nb3
+BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?= ${PYPKGPREFIX}-gnome2-desktop>=2.28.0nb4
BUILDLINK_PKGSRCDIR.py-gnome2-desktop?= ../../x11/py-gnome2-desktop
.include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index b816ece07cb..4131673c6b0 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:49 wiz Exp $
#
DISTNAME= gnome-python-extras-2.14.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python-extras/2.14/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index 793a571144b..93e4b98478c 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/27 18:53:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:49 wiz Exp $
BUILDLINK_TREE+= pygnome2ex
@@ -8,7 +8,7 @@ PYGNOME2EX_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
-BUILDLINK_ABI_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.14.3nb5
+BUILDLINK_ABI_DEPENDS.pygnome2ex+= ${PYPKGPREFIX}-gnome2-extras>=2.14.3nb8
BUILDLINK_PKGSRCDIR.pygnome2ex?= ../../x11/py-gnome2-extras
.include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index e4fd0fe3ef4..79f1cf5afd1 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.67 2010/04/13 17:46:03 drochner Exp $
+# $NetBSD: Makefile,v 1.68 2010/06/13 22:45:49 wiz Exp $
#
DISTNAME= gnome-python-2.28.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
+PKGREVISION= 1
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python/2.28/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index a3b66bf3b0b..6f2e3145532 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/08/27 18:53:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:45:49 wiz Exp $
BUILDLINK_TREE+= pygnome2
@@ -8,7 +8,7 @@ PYGNOME2_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.10.0
-BUILDLINK_ABI_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.26.1nb1
+BUILDLINK_ABI_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.28.1nb1
BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2
.include "../../net/py-ORBit/buildlink3.mk"
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 29a16c1e062..dc910afb860 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.69 2010/01/30 16:27:59 heinz Exp $
+# $NetBSD: Makefile,v 1.70 2010/06/13 22:45:49 wiz Exp $
#
DISTNAME= pygtk-2.16.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
+PKGREVISION= 1
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.16/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 97830b7a5e1..c73f869593e 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/08/27 18:53:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:45:49 wiz Exp $
BUILDLINK_TREE+= pygtk2
@@ -8,7 +8,7 @@ PYGTK2_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.4
-BUILDLINK_ABI_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.14.1nb2
+BUILDLINK_ABI_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.16.0nb1
BUILDLINK_PKGSRCDIR.pygtk2?= ../../x11/py-gtk2
.include "../../devel/py-gobject/buildlink3.mk"
diff --git a/x11/py-gtksourceview/Makefile b/x11/py-gtksourceview/Makefile
index 3f4a27194ac..0223df3b223 100644
--- a/x11/py-gtksourceview/Makefile
+++ b/x11/py-gtksourceview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/11/17 17:08:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:49 wiz Exp $
DISTNAME= pygtksourceview-2.8.0
PKGNAME= ${DISTNAME:S/py/${PYPKGPREFIX}-/}
+PKGREVISION= 1
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtksourceview/2.8/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/py-kiwi/Makefile b/x11/py-kiwi/Makefile
index ab2ffe75a61..8923a229ed8 100644
--- a/x11/py-kiwi/Makefile
+++ b/x11/py-kiwi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:49 wiz Exp $
#
DISTNAME= kiwi-1.9.22
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/kiwi/1.9/}
diff --git a/x11/py-kiwi/buildlink3.mk b/x11/py-kiwi/buildlink3.mk
index fc032c66fa0..b7ea5711b08 100644
--- a/x11/py-kiwi/buildlink3.mk
+++ b/x11/py-kiwi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:49 wiz Exp $
BUILDLINK_TREE+= py-kiwi
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= py-kiwi
PY_KIWI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.py-kiwi+= ${PYPKGPREFIX}-kiwi>=1.9.22
-BUILDLINK_ABI_DEPENDS.py-kiwi?= ${PYPKGPREFIX}-kiwi>=1.9.22nb1
+BUILDLINK_ABI_DEPENDS.py-kiwi?= ${PYPKGPREFIX}-kiwi>=1.9.22nb2
BUILDLINK_PKGSRCDIR.py-kiwi?= ../../x11/py-kiwi
.include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index 8611ec9ad2b..20de2e876b2 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2010/02/04 18:44:23 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:50 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/py-qt3-base/Makefile.common"
PKGNAME= ${PYPKGPREFIX}-qt3-base-${PYQT_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
COMMENT= Python binding for Qt3
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
index 116c71c6e00..ac13c8559c3 100644
--- a/x11/py-qt3-base/buildlink3.mk
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:45:50 wiz Exp $
BUILDLINK_TREE+= pyqt3-base
@@ -8,7 +8,7 @@ PYQT3_BASE_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.pyqt3-base+= ${PYPKGPREFIX}-qt3-base>=3.11
-BUILDLINK_ABI_DEPENDS.pyqt3-base?= ${PYPKGPREFIX}-qt3-base>=3.18.1nb3
+BUILDLINK_ABI_DEPENDS.pyqt3-base?= ${PYPKGPREFIX}-qt3-base>=3.18.1nb5
BUILDLINK_PKGSRCDIR.pyqt3-base?= ../../x11/py-qt3-base
BUILDLINK_LIBDIRS.pyqt3-base+= ${PYSITELIB}
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index e06feb593dc..ad8d8c3e234 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/02/04 18:44:23 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:45:50 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/py-qt3-base/Makefile.common"
PKGNAME= ${PYPKGPREFIX}-qt3-modules-${PYQT_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
COMMENT= Various Python modules for Qt3
diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk
index 8b7025a3700..1dc6630e0ba 100644
--- a/x11/py-qt3-modules/buildlink3.mk
+++ b/x11/py-qt3-modules/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:45:50 wiz Exp $
BUILDLINK_TREE+= pyqt3-mod
@@ -8,7 +8,7 @@ PYQT3_MOD_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.pyqt3-mod+= ${PYPKGPREFIX}-qt3-modules>=3.11
-BUILDLINK_ABI_DEPENDS.pyqt3-mod+= ${PYPKGPREFIX}-qt3-modules>=3.18.1nb3
+BUILDLINK_ABI_DEPENDS.pyqt3-mod+= ${PYPKGPREFIX}-qt3-modules>=3.18.1nb5
BUILDLINK_PKGSRCDIR.pyqt3-mod?= ../../x11/py-qt3-modules
BUILDLINK_LIBDIRS.pyqt3-mod+= ${PYSITELIB}
diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index b25f1c9cf36..7b894608bcf 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2010/02/04 18:44:23 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:50 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/py-qt3-base/Makefile.common"
PKGNAME= ${PYPKGPREFIX}-qt3-qscintilla-${PYQT_VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
COMMENT= Python binding for QScintilla
diff --git a/x11/py-qt4-qscintilla/Makefile b/x11/py-qt4-qscintilla/Makefile
index e579bc9746a..9a5f249438a 100644
--- a/x11/py-qt4-qscintilla/Makefile
+++ b/x11/py-qt4-qscintilla/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/08 15:34:02 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:50 wiz Exp $
#
DISTNAME= QScintilla-gpl-2.4.3
PKGNAME= ${PYPKGPREFIX}-qt4-${DISTNAME:tl:S/-gpl-/-/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/QScintilla2/
diff --git a/x11/py-qt4-qscintilla/buildlink3.mk b/x11/py-qt4-qscintilla/buildlink3.mk
index 46bd285d079..ca7c598ff4f 100644
--- a/x11/py-qt4-qscintilla/buildlink3.mk
+++ b/x11/py-qt4-qscintilla/buildlink3.mk
@@ -1,17 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/05/08 15:34:02 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:50 wiz Exp $
-BUILDLINK_TREE+= py26-qt4-qscintilla
+BUILDLINK_TREE+= py-qt4-qscintilla
-.if !defined(PY26_QT4_QSCINTILLA_BUILDLINK3_MK)
-PY26_QT4_QSCINTILLA_BUILDLINK3_MK:=
+.if !defined(PY_QT4_QSCINTILLA_BUILDLINK3_MK)
+PY_QT4_QSCINTILLA_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.py26-qt4-qscintilla+= ${PYPKGPREFIX}-qt4-qscintilla>=2.4.3
-BUILDLINK_PKGSRCDIR.py26-qt4-qscintilla?= ../../x11/py-qt4-qscintilla
+BUILDLINK_API_DEPENDS.py-qt4-qscintilla+= ${PYPKGPREFIX}-qt4-qscintilla>=2.4.3
+BUILDLINK_ABI_DEPENDS.py-qt4-qscintilla?= ${PYPKGPREFIX}-qt4-qscintilla>=2.4.3nb1
+BUILDLINK_PKGSRCDIR.py-qt4-qscintilla?= ../../x11/py-qt4-qscintilla
.include "../../x11/py-sip/buildlink3.mk"
.include "../../x11/py-qt4/buildlink3.mk"
.include "../../x11/qt4-qscintilla/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
-.endif # PY26_QT4_QSCINTILLA_BUILDLINK3_MK
+.endif # PY_QT4_QSCINTILLA_BUILDLINK3_MK
-BUILDLINK_TREE+= -py26-qt4-qscintilla
+BUILDLINK_TREE+= -py-qt4-qscintilla
diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index e5f8cfc0a12..e9f40c51ba4 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2010/04/22 16:47:31 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:50 wiz Exp $
#
PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION}
PYQT_VERSION= 4.7.3
+PKGREVISION= 1
CATEGORIES= x11 python
MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt4/
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index aab19fa87ee..8c7f0ff2473 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:50 wiz Exp $
#
VERSION= 2.8.10.1
DISTNAME= wxPython-src-${VERSION}
PKGNAME= ${PYPKGPREFIX}-wxWidgets-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxpython/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk
index 508223aaccf..c5fae9f9812 100644
--- a/x11/py-wxWidgets/buildlink3.mk
+++ b/x11/py-wxWidgets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:50 wiz Exp $
BUILDLINK_TREE+= ${PYPKGPREFIX}-wxWidgets
@@ -8,7 +8,7 @@ PY_WXWIDGETS_BUILDLINK3_MK:=
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0
-BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?= ${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb2
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?= ${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb3
BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?= ../../x11/py-wxWidgets
.include "../../x11/wxGTK28/buildlink3.mk"
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index a9d0a74cfd2..20f6fa9acb1 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:50 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt3-libs/Makefile.common"
PKGNAME= qt3-docs-${QTVERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Documentation for the QT C++ X GUI toolkit
BUILD_QT3= yes
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 444c510e02b..10e6818f19a 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:50 wiz Exp $
PKGNAME= qt3-libs-${QTVERSION}
-PKGREVISION= 12
+PKGREVISION= 14
MAINTAINER= adam@NetBSD.org
COMMENT= C++ X GUI toolkit
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index 6fbd7ad65f1..caef5d397bd 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2010/06/13 22:45:50 wiz Exp $
BUILDLINK_TREE+= qt3-libs
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt3-libs
QT3_LIBS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt3-libs+= qt3-libs>=3.2.3
-BUILDLINK_ABI_DEPENDS.qt3-libs?= qt3-libs>=3.3.8nb12
+BUILDLINK_ABI_DEPENDS.qt3-libs?= qt3-libs>=3.3.8nb14
BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs
BUILDLINK_INCDIRS.qt3-libs+= qt3/include
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index ca430337abe..ef822cfa610 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2009/07/11 09:11:13 rillig Exp $
+$NetBSD: distinfo,v 1.52 2010/06/13 22:45:50 wiz Exp $
SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7
RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4
@@ -21,6 +21,7 @@ SHA1 (patch-ao) = 3aacba05b27314cadab7dceba3c21d65bab608d3
SHA1 (patch-ap) = 5040628324d271abfc662c5a6eeb4f1ecf0d4758
SHA1 (patch-aq) = c17ff8b42901ae9a3cc51c33cffe4cffa64b4e4d
SHA1 (patch-ar) = 84c0d7153feabcab6558ba84fbaa723f1c238e40
+SHA1 (patch-as) = 4d173ad8adfe40845653e8309fe2fee7c8ac7897
SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5
SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830
diff --git a/x11/qt3-libs/patches/patch-as b/x11/qt3-libs/patches/patch-as
new file mode 100644
index 00000000000..212103a9dc3
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1 2010/06/13 22:45:50 wiz Exp $
+
+--- src/kernel/qpngio.cpp.orig 2007-02-02 14:01:15.000000000 +0000
++++ src/kernel/qpngio.cpp
+@@ -159,7 +159,7 @@ void setup_qt( QImage& image, png_struct
+ image.setColor( i, qRgba(c,c,c,0xff) );
+ }
+ if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+- const int g = info_ptr->trans_values.gray;
++ const int g = info_ptr->trans_color.gray;
+ if (g < ncols) {
+ image.setAlphaBuffer(TRUE);
+ image.setColor(g, image.color(g) & RGB_MASK);
+@@ -187,7 +187,7 @@ void setup_qt( QImage& image, png_struct
+ info_ptr->palette[i].red,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].blue,
+- info_ptr->trans[i]
++ info_ptr->trans_alpha[i]
+ )
+ );
+ i++;
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index da2f9084af5..e0a5dace64a 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:50 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt3-libs/Makefile.common"
PKGNAME= qt3-mysql-${QTVERSION}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= QT mysql driver
CONFIGURE_ARGS+= -I${QTDIR}/include \
diff --git a/x11/qt3-pgsql/Makefile b/x11/qt3-pgsql/Makefile
index 573e6967f2e..14d3c1bd99e 100644
--- a/x11/qt3-pgsql/Makefile
+++ b/x11/qt3-pgsql/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2010/02/10 19:34:08 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:51 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt3-libs/Makefile.common"
PKGNAME= qt3-psql-${QTVERSION}
-PKGREVISION= 6
+PKGREVISION= 7
COMMENT= QT postgresql driver
CONFIGURE_ARGS+= -I${QTDIR}/include \
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index 57d1fc390ec..e9055083f5d 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:51 wiz Exp $
#
DISTNAME= qscintilla-1.65-gpl-1.6
PKGNAME= qt3-qscintilla-1.6
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= x11
MASTER_SITES= http://www.river-bank.demon.co.uk/download/QScintilla/
diff --git a/x11/qt3-qscintilla/buildlink3.mk b/x11/qt3-qscintilla/buildlink3.mk
index a2ccf87236e..baa8277d0a3 100644
--- a/x11/qt3-qscintilla/buildlink3.mk
+++ b/x11/qt3-qscintilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:51 wiz Exp $
BUILDLINK_TREE+= qt3-qscintilla
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt3-qscintilla
QT3_QSCINTILLA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt3-qscintilla+= qt3-qscintilla>=1.2
-BUILDLINK_ABI_DEPENDS.qt3-qscintilla+= qt3-qscintilla>=1.6nb5
+BUILDLINK_ABI_DEPENDS.qt3-qscintilla+= qt3-qscintilla>=1.6nb6
BUILDLINK_PKGSRCDIR.qt3-qscintilla?= ../../x11/qt3-qscintilla
.include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index f1764ecfdcb..51ccad21497 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2010/06/13 22:45:51 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -11,7 +11,7 @@ GCC_REQD+= 3.4
.include "../../x11/qt3-libs/Makefile.common"
PKGNAME= qt3-tools-${QTVERSION}
-PKGREVISION= 5
+PKGREVISION= 6
COMMENT= QT GUI (WYSIWYG) builder and other tools
DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk
index 8746a773e87..358bb0a48ea 100644
--- a/x11/qt3-tools/buildlink3.mk
+++ b/x11/qt3-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:51 wiz Exp $
BUILDLINK_TREE+= qt3-tools
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt3-tools
QT3_TOOLS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb3
-BUILDLINK_ABI_DEPENDS.qt3-tools+= qt3-tools>=3.3.8nb5
+BUILDLINK_ABI_DEPENDS.qt3-tools+= qt3-tools>=3.3.8nb6
BUILDLINK_PKGSRCDIR.qt3-tools?= ../../x11/qt3-tools
BUILDLINK_DEPMETHOD.qt3-tools?= build
diff --git a/x11/qt4-creator/Makefile b/x11/qt4-creator/Makefile
index d0e0a1c5ae8..a432f81905d 100644
--- a/x11/qt4-creator/Makefile
+++ b/x11/qt4-creator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/05/19 17:51:22 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:51 wiz Exp $
#
DISTNAME= qt-creator-1.3.1-src
PKGNAME= qt4-creator-1.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://get.qt.nokia.com/qtcreator/
diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile
index 0d9c8e7613d..8f2667e7635 100644
--- a/x11/qt4-docs/Makefile
+++ b/x11/qt4-docs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/10/11 09:14:52 adam Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:51 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION= 1
PKGNAME= qt4-docs-${QTVERSION}
COMMENT= Documentation for the QT C++ X GUI toolkit
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 7802c8d4f59..08890c9f277 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.47 2010/05/29 17:10:31 adam Exp $
+# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:51 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= C++ X GUI toolkit
# XXX this is to test what really gets installed when 'do-install' is disabled
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index 2c9b619676b..b748761cbb3 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/02/02 14:05:59 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:51 wiz Exp $
BUILDLINK_TREE+= qt4-libs
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt4-libs
QT4_LIBS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2
-BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2
+BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.6.2nb3
BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
BUILDLINK_INCDIRS.qt4-libs+= qt4/include
diff --git a/x11/qt4-mng/Makefile b/x11/qt4-mng/Makefile
index 45ac74840c0..d2460ffd4c4 100644
--- a/x11/qt4-mng/Makefile
+++ b/x11/qt4-mng/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/02 14:07:18 adam Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:51 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION= 1
PKGNAME= qt4-mng-${QTVERSION}
COMMENT= QT MNG image format plugin
diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile
index 63b9ded8a97..f1d1f162b54 100644
--- a/x11/qt4-mysql/Makefile
+++ b/x11/qt4-mysql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:51 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION= 1
PKGNAME= qt4-mysql-${QTVERSION}
COMMENT= QT mysql driver
diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile
index 4223ca5e9e2..680be049a1a 100644
--- a/x11/qt4-pgsql/Makefile
+++ b/x11/qt4-pgsql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/02/16 13:08:09 adam Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:51 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION= 1
PKGNAME= qt4-pgsql-${QTVERSION}
COMMENT= QT postgresql driver
diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile
index 120b8ad23d7..19eab57ba65 100644
--- a/x11/qt4-qdbus/Makefile
+++ b/x11/qt4-qdbus/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:51 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION= 1
PKGNAME= qt4-qdbus-${QTVERSION}
COMMENT= QT DBus support
diff --git a/x11/qt4-qdbus/buildlink3.mk b/x11/qt4-qdbus/buildlink3.mk
index 6608f6a26ab..461ef3c8ed0 100644
--- a/x11/qt4-qdbus/buildlink3.mk
+++ b/x11/qt4-qdbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:51 wiz Exp $
BUILDLINK_TREE+= qt4-qdbus
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt4-qdbus
QT4_QDBUS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.3.2
-BUILDLINK_ABI_DEPENDS.qt4-qdbus?= qt4-qdbus>=4.5.3nb2
+BUILDLINK_ABI_DEPENDS.qt4-qdbus?= qt4-qdbus>=4.6.2nb1
BUILDLINK_PKGSRCDIR.qt4-qdbus?= ../../x11/qt4-qdbus
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/qt4-qscintilla/Makefile b/x11/qt4-qscintilla/Makefile
index a5a949d3b59..8015fa46ded 100644
--- a/x11/qt4-qscintilla/Makefile
+++ b/x11/qt4-qscintilla/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/08 15:32:13 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:51 wiz Exp $
#
DISTNAME= QScintilla-gpl-2.4.3
PKGNAME= qt4-${DISTNAME:tl:S/-gpl-/-/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/QScintilla2/
diff --git a/x11/qt4-qscintilla/buildlink3.mk b/x11/qt4-qscintilla/buildlink3.mk
index 7965fc188f8..a7965b66c73 100644
--- a/x11/qt4-qscintilla/buildlink3.mk
+++ b/x11/qt4-qscintilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/05/08 15:32:13 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:51 wiz Exp $
BUILDLINK_TREE+= qt4-qscintilla
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= qt4-qscintilla
QT4_QSCINTILLA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt4-qscintilla+= qt4-qscintilla>=2.4.3
+BUILDLINK_ABI_DEPENDS.qt4-qscintilla?= qt4-qscintilla>=2.4.3nb1
BUILDLINK_PKGSRCDIR.qt4-qscintilla?= ../../x11/qt4-qscintilla
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile
index 9dc06c338d1..862ddd23dce 100644
--- a/x11/qt4-sqlite3/Makefile
+++ b/x11/qt4-sqlite3/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:52 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION= 1
PKGNAME= qt4-sqlite3-${QTVERSION}
COMMENT= QT sqlite3 driver
diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile
index e810b4ca83a..6d6d2e63f45 100644
--- a/x11/qt4-tiff/Makefile
+++ b/x11/qt4-tiff/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:52 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION= 1
PKGNAME= qt4-tiff-${QTVERSION}
COMMENT= QT TIFF image format plugin
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index b239d629dda..6ac8c38924d 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2010/02/16 13:08:09 adam Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:52 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION= 1
PKGNAME= qt4-tools-${QTVERSION}
COMMENT= QT GUI (WYSIWYG) builder and other tools
diff --git a/x11/qt4-tools/buildlink3.mk b/x11/qt4-tools/buildlink3.mk
index e778fd845ea..d4724d43258 100644
--- a/x11/qt4-tools/buildlink3.mk
+++ b/x11/qt4-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:52 wiz Exp $
BUILDLINK_TREE+= qt4-tools
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt4-tools
QT4_TOOLS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.1.0
-BUILDLINK_ABI_DEPENDS.qt4-tools+= qt4-tools>=4.5.3nb2
+BUILDLINK_ABI_DEPENDS.qt4-tools+= qt4-tools>=4.6.2nb1
BUILDLINK_PKGSRCDIR.qt4-tools?= ../../x11/qt4-tools
BUILDLINK_DEPMETHOD.qt4-tools?= build
diff --git a/x11/qwt-qt4/Makefile b/x11/qwt-qt4/Makefile
index 79c6d6c13d8..6972bc1ebae 100644
--- a/x11/qwt-qt4/Makefile
+++ b/x11/qwt-qt4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:52 wiz Exp $
DISTNAME= qwt-5.2.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwt/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/qwt-qt4/buildlink3.mk b/x11/qwt-qt4/buildlink3.mk
index 74e8377b49f..49f4080f2cc 100644
--- a/x11/qwt-qt4/buildlink3.mk
+++ b/x11/qwt-qt4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:52 wiz Exp $
BUILDLINK_TREE+= qwt
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qwt
QWT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qwt+= qwt>=5.2.0
-BUILDLINK_ABI_DEPENDS.qwt?= qwt>=5.2.0nb1
+BUILDLINK_ABI_DEPENDS.qwt?= qwt>=5.2.0nb2
BUILDLINK_PKGSRCDIR.qwt?= ../../x11/qwt-qt4
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/qwtplot3d-qt4/Makefile b/x11/qwtplot3d-qt4/Makefile
index d216a1918fe..d411fd3b550 100644
--- a/x11/qwtplot3d-qt4/Makefile
+++ b/x11/qwtplot3d-qt4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:52 wiz Exp $
#
DISTNAME= qwtplot3d-0.2.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwtplot3d/}
EXTRACT_SUFX= .tgz
diff --git a/x11/qwtplot3d-qt4/buildlink3.mk b/x11/qwtplot3d-qt4/buildlink3.mk
index 7d8a9869d3e..a804933c6d4 100644
--- a/x11/qwtplot3d-qt4/buildlink3.mk
+++ b/x11/qwtplot3d-qt4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:52 wiz Exp $
BUILDLINK_TREE+= qwtplot3d
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qwtplot3d
QWTPLOT3D_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qwtplot3d+= qwtplot3d>=0.2.7
-BUILDLINK_ABI_DEPENDS.qwtplot3d?= qwtplot3d>=0.2.7nb1
+BUILDLINK_ABI_DEPENDS.qwtplot3d?= qwtplot3d>=0.2.7nb2
BUILDLINK_PKGSRCDIR.qwtplot3d?= ../../x11/qwtplot3d-qt4
.include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/rep-gtk2/Makefile b/x11/rep-gtk2/Makefile
index 535cd875039..67cf804e991 100644
--- a/x11/rep-gtk2/Makefile
+++ b/x11/rep-gtk2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/03/24 19:43:29 asau Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:52 wiz Exp $
DISTNAME= rep-gtk-0.18.6r2
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rep-gtk/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile
index 29c8eb2a01c..68a4b3dc9e6 100644
--- a/x11/rox-session/Makefile
+++ b/x11/rox-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/02/10 19:17:48 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:52 wiz Exp $
#
DISTNAME= rox-session-0.28
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/ruby-gnome2-gnome/Makefile b/x11/ruby-gnome2-gnome/Makefile
index 39540dd2517..624fd5ca9d7 100644
--- a/x11/ruby-gnome2-gnome/Makefile
+++ b/x11/ruby-gnome2-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:52 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnome-${VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= gnome x11
COMMENT= Ruby binding of libgnome/libgnomeui-2.x
diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile
index e79d4ce0c4d..f3e82ec60e0 100644
--- a/x11/ruby-gnome2-gtk/Makefile
+++ b/x11/ruby-gnome2-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/10/12 03:09:33 obache Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:52 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtk-${VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Ruby binding of GTK+-2.x
diff --git a/x11/ruby-gnome2-gtk/buildlink3.mk b/x11/ruby-gnome2-gtk/buildlink3.mk
index dde667e7901..7338e18fa88 100644
--- a/x11/ruby-gnome2-gtk/buildlink3.mk
+++ b/x11/ruby-gnome2-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:52 wiz Exp $
#
BUILDLINK_TREE+= ruby-gnome2-gtk
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= ruby-gnome2-gtk
RUBY_GNOME2_GTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ruby-gnome2-gtk+= ${RUBY_PKGPREFIX}-gnome2-gtk>=0.17.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk?= ruby18-gnome2-gtk>=0.19.1nb1
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk?= ruby18-gnome2-gtk>=0.19.4nb1
BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk?= ../../x11/ruby-gnome2-gtk
.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
diff --git a/x11/ruby-gnome2-gtksourceview/Makefile b/x11/ruby-gnome2-gtksourceview/Makefile
index 177abcea098..b3a1289dee6 100644
--- a/x11/ruby-gnome2-gtksourceview/Makefile
+++ b/x11/ruby-gnome2-gtksourceview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:52 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtksourceview-${VERSION}
COMMENT= Ruby binding of gtksourceview
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/ruby-gnome2-gtksourceview2/Makefile b/x11/ruby-gnome2-gtksourceview2/Makefile
index 65b347406f4..8eac514dfbd 100644
--- a/x11/ruby-gnome2-gtksourceview2/Makefile
+++ b/x11/ruby-gnome2-gtksourceview2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/10/12 03:09:33 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:53 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gtksourceview2-${VERSION}
COMMENT= Ruby binding of gtksourceview2
+PKGREVISION= 1
CATEGORIES= x11
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/ruby-gnome2-panelapplet/Makefile b/x11/ruby-gnome2-panelapplet/Makefile
index ab5472a4c66..cdf9f810c20 100644
--- a/x11/ruby-gnome2-panelapplet/Makefile
+++ b/x11/ruby-gnome2-panelapplet/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:53 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-panelapplet-${VERSION}
COMMENT= Ruby binding of libpanel-applet-2.6.x
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
CONFLICTS+= ruby-gnome2-panelapplet-[0-9]*
diff --git a/x11/ruby-gnome2-vte/Makefile b/x11/ruby-gnome2-vte/Makefile
index 2e4cc3d4f7e..99ed9e01917 100644
--- a/x11/ruby-gnome2-vte/Makefile
+++ b/x11/ruby-gnome2-vte/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/10/12 03:09:33 obache Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:53 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-vte-${VERSION}
COMMENT= Ruby binding of vte
+PKGREVISION= 1
CATEGORIES= x11
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index d8d9b2d419b..47801d28319 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:45:53 wiz Exp $
DISTNAME= ruby-gtk-${VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-gtk-${VERSION}
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= x11 ruby
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ruby-gnome/}
diff --git a/x11/tint2/Makefile b/x11/tint2/Makefile
index f7a882dd044..8cd3574c6b6 100644
--- a/x11/tint2/Makefile
+++ b/x11/tint2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/05/07 20:53:45 gls Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:53 wiz Exp $
DISTNAME= tint2-0.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://tint2.googlecode.com/files/
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index f657dc99cfc..14ff107141f 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2010/06/11 11:50:39 drochner Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:53 wiz Exp $
#
DISTNAME= vte-0.22.5
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.22/}
EXTRACT_SUFX= .tar.bz2
@@ -25,16 +26,13 @@ CONFIGURE_ARGS+= --disable-deprecation
PKGCONFIG_OVERRIDE+= vte.pc.in
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.0
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
-# for FC_WIDTH
-BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.1.93
-
-BUILDLINK_DEPMETHOD.libXt?= build
-
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
+# for FC_WIDTH
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.1.93
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index 348697a5dc3..0b24f58f469 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2009/08/26 19:56:58 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/06/13 22:45:53 wiz Exp $
BUILDLINK_TREE+= vte
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= vte
VTE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.vte+= vte>=0.14.0
-BUILDLINK_ABI_DEPENDS.vte?= vte>=0.20.5nb1
+BUILDLINK_ABI_DEPENDS.vte?= vte>=0.22.5nb1
BUILDLINK_PKGSRCDIR.vte?= ../../x11/vte
.include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 4b517836720..31e497079fe 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2010/02/08 09:47:44 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:45:53 wiz Exp $
DISTNAME= wdm-1.28
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 windowmaker
MASTER_SITES= http://voins.program.ru/wdm/
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 87c344a8b99..5bdbc7b79b8 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:45:53 wiz Exp $
DISTNAME= wterm-6.2.9
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= x11 windowmaker
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wterm/}
diff --git a/x11/wxGTK24/Makefile b/x11/wxGTK24/Makefile
index 398ffc9aa35..6566584a056 100644
--- a/x11/wxGTK24/Makefile
+++ b/x11/wxGTK24/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2010/02/16 17:33:39 taca Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:53 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-PKGREVISION= 16
+PKGREVISION= 17
COMMENT= GTK-based implementation of the wxWidgets GUI library
CONFLICTS+= wxGTK<=2.4.2nb5
@@ -14,5 +14,6 @@ INSTALLATION_DIRS= ${DOCDIR}
post-install:
${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DESTDIR}${DOCDIR}/LICENSE
+.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index 20135617c98..ca93208ab47 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:53 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -8,7 +8,7 @@ BUILDLINK_TREE+= wxGTK24
WXGTK24_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.wxGTK24+= wxGTK24>=2.4.2
-BUILDLINK_ABI_DEPENDS.wxGTK24?= wxGTK24>=2.4.2nb15
+BUILDLINK_ABI_DEPENDS.wxGTK24?= wxGTK24>=2.4.2nb17
BUILDLINK_PKGSRCDIR.wxGTK24?= ../../x11/wxGTK24
.include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo
index c13939e0045..517fbae3217 100644
--- a/x11/wxGTK24/distinfo
+++ b/x11/wxGTK24/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2010/02/16 17:33:39 taca Exp $
+$NetBSD: distinfo,v 1.11 2010/06/13 22:45:53 wiz Exp $
SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes
-SHA1 (patch-aa) = 1d6b86da5e7a1fd3a13805465e9059d21dbbfc7a
+SHA1 (patch-aa) = f7510b2dafd73da3c79808b141fee6a60cd47269
SHA1 (patch-ab) = bab52051778a93439cfd3144f052bdbcc7024e30
SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4
SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf
diff --git a/x11/wxGTK24/patches/patch-aa b/x11/wxGTK24/patches/patch-aa
index 2ac91d155a9..bb14e9ee7f1 100644
--- a/x11/wxGTK24/patches/patch-aa
+++ b/x11/wxGTK24/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2009/11/29 20:16:20 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2010/06/13 22:45:53 wiz Exp $
---- configure.orig 2003-09-21 13:31:30.000000000 +0200
+--- configure.orig 2003-09-21 11:31:30.000000000 +0000
+++ configure
@@ -1247,7 +1247,7 @@ EOF
@@ -24,6 +24,32 @@ $NetBSD: patch-aa,v 1.4 2009/11/29 20:16:20 joerg Exp $
cat > confcache <<\EOF
+@@ -11972,9 +11973,9 @@ fi
+ echo "$ac_t""$ac_cv_header_png_h" 1>&6
+
+ if test "$ac_cv_header_png_h" = "yes"; then
+- echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
+-echo "configure:11977: checking for png_check_sig in -lpng" >&5
+-ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
++ echo $ac_n "checking for png_sig_cmp in -lpng""... $ac_c" 1>&6
++echo "configure:11977: checking for png_sig_cmp in -lpng" >&5
++ac_lib_var=`echo png'_'png_sig_cmp | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11986,10 +11987,10 @@ cat > conftest.$ac_ext <<EOF
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char png_check_sig();
++char png_sig_cmp();
+
+ int main() {
+-png_check_sig()
++png_sig_cmp()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:11996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -13381,6 +13382,101 @@ echo "configure:13351: checking PANGOFT2
fi
diff --git a/x11/wxGTK26-contrib/Makefile b/x11/wxGTK26-contrib/Makefile
index 7c1a3696db6..6bd5d43d5ec 100644
--- a/x11/wxGTK26-contrib/Makefile
+++ b/x11/wxGTK26-contrib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:54 wiz Exp $
#
.include "../../x11/wxGTK26/Makefile.common"
PKGNAME= ${DISTNAME:S/wxGTK/wxGTK-contrib/}
-PKGREVISION= 4
+PKGREVISION= 6
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= GTK-based implementation of the wxWidgets GUI library (contrib libraries)
diff --git a/x11/wxGTK26-contrib/buildlink3.mk b/x11/wxGTK26-contrib/buildlink3.mk
index 5eb298bd3e7..ae124290bc3 100644
--- a/x11/wxGTK26-contrib/buildlink3.mk
+++ b/x11/wxGTK26-contrib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:54 wiz Exp $
BUILDLINK_TREE+= wxGTK-contrib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= wxGTK-contrib
WXGTK_CONTRIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.wxGTK-contrib+= wxGTK-contrib>=2.6.0nb2
-BUILDLINK_ABI_DEPENDS.wxGTK-contrib?= wxGTK-contrib>=2.6.3nb4
+BUILDLINK_ABI_DEPENDS.wxGTK-contrib?= wxGTK-contrib>=2.6.3nb6
BUILDLINK_PKGSRCDIR.wxGTK-contrib?= ../../x11/wxGTK26-contrib
.include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK26/Makefile b/x11/wxGTK26/Makefile
index 4d1afe935e7..76018af0735 100644
--- a/x11/wxGTK26/Makefile
+++ b/x11/wxGTK26/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/02/16 17:35:34 taca Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:53 wiz Exp $
#
.include "Makefile.common"
-PKGREVISION= 6
+PKGREVISION= 7
COMMENT= GTK-based implementation of the wxWidgets GUI library
post-build:
diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk
index fbf039552e2..25ab8665c0a 100644
--- a/x11/wxGTK26/buildlink3.mk
+++ b/x11/wxGTK26/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:54 wiz Exp $
BUILDLINK_TREE+= wxGTK
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= wxGTK
WXGTK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.wxGTK+= wxGTK>=2.6.0nb2
-BUILDLINK_ABI_DEPENDS.wxGTK+= wxGTK>=2.6.3nb5
+BUILDLINK_ABI_DEPENDS.wxGTK+= wxGTK>=2.6.3nb7
BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK26
.include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK26/distinfo b/x11/wxGTK26/distinfo
index 04b6f3fea91..92a523b5ff6 100644
--- a/x11/wxGTK26/distinfo
+++ b/x11/wxGTK26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2010/02/16 17:35:34 taca Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:45:54 wiz Exp $
SHA1 (wxGTK-2.6.3-libtool.diff3.bz2) = 657566a9384a4bc160dffd26678b5e0c6a1cb5b2
RMD160 (wxGTK-2.6.3-libtool.diff3.bz2) = 233af8dd61317ed1771c1862c6cec65f131b6de0
@@ -6,7 +6,7 @@ Size (wxGTK-2.6.3-libtool.diff3.bz2) = 136446 bytes
SHA1 (wxGTK-2.6.3.tar.bz2) = 7c2dfe27a56aa99b4ea557a436bf84a13a579a9d
RMD160 (wxGTK-2.6.3.tar.bz2) = d7465860d7c07b42d299d4b4c5d015b25f96a9dd
Size (wxGTK-2.6.3.tar.bz2) = 7213119 bytes
-SHA1 (patch-aa) = 0ef5ae28b70a3290e37363193248365f4cf03cec
+SHA1 (patch-aa) = ea46005e47f33a9e3d76f23b463b474fd0691e32
SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b
SHA1 (patch-ac) = 50bd7d4291e44dac1d2bbbae1b12167177f5ef01
SHA1 (patch-ad) = fb51bb80451d39ba2bba53d42722327888b4a0be
diff --git a/x11/wxGTK26/patches/patch-aa b/x11/wxGTK26/patches/patch-aa
index 8d48d044b7b..f69325c83e1 100644
--- a/x11/wxGTK26/patches/patch-aa
+++ b/x11/wxGTK26/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/22 19:44:05 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
---- configure.orig 2006-03-22 00:42:05.000000000 +0100
-+++ configure 2006-10-08 06:26:28.000000000 +0200
+--- configure.orig 2006-03-21 23:42:05.000000000 +0000
++++ configure
@@ -1820,7 +1820,7 @@ _ACEOF
DEFAULT_DEFAULT_wxUSE_MOTIF=1
@@ -21,6 +21,59 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/22 19:44:05 joerg Exp $
echo "$as_me:$LINENO: checking for libraries directory" >&5
echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
+@@ -24519,9 +24520,9 @@ fi
+
+
+ if test "$ac_cv_header_png_h" = "yes"; then
+- echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++ echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
++echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -24539,11 +24540,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char png_check_sig ();
++char png_sig_cmp ();
+ int
+ main ()
+ {
+-png_check_sig ();
++png_sig_cmp ();
+ ;
+ return 0;
+ }
+@@ -24570,20 +24571,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_png_png_check_sig=yes
++ ac_cv_lib_png_png_sig_cmp=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_png_png_check_sig=no
++ac_cv_lib_png_png_sig_cmp=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
+-if test $ac_cv_lib_png_png_check_sig = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
++echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
++if test $ac_cv_lib_png_png_sig_cmp = yes; then
+ PNG_LINK=" -lpng -lz"
+ fi
+
@@ -36663,6 +36664,9 @@ echo "$as_me: WARNING: BeOS threads are
THREAD_OPTS="-mt $THREAD_OPTS"
fi
diff --git a/x11/wxGTK28-contrib/Makefile b/x11/wxGTK28-contrib/Makefile
index 911f6d320dc..c0e235c0c6c 100644
--- a/x11/wxGTK28-contrib/Makefile
+++ b/x11/wxGTK28-contrib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:54 wiz Exp $
#
.include "../../x11/wxGTK28/Makefile.common"
PKGNAME= ${DISTNAME:S/wxGTK/wxGTK28-contrib/}
-PKGREVISION= 2
+PKGREVISION= 4
COMMENT= GTK-based implementation of the wxWidgets GUI library (contrib libraries)
USE_TOOLS+= gmake
diff --git a/x11/wxGTK28-contrib/buildlink3.mk b/x11/wxGTK28-contrib/buildlink3.mk
index 9d9e062226e..5d1b2c09605 100644
--- a/x11/wxGTK28-contrib/buildlink3.mk
+++ b/x11/wxGTK28-contrib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:54 wiz Exp $
BUILDLINK_TREE+= wxGTK28-contrib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= wxGTK28-contrib
WXGTK28_CONTRIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.wxGTK28-contrib+= wxGTK28-contrib>=2.8.10
-BUILDLINK_ABI_DEPENDS.wxGTK28-contrib?= wxGTK28-contrib>=2.8.10nb2
+BUILDLINK_ABI_DEPENDS.wxGTK28-contrib?= wxGTK28-contrib>=2.8.10nb4
BUILDLINK_PKGSRCDIR.wxGTK28-contrib?= ../../x11/wxGTK28-contrib
.include "../../x11/wxGTK28/buildlink3.mk"
diff --git a/x11/wxGTK28/Makefile b/x11/wxGTK28/Makefile
index b5be9cef99c..94deddf7ac8 100644
--- a/x11/wxGTK28/Makefile
+++ b/x11/wxGTK28/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2010/02/19 17:34:41 sno Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:54 wiz Exp $
#
.include "../../x11/wxGTK28/Makefile.common"
-PKGREVISION= 6
+PKGREVISION= 7
PKGNAME= ${DISTNAME:S/wxGTK/wxGTK28/}
COMMENT= GTK-based implementation of the wxWidgets GUI library
diff --git a/x11/wxGTK28/buildlink3.mk b/x11/wxGTK28/buildlink3.mk
index c61c80258b9..81a777d47e4 100644
--- a/x11/wxGTK28/buildlink3.mk
+++ b/x11/wxGTK28/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:54 wiz Exp $
BUILDLINK_TREE+= wxGTK28
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= wxGTK28
WXGTK28_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.10
-BUILDLINK_ABI_DEPENDS.wxGTK28?= wxGTK28>=2.8.10nb4
+BUILDLINK_ABI_DEPENDS.wxGTK28?= wxGTK28>=2.8.10nb7
BUILDLINK_PKGSRCDIR.wxGTK28?= ../../x11/wxGTK28
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo
index 2c8863243a4..794d0e516ad 100644
--- a/x11/wxGTK28/distinfo
+++ b/x11/wxGTK28/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2010/02/16 17:38:14 taca Exp $
+$NetBSD: distinfo,v 1.9 2010/06/13 22:45:54 wiz Exp $
SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
@@ -6,7 +6,7 @@ Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes
SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4
RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432
Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes
-SHA1 (patch-aa) = 1a30c79f07ea8ea5dff02fad9b5e1ba8dadde01a
+SHA1 (patch-aa) = fbcfd8e6abaabab393f24dc368c1c6b8447a75be
SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650
diff --git a/x11/wxGTK28/patches/patch-aa b/x11/wxGTK28/patches/patch-aa
index 27b2277c308..0379533ebc8 100644
--- a/x11/wxGTK28/patches/patch-aa
+++ b/x11/wxGTK28/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2009/05/15 07:09:00 adam Exp $
+$NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
---- configure.orig 2009-03-06 13:17:38.000000000 +0100
+--- configure.orig 2009-03-06 12:17:38.000000000 +0000
+++ configure
@@ -1962,7 +1962,7 @@ _ACEOF
@@ -37,6 +37,59 @@ $NetBSD: patch-aa,v 1.2 2009/05/15 07:09:00 adam Exp $
/usr/X11R6/include \
/usr/X11R6.4/include \
\
+@@ -26379,9 +26380,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
+
+
+ if test "$ac_cv_header_png_h" = "yes"; then
+- echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++ echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
++echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -26399,11 +26400,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char png_check_sig ();
++char png_sig_cmp ();
+ int
+ main ()
+ {
+-png_check_sig ();
++png_sig_cmp ();
+ ;
+ return 0;
+ }
+@@ -26429,20 +26430,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_png_png_check_sig=yes
++ ac_cv_lib_png_png_sig_cmp=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_png_png_check_sig=no
++ac_cv_lib_png_png_sig_cmp=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
+-if test $ac_cv_lib_png_png_check_sig = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
++echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
++if test $ac_cv_lib_png_png_sig_cmp = yes; then
+ PNG_LINK=" -lpng -lz"
+ fi
+
@@ -39478,6 +39479,9 @@ echo "$as_me: WARNING: BeOS threads are
THREAD_OPTS="-mt $THREAD_OPTS"
fi
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 0516cf8010d..8cd521b4e08 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/03/24 19:43:29 asau Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:54 wiz Exp $
DISTNAME= wxhaskell-src-0.9.4
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxhaskell/}
EXTRACT_SUFX= .zip
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index ff19170e4af..171e0b12cd2 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/06/30 00:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:54 wiz Exp $
DISTNAME= xcursorgen-4.3.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 4520bb25460..5f2e3315cde 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:54 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.8.0
DISTNAME= xfce4-clipman-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-clipman-plugin/
COMMENT= Xfce clipboard plugin
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index e4fc7694611..82e02f9e0f9 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:54 wiz Exp $
BUILDLINK_TREE+= xfce4-clipman-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-clipman-plugin
XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.8.0
-BUILDLINK_ABI_DEPENDS.xfce4-clipman-plugin?= xfce4-clipman-plugin>=0.8.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-clipman-plugin?= xfce4-clipman-plugin>=0.8.0nb2
BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?= ../../x11/xfce4-clipman-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 9e258078dcb..5c9d1ce8883 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:54 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
DISTNAME= xfdesktop-${XFCE4_VERSION}
PKGNAME= xfce4-desktop-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce desktop background manager
diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile
index 8456ed196b8..af349fa766f 100644
--- a/x11/xfce4-exo/Makefile
+++ b/x11/xfce4-exo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/01/25 13:55:53 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:54 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 0.3.101
DISTNAME= exo-${XFCE4_VERSION}
PKGNAME= xfce4-exo-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Xfce extension library
diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk
index 78327c2545d..3219789b792 100644
--- a/x11/xfce4-exo/buildlink3.mk
+++ b/x11/xfce4-exo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:55 wiz Exp $
BUILDLINK_TREE+= xfce4-exo
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= xfce4-exo
XFCE4_EXO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.100
+BUILDLINK_ABI_DEPENDS.xfce4-exo?= xfce4-exo>=0.3.101nb2
BUILDLINK_PKGSRCDIR.xfce4-exo?= ../../x11/xfce4-exo
pkgbase := xfce4-exo
diff --git a/x11/xfce4-eyes-plugin/Makefile b/x11/xfce4-eyes-plugin/Makefile
index fd4f1a43098..c2c5d644852 100644
--- a/x11/xfce4-eyes-plugin/Makefile
+++ b/x11/xfce4-eyes-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:56:56 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:55 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 4.4.0
DISTNAME= xfce4-eyes-plugin-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-eyes-plugin/
COMMENT= Xfce eyes plugin
diff --git a/x11/xfce4-eyes-plugin/buildlink3.mk b/x11/xfce4-eyes-plugin/buildlink3.mk
index cb3d71be8b9..c78540aaf47 100644
--- a/x11/xfce4-eyes-plugin/buildlink3.mk
+++ b/x11/xfce4-eyes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:55 wiz Exp $
BUILDLINK_TREE+= xfce4-eyes-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-eyes-plugin
XFCE4_EYES_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-eyes-plugin+= xfce4-eyes-plugin>=4.4.0
-BUILDLINK_ABI_DEPENDS.xfce4-eyes-plugin?= xfce4-eyes-plugin>=4.4.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-eyes-plugin?= xfce4-eyes-plugin>=4.4.0nb2
BUILDLINK_PKGSRCDIR.xfce4-eyes-plugin?= ../../x11/xfce4-eyes-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile
index 627b1d3d758..2ee56184673 100644
--- a/x11/xfce4-gtk2-engine/Makefile
+++ b/x11/xfce4-gtk2-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:55 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,6 +8,7 @@ XFCE4_VERSION= 2.6.0
DISTNAME= gtk-xfce-engine-${XFCE4_VERSION}
PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce GTK2 themes
diff --git a/x11/xfce4-notes-plugin/Makefile b/x11/xfce4-notes-plugin/Makefile
index c470be6b80b..9af6f0fc9dd 100644
--- a/x11/xfce4-notes-plugin/Makefile
+++ b/x11/xfce4-notes-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:55 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,7 +8,7 @@ XFCE4_VERSION= 1.6.0
DISTNAME= xfce4-notes-plugin-${XFCE4_VERSION}
#PKGREVISION= 1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-notes-plugin/
COMMENT= Xfce notes plugin
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index a666d9bda57..b4399b518de 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:55 wiz Exp $
BUILDLINK_TREE+= xfce4-notes-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-notes-plugin
XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=1.6.0
-BUILDLINK_ABI_DEPENDS.xfce4-notes-plugin?= xfce4-notes-plugin>=1.6.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-notes-plugin?= xfce4-notes-plugin>=1.6.0nb2
BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?= ../../x11/xfce4-notes-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index c69cc44e386..86a77f7166f 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2010/05/30 19:34:46 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:55 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../meta-pkgs/xfce4/Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
XFCE4_VERSION= 4.6.2
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 5d06fc723ef..1c050c4422c 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:45:55 wiz Exp $
BUILDLINK_TREE+= xfce4-panel
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= xfce4-panel
XFCE4_PANEL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.6.0
+BUILDLINK_ABI_DEPENDS.xfce4-panel?= xfce4-panel>=4.6.2nb2
BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel
.include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/xfce4-places-plugin/Makefile b/x11/xfce4-places-plugin/Makefile
index 784c290293c..a1a5576292c 100644
--- a/x11/xfce4-places-plugin/Makefile
+++ b/x11/xfce4-places-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:02 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:55 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 1.0.0
DISTNAME= xfce4-places-plugin-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-places-plugin/
COMMENT= Xfce Places plugin
diff --git a/x11/xfce4-places-plugin/buildlink3.mk b/x11/xfce4-places-plugin/buildlink3.mk
index 2931ef979c9..0cb09560e70 100644
--- a/x11/xfce4-places-plugin/buildlink3.mk
+++ b/x11/xfce4-places-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:55 wiz Exp $
BUILDLINK_TREE+= xfce4-places-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-places-plugin
XFCE4_PLACES_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-places-plugin+= xfce4-places-plugin>=1.0.0
-BUILDLINK_ABI_DEPENDS.xfce4-places-plugin?= xfce4-places-plugin>=1.0.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-places-plugin?= xfce4-places-plugin>=1.0.0nb2
BUILDLINK_PKGSRCDIR.xfce4-places-plugin?= ../../x11/xfce4-places-plugin
.include "../../sysutils/xfce4-thunar/buildlink3.mk"
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 38058b48a2e..60f194c1162 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:55 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 1.0.0
DISTNAME= xfce4-screenshooter-plugin-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-screenshooter-plugin/
COMMENT= Xfce screenshot plugin
diff --git a/x11/xfce4-screenshooter-plugin/buildlink3.mk b/x11/xfce4-screenshooter-plugin/buildlink3.mk
index 0613334137f..b7eac607ee8 100644
--- a/x11/xfce4-screenshooter-plugin/buildlink3.mk
+++ b/x11/xfce4-screenshooter-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:31:14 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:55 wiz Exp $
BUILDLINK_TREE+= xfce4-screenshooter-plugin
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= xfce4-screenshooter-plugin
XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-screenshooter-plugin+= xfce4-screenshooter-plugin>=1.0.0
-BUILDLINK_ABI_DEPENDS.xfce4-screenshooter-plugin?= xfce4-screenshooter-plugin>=1.0.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-screenshooter-plugin?= xfce4-screenshooter-plugin>=1.0.0nb2
BUILDLINK_PKGSRCDIR.xfce4-screenshooter-plugin?= ../../x11/xfce4-screenshooter-plugin
.include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index cb3af8daa3a..b4d54a7f492 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:55 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-session-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce session manager
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index 3ffbd0c7986..8cfb9c73455 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2009/09/16 01:15:36 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/06/13 22:45:55 wiz Exp $
BUILDLINK_TREE+= xfce4-session
@@ -6,6 +6,7 @@ BUILDLINK_TREE+= xfce4-session
XFCE4_SESSION_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.6.0
+BUILDLINK_ABI_DEPENDS.xfce4-session?= xfce4-session>=4.6.1nb1
BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session
.include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/xfce4-settings/Makefile b/x11/xfce4-settings/Makefile
index 709d952e7db..659adf2ecb2 100644
--- a/x11/xfce4-settings/Makefile
+++ b/x11/xfce4-settings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:56 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
XFCE4_VERSION= 4.6.3
DISTNAME= xfce4-settings-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Xfce settings manager
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index bb3ea111d0d..7c0794be81c 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/11/29 22:16:34 snj Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:56 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -8,6 +8,7 @@ XFCE4_VERSION= 0.4.2
DISTNAME= Terminal-${XFCE4_VERSION}
PKGNAME= xfce4-terminal-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce terminal emulator
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 6aef2a64997..552b44f5529 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/09/16 01:15:36 reed Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:56 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
DISTNAME= xfce-utils-${XFCE4_VERSION}
PKGNAME= xfce4-utils-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce utilities
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index fac9fe5b316..3f0cb065f8c 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:56 wiz Exp $
#
DISTNAME= xglobe-0.5
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= x11
#
# The original MASTER_SITE for the program responds "200 OK"
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 221c226fcc0..d654bf8213d 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2009/10/25 22:54:03 tron Exp $
+# $NetBSD: Makefile,v 1.82 2010/06/13 22:45:56 wiz Exp $
.include "Makefile.common"
+PKGREVISION= 1
COMMENT= Like the XLock session-locker/screensaver, but with more
diff --git a/x11/xmms-osd/Makefile b/x11/xmms-osd/Makefile
index 9d549de3b60..902db4441c9 100644
--- a/x11/xmms-osd/Makefile
+++ b/x11/xmms-osd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:56 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/xosd/Makefile.common"
PKGNAME= ${DISTNAME:S/xosd/xmms-osd/}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= XMMS plugin that shows current status on your desktop
CONFLICTS= xosd<=2.2.0
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index ee51a096323..12791557057 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/08/26 19:58:42 sno Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:56 wiz Exp $
#
DISTNAME= xpad-1.12
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xpad/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index a7128bf68af..f480dc5cb1f 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2010/03/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:45:56 wiz Exp $
DISTNAME= xplanet-1.2.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xplanet/}
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index badf32f7888..de6e2a50686 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/05/17 16:35:03 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:45:56 wiz Exp $
#
PKGNAME= ${DISTNAME:S/-/-demo-/}
+PKGREVISION= 1
COMMENT= Demo viewer and configuration tool for xscreensaver
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 56a1586bc07..f43f590e115 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:56 wiz Exp $
DISTNAME= xteddy-2.0.1
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= x11 games
MASTER_SITES= http://staffwww.itn.liu.se/~stegu/xteddy/
diff --git a/x11/xvidcap-gtk2/Makefile b/x11/xvidcap-gtk2/Makefile
index 4f308f7a12a..591d17714d7 100644
--- a/x11/xvidcap-gtk2/Makefile
+++ b/x11/xvidcap-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/01/24 13:26:13 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:57 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/xvidcap/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-gtk2-/}
-PKGREVISION= 6
+PKGREVISION= 7
COMMENT= Capture X display to individual frames or MPEG video (GTK2 version)
CONFLICTS+= xvidcap<1.1.3nb3
diff --git a/x11/xvidcap/Makefile b/x11/xvidcap/Makefile
index 1d2a78f15c8..32f6c6cd94f 100644
--- a/x11/xvidcap/Makefile
+++ b/x11/xvidcap/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2010/01/24 13:26:13 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:56 wiz Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-PKGREVISION= 9
+PKGREVISION= 10
COMMENT= Capture X display to individual frames or MPEG video
CONFIGURE_ARGS+= --without-gtk2
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index b8172dd7b57..c8a41ea11c3 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2009/10/22 17:21:34 drochner Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:45:57 wiz Exp $
#
DISTNAME= zenity-2.28.0
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/zenity/2.28/}
EXTRACT_SUFX= .tar.bz2