summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-05-02 11:53:34 +0000
committerwiz <wiz@pkgsrc.org>2003-05-02 11:53:34 +0000
commit7166660e0869e600de95f00511736db4bf628d2d (patch)
tree0b3576bf8d40c5f7d058728d38e43564bcae5836
parent0594acf27e2afd5d50b45048bca038ebd6e1d8a1 (diff)
downloadpkgsrc-7166660e0869e600de95f00511736db4bf628d2d.tar.gz
Dependency bumps, needed because of devel/pth's major bump, and related
dependency bumps.
-rw-r--r--archivers/cxunzip/Makefile4
-rw-r--r--archivers/file-roller/Makefile4
-rw-r--r--audio/SDL_mixer/Makefile5
-rw-r--r--audio/SDL_mixer/buildlink2.mk4
-rw-r--r--audio/SDL_sound/Makefile3
-rw-r--r--audio/SDL_sound/buildlink2.mk4
-rw-r--r--audio/arts/Makefile3
-rw-r--r--audio/arts/buildlink2.mk4
-rw-r--r--audio/audacity/Makefile3
-rw-r--r--audio/aumix/Makefile3
-rw-r--r--audio/cheesetracker/Makefile4
-rw-r--r--audio/easytag/Makefile4
-rw-r--r--audio/flac-xmms/Makefile3
-rw-r--r--audio/freezetag/Makefile3
-rw-r--r--audio/gdcd/Makefile4
-rw-r--r--audio/gkrellm-volume/Makefile3
-rw-r--r--audio/gkrellm-xmms/Makefile7
-rw-r--r--audio/gmodplay/Makefile3
-rw-r--r--audio/gmp3info/Makefile3
-rw-r--r--audio/gnome-media/Makefile4
-rw-r--r--audio/gnome2-media/Makefile3
-rw-r--r--audio/gnome2-media/buildlink2.mk4
-rw-r--r--audio/gqmpeg/Makefile3
-rw-r--r--audio/gtkmserv/Makefile3
-rw-r--r--audio/kdemultimedia2/Makefile4
-rw-r--r--audio/kdemultimedia3/Makefile4
-rw-r--r--audio/lame/Makefile3
-rw-r--r--audio/lame/buildlink2.mk4
-rw-r--r--audio/libao-arts/Makefile3
-rw-r--r--audio/mp3blaster/Makefile4
-rw-r--r--audio/openal/Makefile3
-rw-r--r--audio/openal/buildlink2.mk4
-rw-r--r--audio/rio500/Makefile3
-rw-r--r--audio/streamtuner-live365/Makefile3
-rw-r--r--audio/streamtuner-local/Makefile4
-rw-r--r--audio/streamtuner/Makefile3
-rw-r--r--audio/streamtuner/buildlink2.mk4
-rw-r--r--audio/sweep/Makefile3
-rw-r--r--audio/sweep/buildlink2.mk4
-rw-r--r--audio/timidity/Makefile4
-rw-r--r--audio/tremor-tools/Makefile3
-rw-r--r--audio/vorbis-tools/Makefile4
-rw-r--r--audio/wmusic/Makefile3
-rw-r--r--audio/xhippo/Makefile3
-rw-r--r--audio/xmms-bezier/Makefile4
-rw-r--r--audio/xmms-bump-scope/Makefile3
-rw-r--r--audio/xmms-crossfade/Makefile4
-rw-r--r--audio/xmms-dflowers/Makefile3
-rw-r--r--audio/xmms-dscope/Makefile3
-rw-r--r--audio/xmms-dspectogram/Makefile3
-rw-r--r--audio/xmms-dspectral/Makefile3
-rw-r--r--audio/xmms-fmradio/Makefile3
-rw-r--r--audio/xmms-funtimedancer/Makefile3
-rw-r--r--audio/xmms-gdancer/Makefile3
-rw-r--r--audio/xmms-infinity/Makefile3
-rw-r--r--audio/xmms-iris/Makefile3
-rw-r--r--audio/xmms-jakdaw/Makefile3
-rw-r--r--audio/xmms-jess/Makefile3
-rw-r--r--audio/xmms-mad/Makefile4
-rw-r--r--audio/xmms-madspin/Makefile3
-rw-r--r--audio/xmms-neato/Makefile4
-rw-r--r--audio/xmms-nebulus/Makefile3
-rw-r--r--audio/xmms-paranormal/Makefile3
-rw-r--r--audio/xmms-sid/Makefile3
-rw-r--r--audio/xmms-synaesthesia/Makefile3
-rw-r--r--audio/xmms-tv-scope/Makefile3
-rw-r--r--audio/xmms-vismsa/Makefile3
-rw-r--r--audio/xmms/Makefile4
-rw-r--r--audio/xmms/buildlink2.mk4
-rw-r--r--audio/yamt/Makefile4
-rw-r--r--biology/chemtool/Makefile3
-rw-r--r--cad/boolean/Makefile6
-rw-r--r--cad/geda-utils/Makefile3
-rw-r--r--cad/geda/Makefile11
-rw-r--r--cad/gerbv/Makefile3
-rw-r--r--cad/gnetlist/Makefile4
-rw-r--r--cad/gschem/Makefile3
-rw-r--r--cad/gsymcheck/Makefile3
-rw-r--r--cad/gwave/Makefile3
-rw-r--r--cad/ipal-current/Makefile5
-rw-r--r--cad/libgeda/Makefile3
-rw-r--r--cad/oregano/Makefile4
-rw-r--r--cad/qcad/Makefile3
-rw-r--r--cad/transcalc/Makefile3
-rw-r--r--chat/centericq/Makefile4
-rw-r--r--chat/ekg/Makefile3
-rw-r--r--chat/everybuddy-gnome/Makefile4
-rw-r--r--chat/everybuddy/Makefile4
-rw-r--r--chat/everybuddy/Makefile.common3
-rw-r--r--chat/gabber/Makefile4
-rw-r--r--chat/gaim-gnome/Makefile4
-rw-r--r--chat/gaim-gtk1/Makefile.common4
-rw-r--r--chat/gaim/Makefile3
-rw-r--r--chat/gale/Makefile3
-rw-r--r--chat/gale/buildlink2.mk4
-rw-r--r--chat/gnomeicu/Makefile4
-rw-r--r--chat/gtkyahoo/Makefile3
-rw-r--r--chat/ickle/Makefile3
-rw-r--r--chat/irssi-icb/Makefile3
-rw-r--r--chat/irssi/Makefile4
-rw-r--r--chat/kmess/Makefile3
-rw-r--r--chat/kyim/Makefile3
-rw-r--r--chat/libicq2000/Makefile3
-rw-r--r--chat/libicq2000/buildlink2.mk2
-rw-r--r--chat/libirc/Makefile5
-rw-r--r--chat/licq-gui-qt/Makefile4
-rw-r--r--chat/lmme/Makefile4
-rw-r--r--chat/psi/Makefile3
-rw-r--r--chat/silc-client-icb/Makefile3
-rw-r--r--chat/silc-client/Makefile6
-rw-r--r--chat/silc-server/Makefile3
-rw-r--r--chat/xchat/Makefile.common4
-rw-r--r--chat/xchat2/Makefile3
-rw-r--r--chat/ysm/Makefile3
-rw-r--r--comms/efax-gtk/Makefile4
-rw-r--r--comms/gnome-pilot/Makefile4
-rw-r--r--comms/gnome-pilot/buildlink2.mk4
-rw-r--r--comms/gsmlib/Makefile4
-rw-r--r--comms/jpilot-syncmal/Makefile3
-rw-r--r--comms/jpilot/Makefile3
-rw-r--r--comms/jpilot/buildlink2.mk4
-rw-r--r--converters/wv/Makefile4
-rw-r--r--converters/wv/buildlink2.mk4
-rw-r--r--databases/edb/Makefile4
-rw-r--r--databases/edb/buildlink2.mk4
-rw-r--r--databases/gq/Makefile4
-rw-r--r--databases/gtksql/Makefile4
-rw-r--r--databases/gtranscript/Makefile4
-rw-r--r--databases/kmysqladmin/Makefile4
-rw-r--r--databases/libgda/Makefile.common4
-rw-r--r--databases/libgda/buildlink2.mk4
-rw-r--r--databases/libgnomedb/Makefile4
-rw-r--r--databases/libgnomedb/buildlink2.mk4
-rw-r--r--databases/mergeant/Makefile3
-rw-r--r--databases/openldap/Makefile4
-rw-r--r--databases/openldap/buildlink2.mk4
-rw-r--r--databases/php3-ldap/Makefile4
-rw-r--r--databases/php4-ldap/Makefile4
-rw-r--r--databases/php4-odbc/Makefile4
-rw-r--r--databases/py-psycopg/Makefile3
-rw-r--r--databases/py-psycopg/buildlink2.mk4
-rw-r--r--databases/quicklist/Makefile3
-rw-r--r--databases/unixodbc-DataManager/Makefile4
-rw-r--r--databases/unixodbc-ODBCConfig/Makefile4
-rw-r--r--databases/unixodbc/Makefile4
-rw-r--r--databases/unixodbc/Makefile.common3
-rw-r--r--databases/unixodbc/buildlink2.mk4
-rw-r--r--devel/GConf/Makefile4
-rw-r--r--devel/GConf/buildlink2.mk4
-rw-r--r--devel/GConf2-ui/Makefile3
-rw-r--r--devel/GConf2-ui/buildlink2.mk4
-rw-r--r--devel/GConf2/Makefile.common3
-rw-r--r--devel/GConf2/buildlink2.mk4
-rw-r--r--devel/Gorm/Makefile3
-rw-r--r--devel/SDL/Makefile4
-rw-r--r--devel/SDL/buildlink2.mk4
-rw-r--r--devel/SDL_gfx/Makefile3
-rw-r--r--devel/SDL_gfx/buildlink2.mk4
-rw-r--r--devel/SDL_ttf/Makefile4
-rw-r--r--devel/SDL_ttf/buildlink2.mk4
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--devel/atk/Makefile3
-rw-r--r--devel/atk/buildlink2.mk4
-rw-r--r--devel/autogen/Makefile3
-rw-r--r--devel/bonobo-activation/Makefile3
-rw-r--r--devel/bonobo-activation/buildlink2.mk4
-rw-r--r--devel/bonobo-conf/Makefile4
-rw-r--r--devel/bonobo-conf/buildlink2.mk4
-rw-r--r--devel/bonobo/Makefile4
-rw-r--r--devel/bonobo/buildlink2.mk4
-rw-r--r--devel/cervisia2/Makefile4
-rw-r--r--devel/coconut/Makefile4
-rw-r--r--devel/coconut/buildlink2.mk4
-rw-r--r--devel/cvsync/Makefile3
-rw-r--r--devel/eel/Makefile4
-rw-r--r--devel/eel2/Makefile3
-rw-r--r--devel/eel2/buildlink2.mk4
-rw-r--r--devel/g-wrap/Makefile3
-rw-r--r--devel/g-wrap/buildlink2.mk4
-rw-r--r--devel/gail/Makefile3
-rw-r--r--devel/gail/buildlink2.mk4
-rw-r--r--devel/gal/Makefile3
-rw-r--r--devel/gal/buildlink2.mk4
-rw-r--r--devel/gal2/Makefile4
-rw-r--r--devel/gal2/buildlink2.mk4
-rw-r--r--devel/gconfmm/Makefile3
-rw-r--r--devel/gconfmm/buildlink2.mk4
-rw-r--r--devel/gcvs/Makefile3
-rw-r--r--devel/giblib/Makefile3
-rw-r--r--devel/giblib/buildlink2.mk4
-rw-r--r--devel/glade/Makefile4
-rw-r--r--devel/glade2/Makefile3
-rw-r--r--devel/glib/Makefile4
-rw-r--r--devel/glib/buildlink2.mk4
-rw-r--r--devel/glib2/Makefile3
-rw-r--r--devel/glib2/buildlink2.mk4
-rw-r--r--devel/gnome-objc/Makefile4
-rw-r--r--devel/gnome-objc/buildlink2.mk4
-rw-r--r--devel/gnome2-libole2/Makefile4
-rw-r--r--devel/gnome2-libole2/buildlink2.mk4
-rw-r--r--devel/gnustep-base/Makefile3
-rw-r--r--devel/gnustep-base/buildlink2.mk4
-rw-r--r--devel/gnustep-examples/Makefile4
-rw-r--r--devel/gnustep-objc/Makefile3
-rw-r--r--devel/gnustep-objc/buildlink2.mk4
-rw-r--r--devel/gob/Makefile3
-rw-r--r--devel/gscope/Makefile3
-rw-r--r--devel/gtkdiff/Makefile3
-rw-r--r--devel/guile-fcgi/Makefile3
-rw-r--r--devel/guile-gtk/Makefile4
-rw-r--r--devel/guile-gtk/buildlink2.mk4
-rw-r--r--devel/isect/Makefile3
-rw-r--r--devel/kdbg/Makefile3
-rw-r--r--devel/kdebindings2/Makefile4
-rw-r--r--devel/kdesdk2/Makefile4
-rw-r--r--devel/kdesdk2/buildlink2.mk4
-rw-r--r--devel/kdesdk3/Makefile3
-rw-r--r--devel/kdesdk3/buildlink2.mk4
-rw-r--r--devel/kdevelop-base/Makefile3
-rw-r--r--devel/kdevelop/Makefile3
-rw-r--r--devel/libast/Makefile4
-rw-r--r--devel/libast/buildlink2.mk4
-rw-r--r--devel/libbonobo/Makefile3
-rw-r--r--devel/libbonobo/buildlink2.mk4
-rw-r--r--devel/libbonoboui/Makefile4
-rw-r--r--devel/libbonoboui/buildlink2.mk4
-rw-r--r--devel/libglade/Makefile4
-rw-r--r--devel/libglade/buildlink2.mk4
-rw-r--r--devel/libglade2/Makefile4
-rw-r--r--devel/libglade2/buildlink2.mk4
-rw-r--r--devel/libgnome/Makefile5
-rw-r--r--devel/libgnome/buildlink2.mk4
-rw-r--r--devel/libgnomeui/Makefile3
-rw-r--r--devel/libgnomeui/buildlink2.mk4
-rw-r--r--devel/libgtop/Makefile4
-rw-r--r--devel/libgtop/buildlink2.mk4
-rw-r--r--devel/libgtop2/Makefile4
-rw-r--r--devel/libgtop2/buildlink2.mk4
-rw-r--r--devel/libmpeg3/Makefile4
-rw-r--r--devel/libmpeg3/buildlink2.mk4
-rw-r--r--devel/libole2/Makefile3
-rw-r--r--devel/libole2/buildlink2.mk4
-rw-r--r--devel/libsigc++/Makefile3
-rw-r--r--devel/libsigc++/buildlink2.mk4
-rw-r--r--devel/libsigc++10/Makefile3
-rw-r--r--devel/libsigc++10/buildlink2.mk4
-rw-r--r--devel/libwnck/Makefile3
-rw-r--r--devel/libwnck/buildlink2.mk4
-rw-r--r--devel/maketool/Makefile3
-rw-r--r--devel/mrproject/Makefile4
-rw-r--r--devel/oaf/Makefile3
-rw-r--r--devel/oaf/buildlink2.mk4
-rw-r--r--devel/p5-SDL/Makefile7
-rw-r--r--devel/pango/Makefile3
-rw-r--r--devel/pango/buildlink2.mk4
-rw-r--r--devel/pilrc/Makefile3
-rw-r--r--devel/pwlib/Makefile4
-rw-r--r--devel/pwlib/buildlink2.mk4
-rw-r--r--devel/smpeg/Makefile3
-rw-r--r--devel/smpeg/buildlink2.mk4
-rw-r--r--devel/subversion/Makefile3
-rw-r--r--devel/subversion/buildlink2.mk4
-rw-r--r--devel/umbrello/Makefile3
-rw-r--r--devel/uml/Makefile4
-rw-r--r--devel/xdelta/Makefile3
-rw-r--r--editors/abiword/Makefile4
-rw-r--r--editors/beaver/Makefile3
-rw-r--r--editors/gbib/Makefile3
-rw-r--r--editors/gconf-editor/Makefile4
-rw-r--r--editors/gedit/Makefile3
-rw-r--r--editors/gice/Makefile4
-rw-r--r--editors/gnotepad/Makefile4
-rw-r--r--editors/hnb/Makefile3
-rw-r--r--editors/kile/Makefile3
-rw-r--r--editors/lyx-qt/Makefile.common3
-rw-r--r--editors/manedit/Makefile3
-rw-r--r--editors/vim-gtk/Makefile3
-rw-r--r--editors/vim-kde/Makefile4
-rw-r--r--editors/xemacs-current/Makefile3
-rw-r--r--editors/xemacs-nox11/Makefile3
-rw-r--r--editors/xemacs/Makefile4
-rw-r--r--emulators/BasiliskII/Makefile4
-rw-r--r--emulators/generator/Makefile4
-rw-r--r--emulators/gpsim/Makefile5
-rw-r--r--emulators/hatari/Makefile3
-rw-r--r--emulators/palmosemulator/Makefile4
-rw-r--r--emulators/snes9x/Makefile4
-rw-r--r--emulators/zsnes/Makefile3
-rw-r--r--finance/emma/Makefile3
-rw-r--r--finance/gkrellm-stock/Makefile6
-rw-r--r--finance/gnofin/Makefile4
-rw-r--r--finance/gnucash/Makefile4
-rw-r--r--games/baduki/Makefile3
-rw-r--r--games/ccgo/Makefile3
-rw-r--r--games/clanbomber/Makefile4
-rw-r--r--games/copter-commander/Makefile4
-rw-r--r--games/corewars/Makefile5
-rw-r--r--games/criticalmass/Makefile3
-rw-r--r--games/crossfire-cli/Makefile4
-rw-r--r--games/dopewars/Makefile4
-rw-r--r--games/falcons-eye/Makefile3
-rw-r--r--games/fire/Makefile3
-rw-r--r--games/freeciv-client-gtk/Makefile3
-rw-r--r--games/frozen-bubble/Makefile3
-rw-r--r--games/glchess/Makefile4
-rw-r--r--games/glickomania/Makefile3
-rw-r--r--games/gltron/Makefile3
-rw-r--r--games/gnocatan/Makefile4
-rw-r--r--games/gnome-breakout/Makefile4
-rw-r--r--games/gnome-chess/Makefile4
-rw-r--r--games/gnome-games/Makefile4
-rw-r--r--games/gnome-games/buildlink2.mk4
-rw-r--r--games/gnome2-games/Makefile4
-rw-r--r--games/gnome2-games/buildlink2.mk4
-rw-r--r--games/grhino/Makefile3
-rw-r--r--games/gtetrinet/Makefile3
-rw-r--r--games/gtkballs/Makefile4
-rw-r--r--games/gtkgo/Makefile3
-rw-r--r--games/gturing/Makefile4
-rw-r--r--games/icebreaker/Makefile4
-rw-r--r--games/iso-pernangband/Makefile3
-rw-r--r--games/kdegames2/Makefile4
-rw-r--r--games/kdegames3/Makefile3
-rw-r--r--games/kdetoys2/Makefile4
-rw-r--r--games/kdetoys3/Makefile3
-rw-r--r--games/ketm/Makefile3
-rw-r--r--games/knights/Makefile4
-rw-r--r--games/lbreakout/Makefile4
-rw-r--r--games/lbreakout2/Makefile4
-rw-r--r--games/lgeneral/Makefile4
-rw-r--r--games/lpairs/Makefile3
-rw-r--r--games/ltris/Makefile4
-rw-r--r--games/maelstrom-sdl/Makefile3
-rw-r--r--games/marbles/Makefile3
-rw-r--r--games/mirrormagic-sdl/Makefile4
-rw-r--r--games/newvox/Makefile3
-rw-r--r--games/pacman/Makefile4
-rw-r--r--games/prboom/Makefile4
-rw-r--r--games/sarien/Makefile3
-rw-r--r--games/scummvm/Makefile3
-rw-r--r--games/tileworld/Makefile3
-rw-r--r--games/tuxracer/Makefile4
-rw-r--r--games/xarchon/Makefile3
-rw-r--r--games/xpuyopuyo/Makefile4
-rw-r--r--games/xrick/Makefile3
-rw-r--r--games/xscorch/Makefile3
-rw-r--r--graphics/3DKit/Makefile.common3
-rw-r--r--graphics/3DKit/buildlink2.mk4
-rw-r--r--graphics/GLXKit/Makefile3
-rw-r--r--graphics/GLXKit/buildlink2.mk4
-rw-r--r--graphics/GUIlib/Makefile3
-rw-r--r--graphics/GUIlib/buildlink2.mk4
-rw-r--r--graphics/GeometryKit/Makefile3
-rw-r--r--graphics/GeometryKit/buildlink2.mk4
-rw-r--r--graphics/GlutKit/Makefile3
-rw-r--r--graphics/GlutKit/buildlink2.mk4
-rw-r--r--graphics/ImageViewer/Makefile3
-rw-r--r--graphics/RenderKit/Makefile3
-rw-r--r--graphics/RenderKit/buildlink2.mk4
-rw-r--r--graphics/SDLKit/Makefile3
-rw-r--r--graphics/SDLKit/buildlink2.mk4
-rw-r--r--graphics/SDL_image/Makefile3
-rw-r--r--graphics/SDL_image/buildlink2.mk4
-rw-r--r--graphics/apla/Makefile4
-rw-r--r--graphics/avi-xmms/Makefile3
-rw-r--r--graphics/avifile-devel/Makefile4
-rw-r--r--graphics/avifile-devel/buildlink2.mk4
-rw-r--r--graphics/avifile/Makefile3
-rw-r--r--graphics/avifile/buildlink2.mk4
-rw-r--r--graphics/clanlib/Makefile4
-rw-r--r--graphics/clanlib/buildlink2.mk4
-rw-r--r--graphics/denemo/Makefile8
-rw-r--r--graphics/dia/Makefile4
-rw-r--r--graphics/dumpmpeg/Makefile3
-rw-r--r--graphics/dvdview/Makefile3
-rw-r--r--graphics/ee/Makefile4
-rw-r--r--graphics/eog/Makefile4
-rw-r--r--graphics/eog2/Makefile4
-rw-r--r--graphics/feh/Makefile3
-rw-r--r--graphics/filmgimp/Makefile3
-rw-r--r--graphics/fnlib/Makefile4
-rw-r--r--graphics/fnlib/buildlink2.mk4
-rw-r--r--graphics/g3d/Makefile3
-rw-r--r--graphics/gdk-pixbuf-gnome/buildlink2.mk4
-rw-r--r--graphics/gdk-pixbuf/Makefile.common3
-rw-r--r--graphics/gdk-pixbuf/buildlink2.mk4
-rw-r--r--graphics/gfract/Makefile4
-rw-r--r--graphics/gimageview/Makefile5
-rw-r--r--graphics/gimp-base/Makefile4
-rw-r--r--graphics/gimp-base/buildlink2.mk4
-rw-r--r--graphics/gimp-data/Makefile4
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/giram/Makefile4
-rw-r--r--graphics/gmngview/Makefile3
-rw-r--r--graphics/gmplayer/Makefile3
-rw-r--r--graphics/gnome-iconedit/Makefile4
-rw-r--r--graphics/gpaint/Makefile4
-rw-r--r--graphics/gphoto/Makefile4
-rw-r--r--graphics/gqview-devel/Makefile3
-rw-r--r--graphics/gqview/Makefile3
-rw-r--r--graphics/gtkam/Makefile3
-rw-r--r--graphics/gtkglext/Makefile3
-rw-r--r--graphics/gtkglext/buildlink2.mk4
-rw-r--r--graphics/gxine/Makefile3
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/imlib/buildlink2.mk4
-rw-r--r--graphics/imlib2/Makefile3
-rw-r--r--graphics/imlib2/buildlink2.mk4
-rw-r--r--graphics/kdegraphics2/Makefile4
-rw-r--r--graphics/kdegraphics3/Makefile4
-rw-r--r--graphics/kdegraphics3/buildlink2.mk4
-rw-r--r--graphics/libexif-gtk/Makefile3
-rw-r--r--graphics/libexif-gtk/buildlink2.mk4
-rw-r--r--graphics/libgnomecanvas/Makefile3
-rw-r--r--graphics/libgnomecanvas/buildlink2.mk4
-rw-r--r--graphics/librsvg/Makefile4
-rw-r--r--graphics/librsvg/buildlink2.mk4
-rw-r--r--graphics/librsvg2/Makefile4
-rw-r--r--graphics/librsvg2/buildlink2.mk4
-rw-r--r--graphics/libwmf/Makefile3
-rw-r--r--graphics/libwmf/buildlink2.mk4
-rw-r--r--graphics/mencoder/Makefile3
-rw-r--r--graphics/moz-flash/Makefile4
-rw-r--r--graphics/moz-mplayer/Makefile3
-rw-r--r--graphics/mplayer-share/Makefile3
-rw-r--r--graphics/mplayer/Makefile3
-rw-r--r--graphics/ogle/Makefile3
-rw-r--r--graphics/ogle/buildlink2.mk4
-rw-r--r--graphics/ogle_gui/Makefile3
-rw-r--r--graphics/openquicktime/Makefile3
-rw-r--r--graphics/openquicktime/buildlink2.mk4
-rw-r--r--graphics/plasma/Makefile3
-rw-r--r--graphics/ppmtoxvpic/Makefile4
-rw-r--r--graphics/py-gimp/Makefile4
-rw-r--r--graphics/qiv/Makefile3
-rw-r--r--graphics/sane-frontends/Makefile3
-rw-r--r--graphics/scigraphica/Makefile4
-rw-r--r--graphics/scrot/Makefile4
-rw-r--r--graphics/smpeg-xmms/Makefile5
-rw-r--r--graphics/sodipodi/Makefile4
-rw-r--r--graphics/swfdec/Makefile4
-rw-r--r--graphics/swfdec/buildlink2.mk4
-rw-r--r--graphics/tgif/Makefile4
-rw-r--r--graphics/tuxpaint/Makefile4
-rw-r--r--graphics/water/Makefile3
-rw-r--r--graphics/xine-lib/Makefile3
-rw-r--r--graphics/xine-lib/buildlink2.mk4
-rw-r--r--graphics/xine-ui/Makefile3
-rw-r--r--graphics/xsane/Makefile3
-rw-r--r--graphics/xzgv/Makefile4
-rw-r--r--inputmethod/Chinput/Makefile3
-rw-r--r--inputmethod/ami/Makefile3
-rw-r--r--inputmethod/unicon-im/Makefile4
-rw-r--r--inputmethod/unicon-im/buildlink2.mk4
-rw-r--r--lang/cilk/Makefile4
-rw-r--r--lang/dylan-interpreter/Makefile.common3
-rw-r--r--lang/erlang/Makefile3
-rw-r--r--lang/gb/Makefile4
-rw-r--r--lang/gb/buildlink2.mk4
-rw-r--r--lang/mono/Makefile3
-rw-r--r--lang/mono/buildlink2.mk4
-rw-r--r--lang/python21-pth/Makefile4
-rw-r--r--lang/python21-pth/buildlink2.mk4
-rw-r--r--lang/python22-pth/Makefile3
-rw-r--r--lang/python22-pth/buildlink2.mk4
-rw-r--r--mail/GNUMail/Makefile4
-rw-r--r--mail/Pantomime/Makefile3
-rw-r--r--mail/Pantomime/buildlink2.mk4
-rw-r--r--mail/balsa/Makefile3
-rw-r--r--mail/balsa2/Makefile3
-rw-r--r--mail/clamav/Makefile3
-rw-r--r--mail/courier-authldap/Makefile4
-rw-r--r--mail/evolution/Makefile6
-rw-r--r--mail/evolution/buildlink2.mk4
-rw-r--r--mail/kbiff/Makefile3
-rw-r--r--mail/libesmtp/Makefile3
-rw-r--r--mail/libesmtp/buildlink2.mk4
-rw-r--r--mail/libmilter/Makefile3
-rw-r--r--mail/libmilter/buildlink2.mk4
-rw-r--r--mail/mimedefang/Makefile3
-rw-r--r--mail/pine/Makefile3
-rw-r--r--mail/postfix/Makefile4
-rw-r--r--mail/sendmail/Makefile4
-rw-r--r--mail/sendmail811/Makefile4
-rw-r--r--mail/spamass-milter/Makefile3
-rw-r--r--mail/spruce/Makefile4
-rw-r--r--mail/sylpheed-claws/Makefile6
-rw-r--r--mail/sylpheed/Makefile6
-rw-r--r--mail/xfmail/Makefile4
-rw-r--r--math/euler/Makefile3
-rw-r--r--math/gcalctool/Makefile4
-rw-r--r--math/geg/Makefile5
-rw-r--r--math/gnumeric/Makefile3
-rw-r--r--math/gnumeric0/Makefile4
-rw-r--r--math/graphopt/Makefile3
-rw-r--r--math/grpn/Makefile4
-rw-r--r--math/guppi/Makefile4
-rw-r--r--math/guppi/buildlink2.mk4
-rw-r--r--math/xeukleides/Makefile3
-rw-r--r--meta-pkgs/edesktop/Makefile4
-rw-r--r--meta-pkgs/gnome/Makefile3
-rw-r--r--meta-pkgs/gnome2/Makefile3
-rw-r--r--meta-pkgs/gnustep/Makefile3
-rw-r--r--meta-pkgs/windowmaker-desktop/Makefile3
-rw-r--r--misc/bidwatcher/Makefile4
-rw-r--r--misc/blackbook/Makefile3
-rw-r--r--misc/fooseti/Makefile3
-rw-r--r--misc/gkrellm-moon/Makefile6
-rw-r--r--misc/gkrellm-weather/Makefile6
-rw-r--r--misc/gnome-pim/Makefile3
-rw-r--r--misc/gnome-utils/Makefile4
-rw-r--r--misc/gnome2-utils/Makefile3
-rw-r--r--misc/gperiodic/Makefile3
-rw-r--r--misc/gpsdrive/Makefile4
-rw-r--r--misc/gst-plugins/Makefile3
-rw-r--r--misc/gst-plugins/buildlink2.mk4
-rw-r--r--misc/gstreamer/Makefile3
-rw-r--r--misc/gstreamer/buildlink2.mk4
-rw-r--r--misc/hitchhiker/Makefile4
-rw-r--r--misc/kanjipad/Makefile3
-rw-r--r--misc/kdeaddons2/Makefile3
-rw-r--r--misc/kdeaddons3/Makefile3
-rw-r--r--misc/kdeadmin2/Makefile4
-rw-r--r--misc/kdeadmin3/Makefile3
-rw-r--r--misc/kdeartwork2/Makefile3
-rw-r--r--misc/kdeartwork3/Makefile3
-rw-r--r--misc/kdeedu3/Makefile3
-rw-r--r--misc/kdepim2/Makefile4
-rw-r--r--misc/kdepim3/Makefile3
-rw-r--r--misc/kdepim3/buildlink2.mk4
-rw-r--r--misc/kdeutils2/Makefile4
-rw-r--r--misc/kdeutils3/Makefile3
-rw-r--r--misc/kdeutils3/buildlink2.mk4
-rw-r--r--misc/koffice/Makefile4
-rw-r--r--misc/koffice/buildlink2.mk4
-rw-r--r--misc/koffice11/Makefile4
-rw-r--r--misc/koffice11/buildlink2.mk4
-rw-r--r--misc/kstars/Makefile3
-rw-r--r--misc/ktail/Makefile4
-rw-r--r--misc/nxtvepg/Makefile3
-rw-r--r--misc/ooqstart/Makefile4
-rw-r--r--misc/openoffice/Makefile4
-rw-r--r--net/IglooFTP/Makefile3
-rw-r--r--net/ORBit/Makefile4
-rw-r--r--net/ORBit/buildlink2.mk4
-rw-r--r--net/ORBit2/Makefile5
-rw-r--r--net/ORBit2/buildlink2.mk4
-rw-r--r--net/SDL_net/Makefile3
-rw-r--r--net/SDL_net/buildlink2.mk4
-rw-r--r--net/bug-buddy/Makefile4
-rw-r--r--net/dc_gui/Makefile3
-rw-r--r--net/dctc/Makefile3
-rw-r--r--net/driftnet/Makefile3
-rw-r--r--net/etherape/Makefile3
-rw-r--r--net/ethereal/Makefile3
-rw-r--r--net/ettercap/Makefile3
-rw-r--r--net/firewalk-gtk/Makefile3
-rw-r--r--net/freeradius/Makefile4
-rw-r--r--net/gftp/Makefile4
-rw-r--r--net/gkrellm-ping/Makefile6
-rw-r--r--net/gkrellm-snmp/Makefile4
-rw-r--r--net/gkrellm-wireless/Makefile4
-rw-r--r--net/gnapster/Makefile4
-rw-r--r--net/gnet/Makefile3
-rw-r--r--net/gnet/buildlink2.mk4
-rw-r--r--net/gnet1/Makefile3
-rw-r--r--net/gnet1/buildlink2.mk4
-rw-r--r--net/gnubile/Makefile6
-rw-r--r--net/gtk-gnutella/Makefile3
-rw-r--r--net/gtk_wicontrol/Makefile3
-rw-r--r--net/gtksamba/Makefile5
-rw-r--r--net/gtm/Makefile4
-rw-r--r--net/iplog/Makefile3
-rw-r--r--net/ja-samba/Makefile3
-rw-r--r--net/kdenetwork2/Makefile4
-rw-r--r--net/kdenetwork2/buildlink2.mk4
-rw-r--r--net/kdenetwork3/Makefile3
-rw-r--r--net/kdenetwork3/buildlink2.mk4
-rw-r--r--net/libIDL/Makefile3
-rw-r--r--net/libIDL/buildlink2.mk4
-rw-r--r--net/linc/Makefile3
-rw-r--r--net/linc/buildlink2.mk4
-rw-r--r--net/lmule/Makefile4
-rw-r--r--net/lopster/Makefile7
-rw-r--r--net/mldonkey/Makefile3
-rw-r--r--net/mtr-gtk/Makefile3
-rw-r--r--net/napshare/Makefile5
-rw-r--r--net/nmapfe/Makefile4
-rw-r--r--net/nprobe/Makefile3
-rw-r--r--net/ns/Makefile3
-rw-r--r--net/ntop2/Makefile4
-rw-r--r--net/openh323/Makefile3
-rw-r--r--net/samba/Makefile3
-rw-r--r--net/soup/Makefile4
-rw-r--r--net/soup/buildlink2.mk4
-rw-r--r--net/spread/Makefile3
-rw-r--r--net/spread/buildlink2.mk4
-rw-r--r--net/wistumbler/Makefile3
-rw-r--r--net/xtraceroute/Makefile4
-rw-r--r--news/pan-gnome/Makefile4
-rw-r--r--news/pan/Makefile4
-rw-r--r--parallel/linda/Makefile4
-rw-r--r--print/ggv/Makefile4
-rw-r--r--print/ggv2/Makefile3
-rw-r--r--print/gimp-print/Makefile3
-rw-r--r--print/gnome-print/Makefile4
-rw-r--r--print/gnome-print/buildlink2.mk4
-rw-r--r--print/libgnomeprint/Makefile3
-rw-r--r--print/libgnomeprint/buildlink2.mk4
-rw-r--r--print/libgnomeprintui/Makefile3
-rw-r--r--print/libgnomeprintui/buildlink2.mk4
-rw-r--r--print/scribus/Makefile4
-rw-r--r--security/amavis-perl/Makefile3
-rw-r--r--security/gnupg/Makefile4
-rw-r--r--security/gpa/Makefile3
-rw-r--r--security/gpgme/Makefile3
-rw-r--r--security/gpgme/buildlink2.mk4
-rw-r--r--security/gtk-systrace/Makefile3
-rw-r--r--security/kssh/Makefile3
-rw-r--r--security/nessus-core/Makefile3
-rw-r--r--security/nessus-core/buildlink2.mk4
-rw-r--r--security/nessus-plugins/Makefile3
-rw-r--r--security/nessus/Makefile7
-rw-r--r--security/otpcalc/Makefile3
-rw-r--r--security/pam-ldap/Makefile5
-rw-r--r--security/seahorse/Makefile5
-rw-r--r--sysutils/GWLib/buildlink2.mk4
-rw-r--r--sysutils/cfengine2/Makefile.common3
-rw-r--r--sysutils/gcdmaster/Makefile3
-rw-r--r--sysutils/gcombust/Makefile3
-rw-r--r--sysutils/gentoo/Makefile3
-rw-r--r--sysutils/gkrellm/Makefile3
-rw-r--r--sysutils/gkrellm/buildlink2.mk4
-rw-r--r--sysutils/gkx86info/Makefile5
-rw-r--r--sysutils/gmc/Makefile4
-rw-r--r--sysutils/gnome-vfs/Makefile4
-rw-r--r--sysutils/gnome-vfs/buildlink2.mk4
-rw-r--r--sysutils/gnome-vfs2/Makefile4
-rw-r--r--sysutils/gnome-vfs2/buildlink2.mk4
-rw-r--r--sysutils/gnometoaster/Makefile3
-rw-r--r--sysutils/grun/Makefile3
-rw-r--r--sysutils/gtop/Makefile4
-rw-r--r--sysutils/gworkspace/Makefile.common3
-rw-r--r--sysutils/koncd/Makefile4
-rw-r--r--sysutils/mc/Makefile3
-rw-r--r--sysutils/medusa/Makefile4
-rw-r--r--sysutils/medusa/buildlink2.mk4
-rw-r--r--sysutils/mtoolsfm/Makefile3
-rw-r--r--sysutils/nautilus/Makefile4
-rw-r--r--sysutils/rox-archive/Makefile5
-rw-r--r--sysutils/rox-edit/Makefile3
-rw-r--r--sysutils/rox-lib/Makefile3
-rw-r--r--sysutils/rox-memo/Makefile3
-rw-r--r--sysutils/rox-session/Makefile4
-rw-r--r--sysutils/rox-system/Makefile3
-rw-r--r--sysutils/rox-wallpaper/Makefile3
-rw-r--r--sysutils/rox-wrappers/Makefile6
-rw-r--r--sysutils/rox/Makefile4
-rw-r--r--sysutils/screentest/Makefile3
-rw-r--r--sysutils/toshutils/Makefile5
-rw-r--r--sysutils/vifm/Makefile3
-rw-r--r--sysutils/xcdroast/Makefile3
-rw-r--r--textproc/gtkspell/Makefile4
-rw-r--r--textproc/gtkspell/buildlink2.mk4
-rw-r--r--textproc/libxml2/Makefile3
-rw-r--r--textproc/libxml2/buildlink2.mk4
-rw-r--r--textproc/libxslt/Makefile3
-rw-r--r--textproc/libxslt/buildlink2.mk4
-rw-r--r--textproc/p5-XML-LibXML/Makefile4
-rw-r--r--textproc/php4-domxml/Makefile4
-rw-r--r--textproc/py-xmltools/Makefile3
-rw-r--r--textproc/pyDict/Makefile3
-rw-r--r--textproc/scrollkeeper/Makefile3
-rw-r--r--textproc/scrollkeeper/buildlink2.mk4
-rw-r--r--time/asclock-gtk/Makefile3
-rw-r--r--time/wmfishtime/Makefile3
-rw-r--r--wm/amaterus/Makefile3
-rw-r--r--wm/bbrun/Makefile3
-rw-r--r--wm/econf/Makefile4
-rw-r--r--wm/enlightenment/Makefile4
-rw-r--r--wm/fvwm2/Makefile4
-rw-r--r--wm/icepref/Makefile4
-rw-r--r--wm/icewm-gnome/Makefile4
-rw-r--r--wm/metacity/Makefile3
-rw-r--r--wm/metacity/buildlink2.mk4
-rw-r--r--wm/qvwm/Makefile4
-rw-r--r--wm/sawfish-replibs/Makefile4
-rw-r--r--wm/sawfish/Makefile6
-rw-r--r--wm/sawfish/Makefile.common3
-rw-r--r--wm/waimea/Makefile4
-rw-r--r--wm/whiteBOX/Makefile4
-rw-r--r--wm/wmakerconf/Makefile4
-rw-r--r--www/amaya/Makefile3
-rw-r--r--www/ap-auth-ldap/Makefile3
-rw-r--r--www/ap2-subversion/Makefile3
-rw-r--r--www/bluefish/Makefile3
-rw-r--r--www/cadaver/Makefile3
-rw-r--r--www/dillo/Makefile3
-rw-r--r--www/fcgi/Makefile3
-rw-r--r--www/fcgi/buildlink2.mk4
-rw-r--r--www/galeon/Makefile3
-rw-r--r--www/galway/Makefile6
-rw-r--r--www/glibwww/Makefile6
-rw-r--r--www/glibwww/buildlink2.mk4
-rw-r--r--www/gtkasp2php/Makefile3
-rw-r--r--www/gtkhtml/Makefile6
-rw-r--r--www/gtkhtml/buildlink2.mk4
-rw-r--r--www/kannel/Makefile3
-rw-r--r--www/libgtkhtml/Makefile3
-rw-r--r--www/libgtkhtml/buildlink2.mk4
-rw-r--r--www/mozilla-stable/Makefile4
-rw-r--r--www/mozilla-stable/buildlink2.mk4
-rw-r--r--www/mozilla/Makefile3
-rw-r--r--www/mozilla/buildlink2.mk4
-rw-r--r--www/neon/Makefile3
-rw-r--r--www/neon/buildlink2.mk4
-rw-r--r--www/p5-Apache-Gallery/Makefile3
-rw-r--r--www/phoenix/Makefile4
-rw-r--r--www/py-curl/Makefile3
-rw-r--r--www/quanta-docs/Makefile4
-rw-r--r--www/quanta/Makefile4
-rw-r--r--www/quanta3/Makefile3
-rw-r--r--www/w3m-img/Makefile4
-rw-r--r--www/zope25-AbracadabraObject/Makefile3
-rw-r--r--www/zope25-BTreeFolder/Makefile3
-rw-r--r--www/zope25-CMF/Makefile3
-rw-r--r--www/zope25-CMFPlone/Makefile3
-rw-r--r--www/zope25-Calendar/Makefile3
-rw-r--r--www/zope25-DocumentLibrary/Makefile3
-rw-r--r--www/zope25-EasyImage/Makefile3
-rw-r--r--www/zope25-ExternalEditor/Makefile3
-rw-r--r--www/zope25-FileSystemSite/Makefile3
-rw-r--r--www/zope25-Formulator/Makefile3
-rw-r--r--www/zope25-Fortune/Makefile3
-rw-r--r--www/zope25-JPicture/Makefile3
-rw-r--r--www/zope25-KnowledgeKit/Makefile3
-rw-r--r--www/zope25-LocalFS/Makefile3
-rw-r--r--www/zope25-MetaPublisher/Makefile3
-rw-r--r--www/zope25-ParsedXML/Makefile3
-rw-r--r--www/zope25-Photo/Makefile3
-rw-r--r--www/zope25-PropertyFolder/Makefile3
-rw-r--r--www/zope25-PropertyObject/Makefile3
-rw-r--r--www/zope25-RDFSummary/Makefile3
-rw-r--r--www/zope25-Silva/Makefile3
-rw-r--r--www/zope25-Squishdot/Makefile3
-rw-r--r--www/zope25-TinyTablePlus/Makefile3
-rw-r--r--www/zope25-XMLWidgets/Makefile3
-rw-r--r--www/zope25-ZMySQLDA/Makefile3
-rw-r--r--www/zope25-ZNavigator/Makefile3
-rw-r--r--www/zope25-ZPhotoSlides/Makefile3
-rw-r--r--www/zope25-ZPsycopgDA/Makefile3
-rw-r--r--www/zope25-ZWeather/Makefile3
-rw-r--r--www/zope25-ZWeatherApplet/Makefile3
-rw-r--r--www/zope25-ZWiki/Makefile3
-rw-r--r--www/zope25-Zippy/Makefile3
-rw-r--r--www/zope25-colorz/Makefile3
-rw-r--r--www/zope25/Makefile3
-rw-r--r--x11/acidlaunch/Makefile4
-rw-r--r--x11/controlcenter/Makefile4
-rw-r--r--x11/controlcenter/buildlink2.mk4
-rw-r--r--x11/dfm/Makefile.common4
-rw-r--r--x11/egtk/Makefile5
-rw-r--r--x11/eterm/Makefile4
-rw-r--r--x11/gdkxft/Makefile4
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/gnome--/Makefile4
-rw-r--r--x11/gnome--/buildlink2.mk4
-rw-r--r--x11/gnome-applets/Makefile4
-rw-r--r--x11/gnome-core/Makefile4
-rw-r--r--x11/gnome-core/Makefile.common3
-rw-r--r--x11/gnome-core/buildlink2.mk4
-rw-r--r--x11/gnome-desktop/Makefile3
-rw-r--r--x11/gnome-desktop/buildlink2.mk4
-rw-r--r--x11/gnome-gkrellm/Makefile8
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gnome-libs/buildlink2.mk4
-rw-r--r--x11/gnome-panel/Makefile3
-rw-r--r--x11/gnome-panel/buildlink2.mk4
-rw-r--r--x11/gnome-python/Makefile4
-rw-r--r--x11/gnome-python/buildlink2.mk4
-rw-r--r--x11/gnome-session/Makefile3
-rw-r--r--x11/gnome-users-guide/Makefile6
-rw-r--r--x11/gnome1-panel/Makefile3
-rw-r--r--x11/gnome1-panel/buildlink2.mk4
-rw-r--r--x11/gnome1-session/Makefile3
-rw-r--r--x11/gnome1-session/buildlink2.mk4
-rw-r--r--x11/gnome2-applets/Makefile3
-rw-r--r--x11/gnome2-control-center/Makefile3
-rw-r--r--x11/gnome2-control-center/buildlink2.mk4
-rw-r--r--x11/gnome2-terminal/Makefile4
-rw-r--r--x11/gnustep-back/Makefile3
-rw-r--r--x11/gnustep-back/buildlink2.mk4
-rw-r--r--x11/gnustep-gui/Makefile3
-rw-r--r--x11/gnustep-gui/buildlink2.mk4
-rw-r--r--x11/gnustep-preferences/Makefile4
-rw-r--r--x11/gtk+extra/Makefile3
-rw-r--r--x11/gtk+extra/buildlink2.mk4
-rw-r--r--x11/gtk--/Makefile4
-rw-r--r--x11/gtk--/buildlink2.mk4
-rw-r--r--x11/gtk-engines/Makefile6
-rw-r--r--x11/gtk/Makefile4
-rw-r--r--x11/gtk/buildlink2.mk4
-rw-r--r--x11/gtk2-engines/Makefile3
-rw-r--r--x11/gtk2/Makefile3
-rw-r--r--x11/gtk2/buildlink2.mk4
-rw-r--r--x11/gtkglarea/Makefile4
-rw-r--r--x11/gtkglarea/buildlink2.mk4
-rw-r--r--x11/gtkmm/Makefile3
-rw-r--r--x11/gtkmm/buildlink2.mk4
-rw-r--r--x11/gtkstep/Makefile5
-rw-r--r--x11/gtoolkit/Makefile.common3
-rw-r--r--x11/gtoolkit/buildlink2.mk4
-rw-r--r--x11/hot-babe/Makefile3
-rw-r--r--x11/kde2/Makefile24
-rw-r--r--x11/kde3-i18n-af/Makefile3
-rw-r--r--x11/kde3-i18n-ar/Makefile3
-rw-r--r--x11/kde3-i18n-bg/Makefile3
-rw-r--r--x11/kde3-i18n-bs/Makefile3
-rw-r--r--x11/kde3-i18n-ca/Makefile3
-rw-r--r--x11/kde3-i18n-cs/Makefile3
-rw-r--r--x11/kde3-i18n-da/Makefile3
-rw-r--r--x11/kde3-i18n-de/Makefile3
-rw-r--r--x11/kde3-i18n-el/Makefile3
-rw-r--r--x11/kde3-i18n-en_GB/Makefile3
-rw-r--r--x11/kde3-i18n-eo/Makefile3
-rw-r--r--x11/kde3-i18n-es/Makefile3
-rw-r--r--x11/kde3-i18n-et/Makefile3
-rw-r--r--x11/kde3-i18n-eu/Makefile3
-rw-r--r--x11/kde3-i18n-fa/Makefile3
-rw-r--r--x11/kde3-i18n-fi/Makefile3
-rw-r--r--x11/kde3-i18n-fr/Makefile3
-rw-r--r--x11/kde3-i18n-he/Makefile3
-rw-r--r--x11/kde3-i18n-hu/Makefile3
-rw-r--r--x11/kde3-i18n-it/Makefile3
-rw-r--r--x11/kde3-i18n-ja/Makefile3
-rw-r--r--x11/kde3-i18n-lt/Makefile3
-rw-r--r--x11/kde3-i18n-mt/Makefile3
-rw-r--r--x11/kde3-i18n-nb/Makefile3
-rw-r--r--x11/kde3-i18n-nl/Makefile3
-rw-r--r--x11/kde3-i18n-nn/Makefile3
-rw-r--r--x11/kde3-i18n-nso/Makefile3
-rw-r--r--x11/kde3-i18n-pl/Makefile3
-rw-r--r--x11/kde3-i18n-pt/Makefile3
-rw-r--r--x11/kde3-i18n-pt_BR/Makefile3
-rw-r--r--x11/kde3-i18n-ro/Makefile3
-rw-r--r--x11/kde3-i18n-ru/Makefile3
-rw-r--r--x11/kde3-i18n-sk/Makefile3
-rw-r--r--x11/kde3-i18n-sl/Makefile3
-rw-r--r--x11/kde3-i18n-sr/Makefile3
-rw-r--r--x11/kde3-i18n-sv/Makefile3
-rw-r--r--x11/kde3-i18n-ta/Makefile3
-rw-r--r--x11/kde3-i18n-th/Makefile3
-rw-r--r--x11/kde3-i18n-tr/Makefile3
-rw-r--r--x11/kde3-i18n-uk/Makefile3
-rw-r--r--x11/kde3-i18n-ven/Makefile3
-rw-r--r--x11/kde3-i18n-vi/Makefile3
-rw-r--r--x11/kde3-i18n-xh/Makefile3
-rw-r--r--x11/kde3-i18n-zh_CN/Makefile3
-rw-r--r--x11/kde3-i18n-zh_TW/Makefile3
-rw-r--r--x11/kde3-i18n-zu/Makefile3
-rw-r--r--x11/kde3/Makefile28
-rw-r--r--x11/kdebase2/Makefile4
-rw-r--r--x11/kdebase2/buildlink2.mk4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/kdebase3/buildlink2.mk4
-rw-r--r--x11/kdelibs2/Makefile6
-rw-r--r--x11/kdelibs2/buildlink2.mk8
-rw-r--r--x11/kdelibs3/Makefile6
-rw-r--r--x11/kdelibs3/buildlink2.mk8
-rw-r--r--x11/kterm/Makefile5
-rw-r--r--x11/lablgtk/Makefile3
-rw-r--r--x11/lablgtk/buildlink2.mk4
-rw-r--r--x11/libzvt/Makefile4
-rw-r--r--x11/libzvt/buildlink2.mk4
-rw-r--r--x11/mlterm/Makefile3
-rw-r--r--x11/multi-gnome-terminal/Makefile4
-rw-r--r--x11/p5-gtk/Makefile3
-rw-r--r--x11/py-wxWindows/Makefile4
-rw-r--r--x11/pygtk/Makefile4
-rw-r--r--x11/pygtk/buildlink2.mk4
-rw-r--r--x11/qt2-designer-kde/Makefile4
-rw-r--r--x11/qt3-libs/Makefile.common3
-rw-r--r--x11/qt3-libs/buildlink2.mk4
-rw-r--r--x11/qt3-mysql/Makefile3
-rw-r--r--x11/qt3-psql/Makefile3
-rw-r--r--x11/qt3-tools/Makefile3
-rw-r--r--x11/qt3-tools/buildlink2.mk4
-rw-r--r--x11/qt3/Makefile9
-rw-r--r--x11/rep-gtk/Makefile4
-rw-r--r--x11/ruby-gtk/Makefile6
-rw-r--r--x11/wxGTK/Makefile3
-rw-r--r--x11/wxGTK/buildlink2.mk4
-rw-r--r--x11/xbindkeys-config/Makefile3
-rw-r--r--x11/xdialog/Makefile5
-rw-r--r--x11/xfce/Makefile3
-rw-r--r--x11/xmms-osd/Makefile3
-rw-r--r--x11/xosd/Makefile3
-rw-r--r--x11/xosd/buildlink2.mk4
-rw-r--r--x11/xscreensaver-gnome/Makefile3
-rw-r--r--x11/xscreensaver/Makefile4
-rw-r--r--x11/xteddy2/Makefile4
-rw-r--r--x11/xvattr/Makefile3
902 files changed, 1872 insertions, 1450 deletions
diff --git a/archivers/cxunzip/Makefile b/archivers/cxunzip/Makefile
index dfb1ec1f439..2c9f15b160e 100644
--- a/archivers/cxunzip/Makefile
+++ b/archivers/cxunzip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/01/27 19:46:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:53:34 wiz Exp $
DISTNAME= cxunzip-0.96
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= archivers
MASTER_SITES= http://gurb.ton.tut.fi/gnome/download/
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 75b2fb949c1..6453c6b2fee 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/02/18 14:55:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:53:35 wiz Exp $
#
DISTNAME= file-roller-2.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fileroller/}
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile
index dfdf390d5e9..ba3c37de526 100644
--- a/audio/SDL_mixer/Makefile
+++ b/audio/SDL_mixer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/05 19:04:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:53:36 wiz Exp $
#
DISTNAME= SDL_mixer-1.2.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/
@@ -18,7 +18,6 @@ USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_BUILDLINK2= YES
-BUILDLINK_DEPENDS.SDL= SDL>=1.2.2
CPPFLAGS+= -Dunix=1
diff --git a/audio/SDL_mixer/buildlink2.mk b/audio/SDL_mixer/buildlink2.mk
index 970e2c3e06e..6b210d202a2 100644
--- a/audio/SDL_mixer/buildlink2.mk
+++ b/audio/SDL_mixer/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/03 08:17:22 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:53:36 wiz Exp $
.if !defined(SDL_MIXER_BUILDLINK2_MK)
SDL_MIXER_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= SDL_mixer
-BUILDLINK_DEPENDS.SDL_mixer?= SDL_mixer>=1.2.0
+BUILDLINK_DEPENDS.SDL_mixer?= SDL_mixer>=1.2.4nb2
BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer
EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_mixer=SDL_mixer
diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile
index dbb68f5b080..1814ec2319e 100644
--- a/audio/SDL_sound/Makefile
+++ b/audio/SDL_sound/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/26 22:48:26 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:36 wiz Exp $
#
DISTNAME= SDL_sound-1.0.0
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://icculus.org/SDL_sound/downloads/
diff --git a/audio/SDL_sound/buildlink2.mk b/audio/SDL_sound/buildlink2.mk
index 0f4391f8268..ae738aa5018 100644
--- a/audio/SDL_sound/buildlink2.mk
+++ b/audio/SDL_sound/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/03/26 22:48:26 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:53:37 wiz Exp $
.if !defined(SDL_SOUND_BUILDLINK2_MK)
SDL_SOUND_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= SDL_sound
-BUILDLINK_DEPENDS.SDL_sound?= SDL_sound>=1.0.0
+BUILDLINK_DEPENDS.SDL_sound?= SDL_sound>=1.0.0nb1
BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound
EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_sound=SDL_sound
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 7f1b251d2ad..630fd048106 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/04/01 12:27:04 markd Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:53:37 wiz Exp $
DISTNAME= arts-1.1.1
+PKGREVISION= 1
CATEGORIES= audio
COMMENT= Analog Real-Time Synthesizer
diff --git a/audio/arts/buildlink2.mk b/audio/arts/buildlink2.mk
index 26bba3a12ff..558bafa7d1a 100644
--- a/audio/arts/buildlink2.mk
+++ b/audio/arts/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/03/11 13:33:45 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:53:37 wiz Exp $
.if !defined(ARTS_BUILDLINK2_MK)
ARTS_BUILDLINK2_MK= # defined
@@ -6,7 +6,7 @@ ARTS_BUILDLINK2_MK= # defined
.include "../../mk/bsd.prefs.mk"
BUILDLINK_PACKAGES+= arts
-BUILDLINK_DEPENDS.arts?= arts>=1.1
+BUILDLINK_DEPENDS.arts?= arts>=1.1.1nb1
BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
EVAL_PREFIX+= BUILDLINK_PREFIX.arts=arts
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 05692eb1a35..8b8fd8fee6f 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/10/04 08:59:34 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:53:37 wiz Exp $
DISTNAME= audacity-src-1.0.0-2
PKGNAME= audacity-1.0.0.2
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/audacity-src-1.0.0
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 7c4cd498216..ddc1c654f31 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/03/04 18:07:07 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:53:38 wiz Exp $
DISTNAME= aumix-2.8
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aumix/} \
http://jpj.net/~trevor/aumix/ \
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index b050b97dd57..2e93a773baf 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/10/02 18:22:45 dillo Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:53:38 wiz Exp $
#
DISTNAME= cheesetracker-0.5.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.reduz.com.ar/cheesetracker/
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index a0a60b7c73d..edcf26b3d6b 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2003/03/05 12:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2003/05/02 11:53:39 wiz Exp $
#
DISTNAME= easytag-0.27
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=easytag/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/flac-xmms/Makefile b/audio/flac-xmms/Makefile
index b88f3e8c14f..3bc97676583 100644
--- a/audio/flac-xmms/Makefile
+++ b/audio/flac-xmms/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/02/14 23:56:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:53:39 wiz Exp $
#
DISTNAME= flac-1.1.0
PKGNAME= flac-xmms-1.1.0
+PKGREVISION= 1
CATEGORIES= audio archivers
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/}
diff --git a/audio/freezetag/Makefile b/audio/freezetag/Makefile
index 59cb6d9ba39..9c2b92c9635 100644
--- a/audio/freezetag/Makefile
+++ b/audio/freezetag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/09/21 00:44:25 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:53:39 wiz Exp $
#
DISTNAME= freezetag-0.9.2
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://katz.linuxpower.org/freezetag/current/
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index af1edd91ace..d694abcbcef 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/10/27 07:21:17 rh Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:53:40 wiz Exp $
#
DISTNAME= gdcd-0.2.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://gdcd.undergrid.net/source_archive/
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 69661eeac89..edd63102be1 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/01/03 15:26:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:53:40 wiz Exp $
DISTNAME= volume-0.8
PKGNAME= gkrellm-${DISTNAME}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/volume
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index e91315782fd..ec5d93bd581 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/06/11 19:23:39 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:53:40 wiz Exp $
DISTNAME= gkrellmms-0.5.6
+PKGREVISION= 1
PKGNAME= gkrellm-xmms-0.5.6
WRKSRC= ${WRKDIR}/gkrellmms
CATEGORIES= audio
@@ -10,8 +11,8 @@ MAINTAINER= damon@netbsd.org
HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml
COMMENT= gkrellm xmms plugin
-DEPENDS+= xmms>=1.2.5:../xmms
-DEPENDS+= gkrellm>=1.2.11:../../sysutils/gkrellm
+DEPENDS+= xmms>=1.2.7nb6:../xmms
+DEPENDS+= gkrellm>=1.2.13nb1:../../sysutils/gkrellm
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/audio/gmodplay/Makefile b/audio/gmodplay/Makefile
index 187e9ce9229..b34323ede2e 100644
--- a/audio/gmodplay/Makefile
+++ b/audio/gmodplay/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/12/24 18:55:35 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:53:41 wiz Exp $
DISTNAME= gmodplay-0.08
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://magic.metawire.com/~rani/ \
http://rani.free.fr/
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index 1eeb05e4207..360963f2570 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/12/30 20:47:29 tron Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:53:41 wiz Exp $
DISTNAME= mp3info-0.8.4
PKGNAME= g${DISTNAME}
+PKGREVISION= 1
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/gnome-media/Makefile b/audio/gnome-media/Makefile
index 3d37e1f1f7c..e02dd010876 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2003/02/18 14:55:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:53:41 wiz Exp $
DISTNAME= gnome-media-1.2.3
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-media/1.2/}
diff --git a/audio/gnome2-media/Makefile b/audio/gnome2-media/Makefile
index daae751603c..da818465a58 100644
--- a/audio/gnome2-media/Makefile
+++ b/audio/gnome2-media/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/25 04:49:42 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:42 wiz Exp $
DISTNAME= gnome-media-2.2.1.1
+PKGREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-media/2.2/}
diff --git a/audio/gnome2-media/buildlink2.mk b/audio/gnome2-media/buildlink2.mk
index 5bffee0025b..4ad9f97917e 100644
--- a/audio/gnome2-media/buildlink2.mk
+++ b/audio/gnome2-media/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/25 04:49:42 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:53:42 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-media.
#
@@ -9,7 +9,7 @@
GNOME_MEDIA_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-media
-BUILDLINK_DEPENDS.gnome-media?= gnome-media>=2.2.1.1
+BUILDLINK_DEPENDS.gnome-media?= gnome-media>=2.2.1.1nb1
BUILDLINK_PKGSRCDIR.gnome-media?= ../../audio/gnome2-media
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-media=gnome-media
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index d1cc3cb6029..99777aa5a8c 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2003/02/14 22:28:23 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2003/05/02 11:53:42 wiz Exp $
#
DISTNAME= gqmpeg-0.20.0
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
diff --git a/audio/gtkmserv/Makefile b/audio/gtkmserv/Makefile
index e0448468b2a..fada38b52c6 100644
--- a/audio/gtkmserv/Makefile
+++ b/audio/gtkmserv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:53:42 wiz Exp $
#
DISTNAME= gtkmserv-0.5.2
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/src
CATEGORIES= audio
MASTER_SITES= http://projects.ubertechnique.com/downloads/
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 54fb4b01f48..d221c0a8e16 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2002/09/20 04:48:23 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:53:43 wiz Exp $
DISTNAME= kdemultimedia-2.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
COMMENT= KDE audio tools
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 5e76a2dbbfa..9f5cd436bf5 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/04/09 13:45:17 markd Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:53:43 wiz Exp $
DISTNAME= kdemultimedia-3.1.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
COMMENT= Audio tools for the KDE integrated X11 desktop
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 42037903478..482c4ac298b 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/03/01 11:05:08 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:53:43 wiz Exp $
#
VERS= 3.93.1
DISTNAME= lame-${VERS}
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lame/} \
http://hive.me.gu.edu.au/not_lame/ \
diff --git a/audio/lame/buildlink2.mk b/audio/lame/buildlink2.mk
index d805920f350..30f13f70e24 100644
--- a/audio/lame/buildlink2.mk
+++ b/audio/lame/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/08/28 06:39:19 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:53:43 wiz Exp $
.if !defined(LAME_BUILDLINK2_MK)
LAME_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= lame
-BUILDLINK_DEPENDS.lame?= lame>=3.89
+BUILDLINK_DEPENDS.lame?= lame>=3.93.1nb1
BUILDLINK_PKGSRCDIR.lame?= ../../audio/lame
EVAL_PREFIX+= BUILDLINK_PREFIX.lame=lame
diff --git a/audio/libao-arts/Makefile b/audio/libao-arts/Makefile
index c6e2ac81ffa..fef482c9a52 100644
--- a/audio/libao-arts/Makefile
+++ b/audio/libao-arts/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/04/22 19:23:55 jmc Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:53:43 wiz Exp $
#
.include "../libao/Makefile.common"
PKGNAME= ${DISTNAME:S/libao/libao-arts/}
+PKGREVISION= 1
MAINTAINER= packages@netbsd.org
COMMENT+= (arts plugin)
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 86df764e659..a02df73bb16 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/01/21 17:40:30 seb Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:53:44 wiz Exp $
DISTNAME= mp3blaster-3.1.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= ftp://mud.stack.nl/pub/mp3blaster/ \
http://mp3blaster.linuxave.net/src/
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 0e66182e127..60089423a88 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/17 15:57:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:44 wiz Exp $
#
DISTNAME= openal-20030125
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}fbsd/linux
CATEGORIES= audio
MASTER_SITES= http://math.smsu.edu/~erik/files/fbsd/ \
diff --git a/audio/openal/buildlink2.mk b/audio/openal/buildlink2.mk
index 303f303a7c6..7f5516c6984 100644
--- a/audio/openal/buildlink2.mk
+++ b/audio/openal/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/03/17 15:57:05 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:53:44 wiz Exp $
#
# This Makefile fragment is included by packages that use openal.
#
@@ -9,7 +9,7 @@
OPENAL_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= openal
-BUILDLINK_DEPENDS.openal?= openal>=20030125
+BUILDLINK_DEPENDS.openal?= openal>=20030125nb1
BUILDLINK_PKGSRCDIR.openal?= ../../audio/openal
EVAL_PREFIX+= BUILDLINK_PREFIX.openal=openal
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
index 6ae24610d99..d31c9e56694 100644
--- a/audio/rio500/Makefile
+++ b/audio/rio500/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/03/05 18:05:39 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:53:44 wiz Exp $
#
DISTNAME= rio500-0.7
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rio500/}
diff --git a/audio/streamtuner-live365/Makefile b/audio/streamtuner-live365/Makefile
index 550cf486d67..6e97bba3733 100644
--- a/audio/streamtuner-live365/Makefile
+++ b/audio/streamtuner-live365/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/28 20:30:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:53:45 wiz Exp $
#
DISTNAME= streamtuner-live365-0.3.0
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=streamtuner/}
diff --git a/audio/streamtuner-local/Makefile b/audio/streamtuner-local/Makefile
index a13938ac82f..6da9626ab9c 100644
--- a/audio/streamtuner-local/Makefile
+++ b/audio/streamtuner-local/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/20 06:47:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:53:45 wiz Exp $
#
DISTNAME= streamtuner-local-0.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=streamtuner/}
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index a4b88b3aed4..4de04c45f58 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/20 06:47:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:53:45 wiz Exp $
#
DISTNAME= streamtuner-0.9.1
+PKGREVISION= 1
CATEGORIES= audio www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=streamtuner/}
diff --git a/audio/streamtuner/buildlink2.mk b/audio/streamtuner/buildlink2.mk
index cc6a4400ce1..e7eb512ccc1 100644
--- a/audio/streamtuner/buildlink2.mk
+++ b/audio/streamtuner/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/03/04 14:41:17 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:53:45 wiz Exp $
#
# This Makefile fragment is included by packages that use streamtuner.
#
@@ -9,7 +9,7 @@
STREAMTUNER_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= streamtuner
-BUILDLINK_DEPENDS.streamtuner?= streamtuner>=0.9.1
+BUILDLINK_DEPENDS.streamtuner?= streamtuner>=0.9.1nb1
BUILDLINK_PKGSRCDIR.streamtuner?= ../../audio/streamtuner
EVAL_PREFIX+= BUILDLINK_PREFIX.streamtuner=streamtuner
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 98e4e474d03..f78c0d989a7 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/04/30 17:13:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:53:46 wiz Exp $
#
DISTNAME= sweep-0.8.2
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sweep/}
diff --git a/audio/sweep/buildlink2.mk b/audio/sweep/buildlink2.mk
index e17f02d5d96..0c46c3c0e45 100644
--- a/audio/sweep/buildlink2.mk
+++ b/audio/sweep/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:41 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:53:46 wiz Exp $
#
# This Makefile fragment is included by packages that use sweep.
#
@@ -9,7 +9,7 @@
SWEEP_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= sweep
-BUILDLINK_DEPENDS.sweep?= sweep>=0.5.13
+BUILDLINK_DEPENDS.sweep?= sweep>=0.8.2
BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep
EVAL_PREFIX+= BUILDLINK_PREFIX.sweep=sweep
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 311de8ede1c..1b9c21f5a68 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2003/02/21 17:30:51 mycroft Exp $
+# $NetBSD: Makefile,v 1.38 2003/05/02 11:53:46 wiz Exp $
#
DISTNAME= TiMidity++-2.11.3
PKGNAME= ${DISTNAME:S/TiMidity++/timidity/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.goice.co.jp/member/mo/timidity/dist/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
index 53fb0e3b21d..bd8545b4d58 100644
--- a/audio/tremor-tools/Makefile
+++ b/audio/tremor-tools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/10/02 18:13:17 dillo Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:53:46 wiz Exp $
DISTNAME= vorbis-tools-1.0
+PKGREVISION= 1
PKGNAME= tremor-tools-1.0.0.8
CATEGORIES= audio
MASTER_SITES= http://www.vorbis.com/files/1.0/unix/
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 8ed33c5b18e..27a9b7d7343 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2002/11/30 11:46:06 salo Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/02 11:53:47 wiz Exp $
DISTNAME= vorbis-tools-1.0
PKGNAME= vorbis-tools-1.0.0.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.vorbis.com/files/1.0/unix/
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index 11a072cc76a..008e1ea8364 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/09/21 02:12:00 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:53:47 wiz Exp $
DISTNAME= wmusic-1.4.7
+PKGREVISION= 1
CATEGORIES= audio windowmaker
MASTER_SITES= http://hadess.net/files/
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 613520ab9c2..d0182e1b511 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/03/28 20:31:46 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:53:47 wiz Exp $
#
DISTNAME= xhippo-3.3
+PKGREVISION= 1
CATEGORIES= audio x11
MASTER_SITES= ${MASTER_SITE_GNU:=xhippo/}
diff --git a/audio/xmms-bezier/Makefile b/audio/xmms-bezier/Makefile
index 1c59c54225b..bf5e126283c 100644
--- a/audio/xmms-bezier/Makefile
+++ b/audio/xmms-bezier/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/09 20:24:13 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:53:48 wiz Exp $
#
DISTNAME= bezier-0.0.3
PKGNAME= xmms-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://yossman.net/~kuroyi/
diff --git a/audio/xmms-bump-scope/Makefile b/audio/xmms-bump-scope/Makefile
index d19f8b0e1be..e2a910b5b63 100644
--- a/audio/xmms-bump-scope/Makefile
+++ b/audio/xmms-bump-scope/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/14 23:56:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:48 wiz Exp $
#
DISTNAME= bump_scope-0.0.3
+PKGREVISION= 1
PKGNAME= xmms-bump-scope-0.0.3
CATEGORIES= xmms audio
MASTER_SITES= http://staff.xmms.org/zinx/xmms/
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 8c1257acf8a..4b9f324b32c 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/10/27 06:47:44 rh Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:53:49 wiz Exp $
#
DISTNAME= xmms-crossfade-0.2.9
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/ \
ftp://ftp.falsehope.com/pub/xmms-crossfade/
diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index d9def0de0ae..855cf1d34a6 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/09/21 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:53:49 wiz Exp $
#
DISTNAME= dflowers-1.2
+PKGREVISION= 1
PKGNAME= xmms-${DISTNAME}
CATEGORIES= audio
MASTER_SITES= http://hem.passagen.se/joakime/
diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile
index 19a62790f0a..c4c157d596d 100644
--- a/audio/xmms-dscope/Makefile
+++ b/audio/xmms-dscope/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/09/21 01:34:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:53:50 wiz Exp $
#
DISTNAME= dscope-1.2
+PKGREVISION= 1
PKGNAME= xmms-${DISTNAME}
CATEGORIES= audio
MASTER_SITES= http://hem.passagen.se/joakime/
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
index c3fcc2f08dd..aac30b3f68d 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/09/21 01:46:52 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:53:50 wiz Exp $
#
DISTNAME= dspectogram-1.2
+PKGREVISION= 1
PKGNAME= xmms-${DISTNAME}
CATEGORIES= audio
MASTER_SITES= http://hem.passagen.se/joakime/
diff --git a/audio/xmms-dspectral/Makefile b/audio/xmms-dspectral/Makefile
index cb24c0e060e..93aa625eeda 100644
--- a/audio/xmms-dspectral/Makefile
+++ b/audio/xmms-dspectral/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/15 00:44:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:50 wiz Exp $
#
DISTNAME= dspectral-1.2
+PKGREVISION= 1
PKGNAME= xmms-dspectral-1.2
CATEGORIES= audio
MASTER_SITES= http://hem.passagen.se/joakime/
diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile
index d6161d5c6e7..cc74b47e63d 100644
--- a/audio/xmms-fmradio/Makefile
+++ b/audio/xmms-fmradio/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/10/18 04:28:18 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:53:50 wiz Exp $
#
DISTNAME= xmms-FMRadio-1.4
+PKGREVISION= 1
PKGNAME= xmms-fmradio-1.4
CATEGORIES= audio
MASTER_SITES= http://silicone.free.fr/xmms-FMRadio/
diff --git a/audio/xmms-funtimedancer/Makefile b/audio/xmms-funtimedancer/Makefile
index df4186d258a..e78d6f5102c 100644
--- a/audio/xmms-funtimedancer/Makefile
+++ b/audio/xmms-funtimedancer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/04/10 01:28:41 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:53:51 wiz Exp $
#
DISTNAME= FunTimeDancer-0.1
+PKGREVISION= 1
PKGNAME= xmms-funtimedancer-0.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ftd/}
diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile
index 1dcb10f2693..7143a659b53 100644
--- a/audio/xmms-gdancer/Makefile
+++ b/audio/xmms-gdancer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/09/21 02:00:14 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:53:51 wiz Exp $
#
DISTNAME= gdancer-0.4.3
+PKGREVISION= 1
PKGNAME= xmms-${DISTNAME}
CATEGORIES= audio
MASTER_SITES= http://figz.com/gdancer/files/
diff --git a/audio/xmms-infinity/Makefile b/audio/xmms-infinity/Makefile
index f6f75761ab5..84719d5bfb3 100644
--- a/audio/xmms-infinity/Makefile
+++ b/audio/xmms-infinity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/14 23:56:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:51 wiz Exp $
#
DISTNAME= infinity-0.2
+PKGREVISION= 1
PKGNAME= xmms-${DISTNAME}
CATEGORIES= xmms audio
MASTER_SITES= http://julien.carme.free.fr/
diff --git a/audio/xmms-iris/Makefile b/audio/xmms-iris/Makefile
index 05fb8475cab..4bc18de6c6f 100644
--- a/audio/xmms-iris/Makefile
+++ b/audio/xmms-iris/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/14 23:56:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:51 wiz Exp $
#
DISTNAME= iris-0.11
+PKGREVISION= 1
PKGNAME= xmms-${DISTNAME}
CATEGORIES= xmms audio
MASTER_SITES= http://cdelfosse.free.fr/xmms-iris/
diff --git a/audio/xmms-jakdaw/Makefile b/audio/xmms-jakdaw/Makefile
index bb5aa7a6657..8097f385c3d 100644
--- a/audio/xmms-jakdaw/Makefile
+++ b/audio/xmms-jakdaw/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/01 10:17:32 jmc Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:53:52 wiz Exp $
#
DISTNAME= jakdaw-0.0.4
+PKGREVISION= 1
PKGNAME= xmms-${DISTNAME}
CATEGORIES= audio xmms
MASTER_SITES= http://www.jakdaw.ucam.org/xmms/
diff --git a/audio/xmms-jess/Makefile b/audio/xmms-jess/Makefile
index efd11d85a68..1a5327f41bf 100644
--- a/audio/xmms-jess/Makefile
+++ b/audio/xmms-jess/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/28 21:19:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:53:52 wiz Exp $
#
DISTNAME= JESS-2.9.1
+PKGREVISION= 1
PKGNAME= xmms-jess-2.9.1
CATEGORIES= xmms audio
MASTER_SITES= http://arquier.free.fr/
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index 70e7236ec2c..e2e813defb6 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/22 18:08:32 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:53:52 wiz Exp $
#
DISTNAME= xmms-mad-0.0.9
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://www.superduper.net/downloads/xmms-mad/
diff --git a/audio/xmms-madspin/Makefile b/audio/xmms-madspin/Makefile
index 1e744d7178a..4e9ed6bf130 100644
--- a/audio/xmms-madspin/Makefile
+++ b/audio/xmms-madspin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/02/22 13:16:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:53:52 wiz Exp $
#
DISTNAME= madspin-0.05
+PKGREVISION= 1
PKGNAME= xmms-${DISTNAME}
CATEGORIES= xmms audio
MASTER_SITES= http://www.students.uiuc.edu/~birck/
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
index a23dc63e174..452b7c88e06 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2002/09/21 02:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:53:53 wiz Exp $
#
DISTNAME= neato
PKGNAME= xmms-neato-20010818
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.rpi.edu/~mullr/xmms/
diff --git a/audio/xmms-nebulus/Makefile b/audio/xmms-nebulus/Makefile
index b83ad260501..19fe39272f5 100644
--- a/audio/xmms-nebulus/Makefile
+++ b/audio/xmms-nebulus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/14 23:56:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:53 wiz Exp $
#
DISTNAME= xmms-nebulus-0.3.0
+PKGREVISION= 1
CATEGORIES= xmms audio
MASTER_SITES= http://nebulus.tuxfamily.org/
diff --git a/audio/xmms-paranormal/Makefile b/audio/xmms-paranormal/Makefile
index b7de44cb46d..73087d45206 100644
--- a/audio/xmms-paranormal/Makefile
+++ b/audio/xmms-paranormal/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/14 23:56:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:53 wiz Exp $
#
DISTNAME= paranormal-0.2.0
+PKGREVISION= 1
PKGNAME= xmms-paranormal-0.2.0
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=/paranormal/}
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index 3b3af707503..c4d99f2d620 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/09/03 15:36:40 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:53:54 wiz Exp $
#
DISTNAME= xmms-sid-0.7.4
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.tnsp.org/xs-files/
diff --git a/audio/xmms-synaesthesia/Makefile b/audio/xmms-synaesthesia/Makefile
index 78372a5cd98..b10176d947c 100644
--- a/audio/xmms-synaesthesia/Makefile
+++ b/audio/xmms-synaesthesia/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/01 10:22:39 jmc Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:53:54 wiz Exp $
#
DISTNAME= synaesthesia-xmms-0.0.3-rc3
+PKGREVISION= 1
PKGNAME= xmms-synaesthesia-0.0.3rc3
CATEGORIES= audio xmms
MASTER_SITES= http://staff.xmms.org/zinx/xmms/
diff --git a/audio/xmms-tv-scope/Makefile b/audio/xmms-tv-scope/Makefile
index 17efde27ba1..4b800f1c73d 100644
--- a/audio/xmms-tv-scope/Makefile
+++ b/audio/xmms-tv-scope/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/27 20:29:17 cjep Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:53:54 wiz Exp $
#
DISTNAME= tv_scope-0.0.2
+PKGREVISION= 1
PKGNAME= xmms-tv-scope-0.0.2
CATEGORIES= xmms audio
MASTER_SITES= http://staff.xmms.org/zinx/xmms/
diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile
index eec995c4419..2fab1f81bd6 100644
--- a/audio/xmms-vismsa/Makefile
+++ b/audio/xmms-vismsa/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/09/21 02:09:35 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:53:54 wiz Exp $
#
DISTNAME= vismsa-xmms-plugin-0.2
+PKGREVISION= 1
PKGNAME= xmms-vismsa-0.2
CATEGORIES= audio
MASTER_SITES= http://a.godau.org/
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index dd9f814bb1b..d553a9afc39 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2003/04/29 01:21:23 simonb Exp $
+# $NetBSD: Makefile,v 1.45 2003/05/02 11:53:48 wiz Exp $
#
DISTNAME= xmms-1.2.7
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= audio
MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \
ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/
diff --git a/audio/xmms/buildlink2.mk b/audio/xmms/buildlink2.mk
index 78f9d0433b9..787d3fe3068 100644
--- a/audio/xmms/buildlink2.mk
+++ b/audio/xmms/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/21 01:30:56 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:53:48 wiz Exp $
.if !defined(XMMS_BUILDLINK2_MK)
XMMS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= xmms
-BUILDLINK_DEPENDS.xmms?= xmms>=1.2.7nb1
+BUILDLINK_DEPENDS.xmms?= xmms>=1.2.7nb6
BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms
EVAL_PREFIX+= BUILDLINK_PREFIX.xmms=xmms
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 4e90ba03a81..84ee045dce1 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/01/27 19:48:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:53:55 wiz Exp $
DISTNAME= yamt-0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yamt/}
diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile
index cc594e88ca7..59c0532b96b 100644
--- a/biology/chemtool/Makefile
+++ b/biology/chemtool/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2002/11/30 15:31:59 salo Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:53:55 wiz Exp $
DISTNAME= chemtool-1.4.1
+PKGREVISION= 1
CATEGORIES= biology
MASTER_SITES= http://www.uni-ulm.de/~s_tvolk/chemtool/src/
diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 115319905b2..485e0863a3f 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:53:55 wiz Exp $
#
DISTNAME= boolean
PKGNAME= boolean-${REL}
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/boolean/${REL}/linux
CATEGORIES= cad graphics
MASTER_SITES= http://www.xs4all.nl/~kholwerd/download/boolzip/
@@ -13,7 +13,7 @@ MAINTAINER= dmcmahill@netbsd.org
HOMEPAGE= http://www.xs4all.nl/~kholwerd/bool.html
COMMENT= GDSII viewer/editor + (boolean) operations on sets of 2d polygons
-DEPENDS+= wxGTK>=2.2.7nb1:../../x11/wxGTK
+DEPENDS+= wxGTK>=2.4.0nb1:../../x11/wxGTK
DIST_SUBDIR= ${PKGNAME_NOREV}
REL= 6.2
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 5f985dfc600..50511d28261 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/03/09 06:18:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:53:56 wiz Exp $
#
DISTNAME= geda-utils-${PKGVERSION}
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 021ca20a6ae..e4372ba15bd 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/03/28 21:14:14 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:53:56 wiz Exp $
#
DISTNAME= gEDA-${PKGVERSION}
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,10 +11,10 @@ MAINTAINER= dmcmahill@netbsd.org
HOMEPAGE= http://www.geda.seul.org/
COMMENT= Toolset for automating electronic design
-DEPENDS+= gschem-${PKGVERSION}:../../cad/gschem
-DEPENDS+= gnetlist-${PKGVERSION}nb1:../../cad/gnetlist
-DEPENDS+= gsymcheck-${PKGVERSION}:../../cad/gsymcheck
-DEPENDS+= geda-utils-${PKGVERSION}:../../cad/geda-utils
+DEPENDS+= gschem-${PKGVERSION}nb1:../../cad/gschem
+DEPENDS+= gnetlist-${PKGVERSION}nb2:../../cad/gnetlist
+DEPENDS+= gsymcheck-${PKGVERSION}nb1:../../cad/gsymcheck
+DEPENDS+= geda-utils-${PKGVERSION}nb1:../../cad/geda-utils
DEPENDS+= geda-docs-${PKGVERSION}:../../cad/geda-docs
USE_X11BASE= yes
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 15d553badeb..e2f9644d37f 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/03/21 03:43:21 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:53:56 wiz Exp $
#
DISTNAME= gerbv-0.13
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gerbv/}
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 32bfa312377..4ae937285e0 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/03/09 22:00:54 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:53:56 wiz Exp $
#
DISTNAME= geda-gnetlist-${PKGVERSION}
PKGNAME= gnetlist-${PKGVERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index 4d797a14ecf..649f127bd7c 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/03/09 06:18:26 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:53:57 wiz Exp $
#
DISTNAME= geda-gschem-${PKGVERSION}
+PKGREVISION= 1
PKGNAME= gschem-${PKGVERSION}
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index e18f497ec8f..a3d99ef0129 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/03/09 06:18:26 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:53:57 wiz Exp $
#
DISTNAME= geda-gsymcheck-${PKGVERSION}
+PKGREVISION= 1
PKGNAME= gsymcheck-${PKGVERSION}
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 6a482ab90e0..fa374b4818a 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/01/25 12:48:40 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:53:57 wiz Exp $
#
DISTNAME= gwave-20020122
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://www.cs.unc.edu/~tell/dist/
diff --git a/cad/ipal-current/Makefile b/cad/ipal-current/Makefile
index d84a80b96b5..5746417102c 100644
--- a/cad/ipal-current/Makefile
+++ b/cad/ipal-current/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/09/27 23:17:46 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:53:58 wiz Exp $
#
DISTNAME= ipal-20001210
+PKGREVISION= 1
PKGNAME= ipal-current-20001210
CATEGORIES= cad
MASTER_SITES= ftp://icarus.com/pub/eda/ipal/snapshots/
@@ -11,7 +12,7 @@ HOMEPAGE= http://www.icarus.com/eda/ipal/index.html
COMMENT= Libs and utils for manipulating PAL designs (development version)
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-DEPENDS+= gtk+>=1.2.7:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
GNU_CONFIGURE= YES
USE_GMAKE= YES
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 71197ce71d5..6036cee6d01 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/03/09 06:18:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:53:58 wiz Exp $
#
DISTNAME= libgeda-${PKGVERSION}
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 1525a50e76c..a87f1a2e4aa 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/01/27 19:51:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:53:58 wiz Exp $
#
DISTNAME= oregano-0.20
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= cad gnome
MASTER_SITES= http://www.dtek.chalmers.se/~d4hult/oregano/download/
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 73f6e609d1f..db5ad109aa8 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/04/29 21:51:53 jtb Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:53:59 wiz Exp $
DISTNAME= qcad-1.5.4-src
PKGNAME= qcad-1.5.4
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qcad/}
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index bf34894badc..6cba8bd4414 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/23 12:25:03 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:53:59 wiz Exp $
#
DISTNAME= transcalc-0.13
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://transcalc.sourceforge.net/
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=transcalc/}
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index becaaabf356..2fb130ae8e3 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/04/26 22:05:10 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:53:59 wiz Exp $
#
DISTNAME= centericq-4.9.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= chat
MASTER_SITES= http://konst.org.ua/download/
diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index 0624b50e14a..6941b7ee26b 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/05/02 07:57:31 zuntum Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:54:00 wiz Exp $
#
DISTNAME= ekg-1.0
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://dev.null.pl/ekg/ \
http://dev.null.pl/ekg/stare/
diff --git a/chat/everybuddy-gnome/Makefile b/chat/everybuddy-gnome/Makefile
index 1fb12d129e9..95f8fee07c6 100644
--- a/chat/everybuddy-gnome/Makefile
+++ b/chat/everybuddy-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/01/27 12:54:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:01 wiz Exp $
.include "../everybuddy/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-gnome-/}
-PKGREVISION= 4
+PKGREVISION= 5
CONFLICTS+= everybuddy-[0-9]*
COMMENT+= with GNOME support
diff --git a/chat/everybuddy/Makefile b/chat/everybuddy/Makefile
index 8b2b5017f1e..410179bf4b2 100644
--- a/chat/everybuddy/Makefile
+++ b/chat/everybuddy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/01/27 12:54:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:00 wiz Exp $
.include "Makefile.common"
-PKGREVISION= 2
+PKGREVISION= 3
USE_BUILDLINK2= yes
CONFLICTS+= everybuddy-gnome-[0-9]*
diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common
index 6911dd5205b..414edbcbb61 100644
--- a/chat/everybuddy/Makefile.common
+++ b/chat/everybuddy/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2003/04/03 15:19:33 tron Exp $
+# $NetBSD: Makefile.common,v 1.6 2003/05/02 11:54:00 wiz Exp $
DISTNAME= everybuddy-0.2.0
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://www.everybuddy.com/files/
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index 0aa957b580f..652c4a098ae 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/03/01 11:49:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:54:01 wiz Exp $
DISTNAME= gabber-0.8.7
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gabber/}
diff --git a/chat/gaim-gnome/Makefile b/chat/gaim-gnome/Makefile
index 243c1c1be4d..8d1c996948f 100644
--- a/chat/gaim-gnome/Makefile
+++ b/chat/gaim-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/04/11 15:40:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:02 wiz Exp $
.include "../gaim-gtk1/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-gnome-/}
-PKGREVISION= 2
+PKGREVISION= 3
CONFLICTS+= gaim-[0-9]*
COMMENT+= with GNOME support
diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common
index 4ba8b353a2e..3b21a667b37 100644
--- a/chat/gaim-gtk1/Makefile.common
+++ b/chat/gaim-gtk1/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2003/04/12 08:00:52 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/05/02 11:54:02 wiz Exp $
#
DISTNAME= gaim-0.59.8
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} \
ftp://ftp.marko.net/pub/gaim/
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 197f7931be1..664f66b8a2b 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2003/04/25 17:16:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2003/05/02 11:54:01 wiz Exp $
#
DISTNAME= gaim-0.62
+PKGREVISION= 1
CATEGORIES= chat x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/}
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index bd2c9f9d75c..8bef2b99155 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:54:02 wiz Exp $
#
DISTNAME= gale-0.99a
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://download.gale.org/
diff --git a/chat/gale/buildlink2.mk b/chat/gale/buildlink2.mk
index eeaa2a6fc64..6aed9567621 100644
--- a/chat/gale/buildlink2.mk
+++ b/chat/gale/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:58 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:02 wiz Exp $
.if !defined(GALE_BUILDLINK2_MK)
GALE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gale
-BUILDLINK_DEPENDS.gale?= gale>=0.99
+BUILDLINK_DEPENDS.gale?= gale>=0.99anb1
BUILDLINK_PKGSRCDIR.gale?= ../../chat/gale
EVAL_PREFIX+= BUILDLINK_PREFIX.gale=gale
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 0ca36f0d96f..a69bdbe3f42 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/01/27 19:51:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:54:03 wiz Exp $
DISTNAME= gnomeicu-0.96
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= chat gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile
index ef04e9bbc76..00ce5991b14 100644
--- a/chat/gtkyahoo/Makefile
+++ b/chat/gtkyahoo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/09/21 07:00:33 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:03 wiz Exp $
DISTNAME= gtkyahoo-0.18.2
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkyahoo/} \
http://www.unixtools.org/gtkyahoo/dist/
diff --git a/chat/ickle/Makefile b/chat/ickle/Makefile
index 1d9f7bb09ac..f36fe809f8d 100644
--- a/chat/ickle/Makefile
+++ b/chat/ickle/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/04/30 10:50:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:03 wiz Exp $
DISTNAME= ickle-0.3.2
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ickle/}
diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile
index 4370d4a807f..22bd7b6db37 100644
--- a/chat/irssi-icb/Makefile
+++ b/chat/irssi-icb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:04 wiz Exp $
#
DISTNAME= irssi-icb-0.14
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${IRSSI_DISTNAME}/${DISTNAME}
CATEGORIES= chat
MASTER_SITES= http://www.irssi.org/files/plugins/icb/
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index cd48e459fd7..86e3d91fdb0 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:07 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:54:03 wiz Exp $
DISTNAME= ${IRSSI_DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= chat
MASTER_SITES= http://real.irssi.org/files/
EXTRACT_SUFX= ${IRSSI_EXTRACT_SUFX}
diff --git a/chat/kmess/Makefile b/chat/kmess/Makefile
index 282de12e8e8..41c8f66790e 100644
--- a/chat/kmess/Makefile
+++ b/chat/kmess/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/16 18:19:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:04 wiz Exp $
#
DISTNAME= kmess-1.1
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kmess/}
diff --git a/chat/kyim/Makefile b/chat/kyim/Makefile
index 123df9e635b..80f6802a4a9 100644
--- a/chat/kyim/Makefile
+++ b/chat/kyim/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/20 10:57:01 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:04 wiz Exp $
DISTNAME= kyim-1.0
+PKGREVISION= 1
CATEGORIES= chat kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kyim/}
EXTRACT_SUFX= .tgz
diff --git a/chat/libicq2000/Makefile b/chat/libicq2000/Makefile
index 47fa5ce22dd..48522930b7d 100644
--- a/chat/libicq2000/Makefile
+++ b/chat/libicq2000/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/22 06:21:20 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:04 wiz Exp $
#
DISTNAME= libicq2000-0.3.2
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libicq2000/}
diff --git a/chat/libicq2000/buildlink2.mk b/chat/libicq2000/buildlink2.mk
index 841b44dd4ef..65664a1d733 100644
--- a/chat/libicq2000/buildlink2.mk
+++ b/chat/libicq2000/buildlink2.mk
@@ -2,7 +2,7 @@
LIBICQ2000_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libicq2000
-BUILDLINK_DEPENDS.libicq2000= libicq2000>=0.3.2
+BUILDLINK_DEPENDS.libicq2000= libicq2000>=0.3.2nb1
BUILDLINK_PKGSRCDIR.libicq2000?= ../../chat/libicq2000
EVAL_PREFIX+= BUILDLINK_PREFIX.libicq2000=libicq2000
diff --git a/chat/libirc/Makefile b/chat/libirc/Makefile
index 7ed6ebb7cd3..d0fa0790dac 100644
--- a/chat/libirc/Makefile
+++ b/chat/libirc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:51:30 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:05 wiz Exp $
#
DISTNAME= libirc-0.2
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://www.cs.kau.se/~jorgen/software/
@@ -9,7 +10,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.cs.kau.se/~jorgen/software/
COMMENT= libirc is a C-library for the IRC protocol
-DEPENDS+= glib>=1.2.6:../../devel/glib
+DEPENDS+= glib>=1.2.10nb4:../../devel/glib
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile
index 256beb85ba5..3fb32824b9c 100644
--- a/chat/licq-gui-qt/Makefile
+++ b/chat/licq-gui-qt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/24 23:57:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:05 wiz Exp $
#
DISTNAME= licq-1.2.6
+PKGREVISION= 1
PKGNAME= ${DISTNAME:C/-/-gui-qt-/}
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=licq/}
@@ -17,7 +18,6 @@ USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
WRKSRC= ${WRKDIR:=/${DISTNAME}/plugins/qt-gui}
-BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3
USE_NCURSES= yes # really use ncurses!
.include "../../x11/qt3-libs/buildlink2.mk"
diff --git a/chat/lmme/Makefile b/chat/lmme/Makefile
index 7ce9a04ca89..1a24bec1e53 100644
--- a/chat/lmme/Makefile
+++ b/chat/lmme/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/12/24 18:55:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:05 wiz Exp $
#
DISTNAME= lmme-0.6.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lmme/}
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index 4ede580ec0b..c9a8620ec43 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/03/30 08:04:50 jmc Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:06 wiz Exp $
DISTNAME= psi-0.8.7
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://belnet.dl.sourceforge.net/sourceforge/psi/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/silc-client-icb/Makefile b/chat/silc-client-icb/Makefile
index 43052fb6108..604486229fe 100644
--- a/chat/silc-client-icb/Makefile
+++ b/chat/silc-client-icb/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/27 22:32:16 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:06 wiz Exp $
#
DISTNAME= irssi-icb-0.14
PKGNAME= ${DISTNAME:S/irssi/silc-client/}
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://www.irssi.org/files/plugins/icb/
DISTFILES= ${DISTNAME}.tar.gz ${SILC_CLIENT_DISTFILE}
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 976a9b3e8ba..c2b561fb936 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2003/04/27 22:28:29 salo Exp $
+# $NetBSD: Makefile,v 1.25 2003/05/02 11:54:06 wiz Exp $
#
DISTNAME= ${SILC_CLIENT_DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= chat security
MASTER_SITES= http://www.silcnet.org/download/client/sources/ \
ftp://ftp.silcnet.org/silc/client/sources/ \
@@ -26,8 +26,6 @@ USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \
${WRKSRC}/lib/silcmath/mpi/libtool
-BUILDLINK_DEPENDS.iconv= libiconv>=1.7
-
PKG_SYSCONFSUBDIR?= silc
MAKE_ENV+= examplesdir=${PREFIX}/share/examples/silc
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index f31a2f93827..a495119aa35 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/03/17 20:12:47 salo Exp $
+# $NetBSD: Makefile,v 1.23 2003/05/02 11:54:06 wiz Exp $
#
DISTNAME= silc-server-0.9.13
+PKGREVISION= 1
CATEGORIES= chat security
MASTER_SITES= http://www.silcnet.org/download/server/sources/ \
ftp://ftp.silcnet.org/silc/server/sources/ \
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 1dc3540b2db..8b5ad0549a9 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.15 2003/02/05 05:06:34 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2003/05/02 11:54:07 wiz Exp $
DISTNAME= xchat-1.8.11
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= chat x11
MASTER_SITES= ${HOMEPAGE}files/source/1.8/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index e9e36c1c71e..39baf524802 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/24 14:12:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:07 wiz Exp $
#
DISTNAME= xchat-2.0.2
+PKGREVISION= 1
CATEGORIES= chat gnome
MASTER_SITES= http://www.xchat.org/files/source/2.0/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/ysm/Makefile b/chat/ysm/Makefile
index 70563553b4b..7326cf4cfc9 100644
--- a/chat/ysm/Makefile
+++ b/chat/ysm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/01/19 08:48:47 tron Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:08 wiz Exp $
DISTNAME= ysmv7_2_8_1
+PKGREVISION= 1
PKGNAME= ysm-2.8.1
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ysmv7/}
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 5a3e9f017d5..35e47a7c54a 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:08 wiz Exp $
DISTNAME= efax-gtk-1.0.1b.src
PKGNAME= efax-gtk-1.0.1b
-PKGREVISION= 3
+PKGREVISION= 4
WRKSRC= ${WRKDIR}/efax-gtk
CATEGORIES= comms
MASTER_SITES= http://www.cvine.freeserve.co.uk/efax-gtk/
diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index 7d75fc4a4c0..a4183b24b7f 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/27 12:53:25 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:08 wiz Exp $
#
DISTNAME= gnome-pilot-0.1.71
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-pilot/0.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/comms/gnome-pilot/buildlink2.mk b/comms/gnome-pilot/buildlink2.mk
index 89e7ee80a4e..210fa64b32d 100644
--- a/comms/gnome-pilot/buildlink2.mk
+++ b/comms/gnome-pilot/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/01/11 02:56:25 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:08 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-pilot.
#
@@ -9,7 +9,7 @@
GNOME_PILOT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-pilot
-BUILDLINK_DEPENDS.gnome-pilot?= gnome-pilot>=0.1.71
+BUILDLINK_DEPENDS.gnome-pilot?= gnome-pilot>=0.1.71nb2
BUILDLINK_PKGSRCDIR.gnome-pilot?= ../../comms/gnome-pilot
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-pilot=gnome-pilot
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index a94ec97024e..08509dfdf5e 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/11/30 13:36:13 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:09 wiz Exp $
#
DISTNAME= gsmlib-1.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= comms devel
MASTER_SITES= http://www.pxh.de/fs/gsmlib/download/
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 2da9e8d0094..12996f16622 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/03/04 16:30:18 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:54:10 wiz Exp $
DISTNAME= jpilot-syncmal_0.71.2
+PKGREVISION= 1
PKGNAME= jpilot-syncmal-0.71.2
CATEGORIES= comms
MASTER_SITES= http://jasonday.home.att.net/code/syncmal/
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 790791b5fd8..e5a06e2c73e 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2003/03/04 16:29:28 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2003/05/02 11:54:09 wiz Exp $
#
DISTNAME= jpilot-0.99.5
+PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= http://jpilot.org/
diff --git a/comms/jpilot/buildlink2.mk b/comms/jpilot/buildlink2.mk
index 8e8504e2b8c..9edd082c7ae 100644
--- a/comms/jpilot/buildlink2.mk
+++ b/comms/jpilot/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/03/04 16:29:29 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:09 wiz Exp $
.if !defined(JPILOT_BUILDLINK2_MK)
JPILOT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= jpilot
-BUILDLINK_DEPENDS.jpilot?= jpilot>=0.99.5
+BUILDLINK_DEPENDS.jpilot?= jpilot>=0.99.5nb1
BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot
BUILDLINK_DEPMETHOD.jpilot?= build
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 0bc2de38bfb..6c6a1b56352 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2002/12/24 06:09:47 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2003/05/02 11:54:10 wiz Exp $
#
DISTNAME= wv-0.7.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
diff --git a/converters/wv/buildlink2.mk b/converters/wv/buildlink2.mk
index 041f1a39818..b1180f73fe0 100644
--- a/converters/wv/buildlink2.mk
+++ b/converters/wv/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/12/24 06:09:47 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:10 wiz Exp $
.if !defined(WV_BUILDLINK2_MK)
WV_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= wv
-BUILDLINK_DEPENDS.wv?= wv>=0.7.4nb1
+BUILDLINK_DEPENDS.wv?= wv>=0.7.4nb2
BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv
EVAL_PREFIX+= BUILDLINK_PREFIX.wv=wv
diff --git a/databases/edb/Makefile b/databases/edb/Makefile
index 3c2b3de3d33..90f2b614614 100644
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/20 15:26:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:11 wiz Exp $
#
DISTNAME= edb-1.0.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
diff --git a/databases/edb/buildlink2.mk b/databases/edb/buildlink2.mk
index 7d42ea1c034..0f58c82adba 100644
--- a/databases/edb/buildlink2.mk
+++ b/databases/edb/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:05 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:11 wiz Exp $
.if !defined(EDB_BUILDLINK2_MK)
EDB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= edb
-BUILDLINK_DEPENDS.edb?= edb>=1.0.2
+BUILDLINK_DEPENDS.edb?= edb>=1.0.3nb2
BUILDLINK_PKGSRCDIR.edb?= ../../databases/edb
EVAL_PREFIX+= BUILDLINK_PREFIX.edb=edb
diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index 8a61e2b20ec..cd511858d95 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/02/05 05:06:34 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:54:11 wiz Exp $
#
DISTNAME= gq-0.3.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases net
MASTER_SITES= http://biot.com/gq/download/ \
${MASTER_SITE_SOURCEFORGE:=gqclient/}
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 969e8de6449..efbcf4fed8c 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/01/05 20:14:20 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2003/05/02 11:54:11 wiz Exp $
#
DISTNAME= gtksql-0.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases
MASTER_SITES= http://www.multimania.com/bbrox/GtkSQL/ \
${MASTER_SITE_SUNSITE:=X11/gtkbuffet/apps/gtksql/} \
diff --git a/databases/gtranscript/Makefile b/databases/gtranscript/Makefile
index cea314a01b3..771db40c24b 100644
--- a/databases/gtranscript/Makefile
+++ b/databases/gtranscript/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/01/27 19:42:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:54:12 wiz Exp $
#
DISTNAME= gtranscript-0.0.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= databases
MASTER_SITES= http://gtranscript.linuxbox.com/ \
ftp://ftp.matrix.com.br/pub/linuxberg/files/gnome/office/ \
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index aa7207ea7d4..8a50bdf9adc 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2002/09/20 11:22:06 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:54:12 wiz Exp $
DISTNAME= kmysqladmin-0.5.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases kde
MASTER_SITES= http://www.webeifer.de/alwin/programs/download/kmysqladmin/
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index d6405f837d5..8ce0fbe6bc4 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2003/02/18 14:55:56 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.8 2003/05/02 11:54:12 wiz Exp $
#
DISTNAME?= libgda-0.10.0
-PKGREVISION?= 1
+PKGREVISION?= 2
CATEGORIES?= databases gnome
MASTER_SITES?= ${MASTER_SITE_GNOME:=sources/libgda/0.10/}
EXTRACT_SUFX?= .tar.bz2
diff --git a/databases/libgda/buildlink2.mk b/databases/libgda/buildlink2.mk
index 71c9bae6d0b..de59a9a8de6 100644
--- a/databases/libgda/buildlink2.mk
+++ b/databases/libgda/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/02/14 22:17:41 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:12 wiz Exp $
#
# This Makefile fragment is included by packages that use libgda.
#
@@ -9,7 +9,7 @@
LIBGDA_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgda
-BUILDLINK_DEPENDS.libgda?= libgda>=0.10
+BUILDLINK_DEPENDS.libgda?= libgda>=0.10.0nb2
BUILDLINK_PKGSRCDIR.libgda?= ../../databases/libgda
EVAL_PREFIX+= BUILDLINK_PREFIX.libgda=libgda
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 9f616d01d40..af6b7644efe 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/02/18 14:55:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:12 wiz Exp $
#
DISTNAME= libgnomedb-0.10.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomedb/0.10/}
EXTRACT_SUFX= .tar.bz2
diff --git a/databases/libgnomedb/buildlink2.mk b/databases/libgnomedb/buildlink2.mk
index aa6e6852a1e..50cef3cb151 100644
--- a/databases/libgnomedb/buildlink2.mk
+++ b/databases/libgnomedb/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/02/14 20:18:03 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:54:13 wiz Exp $
#
# This Makefile fragment is included by packages that use libgnomedb.
#
@@ -9,7 +9,7 @@
LIBGNOMEDB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgnomedb
-BUILDLINK_DEPENDS.libgnomedb?= libgnomedb>=0.10.0
+BUILDLINK_DEPENDS.libgnomedb?= libgnomedb>=0.10.0nb2
BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb
EVAL_PREFIX+= BUILDLINK_PREFIX.libgnomedb=libgnomedb
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 4bd82bc6648..562decc3c18 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/04/25 20:20:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:13 wiz Exp $
#
DISTNAME= mergeant-0.10.0
+PKGREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/mergeant/0.10/}
EXTRACT_SUFX= .tar.bz2
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 291746f2e31..63a55c041b5 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2003/02/17 15:27:59 dillo Exp $
+# $NetBSD: Makefile,v 1.54 2003/05/02 11:54:13 wiz Exp $
DISTNAME= openldap-2.0.27
-PKGREVISION= 2
+PKGREVISION= 3
SVR4_PKGNAME= oldap
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff --git a/databases/openldap/buildlink2.mk b/databases/openldap/buildlink2.mk
index 1cbd8997999..0a3bf6d1120 100644
--- a/databases/openldap/buildlink2.mk
+++ b/databases/openldap/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 19:46:30 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:54:13 wiz Exp $
.if !defined(OPENLDAP_BUILDLINK2_MK)
OPENLDAP_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= openldap
-BUILDLINK_DEPENDS.openldap?= openldap-2.0.*
+BUILDLINK_DEPENDS.openldap?= openldap>=2.0.27nb3
BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
EVAL_PREFIX+= BUILDLINK_PREFIX.openldap=openldap
diff --git a/databases/php3-ldap/Makefile b/databases/php3-ldap/Makefile
index 5af3d6999ce..691150b5bc3 100644
--- a/databases/php3-ldap/Makefile
+++ b/databases/php3-ldap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/09 11:55:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:14 wiz Exp $
MODNAME= ldap
CATEGORIES+= databases
-PKGREVISION= # empty
+PKGREVISION= 1
COMMENT= PHP3 extension for LDAP database access
USE_BUILDLINK2= yes
diff --git a/databases/php4-ldap/Makefile b/databases/php4-ldap/Makefile
index 78622a009fb..2a10b9e93ac 100644
--- a/databases/php4-ldap/Makefile
+++ b/databases/php4-ldap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/10/08 22:48:09 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:14 wiz Exp $
MODNAME= ldap
CATEGORIES+= databases
-PKGREVISION= # empty
+PKGREVISION= 1
COMMENT= PHP4 extension for LDAP database access
USE_BUILDLINK2= YES
diff --git a/databases/php4-odbc/Makefile b/databases/php4-odbc/Makefile
index d45639a38e0..2f79921e93c 100644
--- a/databases/php4-odbc/Makefile
+++ b/databases/php4-odbc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/09/20 21:47:22 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:14 wiz Exp $
MODNAME= odbc
CATEGORIES+= databases
-PKGREVISION= # empty
+PKGREVISION= 1
COMMENT= PHP4 extension for ODBC access
USE_BUILDLINK2= YES
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index 13e270b6227..de4328badaf 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/01/21 19:38:22 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:14 wiz Exp $
#
DISTNAME= psycopg-1.0.14
+PKGREVISION= 1
PKGNAME= ${PYPKGPREFIX}-psycopg-1.0.14
CATEGORIES= databases
MASTER_SITES= http://initd.org/pub/software/psycopg/
diff --git a/databases/py-psycopg/buildlink2.mk b/databases/py-psycopg/buildlink2.mk
index c7578de4658..800731d7e6e 100644
--- a/databases/py-psycopg/buildlink2.mk
+++ b/databases/py-psycopg/buildlink2.mk
@@ -1,7 +1,7 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/25 14:44:21 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:15 wiz Exp $
.include "../../lang/python/pyversion.mk"
BUILDLINK_PACKAGES+= psycopg
-BUILDLINK_DEPENDS.psycopg?= ${PYPKGPREFIX}-psycopg-*
+BUILDLINK_DEPENDS.psycopg?= ${PYPKGPREFIX}-psycopg>=1.0.14nb1
BUILDLINK_PKGSRCDIR.psycopg?= ../../databases/py-psycopg
diff --git a/databases/quicklist/Makefile b/databases/quicklist/Makefile
index f7ae1d79a61..a0df6e2a9d9 100644
--- a/databases/quicklist/Makefile
+++ b/databases/quicklist/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/10/21 14:48:52 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:54:15 wiz Exp $
#
DISTNAME= quicklist-0.8.6
+PKGREVISION= 1
CATEGORIES= databases x11
MASTER_SITES= ftp://ftp.quicklist.org/
diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile
index d5538425c5a..62346b1faa0 100644
--- a/databases/unixodbc-DataManager/Makefile
+++ b/databases/unixodbc-DataManager/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/09/20 21:32:05 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:16 wiz Exp $
PKGNAME= unixodbc-DataManager-${ODBC_BASE_VERS}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= GUI tool for unixODBC data source management
USE_BUILDLINK2= YES
diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile
index de303c513d0..a3041d69924 100644
--- a/databases/unixodbc-ODBCConfig/Makefile
+++ b/databases/unixodbc-ODBCConfig/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/09/20 21:36:11 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:16 wiz Exp $
PKGNAME= unixodbc-ODBCConfig-${ODBC_BASE_VERS}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= GUI tool for unixODBC driver configuration
USE_BUILDLINK2= YES
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 37e7f96d994..e9d5ed0588f 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:13 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:15 wiz Exp $
PKGNAME= unixodbc-${ODBC_BASE_VERS}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= ODBC 2.x/3.x driver manager
CONFLICTS+= iodbc-[0-9]*
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common
index 3cee36531fb..1b3c8806583 100644
--- a/databases/unixodbc/Makefile.common
+++ b/databases/unixodbc/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.8 2002/09/20 21:26:30 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2003/05/02 11:54:15 wiz Exp $
DISTNAME= unixODBC-${ODBC_DIST_VERS}
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://www.unixodbc.org/
diff --git a/databases/unixodbc/buildlink2.mk b/databases/unixodbc/buildlink2.mk
index 1cee1f57713..030fa07251f 100644
--- a/databases/unixodbc/buildlink2.mk
+++ b/databases/unixodbc/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/19 08:48:48 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:54:15 wiz Exp $
.if !defined(UNIXODBC_BUILDLINK2_MK)
UNIXODBC_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= unixodbc
-BUILDLINK_DEPENDS.unixodbc?= unixodbc>=2.0.11
+BUILDLINK_DEPENDS.unixodbc?= unixodbc>=2.0.11nb1
BUILDLINK_PKGSRCDIR.unixodbc?= ../../databases/unixodbc
EVAL_PREFIX+= BUILDLINK_PREFIX.unixodbc=unixodbc
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 62a6dec6582..2958d4beb0e 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2002/11/30 23:21:32 salo Exp $
+# $NetBSD: Makefile,v 1.34 2003/05/02 11:54:16 wiz Exp $
#
DISTNAME= GConf-1.0.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/1.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/GConf/buildlink2.mk b/devel/GConf/buildlink2.mk
index 77c91f119fe..64b84dada50 100644
--- a/devel/GConf/buildlink2.mk
+++ b/devel/GConf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:16 wiz Exp $
.if !defined(GCONF_BUILDLINK2_MK)
GCONF_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gconf
-BUILDLINK_DEPENDS.gconf?= GConf>=1.0.7nb1
+BUILDLINK_DEPENDS.gconf?= GConf>=1.0.9nb2
BUILDLINK_PKGSRCDIR.gconf?= ../../devel/GConf
EVAL_PREFIX+= BUILDLINK_PREFIX.gconf=GConf
diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index c05b071cd54..bbd140bd7fc 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/02/14 20:04:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:17 wiz Exp $
#
.include "../../devel/GConf2/Makefile.common"
PKGNAME= ${DISTNAME:S/GConf/GConf2-ui/}
+PKGREVISION= 1
CONFIGURE_ENV+= PKG_USE_GTK=yes
diff --git a/devel/GConf2-ui/buildlink2.mk b/devel/GConf2-ui/buildlink2.mk
index 44e6b040f42..0b273775e61 100644
--- a/devel/GConf2-ui/buildlink2.mk
+++ b/devel/GConf2-ui/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/02/14 20:04:11 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:17 wiz Exp $
#
# This Makefile fragment is included by packages that use GConf2-ui.
#
@@ -7,7 +7,7 @@
GCONF2_UI_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= GConf2-ui
-BUILDLINK_DEPENDS.GConf2-ui?= GConf2-ui>=2.2.0
+BUILDLINK_DEPENDS.GConf2-ui?= GConf2-ui>=2.2.0nb1
BUILDLINK_PKGSRCDIR.GConf2-ui?= ../../devel/GConf2-ui
EVAL_PREFIX+= BUILDLINK_PREFIX.GConf2-ui=GConf2-ui
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index a55e0dcc9fa..2567da21df0 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.3 2003/02/14 20:04:06 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.4 2003/05/02 11:54:17 wiz Exp $
#
DISTNAME= GConf-2.2.0
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/GConf2/buildlink2.mk b/devel/GConf2/buildlink2.mk
index b8963bd361b..32a55339663 100644
--- a/devel/GConf2/buildlink2.mk
+++ b/devel/GConf2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.14 2003/02/18 19:51:12 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2003/05/02 11:54:17 wiz Exp $
#
# This Makefile fragment is included by packages that use GConf2.
#
@@ -9,7 +9,7 @@
GCONF2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= GConf2
-BUILDLINK_DEPENDS.GConf2?= GConf2>=2.2.0
+BUILDLINK_DEPENDS.GConf2?= GConf2>=2.2.0nb1
BUILDLINK_PKGSRCDIR.GConf2?= ../../devel/GConf2
EVAL_PREFIX+= BUILDLINK_PREFIX.GConf2=GConf2
diff --git a/devel/Gorm/Makefile b/devel/Gorm/Makefile
index b964dcba286..94b8fc88cba 100644
--- a/devel/Gorm/Makefile
+++ b/devel/Gorm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/01 11:42:45 rh Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:18 wiz Exp $
#
DISTNAME= Gorm-0.2.6
+PKGREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=dev-apps/}
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 1f07d9d27c4..cfa908448df 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2003/03/09 19:10:35 jschauma Exp $
+# $NetBSD: Makefile,v 1.47 2003/05/02 11:54:18 wiz Exp $
#
DISTNAME= SDL-1.2.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel games
MASTER_SITES= http://www.libsdl.org/release/
diff --git a/devel/SDL/buildlink2.mk b/devel/SDL/buildlink2.mk
index a3a26671fd4..b37f8e87ec0 100644
--- a/devel/SDL/buildlink2.mk
+++ b/devel/SDL/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/03/12 22:07:27 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:18 wiz Exp $
.if !defined(SDL_BUILDLINK2_MK)
SDL_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= SDL
-BUILDLINK_DEPENDS.SDL?= SDL>=1.2.0
+BUILDLINK_DEPENDS.SDL?= SDL>=1.2.5nb4
BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
EVAL_PREFIX+= BUILDLINK_PREFIX.SDL=SDL
diff --git a/devel/SDL_gfx/Makefile b/devel/SDL_gfx/Makefile
index 1307ff11d75..be748dc5cd7 100644
--- a/devel/SDL_gfx/Makefile
+++ b/devel/SDL_gfx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/12/24 18:55:36 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:18 wiz Exp $
#
DISTNAME= SDL_gfx-2.0.3
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.ferzkopp.net/Software/SDL_gfx-2.0/
diff --git a/devel/SDL_gfx/buildlink2.mk b/devel/SDL_gfx/buildlink2.mk
index f2b21926a7e..850b697260d 100644
--- a/devel/SDL_gfx/buildlink2.mk
+++ b/devel/SDL_gfx/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:19 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:19 wiz Exp $
.if !defined(SDL_GFX_BUILDLINK2_MK)
SDL_GFX_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= SDL_gfx
-BUILDLINK_DEPENDS.SDL_gfx?= SDL_gfx>=2.0.3
+BUILDLINK_DEPENDS.SDL_gfx?= SDL_gfx>=2.0.3nb1
BUILDLINK_PKGSRCDIR.SDL_gfx?= ../../devel/SDL_gfx
EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_gfx=SDL_gfx
diff --git a/devel/SDL_ttf/Makefile b/devel/SDL_ttf/Makefile
index baed8c1229c..4d8927cce9f 100644
--- a/devel/SDL_ttf/Makefile
+++ b/devel/SDL_ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/12/24 06:09:49 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:19 wiz Exp $
#
DISTNAME= SDL_ttf-2.0.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/
diff --git a/devel/SDL_ttf/buildlink2.mk b/devel/SDL_ttf/buildlink2.mk
index 225cfbcb3b7..97a112f02bb 100644
--- a/devel/SDL_ttf/buildlink2.mk
+++ b/devel/SDL_ttf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:09:49 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:19 wiz Exp $
.if !defined(SDL_TTF_BUILDLINK2_MK)
SDL_TTF_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= SDL_ttf
-BUILDLINK_DEPENDS.SDL_ttf?= SDL_ttf>=2.0.3nb1
+BUILDLINK_DEPENDS.SDL_ttf?= SDL_ttf>=2.0.3nb2
BUILDLINK_PKGSRCDIR.SDL_ttf?= ../../devel/SDL_ttf
EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_ttf=SDL_ttf
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 47c5a9b88ef..5b6f333834c 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/02/18 14:55:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:54:19 wiz Exp $
#
DISTNAME= anjuta-1.0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=anjuta/}
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 5be8253f42f..7c5255c8abf 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/02/15 06:16:29 salo Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:54:20 wiz Exp $
#
DISTNAME= atk-1.2.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
diff --git a/devel/atk/buildlink2.mk b/devel/atk/buildlink2.mk
index 797f8056a03..12cce9120da 100644
--- a/devel/atk/buildlink2.mk
+++ b/devel/atk/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/15 06:16:29 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:20 wiz Exp $
.if !defined(ATK_BUILDLINK2_MK)
ATK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= atk
-BUILDLINK_DEPENDS.atk?= atk>=1.2.2
+BUILDLINK_DEPENDS.atk?= atk>=1.2.2nb1
BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk
EVAL_PREFIX+= BUILDLINK_PREFIX.atk=atk
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 0120324ab19..1c89ad0969d 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/03/19 18:50:51 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:21 wiz Exp $
DISTNAME= autogen-5.5.3
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=autogen/}
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 5d9507ef86d..e9dd7d68941 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:13 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:54:21 wiz Exp $
#
DISTNAME= bonobo-activation-2.1.1
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/bonobo-activation/2.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/bonobo-activation/buildlink2.mk b/devel/bonobo-activation/buildlink2.mk
index 4647eb9e6d6..226e49121cc 100644
--- a/devel/bonobo-activation/buildlink2.mk
+++ b/devel/bonobo-activation/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2002/12/24 06:09:50 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:54:21 wiz Exp $
.if !defined(BONOBO_ACTIVATION_BUILDLINK2_MK)
BONOBO_ACTIVATION_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= bonobo-activation
-BUILDLINK_DEPENDS.bonobo-activation?= bonobo-activation>=2.1.0nb1
+BUILDLINK_DEPENDS.bonobo-activation?= bonobo-activation>=2.1.1nb1
BUILDLINK_PKGSRCDIR.bonobo-activation?= ../../devel/bonobo-activation
EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo-activation=bonobo-activation
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index dc20e4fa095..236ce9ff7ea 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2002/12/24 06:09:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:54:22 wiz Exp $
DISTNAME= bonobo-conf-0.14
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/bonobo-conf/0.14/}
diff --git a/devel/bonobo-conf/buildlink2.mk b/devel/bonobo-conf/buildlink2.mk
index 780f38ba9fb..cd9321fdb92 100644
--- a/devel/bonobo-conf/buildlink2.mk
+++ b/devel/bonobo-conf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:09:50 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:22 wiz Exp $
.if !defined(BONOBO_CONF_BUILDLINK2_MK)
BONOBO_CONF_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= bonobo-conf
-BUILDLINK_DEPENDS.bonobo-conf?= bonobo-conf>=0.14nb3
+BUILDLINK_DEPENDS.bonobo-conf?= bonobo-conf>=0.14nb4
BUILDLINK_PKGSRCDIR.bonobo-conf?= ../../devel/bonobo-conf
EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo-conf=bonobo-conf
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index ff70227730d..dcd2e87a2aa 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2003/02/16 15:05:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2003/05/02 11:54:21 wiz Exp $
#
DISTNAME= bonobo-1.0.18
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/bonobo/1.0/}
diff --git a/devel/bonobo/buildlink2.mk b/devel/bonobo/buildlink2.mk
index aba5f85ec3f..9e315dc4cce 100644
--- a/devel/bonobo/buildlink2.mk
+++ b/devel/bonobo/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:09:51 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:21 wiz Exp $
.if !defined(BONOBO_BUILDLINK2_MK)
BONOBO_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= bonobo
-BUILDLINK_DEPENDS.bonobo?= bonobo>=1.0.18nb3
+BUILDLINK_DEPENDS.bonobo?= bonobo>=1.0.18nb4
BUILDLINK_PKGSRCDIR.bonobo?= ../../devel/bonobo
EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo=bonobo
diff --git a/devel/cervisia2/Makefile b/devel/cervisia2/Makefile
index 522441b1e6e..931f6488990 100644
--- a/devel/cervisia2/Makefile
+++ b/devel/cervisia2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/09/20 11:26:26 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:22 wiz Exp $
DISTNAME= cervisia-1.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cervisia/}
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 17aff4d517d..99e3e60c40c 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/04/15 20:51:44 jmc Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:22 wiz Exp $
#
DISTNAME= coconut-0.3.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://www.asahi-net.or.jp/~em7t-hmd/coconut/ \
${MASTER_SITE_SOURCEFORGE:=coconut-lib/}
diff --git a/devel/coconut/buildlink2.mk b/devel/coconut/buildlink2.mk
index 39505fbab23..640fa3d9057 100644
--- a/devel/coconut/buildlink2.mk
+++ b/devel/coconut/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/04/15 12:17:43 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:54:22 wiz Exp $
#
# This Makefile fragment is included by packages that use coconut.
#
@@ -9,7 +9,7 @@
COCONUT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= coconut
-BUILDLINK_DEPENDS.coconut?= coconut>=0.3.0nb3
+BUILDLINK_DEPENDS.coconut?= coconut>=0.3.0nb4
BUILDLINK_PKGSRCDIR.coconut?= ../../devel/coconut
EVAL_PREFIX+= BUILDLINK_PREFIX.coconut=coconut
diff --git a/devel/cvsync/Makefile b/devel/cvsync/Makefile
index 2ae703a171a..7d2697688f7 100644
--- a/devel/cvsync/Makefile
+++ b/devel/cvsync/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2003/04/28 00:50:00 gehenna Exp $
+# $NetBSD: Makefile,v 1.27 2003/05/02 11:54:23 wiz Exp $
#
DISTNAME= cvsync-0.20.0
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.daemon-systems.org/cvsync/
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 9d6f4eaca4f..c318fbc148f 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/12/24 06:09:51 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:23 wiz Exp $
#
DISTNAME= eel-1.0.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eel/1.0/}/
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index ae16f7d9acf..7998d6797e8 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/25 08:13:29 rh Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:23 wiz Exp $
#
DISTNAME= eel-2.2.3.1
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/-/2-/}
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eel/2.2/}
diff --git a/devel/eel2/buildlink2.mk b/devel/eel2/buildlink2.mk
index e0f1666670e..2e8c832db59 100644
--- a/devel/eel2/buildlink2.mk
+++ b/devel/eel2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/04/25 08:13:30 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:23 wiz Exp $
#
# This Makefile fragment is included by packages that use eel2.
#
@@ -9,7 +9,7 @@
EEL2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= eel2
-BUILDLINK_DEPENDS.eel2?= eel2>=2.2.3
+BUILDLINK_DEPENDS.eel2?= eel2>=2.2.3.1nb1
BUILDLINK_PKGSRCDIR.eel2?= ../../devel/eel2
EVAL_PREFIX+= BUILDLINK_PREFIX.eel2=eel2
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 0eccbf048be..0d6442f3a70 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/02/24 20:50:19 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:54:24 wiz Exp $
DISTNAME= g-wrap-1.3.4
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnucash.org/pub/g-wrap/source/
diff --git a/devel/g-wrap/buildlink2.mk b/devel/g-wrap/buildlink2.mk
index a7658230d31..ea2f024fcfd 100644
--- a/devel/g-wrap/buildlink2.mk
+++ b/devel/g-wrap/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/24 20:50:19 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:24 wiz Exp $
.if !defined(G_WRAP_BUILDLINK2_MK)
G_WRAP_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= g-wrap
-BUILDLINK_DEPENDS.g-wrap?= g-wrap>=1.3.4
+BUILDLINK_DEPENDS.g-wrap?= g-wrap>=1.3.4nb1
BUILDLINK_PKGSRCDIR.g-wrap?= ../../devel/g-wrap
EVAL_PREFIX+= BUILDLINK_PREFIX.g-wrap=g-wrap
diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index f0da9e966dd..f8da254a7b6 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/02/14 20:21:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:24 wiz Exp $
#
DISTNAME= gail-1.2.0
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gail/1.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gail/buildlink2.mk b/devel/gail/buildlink2.mk
index 32ccc2b66d1..4749836ba26 100644
--- a/devel/gail/buildlink2.mk
+++ b/devel/gail/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/02/14 20:21:57 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:54:24 wiz Exp $
#
# This Makefile fragment is included by packages that use gail.
#
@@ -9,7 +9,7 @@
GAIL_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gail
-BUILDLINK_DEPENDS.gail?= gail>=1.2.0
+BUILDLINK_DEPENDS.gail?= gail>=1.2.0nb1
BUILDLINK_PKGSRCDIR.gail?= ../../devel/gail
EVAL_PREFIX+= BUILDLINK_PREFIX.gail=gail
diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 2adaeed7f53..a1efa10f20f 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2003/01/09 10:48:19 rh Exp $
+# $NetBSD: Makefile,v 1.33 2003/05/02 11:54:24 wiz Exp $
DISTNAME= gal-0.22
+PKGREVISION= 1
CATEGORIES= gnome devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gal/0.22/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gal/buildlink2.mk b/devel/gal/buildlink2.mk
index 8cf088abe97..4dd81429cf0 100644
--- a/devel/gal/buildlink2.mk
+++ b/devel/gal/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/12/24 06:09:52 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:24 wiz Exp $
.if !defined(GAL_BUILDLINK2_MK)
GAL_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gal
-BUILDLINK_DEPENDS.gal?= gal>=0.19.3nb2
+BUILDLINK_DEPENDS.gal?= gal>=0.22nb1
BUILDLINK_PKGSRCDIR.gal?= ../../devel/gal
EVAL_PREFIX+= BUILDLINK_PREFIX.gal=gal
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 4d6cd9b8862..3637a250140 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/03/06 07:58:18 jmc Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:25 wiz Exp $
#
DISTNAME= gal2-0-0.0.7
PKGNAME= ${DISTNAME:S/-0-/-/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gal2-0/0.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gal2/buildlink2.mk b/devel/gal2/buildlink2.mk
index 379ebcf686a..deaa9f2ecaa 100644
--- a/devel/gal2/buildlink2.mk
+++ b/devel/gal2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/07 23:45:36 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:54:25 wiz Exp $
#
# This Makefile fragment is included by packages that use gal2.
#
@@ -9,7 +9,7 @@
GAL2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gal2
-BUILDLINK_DEPENDS.gal2?= gal2>=0.0.7nb1
+BUILDLINK_DEPENDS.gal2?= gal2>=0.0.7nb3
BUILDLINK_PKGSRCDIR.gal2?= ../../devel/gal2
EVAL_PREFIX+= BUILDLINK_PREFIX.gal2=gal2
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 6cdfe8c9a95..d1bb7b513ef 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/01 21:58:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:25 wiz Exp $
#
DISTNAME= gconfmm-2.0.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkmm/}
diff --git a/devel/gconfmm/buildlink2.mk b/devel/gconfmm/buildlink2.mk
index 477db379173..3f78126a306 100644
--- a/devel/gconfmm/buildlink2.mk
+++ b/devel/gconfmm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/03/01 21:58:40 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:25 wiz Exp $
#
# This Makefile fragment is included by packages that use gconfmm.
#
@@ -9,7 +9,7 @@
GCONFMM_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gconfmm
-BUILDLINK_DEPENDS.gconfmm?= gconfmm>=2.0.1
+BUILDLINK_DEPENDS.gconfmm?= gconfmm>=2.0.1nb1
BUILDLINK_PKGSRCDIR.gconfmm?= ../../devel/gconfmm
EVAL_PREFIX+= BUILDLINK_PREFIX.gconfmm=gconfmm
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 8b992310185..02818439d31 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2002/09/21 10:26:44 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:54:26 wiz Exp $
DISTNAME= gcvs-1.0a7
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cvsgui/}
diff --git a/devel/giblib/Makefile b/devel/giblib/Makefile
index eb08601b15b..18dbd7065c6 100644
--- a/devel/giblib/Makefile
+++ b/devel/giblib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/20 10:55:39 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:26 wiz Exp $
#
DISTNAME= giblib-1.2.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.linuxbrit.co.uk/downloads/
diff --git a/devel/giblib/buildlink2.mk b/devel/giblib/buildlink2.mk
index 767bc93f147..b9baaac87bb 100644
--- a/devel/giblib/buildlink2.mk
+++ b/devel/giblib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/20 10:55:40 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:26 wiz Exp $
#
# This Makefile fragment is included by packages that use giblib.
#
@@ -9,7 +9,7 @@
GIBLIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= giblib
-BUILDLINK_DEPENDS.giblib?= giblib>=1.2.2
+BUILDLINK_DEPENDS.giblib?= giblib>=1.2.2nb1
BUILDLINK_PKGSRCDIR.giblib?= ../../devel/giblib
EVAL_PREFIX+= BUILDLINK_PREFIX.giblib=giblib
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index f395e02ec84..00a2446b267 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2003/04/20 08:33:58 rh Exp $
+# $NetBSD: Makefile,v 1.38 2003/05/02 11:54:26 wiz Exp $
DISTNAME= glade-0.6.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glade/0.6/}
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index c9a1a202caa..e69ad8746d9 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/25 06:00:26 rh Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:27 wiz Exp $
#
DISTNAME= glade-2.0.0
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/-/2-/}
CATEGORIES= devel gnome
MASTER_SITES= http://glade.pn.org/ \
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index f21c4613456..4c182ea137d 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2003/03/04 19:53:26 salo Exp $
+# $NetBSD: Makefile,v 1.55 2003/05/02 11:54:27 wiz Exp $
# FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
#
DISTNAME= glib-1.2.10
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/devel/glib/buildlink2.mk b/devel/glib/buildlink2.mk
index 0b80de75e18..d983e446611 100644
--- a/devel/glib/buildlink2.mk
+++ b/devel/glib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/03/04 19:53:26 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:27 wiz Exp $
.if !defined(GLIB_BUILDLINK2_MK)
GLIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= glib
-BUILDLINK_DEPENDS.glib?= glib>=1.2.10nb4
+BUILDLINK_DEPENDS.glib?= glib>=1.2.10nb5
BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib
EVAL_PREFIX+= BUILDLINK_PREFIX.glib=glib
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index aa1ab21ffd0..a57af26c559 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/02/15 10:12:33 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/02 11:54:27 wiz Exp $
DISTNAME= glib-2.2.1
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/glib/glib2/}
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.2/ \
diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk
index 3212eb1ce5e..bdab880510a 100644
--- a/devel/glib2/buildlink2.mk
+++ b/devel/glib2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2002/12/24 03:36:58 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:54:27 wiz Exp $
.if !defined(GLIB2_BUILDLINK2_MK)
GLIB2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= glib2
-BUILDLINK_DEPENDS.glib2?= glib2>=2.2.0
+BUILDLINK_DEPENDS.glib2?= glib2>=2.2.1nb1
BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2
EVAL_PREFIX+= BUILDLINK_PREFIX.glib2=glib2
diff --git a/devel/gnome-objc/Makefile b/devel/gnome-objc/Makefile
index 068bff775cf..c4dfd409315 100644
--- a/devel/gnome-objc/Makefile
+++ b/devel/gnome-objc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/11/30 23:21:36 salo Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:54:28 wiz Exp $
#
DISTNAME= gnome-objc-1.0.40
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-objc/1.0/}
diff --git a/devel/gnome-objc/buildlink2.mk b/devel/gnome-objc/buildlink2.mk
index 3b57dedf0a7..840be1d5a9a 100644
--- a/devel/gnome-objc/buildlink2.mk
+++ b/devel/gnome-objc/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/12 06:27:59 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:28 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-objc.
#
@@ -9,7 +9,7 @@
GNOME_OBJC_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-objc
-BUILDLINK_DEPENDS.gnome-objc?= gnome-objc>=1.0.40nb1
+BUILDLINK_DEPENDS.gnome-objc?= gnome-objc>=1.0.40nb2
BUILDLINK_PKGSRCDIR.gnome-objc?= ../../devel/gnome-objc
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-objc=gnome-objc
diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile
index 92ceb810aae..e5b48494ce0 100644
--- a/devel/gnome2-libole2/Makefile
+++ b/devel/gnome2-libole2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 06:09:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:28 wiz Exp $
#
DISTNAME= libole2-2.2.8
PKGNAME= gnome2-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libole2/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gnome2-libole2/buildlink2.mk b/devel/gnome2-libole2/buildlink2.mk
index 4eca964fec8..fb51c63b443 100644
--- a/devel/gnome2-libole2/buildlink2.mk
+++ b/devel/gnome2-libole2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:09:54 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:28 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome2-libole2.
#
@@ -9,7 +9,7 @@
GNOME2_LIBOLE2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome2-libole2
-BUILDLINK_DEPENDS.gnome2-libole2?= gnome2-libole2>=2.2.8nb1
+BUILDLINK_DEPENDS.gnome2-libole2?= gnome2-libole2>=2.2.8nb2
BUILDLINK_PKGSRCDIR.gnome2-libole2?= ../../devel/gnome2-libole2
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome2-libole2=gnome2-libole2
diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index 586a05e5d83..df07509b1e3 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/01 08:33:34 rh Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:28 wiz Exp $
#
DISTNAME= gnustep-base-1.6.0
+PKGREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/
diff --git a/devel/gnustep-base/buildlink2.mk b/devel/gnustep-base/buildlink2.mk
index e80559d7ec5..53f380f38df 100644
--- a/devel/gnustep-base/buildlink2.mk
+++ b/devel/gnustep-base/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/09/27 23:56:30 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:29 wiz Exp $
#
.if !defined(GNUSTEP_BASE_BUILDLINK2_MK)
GNUSTEP_BASE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnustep-base
-BUILDLINK_DEPENDS.gnustep-base?= gnustep-base>=1.5.0
+BUILDLINK_DEPENDS.gnustep-base?= gnustep-base>=1.6.0nb1
BUILDLINK_PKGSRCDIR.gnustep-base?= ../../devel/gnustep-base
EVAL_PREFIX+= BUILDLINK_PREFIX.gnustep-base=gnustep-base
diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile
index f3fd15626d3..4ff12c81ff6 100644
--- a/devel/gnustep-examples/Makefile
+++ b/devel/gnustep-examples/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/03 04:14:11 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:29 wiz Exp $
#
DISTNAME= gnustep-examples-0.9.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
diff --git a/devel/gnustep-objc/Makefile b/devel/gnustep-objc/Makefile
index 72459619e6b..0a54348ce25 100644
--- a/devel/gnustep-objc/Makefile
+++ b/devel/gnustep-objc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/04/01 08:31:36 rh Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:29 wiz Exp $
#
DISTNAME= gnustep-objc-1.2.3
+PKGREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/libs/
diff --git a/devel/gnustep-objc/buildlink2.mk b/devel/gnustep-objc/buildlink2.mk
index 7300f0af58a..85ffddbf1ab 100644
--- a/devel/gnustep-objc/buildlink2.mk
+++ b/devel/gnustep-objc/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/04/01 08:31:37 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:54:29 wiz Exp $
#
.if !defined(GNUSTEP_OBJC_BUILDLINK2_MK)
GNUSTEP_OBJC_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnustep-objc
-BUILDLINK_DEPENDS.gnustep-objc?= gnustep-objc>=1.2.3
+BUILDLINK_DEPENDS.gnustep-objc?= gnustep-objc>=1.2.3nb1
BUILDLINK_PKGSRCDIR.gnustep-objc?= ../../devel/gnustep-objc
EVAL_PREFIX+= BUILDLINK_PREFIX.gnustep-objc=gnustep-objc
diff --git a/devel/gob/Makefile b/devel/gob/Makefile
index d2cf64b181b..3f16b890f4d 100644
--- a/devel/gob/Makefile
+++ b/devel/gob/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/10 04:54:14 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:30 wiz Exp $
#
DISTNAME= gob-1.0.12
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= http://ftp.5z.com/pub/gob/
diff --git a/devel/gscope/Makefile b/devel/gscope/Makefile
index 44d4e425a09..1744dffeb4c 100644
--- a/devel/gscope/Makefile
+++ b/devel/gscope/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/09/24 10:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:30 wiz Exp $
#
DISTNAME= gscope-0.4.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gscope/}
diff --git a/devel/gtkdiff/Makefile b/devel/gtkdiff/Makefile
index 8c22ce63e6f..bb8ca99a5d8 100644
--- a/devel/gtkdiff/Makefile
+++ b/devel/gtkdiff/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/03/08 21:03:15 rh Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:54:30 wiz Exp $
#
DISTNAME= gtkdiff-1.8.0
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= http://home.catv.ne.jp/pp/ginoue/software/gtkdiff/
diff --git a/devel/guile-fcgi/Makefile b/devel/guile-fcgi/Makefile
index 2ac60782df1..e31f76f9c04 100644
--- a/devel/guile-fcgi/Makefile
+++ b/devel/guile-fcgi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/01/07 11:43:43 uebayasi Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:30 wiz Exp $
DISTNAME= guile-fcgi-0.1
+PKGREVISION= 1
CATEGORIES= devel www
MASTER_SITES= http://www.bgu.ru/%7Edsa/
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index 8548418a9fc..7d422247813 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/02/05 21:35:06 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:54:31 wiz Exp $
#
DISTNAME= guile-gtk-0.19
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel x11
MASTER_SITES= http://www.ping.de/sites/zagadka/guile-gtk/download/ \
http://erin.netpedia.net/download/ \
diff --git a/devel/guile-gtk/buildlink2.mk b/devel/guile-gtk/buildlink2.mk
index ba536904170..6d02bd94fa9 100644
--- a/devel/guile-gtk/buildlink2.mk
+++ b/devel/guile-gtk/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/01/25 12:40:23 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:31 wiz Exp $
.if !defined(GUILE_GTK_BUILDLINK2_MK)
GUILE_GTK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= guile-gtk
-BUILDLINK_DEPENDS.guile-gtk?= guile-gtk>=0.19nb1
+BUILDLINK_DEPENDS.guile-gtk?= guile-gtk>=0.19nb2
BUILDLINK_PKGSRCDIR.guile-gtk?= ../../devel/guile-gtk
EVAL_PREFIX+= BUILDLINK_PREFIX.guile-gtk=guile-gtk
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index 5d0a291f0de..12ed716b208 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/01/28 22:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:54:31 wiz Exp $
#
DISTNAME= isect-1.6.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isectd/}
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 0e8877e918c..7069dc8dac7 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2003/03/18 17:00:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2003/05/02 11:54:32 wiz Exp $
DISTNAME= kdbg-1.2.7
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kdbg/} \
ftp://ftp.eudaptics.com/pub/people/jsixt/
diff --git a/devel/kdebindings2/Makefile b/devel/kdebindings2/Makefile
index 70f81586224..c34c247c3ad 100644
--- a/devel/kdebindings2/Makefile
+++ b/devel/kdebindings2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/09/20 11:30:13 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:32 wiz Exp $
DISTNAME= kdebindings-2.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
COMMENT= Additional language bindings for KDE integrated X11 desktop
diff --git a/devel/kdesdk2/Makefile b/devel/kdesdk2/Makefile
index ace261611f2..be343c0e6d6 100644
--- a/devel/kdesdk2/Makefile
+++ b/devel/kdesdk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/09/20 11:46:27 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:32 wiz Exp $
DISTNAME= kdesdk-2.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
COMMENT= Support applications and tools used by KDE developers
diff --git a/devel/kdesdk2/buildlink2.mk b/devel/kdesdk2/buildlink2.mk
index 1f3f0e1e7e1..c8670434224 100644
--- a/devel/kdesdk2/buildlink2.mk
+++ b/devel/kdesdk2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:41 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:32 wiz Exp $
#
# This Makefile fragment is included by packages that use kdesdk.
#
@@ -9,7 +9,7 @@
KDESDK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdesdk
-BUILDLINK_DEPENDS.kdesdk?= kdesdk>=2.2.2nb1
+BUILDLINK_DEPENDS.kdesdk?= kdesdk>=2.2.2nb2
BUILDLINK_PKGSRCDIR.kdesdk?= ../../devel/kdesdk2
EVAL_PREFIX+= BUILDLINK_PREFIX.kdesdk=kdesdk
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index bf2ee28e883..8d16f30106a 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/04/01 12:27:07 markd Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:33 wiz Exp $
DISTNAME= kdesdk-3.1.1
+PKGREVISION= 1
CATEGORIES= devel
COMMENT= Support applications and tools used by KDE developers
diff --git a/devel/kdesdk3/buildlink2.mk b/devel/kdesdk3/buildlink2.mk
index 76071065356..87e57fca553 100644
--- a/devel/kdesdk3/buildlink2.mk
+++ b/devel/kdesdk3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/03/11 13:30:42 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:33 wiz Exp $
#
# This Makefile fragment is included by packages that use kdesdk.
#
@@ -9,7 +9,7 @@
KDESDK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdesdk
-BUILDLINK_DEPENDS.kdesdk?= kdesdk>=3.1
+BUILDLINK_DEPENDS.kdesdk?= kdesdk>=3.1.1nb1
BUILDLINK_PKGSRCDIR.kdesdk?= ../../devel/kdesdk3
EVAL_PREFIX+= BUILDLINK_PREFIX.kdesdk=kdesdk
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index c4a315a548e..b3a3516c7c5 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/04/27 16:53:49 cjep Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:54:33 wiz Exp $
DISTNAME= kdevelop-2.1.5_for_KDE_3.1
PKGNAME= kdevelop-base-2.1.5
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/kdevelop-2.1.5/src/ \
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 2dec94a29a2..3bdd36a9f92 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2003/03/11 13:30:42 markd Exp $
+# $NetBSD: Makefile,v 1.36 2003/05/02 11:54:33 wiz Exp $
DISTNAME= kdevelop-2.1.5
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 93610805e37..b716951dc88 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/02/14 20:37:18 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:34 wiz Exp $
DISTNAME= libast-0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://www.eterm.org/download/
diff --git a/devel/libast/buildlink2.mk b/devel/libast/buildlink2.mk
index bc6c19b38c8..8d22bdb400e 100644
--- a/devel/libast/buildlink2.mk
+++ b/devel/libast/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/12/26 04:52:19 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:34 wiz Exp $
#
.if !defined(LIBAST_BUILDLINK2_MK)
LIBAST_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libast
-BUILDLINK_DEPENDS.libast?= libast>=0.5
+BUILDLINK_DEPENDS.libast?= libast>=0.5nb2
BUILDLINK_PKGSRCDIR.libast?= ../../devel/libast
EVAL_PREFIX+= BUILDLINK_PREFIX.libast=libast
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index f6bc3817272..77521074828 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/01/25 22:27:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:54:34 wiz Exp $
DISTNAME= libbonobo-2.2.0
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libbonobo/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libbonobo/buildlink2.mk b/devel/libbonobo/buildlink2.mk
index c20a67ffe84..8c5626fc002 100644
--- a/devel/libbonobo/buildlink2.mk
+++ b/devel/libbonobo/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/13 19:28:34 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:34 wiz Exp $
.if !defined(LIBBONOBO_BUILDLINK2_MK)
LIBBONOBO_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libbonobo
-BUILDLINK_DEPENDS.libbonobo?= libbonobo>=2.2.0
+BUILDLINK_DEPENDS.libbonobo?= libbonobo>=2.2.0nb1
BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo
EVAL_PREFIX+= BUILDLINK_PREFIX.libbonobo=libbonobo
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 0775c24fe55..3c52defedc9 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/04/27 09:59:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:54:34 wiz Exp $
#
DISTNAME= libbonoboui-2.2.0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libbonoboui/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libbonoboui/buildlink2.mk b/devel/libbonoboui/buildlink2.mk
index 0e436ad23f0..78517f416f2 100644
--- a/devel/libbonoboui/buildlink2.mk
+++ b/devel/libbonoboui/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 20:13:21 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:34 wiz Exp $
.if !defined(LIBBONOBOUI_BUILDLINK2_MK)
LIBBONOBOUI_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libbonoboui
-BUILDLINK_DEPENDS.libbonoboui?= libbonoboui>=2.2.0
+BUILDLINK_DEPENDS.libbonoboui?= libbonoboui>=2.2.0.1nb2
BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui
EVAL_PREFIX+= BUILDLINK_PREFIX.libbonoboui=libbonoboui
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 2399bb90777..02e544f8fd7 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2003/02/05 14:26:09 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.44 2003/05/02 11:54:35 wiz Exp $
#
DISTNAME= libglade-0.17
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libglade/0.17/}
diff --git a/devel/libglade/buildlink2.mk b/devel/libglade/buildlink2.mk
index 15dd3300598..9e2e1a95ed6 100644
--- a/devel/libglade/buildlink2.mk
+++ b/devel/libglade/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/09/23 02:28:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:35 wiz Exp $
.if !defined(LIBGLADE_BUILDLINK2_MK)
LIBGLADE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libglade
-BUILDLINK_DEPENDS.libglade?= libglade>=0.17nb1
+BUILDLINK_DEPENDS.libglade?= libglade>=0.17nb3
BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade
EVAL_PREFIX+= BUILDLINK_PREFIX.libglade=libglade
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 1134d0df601..3132e504c02 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/01/29 20:28:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:54:35 wiz Exp $
#
DISTNAME= libglade-2.0.1
PKGNAME= ${DISTNAME:S/libglade/libglade2/}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libglade/2.0/}
diff --git a/devel/libglade2/buildlink2.mk b/devel/libglade2/buildlink2.mk
index 076b386cd35..2daee695e33 100644
--- a/devel/libglade2/buildlink2.mk
+++ b/devel/libglade2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/12/24 06:09:56 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:35 wiz Exp $
.if !defined(LIBGLADE2_BUILDLINK2_MK)
LIBGLADE2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libglade2
-BUILDLINK_DEPENDS.libglade2?= libglade2>=2.0.1nb2
+BUILDLINK_DEPENDS.libglade2?= libglade2>=2.0.1nb8
BUILDLINK_PKGSRCDIR.libglade2?= ../../devel/libglade2
EVAL_PREFIX+= BUILDLINK_PREFIX.libglade2=libglade2
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 1d8840c46bb..23960a64ecb 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/02/15 13:30:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:54:35 wiz Exp $
#
DISTNAME= libgnome-2.2.0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnome/2.2/}
EXTRACT_SUFX= .tar.bz2
@@ -14,7 +14,6 @@ COMMENT= Core GNOME2 library (non-graphical)
DEPENDS= docbook>=4.2:../../textproc/docbook
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.22
BUILDLINK_DEPENDS.esound= esound>=0.2.26
GNU_CONFIGURE= YES
diff --git a/devel/libgnome/buildlink2.mk b/devel/libgnome/buildlink2.mk
index 256d814916c..a27aa47b89d 100644
--- a/devel/libgnome/buildlink2.mk
+++ b/devel/libgnome/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/02/14 20:11:49 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:36 wiz Exp $
.if !defined(LIBGNOME_BUILDLINK2_MK)
LIBGNOME_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgnome
-BUILDLINK_DEPENDS.libgnome?= libgnome>=2.2.0.1
+BUILDLINK_DEPENDS.libgnome?= libgnome>=2.2.0.1nb2
BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome
EVAL_PREFIX+= BUILDLINK_PREFIX.libgnome=libgnome
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 1409800bfac..5d558dd1f8f 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/02/14 20:16:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:54:36 wiz Exp $
#
DISTNAME= libgnomeui-2.2.0.1
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeui/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgnomeui/buildlink2.mk b/devel/libgnomeui/buildlink2.mk
index 95c7db529b6..6d4ef9abf81 100644
--- a/devel/libgnomeui/buildlink2.mk
+++ b/devel/libgnomeui/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 20:16:20 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:36 wiz Exp $
.if !defined(LIBGNOMEUI_BUILDLINK2_MK)
LIBGNOMEUI_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgnomeui
-BUILDLINK_DEPENDS.libgnomeui?= libgnomeui>=2.2.0.1
+BUILDLINK_DEPENDS.libgnomeui?= libgnomeui>=2.2.0.1nb1
BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui
EVAL_PREFIX+= BUILDLINK_PREFIX.libgnomeui=libgnomeui
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index b017612dac8..87e94bfa72b 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2003/01/21 10:12:29 tron Exp $
+# $NetBSD: Makefile,v 1.68 2003/05/02 11:54:36 wiz Exp $
DISTNAME= libgtop-1.0.13
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/1.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgtop/buildlink2.mk b/devel/libgtop/buildlink2.mk
index 013ad5b2db6..c7eaa947244 100644
--- a/devel/libgtop/buildlink2.mk
+++ b/devel/libgtop/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/11/04 00:48:32 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:36 wiz Exp $
#
# This Makefile fragment is included by packages that use libgtop.
#
@@ -9,7 +9,7 @@
LIBGTOP_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgtop
-BUILDLINK_DEPENDS.libgtop?= libgtop>=1.0.13
+BUILDLINK_DEPENDS.libgtop?= libgtop>=1.0.13nb2
BUILDLINK_PKGSRCDIR.libgtop?= ../../devel/libgtop
EVAL_PREFIX+= BUILDLINK_PREFIX.libgtop=libgtop
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 1a5047d9d52..66b85b1c1d7 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/01/11 11:22:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:37 wiz Exp $
DISTNAME= libgtop-2.0.0
PKGNAME= ${DISTNAME:S/-/2-/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgtop2/buildlink2.mk b/devel/libgtop2/buildlink2.mk
index b154fa35d67..b60163fb143 100644
--- a/devel/libgtop2/buildlink2.mk
+++ b/devel/libgtop2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/12/24 06:09:57 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:54:37 wiz Exp $
#
# This Makefile fragment is included by packages that use libgtop2.
#
@@ -9,7 +9,7 @@
LIBGTOP2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgtop2
-BUILDLINK_DEPENDS.libgtop2?= libgtop2>=2.0.0nb1
+BUILDLINK_DEPENDS.libgtop2?= libgtop2>=2.0.0nb3
BUILDLINK_PKGSRCDIR.libgtop2?= ../../devel/libgtop2
EVAL_PREFIX+= BUILDLINK_PREFIX.libgtop2=libgtop2
diff --git a/devel/libmpeg3/Makefile b/devel/libmpeg3/Makefile
index 332daf2bbff..f56c70aea49 100644
--- a/devel/libmpeg3/Makefile
+++ b/devel/libmpeg3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/08/31 02:42:42 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:37 wiz Exp $
#
DISTNAME= libmpeg3-1.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel audio graphics
MASTER_SITES= http://heroines.sourceforge.net/
diff --git a/devel/libmpeg3/buildlink2.mk b/devel/libmpeg3/buildlink2.mk
index cbb1d1e5b21..2418d13369a 100644
--- a/devel/libmpeg3/buildlink2.mk
+++ b/devel/libmpeg3/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/08/31 02:42:42 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:37 wiz Exp $
.if !defined(LIBMPEG3_BUILDLINK2_MK)
LIBMPEG3_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libmpeg3
-BUILDLINK_DEPENDS.libmpeg3?= libmpeg3>=1.3nb2
+BUILDLINK_DEPENDS.libmpeg3?= libmpeg3>=1.3nb4
BUILDLINK_PKGSRCDIR.libmpeg3?= ../../devel/libmpeg3
EVAL_PREFIX+= BUILDLINK_PREFIX.libmpeg3=libmpeg3
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile
index ca004e5f059..e0246e2f1bb 100644
--- a/devel/libole2/Makefile
+++ b/devel/libole2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/10/19 10:54:51 rh Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:54:37 wiz Exp $
#
DISTNAME= libole2-0.2.4
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libole2/0.2/}
diff --git a/devel/libole2/buildlink2.mk b/devel/libole2/buildlink2.mk
index 40f0abdcd77..84bd0f12220 100644
--- a/devel/libole2/buildlink2.mk
+++ b/devel/libole2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:31 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:37 wiz Exp $
.if !defined(LIBOLE2_BUILDLINK2_MK)
LIBOLE2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libole2
-BUILDLINK_DEPENDS.libole2?= libole2>=0.2.4
+BUILDLINK_DEPENDS.libole2?= libole2>=0.2.4nb1
BUILDLINK_PKGSRCDIR.libole2?= ../../devel/libole2
EVAL_PREFIX+= BUILDLINK_PREFIX.libole2=libole2
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index df8bb5514bd..d3beeb49151 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/01 11:54:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:38 wiz Exp $
DISTNAME= libsigc++-1.2.3
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libsigc/}
diff --git a/devel/libsigc++/buildlink2.mk b/devel/libsigc++/buildlink2.mk
index 22ef57bffef..154bcd71a03 100644
--- a/devel/libsigc++/buildlink2.mk
+++ b/devel/libsigc++/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/03/01 11:54:07 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:54:38 wiz Exp $
#
# This Makefile fragment is included by packages that use libsigc++.
#
@@ -9,7 +9,7 @@
LIBSIGCXX_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libsigcxx
-BUILDLINK_DEPENDS.libsigcxx?= libsigc++>=1.2.3
+BUILDLINK_DEPENDS.libsigcxx?= libsigc++>=1.2.3nb1
BUILDLINK_PKGSRCDIR.libsigcxx?= ../../devel/libsigc++
EVAL_PREFIX+= BUILDLINK_PREFIX.libsigcxx=libsigcxx
diff --git a/devel/libsigc++10/Makefile b/devel/libsigc++10/Makefile
index 3b3356e4834..b16b8e78d76 100644
--- a/devel/libsigc++10/Makefile
+++ b/devel/libsigc++10/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/01 11:47:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:38 wiz Exp $
DISTNAME= libsigc++-1.0.4
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/libsigc++/libsigc++10/}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libsigc/}
diff --git a/devel/libsigc++10/buildlink2.mk b/devel/libsigc++10/buildlink2.mk
index caddc509787..ec7271383a7 100644
--- a/devel/libsigc++10/buildlink2.mk
+++ b/devel/libsigc++10/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/03/01 11:47:22 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:38 wiz Exp $
.if !defined(LIBSIGCXX10_BUILDLINK2_MK)
LIBSIGCXX10_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libsigcxx10
-BUILDLINK_DEPENDS.libsigcxx10?= libsigc++10>=1.0.4
+BUILDLINK_DEPENDS.libsigcxx10?= libsigc++10>=1.0.4nb1
BUILDLINK_PKGSRCDIR.libsigcxx10?= ../../devel/libsigc++10
EVAL_PREFIX+= BUILDLINK_PREFIX.libsigcxx10=libsigc++10
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index 90bf0418ace..5ff174e01b8 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/02/13 22:33:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:38 wiz Exp $
#
DISTNAME= libwnck-2.2.1
+PKGREVISION= 1
CATEGORIES= devel x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libwnck/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libwnck/buildlink2.mk b/devel/libwnck/buildlink2.mk
index 94c9bb1a0d3..2cf9ce3b0af 100644
--- a/devel/libwnck/buildlink2.mk
+++ b/devel/libwnck/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/02/13 22:33:12 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:39 wiz Exp $
.if !defined(LIBWNCK_BUILDLINK2_MK)
LIBWNCK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libwnck
-BUILDLINK_DEPENDS.libwnck?= libwnck>=2.2.1
+BUILDLINK_DEPENDS.libwnck?= libwnck>=2.2.1nb1
BUILDLINK_PKGSRCDIR.libwnck?= ../../devel/libwnck
EVAL_PREFIX+= BUILDLINK_PREFIX.libwnck=libwnck
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 4efa27ef981..c12fa38330b 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2002/11/30 23:21:39 salo Exp $
+# $NetBSD: Makefile,v 1.23 2003/05/02 11:54:39 wiz Exp $
#
DISTNAME= maketool-0.7
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.alphalink.com.au/~gnb/maketool/
EXTRACT_SUFX= -src.tar.gz
diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile
index fee0d44e5fb..7b839d7ca4a 100644
--- a/devel/mrproject/Makefile
+++ b/devel/mrproject/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/03/05 18:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:54:39 wiz Exp $
#
DISTNAME= mrproject-0.5.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel
MASTER_SITES= ftp://ftp.codefactory.se/pub/software/mrproject/source/
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 0e37f7e5e55..a9dc744b19c 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/02/16 10:49:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:54:39 wiz Exp $
#
DISTNAME= oaf-0.6.10
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/oaf/0.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/oaf/buildlink2.mk b/devel/oaf/buildlink2.mk
index fb090c9d166..6f8422684e1 100644
--- a/devel/oaf/buildlink2.mk
+++ b/devel/oaf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/23 19:57:29 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:40 wiz Exp $
.if !defined(OAF_BUILDLINK2_MK)
OAF_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= oaf
-BUILDLINK_DEPENDS.oaf?= oaf>=0.6.7nb1
+BUILDLINK_DEPENDS.oaf?= oaf>=0.6.10nb1
BUILDLINK_PKGSRCDIR.oaf?= ../../devel/oaf
EVAL_PREFIX+= BUILDLINK_PREFIX.oaf=oaf
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index e3cb06ee0ba..94244c772c3 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/03 08:25:33 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:40 wiz Exp $
DISTNAME= SDL_perl-1.19.2
PKGNAME= p5-SDL-1.19.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= ftp://sdlperl.org/SDL_perl/
@@ -12,9 +12,6 @@ COMMENT= Perl module for SDL
USE_BUILDLINK2= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/SDL_perl/.packlist
-BUILDLINK_DEPENDS.SDL= SDL>=1.2.5
-BUILDLINK_DEPENDS.SDL_mixer= SDL_mixer>=1.2.4
-
.include "../../audio/SDL_mixer/buildlink2.mk"
.include "../../devel/SDL/buildlink2.mk"
.include "../../devel/SDL_gfx/buildlink2.mk"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 851e3e334e4..d29baf522ba 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/03/29 19:00:18 jmc Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/02 11:54:40 wiz Exp $
#
DISTNAME= pango-1.2.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
diff --git a/devel/pango/buildlink2.mk b/devel/pango/buildlink2.mk
index 70a4def405f..041f28a2ff0 100644
--- a/devel/pango/buildlink2.mk
+++ b/devel/pango/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 03:41:11 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:54:40 wiz Exp $
.if !defined(PANGO_BUILDLINK2_MK)
PANGO_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= pango
-BUILDLINK_DEPENDS.pango?= pango>=1.2.0
+BUILDLINK_DEPENDS.pango?= pango>=1.2.1nb1
BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
EVAL_PREFIX+= BUILDLINK_PREFIX.pango=pango
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile
index 4a3d8e8fde2..2d8ddc1085a 100644
--- a/devel/pilrc/Makefile
+++ b/devel/pilrc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:54:41 wiz Exp $
#
DISTNAME= pilrc-2.9p9
+PKGREVISION= 1
PKGNAME= pilrc-2.9.10
#WRKSRC= ${WRKDIR}/pilrc-2.9p9
DIFFS= pilrc-2.9p10.diff
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 1c1ae600b09..db7cb5ab2d4 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2003/03/29 12:40:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2003/05/02 11:54:41 wiz Exp $
#
DISTNAME= pwlib_1.4.4
PKGNAME= pwlib-1.4.4
-PKGREVISION= 2
+PKGREVISION= 3
WRKSRC= ${WRKDIR}/pwlib
CATEGORIES= devel
MASTER_SITES= http://www.openh323.org/bin/
diff --git a/devel/pwlib/buildlink2.mk b/devel/pwlib/buildlink2.mk
index a2269c6cb1f..fb4e39a7103 100644
--- a/devel/pwlib/buildlink2.mk
+++ b/devel/pwlib/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/12/23 15:05:10 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:41 wiz Exp $
#
.if !defined(PWLIB_BUILDLINK2_MK)
PWLIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= pwlib
-BUILDLINK_DEPENDS.pwlib?= pwlib>=1.4.4nb2
+BUILDLINK_DEPENDS.pwlib?= pwlib>=1.4.4nb3
BUILDLINK_PKGSRCDIR.pwlib?= ../../devel/pwlib
EVAL_PREFIX+= BUILDLINK_PREFIX.pwlib=pwlib
diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile
index 406b7090268..886caf4fa80 100644
--- a/devel/smpeg/Makefile
+++ b/devel/smpeg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/12/15 10:01:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:54:41 wiz Exp $
#
DISTNAME= smpeg-0.4.4
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
ftp://ftp.linuxgames.com/loki/open-source/smpeg/
diff --git a/devel/smpeg/buildlink2.mk b/devel/smpeg/buildlink2.mk
index 44713e9b25b..338a2c8b6d3 100644
--- a/devel/smpeg/buildlink2.mk
+++ b/devel/smpeg/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/03/26 14:34:34 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:54:42 wiz Exp $
.if !defined(SMPEG_BUILDLINK2_MK)
SMPEG_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= smpeg
-BUILDLINK_DEPENDS.smpeg?= smpeg>=0.4.3
+BUILDLINK_DEPENDS.smpeg?= smpeg>=0.4.4nb1
BUILDLINK_PKGSRCDIR.smpeg?= ../../devel/smpeg
EVAL_PREFIX+= BUILDLINK_PREFIX.smpeg=smpeg
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index d8449f35e6c..5e7e4c41190 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/04/15 16:23:22 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:42 wiz Exp $
#
DISTNAME= subversion-0.20.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/files/documents/15/3440/
diff --git a/devel/subversion/buildlink2.mk b/devel/subversion/buildlink2.mk
index 7102f69b2ff..6ed4b4287e5 100644
--- a/devel/subversion/buildlink2.mk
+++ b/devel/subversion/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/04/15 16:23:22 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:42 wiz Exp $
#
.if !defined(SUBVERSION_BUILDLINK2_MK)
SUBVERSION_BUILDLINK2_MK= #defined
BUILDLINK_PACKAGES+= subversion-base
-BUILDLINK_DEPENDS.subversion-base?= subversion>=0.20.1
+BUILDLINK_DEPENDS.subversion-base?= subversion>=0.20.1nb1
BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion
EVAL_PREFIX+= BUILDLINK_PREFIX.subversion-base=subversion
diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
index e97e4198120..85a65d95a66 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/28 04:31:55 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:42 wiz Exp $
DISTNAME= umbrello-1.1.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=uml/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/uml/Makefile b/devel/uml/Makefile
index 871c80381c4..7325de42c07 100644
--- a/devel/uml/Makefile
+++ b/devel/uml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/09/20 11:47:20 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:42 wiz Exp $
DISTNAME= uml-1.0.3-1
PKGNAME= uml-1.0.3
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=uml/}
diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile
index 5478e2ba947..8af64c379d4 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2002/10/10 09:51:29 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/02 11:54:43 wiz Exp $
#
DISTNAME= xdelta-1.1.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.xcf.berkeley.edu/pub/xdelta/
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index be82e32b5bf..e28ac6ca1b5 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2003/04/17 06:22:23 martti Exp $
+# $NetBSD: Makefile,v 1.55 2003/05/02 11:54:43 wiz Exp $
#
# According to AbiSource's explanation of their trademark rights,
# compilations/distributions of AbiWord not provided by AbiSource must
@@ -7,7 +7,7 @@
DISTNAME= abiword-${ABIWORD_VERS}
PKGNAME= abiword-personal-${ABIWORD_VERS}
-#PKGREVISION= 1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/abi
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abiword/}
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index e4f127d4e2e..3ffbc0e5b3d 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/19 08:36:38 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:43 wiz Exp $
#
DISTNAME= beaver-0.2.6
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/src
CATEGORIES= editors
MASTER_SITES= http://savannah.nongnu.org/download/beaver/
diff --git a/editors/gbib/Makefile b/editors/gbib/Makefile
index cf7bd371d11..d68e76dab66 100644
--- a/editors/gbib/Makefile
+++ b/editors/gbib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/02 00:34:12 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:44 wiz Exp $
#
DISTNAME= gbib-0.1.1b
+PKGREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= ftp://ftp.seul.org/pub/gbib/src/
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 520302b00aa..e855831a051 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/12/24 06:09:58 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:44 wiz Exp $
#
DISTNAME= gconf-editor-0.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gconf-editor/0.3/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 9b566d2b720..3c6600f7ff9 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/03/12 16:41:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:44 wiz Exp $
#
DISTNAME= gedit-2.2.1
+PKGREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gedit/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index b507955bfa8..8e128eaec67 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:44 wiz Exp $
#
DISTNAME= gice-0.6.1
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/gice
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gice/}
diff --git a/editors/gnotepad/Makefile b/editors/gnotepad/Makefile
index 1fbc601d746..1c78f6bbf40 100644
--- a/editors/gnotepad/Makefile
+++ b/editors/gnotepad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/12/24 06:09:59 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:54:45 wiz Exp $
DISTNAME= gnotepad+-1.3.3
PKGNAME= ${DISTNAME:S/+//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnotepad/}
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index 9b669508fef..2db7eac8947 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/24 13:36:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:45 wiz Exp $
#
DISTNAME= hnb-1.8.1
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hnb/}
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index db256619067..cac33143835 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/01/29 03:40:55 markd Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:45 wiz Exp $
DISTNAME= kile-1.32
+PKGREVISION= 1
CATEGORIES= editors kde
MASTER_SITES= http://perso.club-internet.fr/pascal.brachet/kile/
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 31b33c7c38b..a759533deb7 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2003/03/22 15:25:53 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/05/02 11:54:45 wiz Exp $
#
DISTNAME= lyx-1.3.1
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 26c5f514b10..bcb3cb85ac9 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:54:46 wiz Exp $
#
DISTNAME= manedit-0.5.6
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/manedit
CATEGORIES= editors
MASTER_SITES= ftp://wolfpack.twu.net/users/wolfpack/
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index a58a3a8a233..553c5011685 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2003/02/15 18:56:18 martti Exp $
+# $NetBSD: Makefile,v 1.34 2003/05/02 11:54:46 wiz Exp $
.include "../vim-share/Makefile.common"
PKGNAME= vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION= 1
COMMENT= Vim editor (vi clone) with X11 GTK+ GUI
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index 1457335abf0..c48d72d1b8e 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/12/24 06:10:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:46 wiz Exp $
DISTNAME= kvim-${KVIM_VERSION}
PKGNAME= vim-kde-${KVIM_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/kvim-${KVIM_VERSION}/src
CATEGORIES= editors kde
MASTER_SITES= http://download.kde.org/stable/apps/KDE3.x/utils/ \
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index f2bb869f355..af0483dfbe2 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/04/07 17:30:14 magick Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:54:47 wiz Exp $
DISTNAME= xemacs-21.5.11
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XEMACS:=xemacs-21.5/}
diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile
index 94c253e05d7..3de2a575897 100644
--- a/editors/xemacs-nox11/Makefile
+++ b/editors/xemacs-nox11/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/30 08:51:52 jmc Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:47 wiz Exp $
DISTNAME= xemacs-21.4.12
PKGNAME= xemacs-nox11-21.4.12
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XEMACS:=xemacs-21.4/}
DISTFILES= ${EXTRACT_ONLY} ${EXTRA_FILES}
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 9ce2c2036fb..3b7ef424023 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2003/04/10 18:18:51 jmc Exp $
+# $NetBSD: Makefile,v 1.62 2003/05/02 11:54:47 wiz Exp $
DISTNAME= xemacs-21.4.12
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XEMACS:=xemacs-21.4/}
DISTFILES= ${EXTRACT_ONLY} ${EXTRA_FILES}
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index f0afada236b..b99c3d648f6 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:48 wiz Exp $
#
DISTNAME= BasiliskII_src_31052001
PKGNAME= BasiliskII-0.9.1
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/BasiliskII-0.9/src/Unix
CATEGORIES= emulators
MASTER_SITES= http://iphcip1.physik.uni-mainz.de/~cbauer/
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 10925a6afe3..01b0395bc37 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/07 08:59:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:49 wiz Exp $
#
DISTNAME= generator-0.34
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= http://www.squish.net/generator/files/
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index 0d6b235ef75..549fe19f515 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:49 wiz Exp $
#
DISTNAME= gpsim-0.20.7
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://www.dattalo.com/gnupic/
@@ -9,7 +10,7 @@ MAINTAINER= snoonan@tbearsiberians.com
HOMEPAGE= http://www.dattalo.com/gnupic/gpsim
COMMENT= PIC emulator with X interface
-DEPENDS+= gtk+-1.*:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
DEPENDS+= gtk+extra-[0-9]*:../../x11/gtk+extra
DEPENDS+= eXdbm-[0-9]*:../../devel/eXdbm
DEPENDS+= readline>=2.0:../../devel/readline
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 2f61769b976..7d413db5460 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:49 wiz Exp $
#
DISTNAME= hatari-0.25
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/hatari-0.25/src
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hatari/}
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index e9c1578e48d..62c58d969b5 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:49 wiz Exp $
#
DISTNAME= emulator_src_${POSE_VERSION}
PKGNAME= palmosemulator-${POSE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/Emulator_Src_${POSE_VERSION}
CATEGORIES= emulators x11
MASTER_SITES= http://www.palmos.com/dev/tools/emulator/sources/
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 103843fa221..41affc6a0f7 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/12/30 21:40:10 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:54:50 wiz Exp $
DISTNAME= s9xs139
PKGNAME= snes9x-1.39
-PKGREVISION= 2
+PKGREVISION= 3
WRKSRC= ${WRKDIR}/release
CATEGORIES= emulators
MASTER_SITES= http://www.snes9x.com/zips/
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 71a08b3f161..8074caef99f 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:50 wiz Exp $
#
DISTNAME= zsnes136src
+PKGREVISION= 1
PKGNAME= zsnes-1.360
WRKSRC= ${WRKDIR}/zsnes-1.36/src
CATEGORIES= emulators
diff --git a/finance/emma/Makefile b/finance/emma/Makefile
index eb52bbed4e9..27c50865ae2 100644
--- a/finance/emma/Makefile
+++ b/finance/emma/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/11/30 23:44:10 salo Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:54:50 wiz Exp $
#
DISTNAME= emma-0.8.2
+PKGREVISION= 1
CATEGORIES= finance
MASTER_SITES= ${HOMEPAGE}emma/packages/
diff --git a/finance/gkrellm-stock/Makefile b/finance/gkrellm-stock/Makefile
index a251328598c..0a506bec1fe 100644
--- a/finance/gkrellm-stock/Makefile
+++ b/finance/gkrellm-stock/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:57 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:51 wiz Exp $
DISTNAME= gkrellstock-0.2
PKGNAME= gkrellm-stock-0.2
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/gkrellStock-0.2
CATEGORIES= finance
MASTER_SITES= http://www.geocities.com/m_muthukumar/
@@ -11,7 +11,7 @@ MAINTAINER= damon@netbsd.org
HOMEPAGE= http://www.geocities.com/m_muthukumar/gkrellstock.html
COMMENT= gkrellm stock ticker plugin
-DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm
+DEPENDS+= gkrellm>=1.2.13nb1:../../sysutils/gkrellm
DEPENDS+= p5-finance-quote-1.*:../../finance/p5-finance-quote
USE_PERL5= # defined
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index 1fcb018cbd4..c5492d9650d 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/01/10 07:38:27 cjep Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:54:51 wiz Exp $
#
DISTNAME= gnofin-0.8.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnofin/}
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 31539af5326..40ab95352a7 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2003/02/27 04:08:24 jschauma Exp $
+# $NetBSD: Makefile,v 1.39 2003/05/02 11:54:52 wiz Exp $
DISTNAME= gnucash-1.8.1
+PKGREVISION= 1
CATEGORIES= finance
MASTER_SITES= ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
${MASTER_SITE_SOURCEFORGE:=gnucash/}
@@ -11,7 +12,6 @@ COMMENT= Personal double-entry accounting program
DEPENDS+= p5-finance-quote>=1.06:../../finance/p5-finance-quote
-BUILDLINK_DEPENDS.g-wrap= g-wrap>=1.3.4:../../devel/g-wrap
BUILDLINK_DEPENDS.guile14= guile14>=1.4:../../lang/guile14
BUILDLINK_DEPENDS.guile14+= guile14<1.5.0:../../lang/guile14
BUILD_DEPENDS+= bison>=1.28:../../devel/bison
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 25eec29f730..8801dc2f550 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2002/12/01 02:00:12 salo Exp $
+# $NetBSD: Makefile,v 1.27 2003/05/02 11:54:52 wiz Exp $
DISTNAME= baduki-0.2.9
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://soback.kornet21.net/~artist/baduk/
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index f8c3a586cc7..376fde616d5 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/16 03:56:27 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:52 wiz Exp $
#
DISTNAME= ccgo-0.3.1
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://ccdw.org/~cjj/prog/ccgo/
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index b1c94eca6be..418758706c6 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2002/09/21 13:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2003/05/02 11:54:52 wiz Exp $
DISTNAME= clanbomber-1.01
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games x11
MASTER_SITES= http://www.clanbomber.de/files/
diff --git a/games/copter-commander/Makefile b/games/copter-commander/Makefile
index 0545fef8c59..1dffe051bfe 100644
--- a/games/copter-commander/Makefile
+++ b/games/copter-commander/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/30 06:21:53 jmc Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:53 wiz Exp $
#
DISTNAME= copter-commander-1.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=coco/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index dc9dd596838..b039f0620fc 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:53 wiz Exp $
#
DISTNAME= corewars-0.9.11
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=corewars/}
@@ -9,7 +10,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://corewars.sourceforge.net/
COMMENT= programs on a virtual machine, fighting each other
-DEPENDS+= gtk+>=1.2.0:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
GNU_CONFIGURE= YES
USE_X11BASE= YES
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index e8d53e78e75..e90c6701119 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/04/27 20:29:18 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:53 wiz Exp $
#
DISTNAME= CriticalMass-0.97
PKGNAME= criticalmass-0.97
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=criticalmass/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index 912b18eee82..5a80f65faf1 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/10/21 11:55:43 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:54:54 wiz Exp $
#
DISTNAME= crossfire-client-1.0.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games x11
MASTER_SITES= ftp://ftp.ifi.uio.no/pub/crossfire/
DISTFILES= ${CF_SRC} ${CF_SND} ${CF_RAW}
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index abc336c94e1..77645f3c71b 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/02/05 05:06:34 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:54:54 wiz Exp $
DISTNAME= dopewars-1.5.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/ \
${MASTER_SITE_SOURCEFORGE:=dopewars/} \
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index 30630d7fe3e..2a1358ae9bd 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/12/24 18:55:38 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:54 wiz Exp $
#
DISTNAME= nethack_source_331_jtp_193
+PKGREVISION= 1
PKGNAME= falcons-eye-1.9.3
WRKSRC= ${WRKDIR}
CATEGORIES= games
diff --git a/games/fire/Makefile b/games/fire/Makefile
index 98ea7a7fa15..53abd80dbde 100644
--- a/games/fire/Makefile
+++ b/games/fire/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/27 18:44:27 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:54 wiz Exp $
#
DISTNAME= fire-1.0
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.libsdl.org/projects/fire/src/
diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index 02b95e9b207..98be62c8fdc 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/02/23 13:18:19 salo Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:54:55 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-client-gtk-/}
+PKGREVISION= 1
COMMENT= Freeciv client with GTK+ interface
DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share
diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index 328cdb60166..d1a1096ca68 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/18 17:55:52 salo Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:55 wiz Exp $
#
DISTNAME= frozen-bubble-1.0.0
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://people.mandrakesoft.com/~gc/fb/
EXTRACT_SUFX= .tar.bz2
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 3d294875dd8..a719c8c5484 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/09 20:05:09 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:55 wiz Exp $
#
DISTNAME= glchess-0.4.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=glchess/}
diff --git a/games/glickomania/Makefile b/games/glickomania/Makefile
index e05814c9c92..6f7108352bd 100644
--- a/games/glickomania/Makefile
+++ b/games/glickomania/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/13 11:36:48 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:55 wiz Exp $
#
DISTNAME= glickomania-1.0
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://hibase.cs.hut.fi/~cessu/glickomania/
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index f9b8f363381..42a6f3be98e 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/04/11 00:34:49 salo Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:54:56 wiz Exp $
#
DISTNAME= gltron-0.62-source
PKGNAME= ${DISTNAME:S/-source$//}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gltron/}
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index a9efa673e33..7da9870c0e5 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/10/05 04:26:12 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:54:56 wiz Exp $
#
DISTNAME= gnocatan-0.6.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnocatan/}
diff --git a/games/gnome-breakout/Makefile b/games/gnome-breakout/Makefile
index c8458150ec8..e90d74e63ce 100644
--- a/games/gnome-breakout/Makefile
+++ b/games/gnome-breakout/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/12/24 06:10:02 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:54:56 wiz Exp $
#
DISTNAME= gnome-breakout-0.5.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games gnome
MASTER_SITES= http://www.senet.com.au/~alcaron/
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index 877d37c93cf..236aaf91e02 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/02/18 14:55:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/05/02 11:54:56 wiz Exp $
DISTNAME= gnome-chess-0.3.3
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-chess/0.3/}
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index cb29a14db9e..982ae7a2b58 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2003/02/18 14:55:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.50 2003/05/02 11:54:57 wiz Exp $
DISTNAME= gnome-games-1.4.0.4
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-games/1.4/}\
${MASTER_SITE_LOCAL}
diff --git a/games/gnome-games/buildlink2.mk b/games/gnome-games/buildlink2.mk
index cca2d54c144..7568ce3b264 100644
--- a/games/gnome-games/buildlink2.mk
+++ b/games/gnome-games/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:41 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:57 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-games.
#
@@ -9,7 +9,7 @@
GNOME_GAMES_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-games
-BUILDLINK_DEPENDS.gnome-games?= gnome-games>=1.4.0.4nb3
+BUILDLINK_DEPENDS.gnome-games?= gnome-games>=1.4.0.4nb5
BUILDLINK_PKGSRCDIR.gnome-games?= ../../games/gnome-games
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-games=gnome-games
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 2dc91c5beb8..4ce8f82ca9c 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/05/01 11:21:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:57 wiz Exp $
DISTNAME= gnome-games-2.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-games/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/gnome2-games/buildlink2.mk b/games/gnome2-games/buildlink2.mk
index 0f2f7218304..785c6bc1345 100644
--- a/games/gnome2-games/buildlink2.mk
+++ b/games/gnome2-games/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/21 02:28:57 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:57 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-games.
#
@@ -9,7 +9,7 @@
GNOME_GAMES_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-games
-BUILDLINK_DEPENDS.gnome-games?= gnome-games>=1.4.0.4nb3
+BUILDLINK_DEPENDS.gnome-games?= gnome-games>=2.2.1nb2
BUILDLINK_PKGSRCDIR.gnome-games?= ../../games/gnome-games
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-games=gnome-games
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index 187b359b8b4..9c4e698c87b 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/09 19:29:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:58 wiz Exp $
#
DISTNAME= grhino-0.7.0
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://ftp1.sourceforge.net/rhino/
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index d30469c620c..7959a0bdda5 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/24 00:16:10 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:54:58 wiz Exp $
#
DISTNAME= gtetrinet-0.4.4
+PKGREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtetrinet/}
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 3c259ca2815..ff8c0bfa241 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/12/24 06:10:03 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:58 wiz Exp $
#
DISTNAME= gtkballs-3.0.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ftp://ftp.antex.ru/pub/unix/dfo/gtkballs/ \
http://gtkballs.antex.ru/dist/
diff --git a/games/gtkgo/Makefile b/games/gtkgo/Makefile
index 9e1a2579f7f..625daca4de8 100644
--- a/games/gtkgo/Makefile
+++ b/games/gtkgo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/10 09:18:26 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:54:58 wiz Exp $
#
DISTNAME= gtkgo-0_0_10
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/_/./g}
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= games gnome
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 42498d82f2c..364881c52c3 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/02/18 14:55:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:58 wiz Exp $
#
DISTNAME= gturing-0.1.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gturing/0.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index d92a99718b4..c8e322d0547 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/04/03 08:25:34 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:59 wiz Exp $
#
DISTNAME= icebreaker-1.9.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.mattdm.org/icebreaker/1.9.x/
EXTRACT_SUFX= .tgz
diff --git a/games/iso-pernangband/Makefile b/games/iso-pernangband/Makefile
index d5557c19e97..739b0dc8c0f 100644
--- a/games/iso-pernangband/Makefile
+++ b/games/iso-pernangband/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/12/24 18:55:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:59 wiz Exp $
#
DISTNAME= iso-pern_src-0_2_6
+PKGREVISION= 1
PKGNAME= iso-pernangband-0.2.6
WRKSRC= ${WRKDIR}/iso-pern_src/src
CATEGORIES= games
diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile
index 3db5bd234a8..60a6e029dc9 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/09/20 04:48:29 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:54:59 wiz Exp $
DISTNAME= kdegames-2.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
COMMENT= Games for the KDE integrated X11 desktop
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 3219f5c8a74..8f35f658448 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/04/01 12:27:07 markd Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:55:00 wiz Exp $
DISTNAME= kdegames-3.1.1
+PKGREVISION= 1
CATEGORIES= games
COMMENT= Games for the KDE integrated X11 desktop
diff --git a/games/kdetoys2/Makefile b/games/kdetoys2/Makefile
index 4ae3c968e31..10f9f66759d 100644
--- a/games/kdetoys2/Makefile
+++ b/games/kdetoys2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/09/20 08:16:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:55:00 wiz Exp $
DISTNAME= kdetoys-2.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
COMMENT= Toys for the KDE integrated X11 desktop
diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile
index 73deb80c2a3..fa78c56806b 100644
--- a/games/kdetoys3/Makefile
+++ b/games/kdetoys3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/04/01 12:27:07 markd Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:00 wiz Exp $
DISTNAME= kdetoys-3.1.1
+PKGREVISION= 1
CATEGORIES= games
COMMENT= Toys for the KDE integrated X11 desktop
diff --git a/games/ketm/Makefile b/games/ketm/Makefile
index 67f34d84c36..55facfd3dc1 100644
--- a/games/ketm/Makefile
+++ b/games/ketm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/10/15 23:23:05 kristerw Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:55:00 wiz Exp $
#
DISTNAME= ketm-0.0.6
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://home.t-online.de/home/haslbeck/ketm/
EXTRACT_SUFX= .tar.bz2
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 529684f1dca..7dd594cbc37 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/04/27 13:44:12 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:55:01 wiz Exp $
DISTNAME= knights-0.4.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=knights/}
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index 1247747bf33..7e7da6648b8 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/01/25 12:09:11 rh Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:55:01 wiz Exp $
#
DISTNAME= lbreakout-010315
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lgames/}
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 1987581a104..af6f92fffc8 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/03 08:25:35 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:55:01 wiz Exp $
#
DISTNAME= lbreakout2-2.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lgames/}
diff --git a/games/lgeneral/Makefile b/games/lgeneral/Makefile
index c04ed3d2796..31d0d016e42 100644
--- a/games/lgeneral/Makefile
+++ b/games/lgeneral/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/03 08:25:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:01 wiz Exp $
#
DISTNAME= lgeneral-1.1.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lgeneral/}
diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile
index 7b223e4335d..fb62a3b23ff 100644
--- a/games/lpairs/Makefile
+++ b/games/lpairs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/08/27 18:55:36 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:02 wiz Exp $
#
DISTNAME= lpairs-1.0
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lgames/}
diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index 83b3d2fb5f2..6cf81098d52 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/03 08:25:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:02 wiz Exp $
#
DISTNAME= ltris-1.0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lgames/}
diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile
index 37493f2da31..2efe05f8445 100644
--- a/games/maelstrom-sdl/Makefile
+++ b/games/maelstrom-sdl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/08/27 19:06:57 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:03 wiz Exp $
#
DISTNAME= Maelstrom-3.0.5
+PKGREVISION= 1
PKGNAME= maelstrom-sdl-3.0.5
CATEGORIES= games x11
MASTER_SITES= http://www.devolution.com/~slouken/Maelstrom/src/
diff --git a/games/marbles/Makefile b/games/marbles/Makefile
index 37a54065d31..2baf7522996 100644
--- a/games/marbles/Makefile
+++ b/games/marbles/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/08/27 19:07:37 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:03 wiz Exp $
#
DISTNAME= marbles-1.0.2
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lgames/}
diff --git a/games/mirrormagic-sdl/Makefile b/games/mirrormagic-sdl/Makefile
index 9e7800bb935..a3b740717a9 100644
--- a/games/mirrormagic-sdl/Makefile
+++ b/games/mirrormagic-sdl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/04/10 01:28:17 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:03 wiz Exp $
#
DISTNAME= mirrormagic-2.0.1
PKGNAME= ${DISTNAME:S/-/-sdl-/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games x11
MASTER_SITES= http://www.artsoft.org/RELEASES/unix/mirrormagic/
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index 00faa4810a4..b4a78b050f0 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/27 19:08:08 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:55:03 wiz Exp $
#
DISTNAME= newvox-1.0
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.libsdl.org/projects/newvox/src/
diff --git a/games/pacman/Makefile b/games/pacman/Makefile
index 97b0a337e76..a8d79deb7a6 100644
--- a/games/pacman/Makefile
+++ b/games/pacman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2002/09/23 10:14:40 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/02 11:55:04 wiz Exp $
DISTNAME= Pacman-0.3-CVS-00-11-17
PKGNAME= Pacman-0.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games x11
MASTER_SITES= http://dark.x.dtu.dk/~mbn/clanlib/download/snapshots/Games/
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 4775e58b6e4..47f541d5e2c 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/03 08:25:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:55:04 wiz Exp $
#
DISTNAME= prboom-2.2.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/}
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index 6edad510a9c..d9ea142c9e7 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/28 22:03:20 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:04 wiz Exp $
#
DISTNAME= sarien-0.7.0
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sarien/}
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 9005b0e5873..935c24b9b72 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:05 wiz Exp $
DISTNAME= scummvm_0.3.0b-src
+PKGREVISION= 1
PKGNAME= scummvm-0.3.0
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
CATEGORIES= games
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 4299988b48e..cf59adc5fb0 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:05 wiz Exp $
#
DISTNAME= tworld-1.0
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/^t/tile/}
WRKSRC= ${WRKDIR}/tworld-1.0
CATEGORIES= games
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index ad6d63186cd..4fcb211f726 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/07 19:26:17 jmc Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:05 wiz Exp $
#
DISTNAME= tuxracer-0.61
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxracer/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index ae6f44c19bd..f62dd57ba11 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/09/06 12:17:38 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:55:05 wiz Exp $
#
DISTNAME= xarchon-0.50
+PKGREVISION= 1
CATEGORIES= games x11
MASTER_SITES= http://xarchon.seul.org/ \
ftp://xarchon.seul.org/pub/xarchon/
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index b77138591f4..76f83b4cbde 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/02/05 05:06:35 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/02 11:55:06 wiz Exp $
DISTNAME= xpuyopuyo-0.9.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games x11
MASTER_SITES= http://chaos2.org/xpuyopuyo/ \
http://lenin.dabney.caltech.edu./~justins/xpuyopuyo/
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 19005c02841..12677db72f3 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/01/06 19:48:08 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:06 wiz Exp $
#
DISTNAME= xrick-021212
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.bigorno.net/xrick/
EXTRACT_SUFX= .tgz
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 6502f49aa05..46ffd375ea7 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/08/31 13:33:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:06 wiz Exp $
#
DISTNAME= xscorch-0.1.15
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://chaos2.org/xscorch/
diff --git a/graphics/3DKit/Makefile.common b/graphics/3DKit/Makefile.common
index 9ebe7360a58..6f995d854f9 100644
--- a/graphics/3DKit/Makefile.common
+++ b/graphics/3DKit/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/09/29 06:12:51 rh Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/05/02 11:55:07 wiz Exp $
#
DISTNAME= 3DKit-0.3.1r2
+PKGREVISION= 1
CATEGORIES?= graphics gnustep
MASTER_SITES= http://www.gnu.org/software/gnu3dkit/
DIST_SUBDIR= 3DKit
diff --git a/graphics/3DKit/buildlink2.mk b/graphics/3DKit/buildlink2.mk
index 5a086f8ee34..6a8e2854e95 100644
--- a/graphics/3DKit/buildlink2.mk
+++ b/graphics/3DKit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/29 06:12:51 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:07 wiz Exp $
#
# This Makefile fragment is included by packages that use 3DKit.
#
@@ -9,7 +9,7 @@
3DKIT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= 3DKit
-BUILDLINK_DEPENDS.3DKit?= 3DKit>=0.3.1r2
+BUILDLINK_DEPENDS.3DKit?= 3DKit>=0.3.1r2nb1
BUILDLINK_PKGSRCDIR.3DKit?= ../../graphics/3DKit
EVAL_PREFIX+= BUILDLINK_PREFIX.3DKit=3DKit
diff --git a/graphics/GLXKit/Makefile b/graphics/GLXKit/Makefile
index ee388a57b76..6ceb12ab91e 100644
--- a/graphics/GLXKit/Makefile
+++ b/graphics/GLXKit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/04/01 09:46:08 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:07 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/GLXKit/}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/GLXKit
COMMENT= 3DKit GLX backend
diff --git a/graphics/GLXKit/buildlink2.mk b/graphics/GLXKit/buildlink2.mk
index 94a9d80bfd3..a21dcdd961c 100644
--- a/graphics/GLXKit/buildlink2.mk
+++ b/graphics/GLXKit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/29 06:15:34 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:07 wiz Exp $
#
# This Makefile fragment is included by packages that use GLXKit.
#
@@ -9,7 +9,7 @@
GLXKIT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= GLXKit
-BUILDLINK_DEPENDS.GLXKit?= GLXKit>=0.3.1r2
+BUILDLINK_DEPENDS.GLXKit?= GLXKit>=0.3.1r2nb1
BUILDLINK_PKGSRCDIR.GLXKit?= ../../graphics/GLXKit
EVAL_PREFIX+= BUILDLINK_PREFIX.GLXKit=GLXKit
diff --git a/graphics/GUIlib/Makefile b/graphics/GUIlib/Makefile
index 5182ff38d36..a11dd620f48 100644
--- a/graphics/GUIlib/Makefile
+++ b/graphics/GUIlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/08/27 19:14:46 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:07 wiz Exp $
#
DISTNAME= GUIlib-1.1.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.libsdl.org/projects/GUIlib/src/
diff --git a/graphics/GUIlib/buildlink2.mk b/graphics/GUIlib/buildlink2.mk
index 017f9ce1cbd..34120a87429 100644
--- a/graphics/GUIlib/buildlink2.mk
+++ b/graphics/GUIlib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:43 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:07 wiz Exp $
.if !defined(GUILIB_BUILDLINK2_MK)
GUILIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= GUIlib
-BUILDLINK_DEPENDS.GUIlib?= GUIlib>=1.1.0
+BUILDLINK_DEPENDS.GUIlib?= GUIlib>=1.1.0nb1
BUILDLINK_PKGSRCDIR.GUIlib?= ../../graphics/GUIlib
EVAL_PREFIX+= BUILDLINK_PREFIX.GUIlib=GUIlib
diff --git a/graphics/GeometryKit/Makefile b/graphics/GeometryKit/Makefile
index 4cc6e3bce85..17ed23aa7c6 100644
--- a/graphics/GeometryKit/Makefile
+++ b/graphics/GeometryKit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/29 06:14:11 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:08 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/GeometryKit/}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/3DKit/GeometryKit
COMMENT= Objective-C class library for calculating 3D geometry
diff --git a/graphics/GeometryKit/buildlink2.mk b/graphics/GeometryKit/buildlink2.mk
index 5c62a60c6c2..0b33838bc60 100644
--- a/graphics/GeometryKit/buildlink2.mk
+++ b/graphics/GeometryKit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/29 06:14:12 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:08 wiz Exp $
#
# This Makefile fragment is included by packages that use GeometryKit.
#
@@ -9,7 +9,7 @@
GEOMETRYKIT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= GeometryKit
-BUILDLINK_DEPENDS.GeometryKit?= GeometryKit>=0.3.1r2
+BUILDLINK_DEPENDS.GeometryKit?= GeometryKit>=0.3.1r2nb1
BUILDLINK_PKGSRCDIR.GeometryKit?= ../../graphics/GeometryKit
EVAL_PREFIX+= BUILDLINK_PREFIX.GeometryKit=GeometryKit
diff --git a/graphics/GlutKit/Makefile b/graphics/GlutKit/Makefile
index f1aba522aae..2e83deb8bc4 100644
--- a/graphics/GlutKit/Makefile
+++ b/graphics/GlutKit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/04/01 09:36:11 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:08 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/GlutKit/}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/GlutKit
COMMENT= 3DKit GLUT backend
diff --git a/graphics/GlutKit/buildlink2.mk b/graphics/GlutKit/buildlink2.mk
index 283afbac493..4e25f54e752 100644
--- a/graphics/GlutKit/buildlink2.mk
+++ b/graphics/GlutKit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/29 06:16:06 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:08 wiz Exp $
#
# This Makefile fragment is included by packages that use GlutKit.
#
@@ -9,7 +9,7 @@
GLUTKIT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= GlutKit
-BUILDLINK_DEPENDS.GlutKit?= GlutKit>=0.3.1r2
+BUILDLINK_DEPENDS.GlutKit?= GlutKit>=0.3.1r2nb1
BUILDLINK_PKGSRCDIR.GlutKit?= ../../graphics/GlutKit
EVAL_PREFIX+= BUILDLINK_PREFIX.GlutKit=GlutKit
diff --git a/graphics/ImageViewer/Makefile b/graphics/ImageViewer/Makefile
index 069d89eae27..01eb9293ebe 100644
--- a/graphics/ImageViewer/Makefile
+++ b/graphics/ImageViewer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/29 09:29:56 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:08 wiz Exp $
#
DISTNAME= ImageViewer-0.6.0
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/ImageViewer
CATEGORIES= graphics gnustep
MASTER_SITES= http://www.nice.ch/~phip/
diff --git a/graphics/RenderKit/Makefile b/graphics/RenderKit/Makefile
index 3410af1328e..487a987ce63 100644
--- a/graphics/RenderKit/Makefile
+++ b/graphics/RenderKit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/04/01 09:24:54 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:09 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/RenderKit/}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/3DKit/RenderKit
COMMENT= Objective-C API for core scene rendering
diff --git a/graphics/RenderKit/buildlink2.mk b/graphics/RenderKit/buildlink2.mk
index 6c2510a1cfc..df4e81011a1 100644
--- a/graphics/RenderKit/buildlink2.mk
+++ b/graphics/RenderKit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/29 06:14:50 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:09 wiz Exp $
#
# This Makefile fragment is included by packages that use RenderKit.
#
@@ -9,7 +9,7 @@
RENDERKIT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= RenderKit
-BUILDLINK_DEPENDS.RenderKit?= RenderKit>=0.3.1r2
+BUILDLINK_DEPENDS.RenderKit?= RenderKit>=0.3.1r2nb1
BUILDLINK_PKGSRCDIR.RenderKit?= ../../graphics/RenderKit
EVAL_PREFIX+= BUILDLINK_PREFIX.RenderKit=RenderKit
diff --git a/graphics/SDLKit/Makefile b/graphics/SDLKit/Makefile
index c7a16b992cc..4cbbd117b0c 100644
--- a/graphics/SDLKit/Makefile
+++ b/graphics/SDLKit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/04/01 10:00:20 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:09 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/SDLKit/}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/SDLKit
COMMENT= 3DKit SDL backend
diff --git a/graphics/SDLKit/buildlink2.mk b/graphics/SDLKit/buildlink2.mk
index 2675ca7559f..4d0446c9e64 100644
--- a/graphics/SDLKit/buildlink2.mk
+++ b/graphics/SDLKit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/29 06:16:53 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:09 wiz Exp $
#
# This Makefile fragment is included by packages that use SDLKit.
#
@@ -9,7 +9,7 @@
SDLKIT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= SDLKit
-BUILDLINK_DEPENDS.SDLKit?= SDLKit>=0.3.1r2
+BUILDLINK_DEPENDS.SDLKit?= SDLKit>=0.3.1r2nb1
BUILDLINK_PKGSRCDIR.SDLKit?= ../../graphics/SDLKit
EVAL_PREFIX+= BUILDLINK_PREFIX.SDLKit=SDLKit
diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile
index a9d8ed841ab..e15d564a106 100644
--- a/graphics/SDL_image/Makefile
+++ b/graphics/SDL_image/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/05 19:03:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:10 wiz Exp $
#
DISTNAME= SDL_image-1.2.2
+PKGREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/
diff --git a/graphics/SDL_image/buildlink2.mk b/graphics/SDL_image/buildlink2.mk
index 5771aa5cace..e861f8658c0 100644
--- a/graphics/SDL_image/buildlink2.mk
+++ b/graphics/SDL_image/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/03 08:20:01 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:10 wiz Exp $
#
.if !defined(SDL_IMAGE_BUILDLINK2_MK)
SDL_IMAGE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= SDL_image
-BUILDLINK_DEPENDS.SDL_image?= SDL_image>=1.2.1
+BUILDLINK_DEPENDS.SDL_image?= SDL_image>=1.2.2nb1
BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image
EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_image=SDL_image
diff --git a/graphics/apla/Makefile b/graphics/apla/Makefile
index 5837580f6e7..3989a0f2f5a 100644
--- a/graphics/apla/Makefile
+++ b/graphics/apla/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/02/13 21:16:10 fredb Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:55:10 wiz Exp $
#
DISTNAME= apla-1.0.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://pd37.warszawa.sdi.tpnet.pl/NetBSD/
diff --git a/graphics/avi-xmms/Makefile b/graphics/avi-xmms/Makefile
index d743617065a..48e820d6aa7 100644
--- a/graphics/avi-xmms/Makefile
+++ b/graphics/avi-xmms/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/21 10:53:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:11 wiz Exp $
#
DISTNAME= avi-xmms-1.2.2
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.xmms.org/files/plugins/avi-xmms/ \
ftp://ftp.sunet.se/pub/multimedia/xmms/plugins/avi-xmms/ \
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index 00a138d78d1..6e48b130134 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2003/03/29 12:41:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2003/05/02 11:55:11 wiz Exp $
#
DISTNAME= avifile-0.6.20010814
-PKGREVISION= 2
+PKGREVISION= 3
WRKSRC= ${WRKDIR}/avifile-0.6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/graphics/avifile-devel/buildlink2.mk b/graphics/avifile-devel/buildlink2.mk
index fe79d344b84..061e25174f8 100644
--- a/graphics/avifile-devel/buildlink2.mk
+++ b/graphics/avifile-devel/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/02/13 16:31:25 fredb Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:55:11 wiz Exp $
.if !defined(AVIFILE_BUILDLINK2_MK)
AVIFILE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= avifile
-BUILDLINK_DEPENDS.avifile?= avifile>=0.6.20010814nb2
+BUILDLINK_DEPENDS.avifile?= avifile>=0.6.20010814nb3
BUILDLINK_PKGSRCDIR.avifile?= ../../graphics/avifile-devel
EVAL_PREFIX+= BUILDLINK_PREFIX.avifile=avifile
diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile
index ebe7776d900..dd3de3c40ea 100644
--- a/graphics/avifile/Makefile
+++ b/graphics/avifile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/02/02 21:53:25 zuntum Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:55:11 wiz Exp $
DISTNAME= avifile-0.53.5
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://ernie.eit.uni-kl.de/avifile/ \
http://divx.euro.ru/ \
diff --git a/graphics/avifile/buildlink2.mk b/graphics/avifile/buildlink2.mk
index e2b2d078618..cd52ba4c445 100644
--- a/graphics/avifile/buildlink2.mk
+++ b/graphics/avifile/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:46 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:11 wiz Exp $
.if !defined(AVIFILE_BUILDLINK2_MK)
AVIFILE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= avifile
-BUILDLINK_DEPENDS.avifile?= avifile>=0.53.5
+BUILDLINK_DEPENDS.avifile?= avifile>=0.53.5nb1
BUILDLINK_PKGSRCDIR.avifile?= ../../graphics/avifile
EVAL_PREFIX+= BUILDLINK_PREFIX.avifile=avifile
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index e65c6367f92..e807359466e 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2003/03/09 19:17:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.31 2003/05/02 11:55:12 wiz Exp $
DISTNAME= ClanLib-0.4.4
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics games devel x11
MASTER_SITES= http://dark.x.dtu.dk/~mbn/clanlib/download/
diff --git a/graphics/clanlib/buildlink2.mk b/graphics/clanlib/buildlink2.mk
index 3be2d8b68dc..cba41654b1b 100644
--- a/graphics/clanlib/buildlink2.mk
+++ b/graphics/clanlib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/03/12 22:07:28 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:55:12 wiz Exp $
.if !defined(CLANLIB_BUILDLINK2_MK)
CLANLIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= ClanLib
-BUILDLINK_DEPENDS.ClanLib?= ClanLib>=0.4.4nb1
+BUILDLINK_DEPENDS.ClanLib?= ClanLib>=0.4.4nb4
BUILDLINK_PKGSRCDIR.ClanLib?= ../../graphics/clanlib
EVAL_PREFIX+= BUILDLINK_PREFIX.ClanLib=ClanLib
diff --git a/graphics/denemo/Makefile b/graphics/denemo/Makefile
index 4305f4708dd..08b488890fe 100644
--- a/graphics/denemo/Makefile
+++ b/graphics/denemo/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:04 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:55:12 wiz Exp $
#
DISTNAME= denemo-0.5.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=denemo/}
MAINTAINER= rh@netbsd.org
HOMEPAGE= http://denemo.sourceforge.net/
-COMMENT= GUI musical score editor written in C/gtk+
+COMMENT= GUI musical score editor written in C/GTK+
DEPENDS+= lilypond-[0-9]*:../../print/lilypond
-DEPENDS+= gtk+>=1.2.0:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
GNU_CONFIGURE= YES
USE_X11BASE= YES
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 235cb4c98dd..0f144181004 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2002/12/30 19:19:18 jmcneill Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:55:12 wiz Exp $
DISTNAME= dia-0.90
-# PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dia/0.90/}
diff --git a/graphics/dumpmpeg/Makefile b/graphics/dumpmpeg/Makefile
index 17f06ec517a..f460686b029 100644
--- a/graphics/dumpmpeg/Makefile
+++ b/graphics/dumpmpeg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/08/29 08:45:49 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:55:13 wiz Exp $
#
DISTNAME= dumpmpeg-0.6
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dumpmpeg/}
diff --git a/graphics/dvdview/Makefile b/graphics/dvdview/Makefile
index f47a109eb42..e5322b9a979 100644
--- a/graphics/dvdview/Makefile
+++ b/graphics/dvdview/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/02/13 19:04:47 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:55:13 wiz Exp $
DISTNAME= dvdview-1.2.2
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://rachmaninoff.informatik.uni-mannheim.de/dvdview/data/
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index 98fd9b3f503..75ba408abe1 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2002/12/24 06:10:04 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2003/05/02 11:55:13 wiz Exp $
DISTNAME= ee-0.3.12
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ee/0.3/}
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 176668b449b..c3eb1988115 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/12/24 06:10:05 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:55:14 wiz Exp $
DISTNAME= eog-0.6
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= gnome graphics x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/0.6/}
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 4b6b0e5157d..0b4588585cf 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/02/18 14:55:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:55:14 wiz Exp $
#
DISTNAME= eog-2.2.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index f2bd057c430..499139b78e4 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/02/24 16:10:07 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:55:14 wiz Exp $
#
DISTNAME= feh-1.2.5
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.linuxbrit.co.uk/downloads/
diff --git a/graphics/filmgimp/Makefile b/graphics/filmgimp/Makefile
index fc01220aa0f..e8e27c6f2d0 100644
--- a/graphics/filmgimp/Makefile
+++ b/graphics/filmgimp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/29 06:17:22 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:14 wiz Exp $
DISTNAME= filmgimp-0.15
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=filmgimp/}
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 1756fbbbe1b..c76a5433123 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:23 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:55:15 wiz Exp $
DISTNAME= fnlib-0.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 graphics
MASTER_SITES= ftp://ftp.enlightenment.org/pub/e/enlightenment/libs/
diff --git a/graphics/fnlib/buildlink2.mk b/graphics/fnlib/buildlink2.mk
index ba9e8018f2c..9bb953882e4 100644
--- a/graphics/fnlib/buildlink2.mk
+++ b/graphics/fnlib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:58 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:15 wiz Exp $
.if !defined(FNLIB_BUILDLINK2_MK)
FNLIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= fnlib
-BUILDLINK_DEPENDS.fnlib?= fnlib>=0.5nb1
+BUILDLINK_DEPENDS.fnlib?= fnlib>=0.5nb3
BUILDLINK_PKGSRCDIR.fnlib?= ../../graphics/fnlib
EVAL_PREFIX+= BUILDLINK_PREFIX.fnlib=fnlib
diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile
index 00df11035d7..06db3a1363b 100644
--- a/graphics/g3d/Makefile
+++ b/graphics/g3d/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:55:15 wiz Exp $
#
DISTNAME= g3d-0.0.2
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/g3d
CATEGORIES= graphics
MASTER_SITES= http://condor.stcloudstate.edu/~hebl9901/g3d/
diff --git a/graphics/gdk-pixbuf-gnome/buildlink2.mk b/graphics/gdk-pixbuf-gnome/buildlink2.mk
index ca5223c665d..3aca755d527 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink2.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:47 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:16 wiz Exp $
.if !defined(GDK_PIXBUF_GNOME_BUILDLINK2_MK)
GDK_PIXBUF_GNOME_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gdk-pixbuf-gnome
-BUILDLINK_DEPENDS.gdk-pixbuf-gnome?= gdk-pixbuf-gnome>=0.11.0nb1
+BUILDLINK_DEPENDS.gdk-pixbuf-gnome?= gdk-pixbuf-gnome>=0.22.0nb1
BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?= ../../graphics/gdk-pixbuf-gnome
EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf-gnome=gdk-pixbuf-gnome
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index e5e89e678ad..44d8760b53e 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.29 2003/01/15 21:03:25 wiz Exp $
+# $NetBSD: Makefile.common,v 1.30 2003/05/02 11:55:15 wiz Exp $
#
DISTNAME= gdk-pixbuf-${VER}.0
+PKGREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${VER}/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gdk-pixbuf/buildlink2.mk b/graphics/gdk-pixbuf/buildlink2.mk
index 4884805e3eb..4db3ab78cab 100644
--- a/graphics/gdk-pixbuf/buildlink2.mk
+++ b/graphics/gdk-pixbuf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/23 09:22:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:55:16 wiz Exp $
.if !defined(GDK_PIXBUF_BUILDLINK2_MK)
GDK_PIXBUF_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gdk-pixbuf
-BUILDLINK_DEPENDS.gdk-pixbuf?= gdk-pixbuf>=0.17.0
+BUILDLINK_DEPENDS.gdk-pixbuf?= gdk-pixbuf>=0.22.0nb1
BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf
EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 1c2673e7d03..7ca72a5c0de 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/12/24 18:55:39 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:55:16 wiz Exp $
#
DISTNAME= gfract-0.21
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics x11
MASTER_SITES= http://www.cs.Helsinki.FI/u/salerma/gfract/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gfract-palettes-0.1.tar.gz
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 02864bd76bd..3f5fb08fc7b 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/02/05 05:06:35 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:55:17 wiz Exp $
DISTNAME= gimageview-0.2.13
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
@@ -17,7 +17,6 @@ USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_X11= YES
-BUILDLINK_DEPENDS.libwmf= libwmf>=0.2.8
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index d3a71fc03f0..d14381fe08d 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:23 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:55:17 wiz Exp $
DISTNAME= gimp-1.2.3
PKGNAME= gimp-base-1.2.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.3/ \
ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.3/ \
diff --git a/graphics/gimp-base/buildlink2.mk b/graphics/gimp-base/buildlink2.mk
index f885202e240..f95da35dc8a 100644
--- a/graphics/gimp-base/buildlink2.mk
+++ b/graphics/gimp-base/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/22 21:49:48 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:55:17 wiz Exp $
.if !defined(GIMP_BASE_BUILDLINK2_MK)
GIMP_BASE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gimp-base
-BUILDLINK_DEPENDS.gimp-base?= gimp-base>=1.2.3nb1
+BUILDLINK_DEPENDS.gimp-base?= gimp-base>=1.2.3nb5
BUILDLINK_PKGSRCDIR.gimp-base?= ../../graphics/gimp-base
DEPENDS+= ${BUILDLINK_DEPENDS.gimp-base}:../../graphics/gimp-base
diff --git a/graphics/gimp-data/Makefile b/graphics/gimp-data/Makefile
index d4ab55e8809..74a5c45e90f 100644
--- a/graphics/gimp-data/Makefile
+++ b/graphics/gimp-data/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/09/24 09:36:39 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:18 wiz Exp $
DISTNAME= gimp-data-extras-1.2.0
PKGNAME= gimp-data-1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.3/ \
ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.3/ \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index b1c6d78948a..6a6b834c1d8 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2002/10/07 16:38:22 dent Exp $
+# $NetBSD: Makefile,v 1.83 2003/05/02 11:55:17 wiz Exp $
DISTNAME= gimp-1.2.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
DISTFILES= # nothing
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 83ee14797c3..bdefdcd8170 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2003/03/09 19:17:56 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2003/05/02 11:55:18 wiz Exp $
DISTNAME= giram-0.3.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.giram.org/downloads/
diff --git a/graphics/gmngview/Makefile b/graphics/gmngview/Makefile
index 582cdde70b0..88510ae3030 100644
--- a/graphics/gmngview/Makefile
+++ b/graphics/gmngview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/04 13:56:31 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:18 wiz Exp $
#
DISTNAME= libmng-1.0.5
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/libmng/gmngview/}
WRKSRC= ${WRKDIR}/${DISTNAME}/contrib/gcc/gtk-mng-view
CATEGORIES= graphics
diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile
index 722ec50ecba..dd65c5ebb34 100644
--- a/graphics/gmplayer/Makefile
+++ b/graphics/gmplayer/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2003/04/21 18:07:32 tron Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:55:18 wiz Exp $
#
.include "../../graphics/mplayer-share/Makefile.common"
PKGNAME= gmplayer-${MPLAYER_PKG_VERSION}
+PKGREVISION= 1
SKIN_SITES= http://www.mplayerhq.hu/MPlayer/Skin/ \
ftp://ftp.mplayerhq.hu/MPlayer/Skin/ \
${MASTER_SITE_LOCAL:=mplayer}
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index db40e990377..2227c7b1f9d 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/12/01 13:49:41 salo Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:55:19 wiz Exp $
#
DISTNAME= gnome-iconedit-1.2.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= http://www.webtribe.net/i/iain/
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index c717d7b27ce..33f21ed1279 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 06:10:05 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:20 wiz Exp $
#
DISTNAME= gpaint-0.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpaint/}
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 4da552b48ba..c76c00246a8 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/02/05 05:06:35 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:55:20 wiz Exp $
DISTNAME= gphoto-0.4.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.gphoto.net/dist/
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index 71cb99e41d8..025c2fe2908 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/04 13:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:20 wiz Exp $
#
DISTNAME= gqview-1.3.1
+PKGREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/}
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 74d5213bb91..6dc1b6a0417 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2003/03/04 13:15:42 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2003/05/02 11:55:20 wiz Exp $
#
DISTNAME= gqview-1.2.2
+PKGREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/}
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 49e543199c7..88b5390dc7a 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/02/20 23:47:49 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:21 wiz Exp $
#
DISTNAME= gtkam-0.1.10
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index f1448aac651..6997a3db654 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/28 14:05:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:55:21 wiz Exp $
#
DISTNAME= gtkglext-0.7.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkglext/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gtkglext/buildlink2.mk b/graphics/gtkglext/buildlink2.mk
index bc86590f080..40f70c6baee 100644
--- a/graphics/gtkglext/buildlink2.mk
+++ b/graphics/gtkglext/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/04/28 14:05:37 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:55:21 wiz Exp $
#
# This Makefile fragment is included by packages that use gtkglext.
#
@@ -9,7 +9,7 @@
GTKGLEXT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtkglext
-BUILDLINK_DEPENDS.gtkglext?= gtkglext>=0.6.1
+BUILDLINK_DEPENDS.gtkglext?= gtkglext>=0.7.1nb1
BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext
EVAL_PREFIX+= BUILDLINK_PREFIX.gtkglext=gtkglext
diff --git a/graphics/gxine/Makefile b/graphics/gxine/Makefile
index 4bac75c91c8..7d796919315 100644
--- a/graphics/gxine/Makefile
+++ b/graphics/gxine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/11 09:24:23 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:21 wiz Exp $
#
DISTNAME= gxine-0.3.3
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index f8ccf8b2392..cb8c2ac322b 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2003/03/14 19:37:40 jlam Exp $
+# $NetBSD: Makefile,v 1.75 2003/05/02 11:55:22 wiz Exp $
#
DISTNAME= imlib-1.9.14
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/imlib/1.9/}
diff --git a/graphics/imlib/buildlink2.mk b/graphics/imlib/buildlink2.mk
index ecf1c73435f..be0fe600a00 100644
--- a/graphics/imlib/buildlink2.mk
+++ b/graphics/imlib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/11/26 12:32:20 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:55:22 wiz Exp $
.if !defined(IMLIB_BUILDLINK2_MK)
IMLIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= imlib
-BUILDLINK_DEPENDS.imlib?= imlib>=1.9.11nb2
+BUILDLINK_DEPENDS.imlib?= imlib>=1.9.14nb3
BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib
EVAL_PREFIX+= BUILDLINK_PREFIX.imlib=imlib
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 410b7e062a9..6949e973f3c 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/02/15 12:00:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:55:22 wiz Exp $
#
DISTNAME= imlib2-1.0.6
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
diff --git a/graphics/imlib2/buildlink2.mk b/graphics/imlib2/buildlink2.mk
index 172d7c03fd3..7e1e4ad5520 100644
--- a/graphics/imlib2/buildlink2.mk
+++ b/graphics/imlib2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:49 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:23 wiz Exp $
.if !defined(IMLIB2_BUILDLINK2_MK)
IMLIB2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= imlib2
-BUILDLINK_DEPENDS.imlib2?= imlib2>=1.0.3nb1
+BUILDLINK_DEPENDS.imlib2?= imlib2>=1.0.6nb1
BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2
EVAL_PREFIX+= BUILDLINK_PREFIX.imlib2=imlib2
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index d10621b59fa..309a3dd7929 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2002/10/14 11:55:17 markd Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:55:23 wiz Exp $
DISTNAME= kdegraphics-2.2.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
COMMENT= Graphics programs for the KDE integrated X11 desktop
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 16e7b0c7360..9d3264399a4 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/04/10 13:13:27 markd Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:55:23 wiz Exp $
DISTNAME= kdegraphics-3.1.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
COMMENT= Graphics programs for the KDE integrated X11 desktop
diff --git a/graphics/kdegraphics3/buildlink2.mk b/graphics/kdegraphics3/buildlink2.mk
index bfef08503be..de8d76e048f 100644
--- a/graphics/kdegraphics3/buildlink2.mk
+++ b/graphics/kdegraphics3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/12/24 06:10:07 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:55:23 wiz Exp $
#
# This Makefile fragment is included by packages that use kdegraphics.
#
@@ -7,7 +7,7 @@
KDEGRAPHICS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdegraphics
-BUILDLINK_DEPENDS.kdegraphics?= kdegraphics>=3.0.4nb1
+BUILDLINK_DEPENDS.kdegraphics?= kdegraphics>=3.1.1nb3
BUILDLINK_PKGSRCDIR.kdegraphics?= ../../graphics/kdegraphics3
EVAL_PREFIX+= BUILDLINK_PREFIX.kdegraphics=kdegraphics
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 850d1341cf5..4f61bac07cc 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/01/31 10:23:33 shell Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:24 wiz Exp $
DISTNAME= libexif-gtk-0.3.3
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libexif/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libexif-gtk/buildlink2.mk b/graphics/libexif-gtk/buildlink2.mk
index fef9036269d..d35641c34bb 100644
--- a/graphics/libexif-gtk/buildlink2.mk
+++ b/graphics/libexif-gtk/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/12/24 21:30:35 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:24 wiz Exp $
#
.if !defined(LIBEXIF_GTK_BUILDLINK2_MK)
LIBEXIF_GTK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libexif-gtk
-BUILDLINK_DEPENDS.libexif-gtk?= libexif-gtk>=0.3.2
+BUILDLINK_DEPENDS.libexif-gtk?= libexif-gtk>=0.3.3nb1
BUILDLINK_PKGSRCDIR.libexif-gtk?= ../../graphics/libexif-gtk
EVAL_PREFIX+= BUILDLINK_PREFIX.libexif-gtk=libexif-gtk
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 1c24acf2688..67cc408e630 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/02/28 10:26:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:55:24 wiz Exp $
#
DISTNAME= libgnomecanvas-2.2.0.2
+PKGREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libgnomecanvas/buildlink2.mk b/graphics/libgnomecanvas/buildlink2.mk
index 5eda1c1a695..dfe5660f7b9 100644
--- a/graphics/libgnomecanvas/buildlink2.mk
+++ b/graphics/libgnomecanvas/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 20:14:28 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:55:24 wiz Exp $
.if !defined(LIBGNOMECANVAS_BUILDLINK2_MK)
LIBGNOMECANVAS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgnomecanvas
-BUILDLINK_DEPENDS.libgnomecanvas?= libgnomecanvas>=2.2.0.1
+BUILDLINK_DEPENDS.libgnomecanvas?= libgnomecanvas>=2.2.0.2nb1
BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas
EVAL_PREFIX+= BUILDLINK_PREFIX.libgnomecanvas=libgnomecanvas
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index a117d07d001..b56c29edc65 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/12/24 06:10:07 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:55:24 wiz Exp $
#
DISTNAME= librsvg-1.0.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/1.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/librsvg/buildlink2.mk b/graphics/librsvg/buildlink2.mk
index e66e37bf195..57e7a8a38d1 100644
--- a/graphics/librsvg/buildlink2.mk
+++ b/graphics/librsvg/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:10:07 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:24 wiz Exp $
#
.if !defined(LIBRSVG_BUILDLINK2_MK)
LIBRSVG_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= librsvg
-BUILDLINK_DEPENDS.librsvg?= librsvg>=1.0.1nb2
+BUILDLINK_DEPENDS.librsvg?= librsvg>=1.0.1nb3
BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg
EVAL_PREFIX+= BUILDLINK_PREFIX.librsvg=librsvg
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 705ad2ea7b9..4c2b79d8989 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/12/24 06:10:08 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:25 wiz Exp $
#
DISTNAME= librsvg-2.0.1
PKGNAME= ${DISTNAME:S/-/2-/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/librsvg2/buildlink2.mk b/graphics/librsvg2/buildlink2.mk
index 2d59366bfc5..1f0e41df6a9 100644
--- a/graphics/librsvg2/buildlink2.mk
+++ b/graphics/librsvg2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:10:08 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:25 wiz Exp $
#
# This Makefile fragment is included by packages that use librsvg2.
#
@@ -9,7 +9,7 @@
LIBRSVG2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= librsvg2
-BUILDLINK_DEPENDS.librsvg2?= librsvg2>=2.0.1nb1
+BUILDLINK_DEPENDS.librsvg2?= librsvg2>=2.0.1nb2
BUILDLINK_PKGSRCDIR.librsvg2?= ../../graphics/librsvg2
EVAL_PREFIX+= BUILDLINK_PREFIX.librsvg2=librsvg2
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 40d21b8703e..99b8804aed2 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2003/01/20 21:46:48 drochner Exp $
+# $NetBSD: Makefile,v 1.35 2003/05/02 11:55:25 wiz Exp $
#
DISTNAME= libwmf-0.2.8
+PKGREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
diff --git a/graphics/libwmf/buildlink2.mk b/graphics/libwmf/buildlink2.mk
index fc40f7bdf62..488412b818e 100644
--- a/graphics/libwmf/buildlink2.mk
+++ b/graphics/libwmf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/12/24 06:10:08 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/02 11:55:25 wiz Exp $
.if !defined(LIBWMF_BUILDLINK2_MK)
LIBWMF_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libwmf
-BUILDLINK_DEPENDS.libwmf?= libwmf>=0.2.7nb1
+BUILDLINK_DEPENDS.libwmf?= libwmf>=0.2.8nb1
BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf
EVAL_PREFIX+= BUILDLINK_PREFIX.libwmf=libwmf
diff --git a/graphics/mencoder/Makefile b/graphics/mencoder/Makefile
index f436243e967..505efedda69 100644
--- a/graphics/mencoder/Makefile
+++ b/graphics/mencoder/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2003/03/22 03:13:37 salo Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:55:25 wiz Exp $
#
.include "../../graphics/mplayer-share/Makefile.common"
PKGNAME= mencoder-${MPLAYER_PKG_VERSION}
+PKGREVISION= 1
COMMENT= Simple movie encoder for MPlayer-playable movies
USE_BUILDLINK2= # defined
diff --git a/graphics/moz-flash/Makefile b/graphics/moz-flash/Makefile
index ad4edb342bd..8206cbd1881 100644
--- a/graphics/moz-flash/Makefile
+++ b/graphics/moz-flash/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2003/02/05 03:30:49 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:26 wiz Exp $
#
.include "../libflash/Makefile.common"
PKGNAME= moz-flash-1.0
-PKGREVISION= 2
+PKGREVISION= 3
MAINTAINER= joda@netbsd.org
COMMENT= Mozilla open source Flash(tm) plugin
diff --git a/graphics/moz-mplayer/Makefile b/graphics/moz-mplayer/Makefile
index 8b55f141703..d92f32b5858 100644
--- a/graphics/moz-mplayer/Makefile
+++ b/graphics/moz-mplayer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/19 07:32:05 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:26 wiz Exp $
#
DISTNAME= mplayerplug-in_v0.71
+PKGREVISION= 1
PKGNAME= moz-mplayer-0.71
WRKSRC= ${WRKDIR}/mplayerplug-in
CATEGORIES= graphics www
diff --git a/graphics/mplayer-share/Makefile b/graphics/mplayer-share/Makefile
index 0bffed0b7fb..6bcaae37fc9 100644
--- a/graphics/mplayer-share/Makefile
+++ b/graphics/mplayer-share/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/03/28 21:14:22 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:55:27 wiz Exp $
.include "Makefile.common"
PKGNAME= mplayer-share-${MPLAYER_PKG_VERSION}
+PKGREVISION= 1
COMMENT= Documentation and fonts used by mplayer and gmplayer
NO_BUILD= YES
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index 34d37080bd9..b2014e325b5 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2003/03/22 03:13:37 salo Exp $
+# $NetBSD: Makefile,v 1.33 2003/05/02 11:55:26 wiz Exp $
#
.include "../../graphics/mplayer-share/Makefile.common"
PKGNAME= mplayer-${MPLAYER_PKG_VERSION}
+PKGREVISION= 1
COMMENT= Software only MPEG-1/2/4 video decoder
USE_BUILDLINK2= # defined
diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile
index d5eb4caae2a..aa83ab33bbe 100644
--- a/graphics/ogle/Makefile
+++ b/graphics/ogle/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/04/23 02:22:24 jmc Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:55:27 wiz Exp $
DISTNAME= ogle-0.9.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
diff --git a/graphics/ogle/buildlink2.mk b/graphics/ogle/buildlink2.mk
index 96f88d397c2..6d536717cf0 100644
--- a/graphics/ogle/buildlink2.mk
+++ b/graphics/ogle/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/04/10 10:18:03 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:55:27 wiz Exp $
.if !defined(OGLE_BUILDLINK2_MK)
OGLE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= ogle
-BUILDLINK_DEPENDS.ogle?= ogle>=0.9.1
+BUILDLINK_DEPENDS.ogle?= ogle>=0.9.1nb1
BUILDLINK_PKGSRCDIR.ogle?= ../../graphics/ogle
EVAL_PREFIX+= BUILDLINK_PREFIX.ogle=ogle
diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile
index 27bc1c07e78..529e51d6a95 100644
--- a/graphics/ogle_gui/Makefile
+++ b/graphics/ogle_gui/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/04/10 10:22:10 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:55:27 wiz Exp $
DISTNAME= ogle_gui-0.9.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
diff --git a/graphics/openquicktime/Makefile b/graphics/openquicktime/Makefile
index cdcd4940151..2af9d574ef7 100644
--- a/graphics/openquicktime/Makefile
+++ b/graphics/openquicktime/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/23 10:06:54 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:27 wiz Exp $
#
DISTNAME= ${PKGNAME}-src
+PKGREVISION= 1
PKGNAME= openquicktime-1.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openquicktime/}
diff --git a/graphics/openquicktime/buildlink2.mk b/graphics/openquicktime/buildlink2.mk
index 2e124e5a64f..a7253faeb64 100644
--- a/graphics/openquicktime/buildlink2.mk
+++ b/graphics/openquicktime/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/04/23 10:26:42 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:27 wiz Exp $
#
# This Makefile fragment is included by packages that use openquicktime.
#
@@ -9,7 +9,7 @@
OPENQUICKTIME_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= openquicktime
-BUILDLINK_DEPENDS.openquicktime?= openquicktime>=1.0
+BUILDLINK_DEPENDS.openquicktime?= openquicktime>=1.0nb1
BUILDLINK_PKGSRCDIR.openquicktime?= ../../graphics/openquicktime
EVAL_PREFIX+= BUILDLINK_PREFIX.openquicktime=openquicktime
diff --git a/graphics/plasma/Makefile b/graphics/plasma/Makefile
index b74027336a4..f660ed0f77e 100644
--- a/graphics/plasma/Makefile
+++ b/graphics/plasma/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/08/27 19:17:57 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:28 wiz Exp $
#
DISTNAME= plasma-1.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.libsdl.org/projects/plasma/src/
diff --git a/graphics/ppmtoxvpic/Makefile b/graphics/ppmtoxvpic/Makefile
index f190668f185..4b693f150a9 100644
--- a/graphics/ppmtoxvpic/Makefile
+++ b/graphics/ppmtoxvpic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:16 fredb Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:28 wiz Exp $
#
PKGNAME= ppmtoxvpic-0.99.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MAINTAINER= hubertf@netbsd.org
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index a022c25032a..b65a0d83951 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/10/09 17:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:28 wiz Exp $
#
DISTNAME= pygimp-1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.daa.com.au/pub/james/pygimp/
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 8ddee1b98d3..dd24296955e 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/09/11 18:18:20 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:28 wiz Exp $
#
DISTNAME= qiv-1.8-src
+PKGREVISION= 1
PKGNAME= qiv-1.8
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
CATEGORIES= graphics
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 567290f5265..952e27ae5cc 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2002/12/16 18:06:13 tron Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:55:29 wiz Exp $
.include "../sane-backends/Makefile.common"
DISTNAME= sane-frontends-${SANE_VERSION}
+PKGREVISION= 1
COMMENT= Frontends for access to scanners, digitals camera, frame grabbers etc
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index e8e5eba1259..4d695363370 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/02/05 05:06:36 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:55:29 wiz Exp $
#
DISTNAME= scigraphica-0.8.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/}
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index 7529900b0f6..eeffc68ebf9 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/27 19:29:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:29 wiz Exp $
#
DISTNAME= scrot-0.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://linuxbrit.co.uk/downloads/
diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile
index bd44918b84b..d3f03dff4ec 100644
--- a/graphics/smpeg-xmms/Makefile
+++ b/graphics/smpeg-xmms/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/10 13:32:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:30 wiz Exp $
#
DISTNAME= smpeg-xmms-0.3.5
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/
@@ -9,8 +10,6 @@ MAINTAINER= jrp@hispabsd.org
HOMEPAGE= http://www.xmms.org/
COMMENT= MPEG video plugin using SDL/smpeg as the backend
-BUILDLINK_DEPENDS.smpeg= smpeg>=0.4.4
-
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index ec06291bd57..aefe8d9a527 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/03/13 14:33:20 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:55:30 wiz Exp $
#
DISTNAME= sodipodi-0.31
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sodipodi/}
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index defe5602791..f02ed6cdc9d 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/05/01 12:36:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:30 wiz Exp $
#
DISTNAME= swfdec-0.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swfdec/}
diff --git a/graphics/swfdec/buildlink2.mk b/graphics/swfdec/buildlink2.mk
index 73829110166..6c88df75682 100644
--- a/graphics/swfdec/buildlink2.mk
+++ b/graphics/swfdec/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/23 08:15:40 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:30 wiz Exp $
#
# This Makefile fragment is included by packages that use swfdec.
#
@@ -9,7 +9,7 @@
SWFDEC_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= swfdec
-BUILDLINK_DEPENDS.swfdec?= swfdec>=0.2.1
+BUILDLINK_DEPENDS.swfdec?= swfdec>=0.2.1nb2
BUILDLINK_PKGSRCDIR.swfdec?= ../../graphics/swfdec
EVAL_PREFIX+= BUILDLINK_PREFIX.swfdec=swfdec
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index e0e1cfeaaed..b2a3ec0fc63 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2003/03/02 19:47:24 jschauma Exp $
+# $NetBSD: Makefile,v 1.39 2003/05/02 11:55:31 wiz Exp $
#
DISTNAME= tgif-4.1.42
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ftp://bourbon.usc.edu/pub/tgif/free-of-charge/
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 1d7bdc65f86..cd81953345b 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/04/03 08:25:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:55:31 wiz Exp $
#
DISTNAME= tuxpaint-0.9.10
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
diff --git a/graphics/water/Makefile b/graphics/water/Makefile
index 95fcbedfbb6..04d6890a7b4 100644
--- a/graphics/water/Makefile
+++ b/graphics/water/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/08/27 19:18:37 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:31 wiz Exp $
#
DISTNAME= water-1.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.libsdl.org/projects/water/src/
diff --git a/graphics/xine-lib/Makefile b/graphics/xine-lib/Makefile
index 19e968e5dc2..c52ccec9f9b 100644
--- a/graphics/xine-lib/Makefile
+++ b/graphics/xine-lib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/04/11 09:52:16 rh Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:31 wiz Exp $
#
DISTNAME= xine-lib-1-beta10
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/-beta/.0rc/}
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
diff --git a/graphics/xine-lib/buildlink2.mk b/graphics/xine-lib/buildlink2.mk
index bcb69ac66af..7f57d0b8a17 100644
--- a/graphics/xine-lib/buildlink2.mk
+++ b/graphics/xine-lib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/04/11 09:52:16 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:55:31 wiz Exp $
#
# This Makefile fragment is included by packages that use xine-lib.
#
@@ -7,7 +7,7 @@
XINE_LIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= xine-lib
-BUILDLINK_DEPENDS.xine-lib?= xine-lib>=1.0rc10
+BUILDLINK_DEPENDS.xine-lib?= xine-lib>=1.0rc10nb1
BUILDLINK_PKGSRCDIR.xine-lib?= ../../graphics/xine-lib
EVAL_PREFIX+= BUILDLINK_PREFIX.xine-lib=xine-lib
diff --git a/graphics/xine-ui/Makefile b/graphics/xine-ui/Makefile
index bbca0a046f6..8f830dc2037 100644
--- a/graphics/xine-ui/Makefile
+++ b/graphics/xine-ui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/11 11:59:55 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:32 wiz Exp $
#
DISTNAME= xine-ui-0.9.20
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 2f213a39192..b5e561acdf1 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2003/01/09 15:43:09 mycroft Exp $
+# $NetBSD: Makefile,v 1.39 2003/05/02 11:55:32 wiz Exp $
DISTNAME= xsane-0.90
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.xsane.org/download/ \
http://gd.tuwien.ac.at/hci/sane/xsane/ \
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 0234a6a4974..5936fd71c6d 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2002/09/23 01:29:05 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:55:32 wiz Exp $
DISTNAME= xzgv-0.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://xzgv.browser.org/ \
ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/
diff --git a/inputmethod/Chinput/Makefile b/inputmethod/Chinput/Makefile
index 1c5911e0316..97865e4fccb 100644
--- a/inputmethod/Chinput/Makefile
+++ b/inputmethod/Chinput/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/09/23 02:39:34 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:32 wiz Exp $
DISTNAME= Chinput-3.0
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= http://download.linuxbyte.net/Chinese/Input/
diff --git a/inputmethod/ami/Makefile b/inputmethod/ami/Makefile
index 15947b89e51..41849bc4879 100644
--- a/inputmethod/ami/Makefile
+++ b/inputmethod/ami/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/12/08 03:24:26 salo Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:33 wiz Exp $
#
DISTNAME= ami-1.0.11
+PKGREVISION= 1
CATEGORIES= korean inputmethod
MASTER_SITES= http://www.kr.freebsd.org/~hwang/ami/
diff --git a/inputmethod/unicon-im/Makefile b/inputmethod/unicon-im/Makefile
index 424b32c5044..e7f00d41950 100644
--- a/inputmethod/unicon-im/Makefile
+++ b/inputmethod/unicon-im/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/04/18 13:39:37 kei Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:55:33 wiz Exp $
DISTNAME= unicon-1.2
PKGNAME= unicon-im-1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= inputmethod
MASTER_SITES= http://www.opencjk.org/~yumj/download/
diff --git a/inputmethod/unicon-im/buildlink2.mk b/inputmethod/unicon-im/buildlink2.mk
index cc7c3abc6b3..9b4f6bb15ea 100644
--- a/inputmethod/unicon-im/buildlink2.mk
+++ b/inputmethod/unicon-im/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/19 08:48:49 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:55:34 wiz Exp $
.if !defined(UNICON_IM_BUILDLINK2_MK)
UNICON_IM_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= unicon-im
-BUILDLINK_DEPENDS.unicon-im?= unicon-im>=1.2
+BUILDLINK_DEPENDS.unicon-im?= unicon-im>=1.2nb2
BUILDLINK_PKGSRCDIR.unicon-im?= ../../inputmethod/unicon-im
EVAL_PREFIX+= BUILDLINK_PREFIX.unicon-im=unicon-im
diff --git a/lang/cilk/Makefile b/lang/cilk/Makefile
index cb2ac385230..ae01aa898cf 100644
--- a/lang/cilk/Makefile
+++ b/lang/cilk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/10/13 12:17:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:55:34 wiz Exp $
DISTNAME= cilk-5.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang parallel
MASTER_SITES= http://supertech.lcs.mit.edu/cilk/ \
ftp://theory.lcs.mit.edu/pub/cilk/
diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common
index 5e263378741..a9980533aba 100644
--- a/lang/dylan-interpreter/Makefile.common
+++ b/lang/dylan-interpreter/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2002/11/14 21:45:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2003/05/02 11:55:34 wiz Exp $
#
DISTNAME= gwydion-dylan-${DYLAN_VERSION}
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://berlin.ccc.de/pub/gd/src/ \
ftp://ftp.fu-berlin.de/pub/unix/languages/dylan/src/ \
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 2ab2136963b..96f12b36c75 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/29 23:47:45 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:34 wiz Exp $
DISTNAME= otp_src_R9B-1
PKGNAME= erlang-9.1
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://www.erlang.org/download/
diff --git a/lang/gb/Makefile b/lang/gb/Makefile
index 47b6c10e222..ce398ff7e11 100644
--- a/lang/gb/Makefile
+++ b/lang/gb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/04/24 09:20:34 cjep Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:55:35 wiz Exp $
#
DISTNAME= gb-0.0.20
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gb/0.0/}
diff --git a/lang/gb/buildlink2.mk b/lang/gb/buildlink2.mk
index 647dc6bd474..4140f9bef6d 100644
--- a/lang/gb/buildlink2.mk
+++ b/lang/gb/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/12/24 06:10:10 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:55:35 wiz Exp $
.if !defined(GB_BUILDLINK2_MK)
GB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gb
-BUILDLINK_DEPENDS.gb?= gb>=0.0.20nb2
+BUILDLINK_DEPENDS.gb?= gb>=0.0.20nb3
BUILDLINK_PKGSRCDIR.gb?= ../../lang/gb
EVAL_PREFIX+= BUILDLINK_PREFIX.gb=gb
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index cb48e306f00..9c8f05e1251 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/15 08:27:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:35 wiz Exp $
#
DISTNAME= mono-0.23
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://www.go-mono.org/archive/
diff --git a/lang/mono/buildlink2.mk b/lang/mono/buildlink2.mk
index 2dae35a47a8..a878bbe6e39 100644
--- a/lang/mono/buildlink2.mk
+++ b/lang/mono/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/03/15 08:27:45 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:55:35 wiz Exp $
#
# This Makefile fragment is included by packages that use mono.
#
@@ -9,7 +9,7 @@
MONO_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= mono
-BUILDLINK_DEPENDS.mono?= mono>=0.23
+BUILDLINK_DEPENDS.mono?= mono>=0.23nb1
BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono
EVAL_PREFIX+= BUILDLINK_PREFIX.mono=mono
diff --git a/lang/python21-pth/Makefile b/lang/python21-pth/Makefile
index 6ac36ab0de2..e0466ea2d08 100644
--- a/lang/python21-pth/Makefile
+++ b/lang/python21-pth/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/01/22 17:05:33 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:35 wiz Exp $
#
DISTNAME= Python-2.1.3
PKGNAME= python21-pth-2.1.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ftp://ftp.python.org/pub/python/2.1.3/
EXTRACT_SUFX= .tgz
diff --git a/lang/python21-pth/buildlink2.mk b/lang/python21-pth/buildlink2.mk
index c113866d7d5..d49776861eb 100644
--- a/lang/python21-pth/buildlink2.mk
+++ b/lang/python21-pth/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/03/14 19:37:45 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:55:36 wiz Exp $
.if !defined(PYTHON21_BUILDLINK2_MK)
PYTHON21_BUILDLINK2_MK= # defined
@@ -7,7 +7,7 @@ PYTHON21_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= python21-pth
BUILDLINK_PKGBASE.python21-pth?= python21-pth
-BUILDLINK_DEPENDS.python21-pth?= python21-pth>=2.1
+BUILDLINK_DEPENDS.python21-pth?= python21-pth>=2.1.3nb2
BUILDLINK_PKGSRCDIR.python21-pth?= ../../lang/python21-pth
.if defined(BUILDLINK_DEPMETHOD.python)
diff --git a/lang/python22-pth/Makefile b/lang/python22-pth/Makefile
index 4d565e02eed..4798de94866 100644
--- a/lang/python22-pth/Makefile
+++ b/lang/python22-pth/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/12/25 16:57:43 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:36 wiz Exp $
#
DISTNAME= Python-2.2.2
+PKGREVISION= 1
PKGNAME= python22-pth-2.2.2
CATEGORIES= lang
MASTER_SITES= ftp://ftp.python.org/pub/python/2.2.2/
diff --git a/lang/python22-pth/buildlink2.mk b/lang/python22-pth/buildlink2.mk
index df4f418b200..e8a9a89c45e 100644
--- a/lang/python22-pth/buildlink2.mk
+++ b/lang/python22-pth/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/03/14 19:37:45 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:36 wiz Exp $
.if !defined(PYTHON22_BUILDLINK2_MK)
PYTHON22_BUILDLINK2_MK= # defined
@@ -7,7 +7,7 @@ PYTHON22_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= python22-pth
BUILDLINK_PKGBASE.python22-pth?= python22-pth
-BUILDLINK_DEPENDS.python22-pth?= python22-pth>=2.2
+BUILDLINK_DEPENDS.python22-pth?= python22-pth>=2.2.2nb1
BUILDLINK_PKGSRCDIR.python22-pth?= ../../lang/python22-pth
.if defined(BUILDLINK_DEPMETHOD.python)
diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index ab305f486fb..950e9cbc175 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/01/03 14:12:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:36 wiz Exp $
#
DISTNAME= GNUMail-1.0.3
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/GNUMail
CATEGORIES= mail gnustep
MASTER_SITES= http://extrovert.screwdriver.net/~extra/cgi-bin/
diff --git a/mail/Pantomime/Makefile b/mail/Pantomime/Makefile
index e8885cadef4..06efe6d27bb 100644
--- a/mail/Pantomime/Makefile
+++ b/mail/Pantomime/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/29 03:41:15 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:37 wiz Exp $
#
DISTNAME= Pantomime-1.0.5
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/Pantomime
CATEGORIES= mail gnustep
MASTER_SITES= http://extrovert.screwdriver.net/~extra/cgi-bin/
diff --git a/mail/Pantomime/buildlink2.mk b/mail/Pantomime/buildlink2.mk
index 8f0121da880..2fa13e57097 100644
--- a/mail/Pantomime/buildlink2.mk
+++ b/mail/Pantomime/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/29 03:41:15 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:37 wiz Exp $
#
# This Makefile fragment is included by packages that use Pantomime.
#
@@ -9,7 +9,7 @@
PANTOMIME_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= Pantomime
-BUILDLINK_DEPENDS.Pantomime?= Pantomime>=1.0.5
+BUILDLINK_DEPENDS.Pantomime?= Pantomime>=1.0.5nb1
BUILDLINK_PKGSRCDIR.Pantomime?= ../../mail/Pantomime
EVAL_PREFIX+= BUILDLINK_PREFIX.Pantomime=Pantomime
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 67d925c1824..772f47eccc6 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2003/04/26 03:09:30 rh Exp $
+# $NetBSD: Makefile,v 1.32 2003/05/02 11:55:37 wiz Exp $
#
DISTNAME= balsa-1.4.3
+PKGREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \
ftp://ftp.newton.cx/pub/balsa/
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index c2c65272684..65c52703264 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/27 00:42:58 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:37 wiz Exp $
#
DISTNAME= balsa-2.0.10
+PKGREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= http://balsa.gnome.org/ \
ftp://ftp.newton.cx/pub/balsa/
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index ed98b6b7fd9..8973e1e97cd 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/26 18:55:17 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:37 wiz Exp $
DISTNAME= clamav-0.54
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://clamav.elektrapro.com/stable/
diff --git a/mail/courier-authldap/Makefile b/mail/courier-authldap/Makefile
index 3cb2f1bc440..7c86504ed39 100644
--- a/mail/courier-authldap/Makefile
+++ b/mail/courier-authldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:28 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:55:38 wiz Exp $
PKGNAME= courier-authldap-${BASE_VERS}
-PKGREVISION?= # empty
+PKGREVISION?= 1
COMMENT= Courier LDAP authentication module
CONFLICTS= courier-imap-ldap-[0-9]*
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 84dc3f9544f..228ac12ba94 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2003/04/12 04:26:41 rh Exp $
+# $NetBSD: Makefile,v 1.36 2003/05/02 11:55:38 wiz Exp $
DISTNAME= evolution-1.2.4
+PKGREVISION= 1
CATEGORIES= mail time gnome
MASTER_SITES= ftp://ftp.ximian.com/pub/ximian-evolution/source/ \
ftp://ximian.netnitco.net/pub/mirrors/ximian/ximian-evolution/source/ \
@@ -26,10 +27,7 @@ BUILD_USES_MSGFMT= YES
# Using a wildcard here doesn't make sense because the version number of
# "db3" is hardcoded in the "configure" script and some source modules.
BUILDLINK_DEPENDS.db3= db3-3.11.2
-BUILDLINK_DEPENDS.gnome-vfs= gnome-vfs>=1.0.5
BUILDLINK_DEPENDS.libxml= libxml>=1.8.17
-BUILDLINK_DEPENDS.gal= gal>=0.22
-BUILDLINK_DEPENDS.gtkhtml= gtkhtml>=1.1.7
GNU_CONFIGURE= YES
USE_GMAKE= YES
diff --git a/mail/evolution/buildlink2.mk b/mail/evolution/buildlink2.mk
index 0f6276584e1..d125a9b9d0e 100644
--- a/mail/evolution/buildlink2.mk
+++ b/mail/evolution/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:10:11 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:38 wiz Exp $
#
.if !defined(EVOLUTION_BUILDLINK2_MK)
EVOLUTION_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= evolution
-BUILDLINK_DEPENDS.evolution?= evolution>=1.0.8nb5
+BUILDLINK_DEPENDS.evolution?= evolution>=1.2.4nb1
BUILDLINK_PKGSRCDIR.evolution?= ../../mail/evolution
EVAL_PREFIX+= BUILDLINK_PREFIX.evolution=evolution
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 2ef0eb3e222..396e7a195cc 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/11 13:56:31 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:38 wiz Exp $
DISTNAME= kbiff-3.6.3
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://devel-home.kde.org/~granroth/kbiff/
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index a5f45e3610f..dc158772ab5 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/01/19 08:48:49 tron Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:39 wiz Exp $
DISTNAME= libesmtp-1.0rc1
+PKGREVISION= 1
CATEGORIES= mail devel
MASTER_SITES= http://www.stafford.uklinux.net/libesmtp/ \
http://www.tobez.org/download/port-mirrors/mail/libesmtp/ \
diff --git a/mail/libesmtp/buildlink2.mk b/mail/libesmtp/buildlink2.mk
index 6bc38ca798c..455abc1b21c 100644
--- a/mail/libesmtp/buildlink2.mk
+++ b/mail/libesmtp/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/03/22 07:49:46 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:39 wiz Exp $
.if !defined(LIBESMTP_BUILDLINK2_MK)
LIBESMTP_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libesmtp
-BUILDLINK_DEPENDS.libesmtp?= libesmtp>=1.0rc1
+BUILDLINK_DEPENDS.libesmtp?= libesmtp>=1.0rc1nb1
BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp
EVAL_PREFIX+= BUILDLINK_PREFIX.libesmtp=libesmtp
diff --git a/mail/libmilter/Makefile b/mail/libmilter/Makefile
index c222f226fa5..57f8547035b 100644
--- a/mail/libmilter/Makefile
+++ b/mail/libmilter/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/23 13:03:31 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:39 wiz Exp $
.include "../../mail/sendmail/Makefile.common"
PKGNAME= libmilter-${DIST_VERS}
+PKGREVISION= 1
COMMENT= Mail filter support library for sendmail
USE_MILTER= YES
diff --git a/mail/libmilter/buildlink2.mk b/mail/libmilter/buildlink2.mk
index 4d8ecae5722..8a1635591a8 100644
--- a/mail/libmilter/buildlink2.mk
+++ b/mail/libmilter/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/23 13:03:31 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:39 wiz Exp $
#
# This Makefile fragment is included by packages that use libmilter.
#
@@ -7,7 +7,7 @@
LIBMILTER_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libmilter
-BUILDLINK_DEPENDS.libmilter?= libmilter>=8.12.6
+BUILDLINK_DEPENDS.libmilter?= libmilter>=8.12.9nb1
BUILDLINK_PKGSRCDIR.libmilter?= ../../mail/libmilter
EVAL_PREFIX+= BUILDLINK_PREFIX.libmilter=libmilter
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 001481f24d5..db5fc6a5155 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/04/28 12:47:11 markd Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:55:39 wiz Exp $
DISTNAME= mimedefang-2.33
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.roaringpenguin.com/mimedefang/
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 19ebe0f9134..f07d9d6432f 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2003/01/23 07:37:18 martti Exp $
+# $NetBSD: Makefile,v 1.68 2003/05/02 11:55:40 wiz Exp $
DISTNAME= pine4.53
PKGNAME= pine-4.53
+PKGREVISION= 1
CATEGORIES= mail news
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
ftp://ftp.fu-berlin.de/unix/mail/pine/
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 218807cb19f..9b77bf86174 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2003/05/01 14:07:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.94 2003/05/02 11:55:40 wiz Exp $
DISTNAME= postfix-2.0.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 5bf04fe478d..6233a72d574 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2003/05/01 15:19:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.59 2003/05/02 11:55:40 wiz Exp $
.include "../../mail/sendmail/Makefile.common"
PKGNAME= sendmail-${DIST_VERS}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= The well known Mail Transport Agent
MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index 3d691f10f14..934d85a9282 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/05/01 15:01:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:55:41 wiz Exp $
DISTNAME= sendmail.8.11.6
PKGNAME= sendmail-8.11.6
-PKGREVISION= 4
+PKGREVISION= 5
WRKSRC= ${WRKDIR}/${PKGNAME:C/nb[0-9]+$//}
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index 694ea201a96..1ac9a02aa0b 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/03 14:49:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:41 wiz Exp $
#
DISTNAME= spamass-milter-0.1.3a
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://savannah.nongnu.org/download/spamass-milt/
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index d807d04f205..3558ea01c8b 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/12/08 00:06:08 salo Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:55:41 wiz Exp $
#
DISTNAME= spruce-0.5.17
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=spruce/}
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 18f45c1d0ad..7005a3a6bd7 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/03/22 05:23:32 salo Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:55:42 wiz Exp $
#
DISTNAME= sylpheed-0.8.11claws
PKGNAME= sylpheed-claws-0.8.11
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail news x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
EXTRACT_SUFX= .tar.bz2
@@ -34,8 +34,6 @@ CONFIGURE_ARGS+= --enable-aspell
PKG_SYSCONFSUBDIR= sylpheed
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-BUILDLINK_DEPENDS.gpgme= gpgme>=0.3.10
-
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= USE_INET6 USE_OPENLDAP
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index d92cc43854d..d052aa21227 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2003/03/22 13:47:56 chris Exp $
+# $NetBSD: Makefile,v 1.37 2003/05/02 11:55:42 wiz Exp $
DISTNAME= sylpheed-0.8.11
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail news x11
MASTER_SITES= http://sylpheed.good-day.net/sylpheed/
EXTRACT_SUFX= .tar.bz2
@@ -30,8 +30,6 @@ CONFIGURE_ARGS+= --enable-compface
PKG_SYSCONFSUBDIR= sylpheed
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-BUILDLINK_DEPENDS.gpgme= gpgme>=0.3.10
-
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= USE_INET6 USE_OPENLDAP
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 298d8e234a9..a6ad8388c58 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2002/12/28 21:22:53 jschauma Exp $
+# $NetBSD: Makefile,v 1.28 2003/05/02 11:55:42 wiz Exp $
DISTNAME= xfmail-1.4.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail x11
MASTER_SITES= ftp://xfmail.ufies.org/pub/xfmail/release/1.4.7/source/
EXTRACT_SUFX= .tar.bz2
diff --git a/math/euler/Makefile b/math/euler/Makefile
index 4fd7046b34e..9e304efd56f 100644
--- a/math/euler/Makefile
+++ b/math/euler/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/04/29 22:22:44 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:43 wiz Exp $
DISTNAME= euler-1.60.6
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/euler-1.60/source
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=euler/}
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 0531185b273..00df6dc6d70 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 06:10:11 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:43 wiz Exp $
#
DISTNAME= gcalctool-4.1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcalctool/4.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 0965c7c0b93..2fb2944d127 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:42 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:43 wiz Exp $
#
DISTNAME= geg-1.0.1
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= http://www.infolaunch.com/~daveb/
@@ -9,7 +10,7 @@ MAINTAINER= chris@infolaunch.com
HOMEPAGE= http://www.infolaunch.com/~daveb/
COMMENT= Program for drawing 2D math functions within a nice GUI
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
GNU_CONFIGURE= yes
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index a760192cd2d..ed8165d0276 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2003/04/25 13:06:04 rh Exp $
+# $NetBSD: Makefile,v 1.71 2003/05/02 11:55:44 wiz Exp $
#
DISTNAME= gnumeric-1.0.13
+PKGREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.0/}
diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile
index d9d51684d27..6f03488ddfa 100644
--- a/math/gnumeric0/Makefile
+++ b/math/gnumeric0/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/12/24 06:10:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:55:44 wiz Exp $
#
DISTNAME= gnumeric-0.75
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/0.75/}
diff --git a/math/graphopt/Makefile b/math/graphopt/Makefile
index ff5152f44db..a92c96e1a78 100644
--- a/math/graphopt/Makefile
+++ b/math/graphopt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/20 11:14:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:44 wiz Exp $
#
DISTNAME= graphopt-0.3
+PKGREVISION= 1
CATEGORIES= math graphics
MASTER_SITES= http://switch.dl.sourceforge.net/sourceforge/graphopt/
EXTRACT_SUFX= .tgz
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 4e4ed83268d..121acd4d7d4 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/09/23 22:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:44 wiz Exp $
#
DISTNAME= grpn-1.1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= ftp://lashwhip.com/pub/ \
http://lashwhip.com/grpn/
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 38185116a25..d3594e82780 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2003/01/07 03:56:27 uebayasi Exp $
+# $NetBSD: Makefile,v 1.25 2003/05/02 11:55:45 wiz Exp $
DISTNAME= Guppi-0.40.3
PKGNAME= ${DISTNAME:S/G/g/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= math graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/Guppi/0.40/}
EXTRACT_SUFX= .tar.bz2
diff --git a/math/guppi/buildlink2.mk b/math/guppi/buildlink2.mk
index f0759a99aa5..2bda922eeb9 100644
--- a/math/guppi/buildlink2.mk
+++ b/math/guppi/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:10:12 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:45 wiz Exp $
.if !defined(GUPPI_BUILDLINK2_MK)
GUPPI_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= guppi
-BUILDLINK_DEPENDS.guppi?= guppi>=0.40.3nb2
+BUILDLINK_DEPENDS.guppi?= guppi>=0.40.3nb3
BUILDLINK_PKGSRCDIR.guppi?= ../../math/guppi
EVAL_PREFIX+= BUILDLINK_PREFIX.guppi=guppi
diff --git a/math/xeukleides/Makefile b/math/xeukleides/Makefile
index f0927309e8c..475c1f7a48c 100644
--- a/math/xeukleides/Makefile
+++ b/math/xeukleides/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/07 18:13:51 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:45 wiz Exp $
# FreeBSD Id: ports/math/eukleides/Makefile,v 1.1 2002/06/04 18:40:20 ijliao Exp
DISTNAME= xeukleides.0.9.0
+PKGREVISION= 1
PKGNAME= xeukleides-0.9.0
CATEGORIES= math
MASTER_SITES= http://perso.wanadoo.fr/obrecht/download/
diff --git a/meta-pkgs/edesktop/Makefile b/meta-pkgs/edesktop/Makefile
index ee2d1daf6b2..8f1976c8706 100644
--- a/meta-pkgs/edesktop/Makefile
+++ b/meta-pkgs/edesktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/03/28 21:14:23 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/02 11:55:45 wiz Exp $
#
DISTNAME= edesktop-1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= meta-pkgs x11
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 380e8fb7f28..0e87c9fc8c7 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/03/28 21:14:24 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:55:46 wiz Exp $
DISTNAME= gnome-1.4.2.1
+PKGREVISION= 1
CATEGORIES= meta-pkgs x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/meta-pkgs/gnome2/Makefile b/meta-pkgs/gnome2/Makefile
index 0817ec9b45e..f374ef9765d 100644
--- a/meta-pkgs/gnome2/Makefile
+++ b/meta-pkgs/gnome2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/04/29 08:28:48 rh Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:46 wiz Exp $
DISTNAME= gnome-2.2.3
+PKGREVISION= 1
CATEGORIES= meta-pkgs x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/meta-pkgs/gnustep/Makefile b/meta-pkgs/gnustep/Makefile
index c48459d6a31..e73de1dde63 100644
--- a/meta-pkgs/gnustep/Makefile
+++ b/meta-pkgs/gnustep/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/04/01 10:21:33 rh Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:46 wiz Exp $
#
DISTNAME= gnustep-1.6.0
+PKGREVISION= 1
CATEGORIES= meta-pkgs x11 gnustep
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/meta-pkgs/windowmaker-desktop/Makefile b/meta-pkgs/windowmaker-desktop/Makefile
index 9bf338e4642..5d5085912c1 100644
--- a/meta-pkgs/windowmaker-desktop/Makefile
+++ b/meta-pkgs/windowmaker-desktop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/04/26 09:49:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:55:46 wiz Exp $
#
DISTNAME= windowmaker-desktop-1.1
+PKGREVISION= 1
CATEGORIES= meta-pkgs x11 windowmaker
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index 8da5b32e239..4e06df3655e 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2003/04/06 11:48:25 tron Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:55:47 wiz Exp $
DISTNAME= bidwatcher-1.3.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bidwatcher/}
diff --git a/misc/blackbook/Makefile b/misc/blackbook/Makefile
index e302891c97a..2a4aa4e8c49 100644
--- a/misc/blackbook/Makefile
+++ b/misc/blackbook/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/02 21:18:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:47 wiz Exp $
#
DISTNAME= blackbook-3
+PKGREVISION= 1
PKGNAME= ${DISTNAME}.0
CATEGORIES= misc x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blackbook/}
diff --git a/misc/fooseti/Makefile b/misc/fooseti/Makefile
index e396effbf07..824afc2ebf3 100644
--- a/misc/fooseti/Makefile
+++ b/misc/fooseti/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/28 15:37:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:47 wiz Exp $
#
DISTNAME= fooseti-0.6.6
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://www-personal.engin.umich.edu/~agorski/fooseti/
diff --git a/misc/gkrellm-moon/Makefile b/misc/gkrellm-moon/Makefile
index 88541d73b51..00bb44ce041 100644
--- a/misc/gkrellm-moon/Makefile
+++ b/misc/gkrellm-moon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:25 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:47 wiz Exp $
DISTNAME= gkrellmoon-0.3
PKGNAME= gkrellm-moon-0.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/}
@@ -10,7 +10,7 @@ MAINTAINER= damon@netbsd.org
HOMEPAGE= http://gkrellmoon.sourceforge.net/
COMMENT= gkrellm moonclock plugin
-DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm
+DEPENDS+= gkrellm>=1.2.13nb1:../../sysutils/gkrellm
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index 445334e2c01..f64dfcff598 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:25 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:48 wiz Exp $
DISTNAME= gkrellweather-0.2.7
PKGNAME= gkrellm-weather-0.2.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= http://www.cse.unsw.edu.au/~flam/repository/c/gkrellm/
@@ -10,7 +10,7 @@ MAINTAINER= damon@netbsd.org
HOMEPAGE= http://www.cse.unsw.edu.au/~flam/programs/gkrellweather.html
COMMENT= gkrellm weather plugin
-DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm
+DEPENDS+= gkrellm>=1.2.13nb1:../../sysutils/gkrellm
DEPENDS+= wmWeather-1.3*:../../x11/wmweather
pre-install:
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 1621f4a2ab3..c29c833e6b8 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2003/01/11 04:24:31 rh Exp $
+# $NetBSD: Makefile,v 1.37 2003/05/02 11:55:48 wiz Exp $
DISTNAME= gnome-pim-1.4.6
+PKGREVISION= 1
CATEGORIES= misc x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-pim/1.4/}
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 3b50f45a8b5..58b5c0c8630 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2003/04/20 14:17:48 rh Exp $
+# $NetBSD: Makefile,v 1.59 2003/05/02 11:55:48 wiz Exp $
DISTNAME= gnome-utils-1.4.1.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-utils/1.4/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index aeb23cf096b..51f33eae075 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/21 03:34:02 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:48 wiz Exp $
#
DISTNAME= gnome-utils-2.2.1
+PKGREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-utils/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index 660deb19e82..fcf13140f4d 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/12/01 16:25:57 salo Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:55:49 wiz Exp $
#
DISTNAME= gperiodic-1.2.6
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/gperiodic
CATEGORIES= misc x11
MASTER_SITES= ftp://ftp.seul.org/pub/gperiodic/
diff --git a/misc/gpsdrive/Makefile b/misc/gpsdrive/Makefile
index bb1e61c5783..1959978da3b 100644
--- a/misc/gpsdrive/Makefile
+++ b/misc/gpsdrive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/01/10 07:42:02 cjep Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:49 wiz Exp $
DISTNAME= gpsdrive-1.31
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://gpsdrive.kraftvoll.at/
diff --git a/misc/gst-plugins/Makefile b/misc/gst-plugins/Makefile
index a1be84e029f..724b9f56777 100644
--- a/misc/gst-plugins/Makefile
+++ b/misc/gst-plugins/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/25 04:43:50 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:49 wiz Exp $
#
DISTNAME= gst-plugins-0.6.1
+PKGREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gst-plugins/0.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/gst-plugins/buildlink2.mk b/misc/gst-plugins/buildlink2.mk
index c94b9315f20..6b3a8f9219b 100644
--- a/misc/gst-plugins/buildlink2.mk
+++ b/misc/gst-plugins/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/25 04:43:51 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:49 wiz Exp $
#
# This Makefile fragment is included by packages that use gst-plugins.
#
@@ -7,7 +7,7 @@
GST_PLUGINS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gst-plugins
-BUILDLINK_DEPENDS.gst-plugins?= gst-plugins>=0.6.1
+BUILDLINK_DEPENDS.gst-plugins?= gst-plugins>=0.6.1nb1
BUILDLINK_PKGSRCDIR.gst-plugins?= ../../misc/gst-plugins
EVAL_PREFIX+= BUILDLINK_PREFIX.gst-plugins=gst-plugins
diff --git a/misc/gstreamer/Makefile b/misc/gstreamer/Makefile
index 5003271b042..3f89d407bfd 100644
--- a/misc/gstreamer/Makefile
+++ b/misc/gstreamer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/25 04:39:55 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:55:50 wiz Exp $
#
DISTNAME= gstreamer-0.6.1
+PKGREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gstreamer/0.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/gstreamer/buildlink2.mk b/misc/gstreamer/buildlink2.mk
index 683e704bdf0..58d6f4115e6 100644
--- a/misc/gstreamer/buildlink2.mk
+++ b/misc/gstreamer/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/25 04:39:55 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:50 wiz Exp $
#
# This Makefile fragment is included by packages that use gstreamer.
#
@@ -9,7 +9,7 @@
GSTREAMER_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gstreamer
-BUILDLINK_DEPENDS.gstreamer?= gstreamer>=0.6.1
+BUILDLINK_DEPENDS.gstreamer?= gstreamer>=0.6.1nb1
BUILDLINK_PKGSRCDIR.gstreamer?= ../../misc/gstreamer
EVAL_PREFIX+= BUILDLINK_PREFIX.gstreamer=gstreamer
diff --git a/misc/hitchhiker/Makefile b/misc/hitchhiker/Makefile
index 99b60be10f8..0b730a3e819 100644
--- a/misc/hitchhiker/Makefile
+++ b/misc/hitchhiker/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/12/08 00:24:44 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:55:51 wiz Exp $
#
DISTNAME= hh2000-0.6
PKGNAME= hitchhiker-0.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hitchhiker/}
diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile
index cc64e864d90..95fde48bbcc 100644
--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/10/13 11:38:16 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:51 wiz Exp $
#
DISTNAME= kanjipad-1.2.1
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.gtk.org/pub/users/otaylor/kanjipad/
diff --git a/misc/kdeaddons2/Makefile b/misc/kdeaddons2/Makefile
index 8a339b866e3..bfcb3c7aa6a 100644
--- a/misc/kdeaddons2/Makefile
+++ b/misc/kdeaddons2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/09/20 03:00:06 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:55:51 wiz Exp $
DISTNAME= kdeaddons-2.2.2
+PKGREVISION= 1
COMMENT= Add ons for the KDE integrated X11 desktop
.include "../../x11/kde2/Makefile.kde2"
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 96fe9a0726b..7d1ffd6b949 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/04/01 12:27:08 markd Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:51 wiz Exp $
DISTNAME= kdeaddons-3.1.1
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Add ons for the KDE integrated X11 desktop
diff --git a/misc/kdeadmin2/Makefile b/misc/kdeadmin2/Makefile
index d914d2b5504..a2cb89280f1 100644
--- a/misc/kdeadmin2/Makefile
+++ b/misc/kdeadmin2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/01/22 19:36:00 skrll Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:55:52 wiz Exp $
DISTNAME= kdeadmin-2.2.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
COMMENT= System administration tools for the KDE integrated X11 desktop
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index 34349d10a81..f9fc86b0419 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/04/01 12:27:09 markd Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:52 wiz Exp $
DISTNAME= kdeadmin-3.1.1
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= System administration tools for the KDE integrated X11 desktop
diff --git a/misc/kdeartwork2/Makefile b/misc/kdeartwork2/Makefile
index 25d1c6dcdec..fd57f6dbbe5 100644
--- a/misc/kdeartwork2/Makefile
+++ b/misc/kdeartwork2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/09/20 02:51:57 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:52 wiz Exp $
DISTNAME= kdeartwork-2.2.2
+PKGREVISION= 1
COMMENT= Artwork for the KDE integrated X11 desktop
.include "../../x11/kde2/Makefile.kde2"
diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile
index afa6a24b16a..1543a6dd64c 100644
--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/04/01 12:27:09 markd Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:53 wiz Exp $
DISTNAME= kdeartwork-3.1.1
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Artwork for the KDE integrated X11 desktop
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 5f762f86bfe..e3cc8f1725f 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/04/01 12:27:10 markd Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:55:53 wiz Exp $
DISTNAME= kdeedu-3.1.1
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop
diff --git a/misc/kdepim2/Makefile b/misc/kdepim2/Makefile
index fc16b4fa870..366e1169c18 100644
--- a/misc/kdepim2/Makefile
+++ b/misc/kdepim2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/02/13 14:40:17 agc Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:55:54 wiz Exp $
DISTNAME= kdepim-2.2.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
COMMENT= Personal Information Management tools for the KDE desktop
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index f45f3faa22c..b9840b7c24c 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/04/01 12:27:10 markd Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:55:54 wiz Exp $
DISTNAME= kdepim-3.1.1
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Personal Information Management tools for the KDE desktop
diff --git a/misc/kdepim3/buildlink2.mk b/misc/kdepim3/buildlink2.mk
index d88a4e3ffcf..42c66936e91 100644
--- a/misc/kdepim3/buildlink2.mk
+++ b/misc/kdepim3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:42 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:54 wiz Exp $
#
# This Makefile fragment is included by packages that use kdepim.
#
@@ -9,7 +9,7 @@
KDEPIM_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdepim
-BUILDLINK_DEPENDS.kdepim?= kdepim>=3.0.5.1
+BUILDLINK_DEPENDS.kdepim?= kdepim>=3.1.1nb1
BUILDLINK_PKGSRCDIR.kdepim?= ../../misc/kdepim3
EVAL_PREFIX+= BUILDLINK_PREFIX.kdepim=kdepim
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 0e72f20062d..6c946bcec36 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/02/18 00:35:51 jtb Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:55:54 wiz Exp $
DISTNAME= kdeutils-2.2.2
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Utilities for the KDE integrated X11 desktop
CONFLICTS= efax-[0-9]*
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 40d5264e596..79b3d0559e5 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/04/01 12:27:10 markd Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:55:55 wiz Exp $
DISTNAME= kdeutils-3.1.1
+PKGREVISION= 1
COMMENT= Utilities for the KDE integrated X11 desktop
CONFLICTS= efax-[0-9]*
diff --git a/misc/kdeutils3/buildlink2.mk b/misc/kdeutils3/buildlink2.mk
index 9c245f7a7fd..f2372558eef 100644
--- a/misc/kdeutils3/buildlink2.mk
+++ b/misc/kdeutils3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/03/11 13:22:31 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:55 wiz Exp $
#
# This Makefile fragment is included by packages that use kdeutils.
#
@@ -9,7 +9,7 @@
KDEUTILS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdeutils
-BUILDLINK_DEPENDS.kdeutils?= kdeutils>=3.1
+BUILDLINK_DEPENDS.kdeutils?= kdeutils>=3.1.1nb1
BUILDLINK_PKGSRCDIR.kdeutils?= ../../misc/kdeutils3
EVAL_PREFIX+= BUILDLINK_PREFIX.kdeutils=kdeutils
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 5d21dfa0ad6..d5c1c0f040b 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/04/09 13:57:14 markd Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/02 11:55:55 wiz Exp $
DISTNAME= koffice-1.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc kde
MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.2.1/src/ \
ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.2.1/src/ \
diff --git a/misc/koffice/buildlink2.mk b/misc/koffice/buildlink2.mk
index 095cc1c5c42..40281326ab9 100644
--- a/misc/koffice/buildlink2.mk
+++ b/misc/koffice/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:42 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:55 wiz Exp $
#
# This Makefile fragment is included by packages that use koffice.
#
@@ -9,7 +9,7 @@
KOFFICE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= koffice
-BUILDLINK_DEPENDS.koffice?= koffice>=1.2nb1
+BUILDLINK_DEPENDS.koffice?= koffice>=1.2.1nb2
BUILDLINK_PKGSRCDIR.koffice?= ../../misc/koffice
EVAL_PREFIX+= BUILDLINK_PREFIX.koffice=koffice
diff --git a/misc/koffice11/Makefile b/misc/koffice11/Makefile
index 846c866267f..ca6a09f2e9b 100644
--- a/misc/koffice11/Makefile
+++ b/misc/koffice11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/10/08 14:39:30 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:55 wiz Exp $
DISTNAME= koffice-1.1.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc kde
MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.1.1/src/ \
ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.1.1/src/ \
diff --git a/misc/koffice11/buildlink2.mk b/misc/koffice11/buildlink2.mk
index d085dda0024..f16e82b59d2 100644
--- a/misc/koffice11/buildlink2.mk
+++ b/misc/koffice11/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:43 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:55:56 wiz Exp $
#
# This Makefile fragment is included by packages that use koffice.
#
@@ -9,7 +9,7 @@
KOFFICE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= koffice
-BUILDLINK_DEPENDS.koffice?= koffice>=1.1.1nb1
+BUILDLINK_DEPENDS.koffice?= koffice>=1.1.1nb2
BUILDLINK_PKGSRCDIR.koffice?= ../../misc/koffice11
EVAL_PREFIX+= BUILDLINK_PREFIX.koffice=koffice
diff --git a/misc/kstars/Makefile b/misc/kstars/Makefile
index 9a840044830..7af69b57e66 100644
--- a/misc/kstars/Makefile
+++ b/misc/kstars/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:56 wiz Exp $
# FreeBSD Id: ports/astro/kstars/Makefile,v 1.7 2002/03/31 06:52:00 pat Exp
DISTNAME= kstars-0.9.kde2
+PKGREVISION= 1
PKGNAME= kstars-0.9
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= misc
diff --git a/misc/ktail/Makefile b/misc/ktail/Makefile
index 0a31e9fc7e2..20f3533b3f2 100644
--- a/misc/ktail/Makefile
+++ b/misc/ktail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/09/20 11:56:14 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:55:56 wiz Exp $
DISTNAME= ktail-0.5.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc kde
MASTER_SITES= http://www.franken.de/users/duffy1/rjakob/
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 377dfb2ce10..6ba88bcd018 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2003/04/06 19:41:09 magick Exp $
+# $NetBSD: Makefile,v 1.25 2003/05/02 11:55:56 wiz Exp $
DISTNAME= nxtvepg-2.5.0
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nxtvepg/}
diff --git a/misc/ooqstart/Makefile b/misc/ooqstart/Makefile
index 7ea94c279a2..78a604ecb22 100644
--- a/misc/ooqstart/Makefile
+++ b/misc/ooqstart/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/12/24 06:10:16 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:57 wiz Exp $
#
DISTNAME= ooqstart-0.8.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ooqstart/}
EXTRACT_SUFX= .tgz
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index d6bc88d5e3f..9861c8dda82 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2003/03/14 19:37:51 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2003/05/02 11:55:57 wiz Exp $
DISTNAME= openoffice-0.0.0.641
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/oo_641_src/config_office
CATEGORIES= misc
MASTER_SITES= http://sf1.mirror.openoffice.org/641b/ \
diff --git a/net/IglooFTP/Makefile b/net/IglooFTP/Makefile
index 80034001626..23d2ce133d9 100644
--- a/net/IglooFTP/Makefile
+++ b/net/IglooFTP/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:57 wiz Exp $
DISTNAME= IglooFTP-0.6.1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/src
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/network/file-transfer/} \
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 797ad343541..8de975def2e 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.84 2003/01/19 13:48:18 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2003/05/02 11:55:58 wiz Exp $
#
DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ORBit/0.${ORBIT_MAJOR}/}
diff --git a/net/ORBit/buildlink2.mk b/net/ORBit/buildlink2.mk
index d9dfd23205f..eac3837ebec 100644
--- a/net/ORBit/buildlink2.mk
+++ b/net/ORBit/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/09/23 19:57:29 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:55:58 wiz Exp $
.if !defined(ORBIT_BUILDLINK2_MK)
ORBIT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= ORBit
-BUILDLINK_DEPENDS.ORBit?= ORBit>=0.5.12
+BUILDLINK_DEPENDS.ORBit?= ORBit>=0.5.15nb4
BUILDLINK_PKGSRCDIR.ORBit?= ../../net/ORBit
EVAL_PREFIX+= BUILDLINK_PREFIX.ORBit=ORBit
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 7bfeaabbbe1..4ea1dc9cd1f 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/01/22 09:25:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:55:58 wiz Exp $
#
DISTNAME= ORBit2-2.6.0
+PKGREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ORBit2/2.6/}
EXTRACT_SUFX= .tar.bz2
@@ -18,8 +19,6 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/ORBit-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit-CosNaming-2.0.pc.in
-BUILDLINK_DEPENDS.linc= linc>=1.0.0
-
.include "../../net/linc/buildlink2.mk"
.include "../../net/libIDL/buildlink2.mk"
.include "../../devel/popt/buildlink2.mk"
diff --git a/net/ORBit2/buildlink2.mk b/net/ORBit2/buildlink2.mk
index 94751f68e5e..559cba27ce0 100644
--- a/net/ORBit2/buildlink2.mk
+++ b/net/ORBit2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/12/24 06:10:17 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/05/02 11:55:58 wiz Exp $
.if !defined(ORBIT2_BUILDLINK2_MK)
ORBIT2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= orbit2
-BUILDLINK_DEPENDS.orbit2?= ORBit2>=2.5.0nb1
+BUILDLINK_DEPENDS.orbit2?= ORBit2>=2.6.0nb1
BUILDLINK_PKGSRCDIR.orbit2?= ../../net/ORBit2
EVAL_PREFIX+= BUILDLINK_PREFIX.orbit2=orbit2
diff --git a/net/SDL_net/Makefile b/net/SDL_net/Makefile
index 40698737788..f32826f5d62 100644
--- a/net/SDL_net/Makefile
+++ b/net/SDL_net/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/08/27 19:01:41 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:58 wiz Exp $
#
DISTNAME= SDL_net-1.2.3
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.libsdl.org/projects/SDL_net/release/
diff --git a/net/SDL_net/buildlink2.mk b/net/SDL_net/buildlink2.mk
index 6f0e80abf1b..02c14735ad9 100644
--- a/net/SDL_net/buildlink2.mk
+++ b/net/SDL_net/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:10 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:55:59 wiz Exp $
.if !defined(SDL_NET_BUILDLINK2_MK)
SDL_NET_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= SDL_net
-BUILDLINK_DEPENDS.SDL_net?= SDL_net>=1.2.0
+BUILDLINK_DEPENDS.SDL_net?= SDL_net>=1.2.3nb1
BUILDLINK_PKGSRCDIR.SDL_net?= ../../net/SDL_net
EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_net=SDL_net
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 56d38ac1c2f..d1c5011e333 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/02/18 14:56:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:55:59 wiz Exp $
#
DISTNAME= bug-buddy-2.2.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/bug-buddy/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/dc_gui/Makefile b/net/dc_gui/Makefile
index 94f843ac109..83a4b2c3327 100644
--- a/net/dc_gui/Makefile
+++ b/net/dc_gui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/01/28 13:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:55:59 wiz Exp $
#
DISTNAME= dc_gui-0.66
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.ac2i.tzo.com/dctc/ \
http://brainz.servebeer.com/dctc/
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index fa7efd47b92..26550df439b 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/01/28 13:41:16 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:55:59 wiz Exp $
#
DISTNAME= dctc-0.84.1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.ac2i.tzo.com/dctc/ \
http://brainz.servebeer.com/dctc/
diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile
index e92cfdf4a10..3d3cec8a160 100644
--- a/net/driftnet/Makefile
+++ b/net/driftnet/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/04/25 20:22:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:00 wiz Exp $
#
DISTNAME= driftnet-0.1.6
+PKGREVISION= 1
CATEGORIES= graphics net
MASTER_SITES= http://www.ex-parrot.com/~chris/driftnet/
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index a707ede13a7..912f3b6a44c 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/27 14:35:34 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:00 wiz Exp $
#
DISTNAME= etherape-0.9.0
+PKGREVISION= 1
CATEGORIES= gnome net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/}
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 3d48634828f..466d0aed44c 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2003/04/17 07:17:01 tron Exp $
+# $NetBSD: Makefile,v 1.75 2003/05/02 11:56:00 wiz Exp $
DISTNAME= ethereal-0.9.11
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.ethereal.com/pub/ethereal/ \
ftp://ftp.sunet.se/pub/network/monitoring/ethereal/
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 18c192b8b2b..a891fcfde7b 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/02/09 23:15:54 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:56:01 wiz Exp $
DISTNAME= ettercap-0.6.9
+PKGREVISION= 1
CATEGORIES= security net
MASTER_SITES= http://ettercap.sourceforge.net/download/
diff --git a/net/firewalk-gtk/Makefile b/net/firewalk-gtk/Makefile
index e15922ce331..3bcfe1be462 100644
--- a/net/firewalk-gtk/Makefile
+++ b/net/firewalk-gtk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:01 wiz Exp $
DISTNAME= firewalk-1.0
+PKGREVISION= 1
PKGNAME= firewalk-gtk-1.0
WRKSRC= ${WRKDIR}/${DISTNAME:C/f/F/}
CATEGORIES= net security
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 9c462450b3c..cf8ee791668 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/12 05:56:49 jmc Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:01 wiz Exp $
DISTNAME= freeradius-0.7
CATEGORIES= net
-PKGREVISION= 1
+PKGREVISION= 2
MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
ftp://ftp.Awfulhak.org/pub/radius/
diff --git a/net/gftp/Makefile b/net/gftp/Makefile
index f62bc35ea1f..06b023fd4f8 100644
--- a/net/gftp/Makefile
+++ b/net/gftp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/04/27 14:39:12 cjep Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:56:02 wiz Exp $
DISTNAME= gftp-2.0.8
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= http://gftp.seul.org/ \
ftp://gftp.seul.org/pub/gftp/ \
diff --git a/net/gkrellm-ping/Makefile b/net/gkrellm-ping/Makefile
index f0ff506a199..b36cde9dfb5 100644
--- a/net/gkrellm-ping/Makefile
+++ b/net/gkrellm-ping/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:28 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:02 wiz Exp $
DISTNAME= gkrellmPing-0.2-3
PKGNAME= gkrellm-ping-0.2.3
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/gkrellmPing
CATEGORIES= net sysutils
MASTER_SITES= http://gkrellmping.dweb.ro/downloads/
@@ -11,7 +11,7 @@ MAINTAINER= damon@netbsd.org
HOMEPAGE= http://gkrellmping.dweb.ro/
COMMENT= gkrellm ping plugin
-DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm
+DEPENDS+= gkrellm>=1.2.13nb1:../../sysutils/gkrellm
USE_GMAKE= #defined
diff --git a/net/gkrellm-snmp/Makefile b/net/gkrellm-snmp/Makefile
index c015467488f..23f69263643 100644
--- a/net/gkrellm-snmp/Makefile
+++ b/net/gkrellm-snmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/10/09 14:26:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:02 wiz Exp $
DISTNAME= gkrellm_snmp-0.18
PKGNAME= gkrellm-snmp-0.18
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net sysutils
MASTER_SITES= http://triq.net/gkrellm/
diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index ea4a1fb7f4d..dfeddb438e5 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/10/09 14:17:41 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:02 wiz Exp $
DISTNAME= gkrellmwireless-0.2.2
PKGNAME= gkrellm-wireless-0.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net sysutils
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index d3c2e079c80..a013e991c6d 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/03/27 15:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2003/05/02 11:56:03 wiz Exp $
DISTNAME= gnapster-1.5.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnapster/}
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index 820ba2efcb4..c78e43c52f5 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/04/22 13:49:04 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:56:03 wiz Exp $
#
DISTNAME= gnet-2.0.1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.gnetlibrary.org/src/
diff --git a/net/gnet/buildlink2.mk b/net/gnet/buildlink2.mk
index aa07d74f31d..e2664216e32 100644
--- a/net/gnet/buildlink2.mk
+++ b/net/gnet/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/04/15 12:19:17 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:56:03 wiz Exp $
#
# This Makefile fragment is included by packages that use gnet.
#
@@ -7,7 +7,7 @@
GNET_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnet
-BUILDLINK_DEPENDS.gnet?= gnet>=2.0.0
+BUILDLINK_DEPENDS.gnet?= gnet>=2.0.1nb1
BUILDLINK_PKGSRCDIR.gnet?= ../../net/gnet
EVAL_PREFIX+= BUILDLINK_PREFIX.gnet=gnet
diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile
index 29573259152..be8441fcc75 100644
--- a/net/gnet1/Makefile
+++ b/net/gnet1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/04/23 08:25:08 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:03 wiz Exp $
#
DISTNAME= gnet-1.1.8
+PKGREVISION= 1
PKGNAME= gnet1-1.1.8
CATEGORIES= net
MASTER_SITES= http://www.gnetlibrary.org/src/
diff --git a/net/gnet1/buildlink2.mk b/net/gnet1/buildlink2.mk
index 0f3af5ca0f0..a709eae8c18 100644
--- a/net/gnet1/buildlink2.mk
+++ b/net/gnet1/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/04/15 12:17:19 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:56:03 wiz Exp $
#
# This Makefile fragment is included by packages that use gnet1.
#
@@ -9,7 +9,7 @@
GNET1_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnet1
-BUILDLINK_DEPENDS.gnet1?= gnet1>=1.1.7nb1
+BUILDLINK_DEPENDS.gnet1?= gnet1>=1.1.8nb1
BUILDLINK_PKGSRCDIR.gnet1?= ../../net/gnet1
EVAL_PREFIX+= BUILDLINK_PREFIX.gnet1=gnet1
diff --git a/net/gnubile/Makefile b/net/gnubile/Makefile
index 283b22d1bb1..fbf7004f89d 100644
--- a/net/gnubile/Makefile
+++ b/net/gnubile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:30 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:04 wiz Exp $
DISTNAME= gnubile-0.20
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= http://gnutella.wego.com/file_depot/0-10000000/110000-120000/116705/folder/127699/
@@ -9,7 +9,7 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://gnutella.wego.com/
COMMENT= Unix Gnutella client for GNOME
-DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb5:../../x11/gnome-core
USE_GMAKE= YES
USE_X11= YES
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 7d8a29a018b..9ad7ecdf01d 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2002/11/25 15:20:26 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/02 11:56:04 wiz Exp $
#
DISTNAME= gtk-gnutella-0.91.1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/}
diff --git a/net/gtk_wicontrol/Makefile b/net/gtk_wicontrol/Makefile
index 131d71e6b14..722b4e28a8c 100644
--- a/net/gtk_wicontrol/Makefile
+++ b/net/gtk_wicontrol/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/03/04 15:04:45 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:05 wiz Exp $
DISTNAME= gtk_wicontrol-0.17
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.izawa.org/software/gtk_wicontrol/
diff --git a/net/gtksamba/Makefile b/net/gtksamba/Makefile
index 1f62d56586a..2b0ba359a98 100644
--- a/net/gtksamba/Makefile
+++ b/net/gtksamba/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/02/25 04:18:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:56:05 wiz Exp $
#
DISTNAME= gtksamba-0.3.2pl1
+PKGREVISION= 1
PKGNAME= gtksamba-0.3.2.1
CATEGORIES= net
MASTER_SITES= http://www.open-systems.com/gtksamba/
@@ -10,7 +11,7 @@ MAINTAINER= packages@NetBSD.org
HOMEPAGE= http://www.open-systems.com/gtksamba.html
COMMENT= Samba configuration tool for X Window System
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index c627d04ad2b..de065c9906d 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/12/24 06:10:18 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:56:05 wiz Exp $
#
DISTNAME= gtm-0.4.11
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtm/}
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index a8256586397..819556f38f1 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/06 11:06:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:05 wiz Exp $
#
DISTNAME= iplog-2.2.3
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ojnk/}
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index df189ed395f..a207b63746b 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/04/09 05:05:12 taca Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:56:06 wiz Exp $
.include "Makefile.common"
PKGNAME= ja-samba-${SAMBA_BASE_VERS:S/b/.2/}.${SAMBA_JA_VERS}
+PKGREVISION= 1
CATEGORIES= net
MAINTAINER= tech-pkg-ja@jp.netbsd.org
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index fd30681b7ee..71433b0c1c9 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2002/12/06 19:35:13 tron Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:56:06 wiz Exp $
DISTNAME= kdenetwork-2.2.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net
COMMENT= Network modules for the KDE integrated X11 desktop
diff --git a/net/kdenetwork2/buildlink2.mk b/net/kdenetwork2/buildlink2.mk
index e25d0caa9b9..fc6cd3086e7 100644
--- a/net/kdenetwork2/buildlink2.mk
+++ b/net/kdenetwork2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:43 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:56:06 wiz Exp $
#
# This Makefile fragment is included by packages that use kdenetwork.
#
@@ -9,7 +9,7 @@
KDENETWORK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdenetwork
-BUILDLINK_DEPENDS.kdenetwork?= kdenetwork>=2.2.2nb4
+BUILDLINK_DEPENDS.kdenetwork?= kdenetwork>=2.2.2nb5
BUILDLINK_PKGSRCDIR.kdenetwork?= ../../net/kdenetwork2
EVAL_PREFIX+= BUILDLINK_PREFIX.kdenetwork=kdenetwork
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index c5bc9470041..c89ef695f96 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/04/01 12:27:10 markd Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:56:06 wiz Exp $
DISTNAME= kdenetwork-3.1.1
+PKGREVISION= 1
CATEGORIES= net
COMMENT= Network modules for the KDE integrated X11 desktop
diff --git a/net/kdenetwork3/buildlink2.mk b/net/kdenetwork3/buildlink2.mk
index 4595beea78c..6386d9c8363 100644
--- a/net/kdenetwork3/buildlink2.mk
+++ b/net/kdenetwork3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/03/11 13:13:27 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:56:06 wiz Exp $
#
# This Makefile fragment is included by packages that use kdenetwork.
#
@@ -9,7 +9,7 @@
KDENETWORK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdenetwork
-BUILDLINK_DEPENDS.kdenetwork?= kdenetwork>=3.1
+BUILDLINK_DEPENDS.kdenetwork?= kdenetwork>=3.1.1nb1
BUILDLINK_PKGSRCDIR.kdenetwork?= ../../net/kdenetwork3
EVAL_PREFIX+= BUILDLINK_PREFIX.kdenetwork=kdenetwork
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index 23d9e4f52ad..081617a0c5f 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/01/22 08:58:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:56:07 wiz Exp $
#
DISTNAME= libIDL-0.8.0
+PKGREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libIDL/0.8/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/libIDL/buildlink2.mk b/net/libIDL/buildlink2.mk
index 34f58a1d9aa..f27073a6fde 100644
--- a/net/libIDL/buildlink2.mk
+++ b/net/libIDL/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:10:19 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:56:07 wiz Exp $
.if !defined(LIBIDL2_BUILDLINK2_MK)
LIBIDL2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= idl
-BUILDLINK_DEPENDS.idl?= libIDL>=0.7.4nb3
+BUILDLINK_DEPENDS.idl?= libIDL>=0.8.0nb1
BUILDLINK_PKGSRCDIR.idl?= ../../net/libIDL
EVAL_PREFIX+= BUILDLINK_PREFIX.idl=idl
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 60502befe5b..da7cbf76aeb 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/01/22 08:29:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:56:07 wiz Exp $
#
DISTNAME= linc-1.0.1
+PKGREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/linc/1.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/linc/buildlink2.mk b/net/linc/buildlink2.mk
index 6c580ffc3bb..5175fa06d3c 100644
--- a/net/linc/buildlink2.mk
+++ b/net/linc/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/12/24 06:10:19 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:56:07 wiz Exp $
.if !defined(LINC_BUILDLINK2_MK)
LINC_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= linc
-BUILDLINK_DEPENDS.linc?= linc>=0.7.0nb1
+BUILDLINK_DEPENDS.linc?= linc>=1.0.1nb1
BUILDLINK_PKGSRCDIR.linc?= ../../net/linc
EVAL_PREFIX+= BUILDLINK_PREFIX.linc=linc
diff --git a/net/lmule/Makefile b/net/lmule/Makefile
index 203b7e50848..4d2422f17fc 100644
--- a/net/lmule/Makefile
+++ b/net/lmule/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/16 14:54:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:07 wiz Exp $
#
DISTNAME= lmule-1.1.13
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lmule/}
diff --git a/net/lopster/Makefile b/net/lopster/Makefile
index 10d37b411d3..1cbe9872dad 100644
--- a/net/lopster/Makefile
+++ b/net/lopster/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/15 05:44:41 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:08 wiz Exp $
#
DISTNAME= lopster-1.2.0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lopster/}
@@ -9,8 +10,8 @@ MAINTAINER= ad@netbsd.org
HOMEPAGE= http://lopster.sourceforge.net/
COMMENT= Yet another Gtk+ Napster clone
-DEPENDS+= glib>=1.2.0:../../devel/glib
-DEPENDS+= gtk+>=1.2.8:../../x11/gtk
+DEPENDS+= glib>=1.2.10nb5:../../devel/glib
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 666391269b7..9f86c4ba9c2 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/31 15:56:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:08 wiz Exp $
#
DISTNAME= mldonkey-2.04rc1.sources
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/.sources//}
WRKSRC= ${WRKDIR}/mldonkey
CATEGORIES= net
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index 7d5ff99e074..9e72d078199 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/01/09 16:36:05 mycroft Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:56:08 wiz Exp $
#
DISTNAME= mtr-0.52
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/-/-gtk-/}
CATEGORIES= net
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
diff --git a/net/napshare/Makefile b/net/napshare/Makefile
index f2035f12322..7285a80c2e3 100644
--- a/net/napshare/Makefile
+++ b/net/napshare/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/09/02 14:50:01 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:09 wiz Exp $
DISTNAME= napshare-1.1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=napshare/}
@@ -8,7 +9,7 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://napshare.sourceforge.net/
COMMENT= Fully featured Gnutella P2P client made to run 24/7 unattended
-DEPENDS= gtk+-1.2.*:../../x11/gtk
+DEPENDS= gtk+>=1.2.10nb4:../../x11/gtk
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/net/nmapfe/Makefile b/net/nmapfe/Makefile
index 8f3cde2f606..b6cfc5f2d0b 100644
--- a/net/nmapfe/Makefile
+++ b/net/nmapfe/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/04/28 20:49:50 salo Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:56:09 wiz Exp $
#
DISTNAME= nmap-3.27
PKGNAME= nmapfe-0.9.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net security
MASTER_SITES= http://www.insecure.org/nmap/dist/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/nprobe/Makefile b/net/nprobe/Makefile
index 8701c809be4..5c99758e102 100644
--- a/net/nprobe/Makefile
+++ b/net/nprobe/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:56:10 wiz Exp $
DISTNAME= nProbe-source-1.3.1
+PKGREVISION= 1
PKGNAME= nprobe-1.3.1
WRKSRC= ${WRKDIR}/nProbe
CATEGORIES= net
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 2ff8c0b324f..6bac9c2c63b 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:10 wiz Exp $
DISTNAME= ns-src-2.1b9a
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/b/rc/:S/-src//}
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
CATEGORIES= net
diff --git a/net/ntop2/Makefile b/net/ntop2/Makefile
index 1ed6dbafc3f..bce53754eb9 100644
--- a/net/ntop2/Makefile
+++ b/net/ntop2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:56:10 wiz Exp $
DISTNAME= ntop-2.1.54
PKGNAME= ntop2-2.1.54
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/${DISTNAME}/ntop
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ntop/}
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 90551d86ebd..bfe8275bed3 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:56:11 wiz Exp $
#
DISTNAME= openh323_1.10.4
+PKGREVISION= 1
PKGNAME= openh323-1.10.4
WRKSRC= ${WRKDIR}/openh323
CATEGORIES= net
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 85c0c41971b..474b58f3a71 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2003/04/10 11:58:55 uebayasi Exp $
+# $NetBSD: Makefile,v 1.97 2003/05/02 11:56:11 wiz Exp $
.include "Makefile.common"
+PKGREVISION= 1
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.samba.org/
diff --git a/net/soup/Makefile b/net/soup/Makefile
index 2f31bf9f49e..e10088dd11e 100644
--- a/net/soup/Makefile
+++ b/net/soup/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/01/13 21:28:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:11 wiz Exp $
#
DISTNAME= soup-0.7.10
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/soup/0.7/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/soup/buildlink2.mk b/net/soup/buildlink2.mk
index c982c229aa4..1411cb17990 100644
--- a/net/soup/buildlink2.mk
+++ b/net/soup/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:10:19 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:56:11 wiz Exp $
#
# This Makefile fragment is included by packages that use soup.
#
@@ -9,7 +9,7 @@
SOUP_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= soup
-BUILDLINK_DEPENDS.soup?= soup>=0.7.10nb1
+BUILDLINK_DEPENDS.soup?= soup>=0.7.10nb3
BUILDLINK_PKGSRCDIR.soup?= ../../net/soup
EVAL_PREFIX+= BUILDLINK_PREFIX.soup=soup
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 14812be0e3e..36b2d6b57e3 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:12 wiz Exp $
#
DISTNAME= ${BASENAME}-src-${VER}
+PKGREVISION= 1
PKGNAME= ${BASENAME}-${VER}
WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= net
diff --git a/net/spread/buildlink2.mk b/net/spread/buildlink2.mk
index 2879ab95d63..55abec527b0 100644
--- a/net/spread/buildlink2.mk
+++ b/net/spread/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/03/28 21:24:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:56:12 wiz Exp $
.if !defined(SPREAD_BUILDLINK2_MK)
SPREAD_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= spread
-BUILDLINK_DEPENDS.spread?= spread>=3.17.0
+BUILDLINK_DEPENDS.spread?= spread>=3.17.0nb1
BUILDLINK_PKGSRCDIR.spread?= ../../net/spread
EVAL_PREFIX+= BUILDLINK_PREFIX.spread=spread
diff --git a/net/wistumbler/Makefile b/net/wistumbler/Makefile
index c5243caa0de..20f0a1debc7 100644
--- a/net/wistumbler/Makefile
+++ b/net/wistumbler/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:12 wiz Exp $
DISTNAME= wistumbler-20020811-2
+PKGREVISION= 1
PKGNAME= wistumbler-20020811.2
WRKSRC= ${WRKDIR}/wistumbler
CATEGORIES= net
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 56c2b251c5b..a6604644a16 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2003/04/27 14:40:11 cjep Exp $
+# $NetBSD: Makefile,v 1.30 2003/05/02 11:56:12 wiz Exp $
#
DISTNAME= xtraceroute-0.8.14
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net x11
MASTER_SITES= http://www.dtek.chalmers.se/~d3august/xt/dl/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/news/pan-gnome/Makefile b/news/pan-gnome/Makefile
index 9a68984d20e..7db45bce9d2 100644
--- a/news/pan-gnome/Makefile
+++ b/news/pan-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/15 10:26:35 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:13 wiz Exp $
#
DISTNAME= pan-0.11.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= news gnome
MASTER_SITES= http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/SOURCE/
EXTRACT_SUFX= .tar.bz2
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 0094e7e35b6..e5072d1ebe5 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/04/15 12:17:43 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/02 11:56:13 wiz Exp $
#
DISTNAME= pan-0.13.4
-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/parallel/linda/Makefile b/parallel/linda/Makefile
index 2923e35a66f..7bdb707ac42 100644
--- a/parallel/linda/Makefile
+++ b/parallel/linda/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/12/24 06:10:20 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:14 wiz Exp $
#
DISTNAME= linda-0.1.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= parallel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=linda/}
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 8f2ff045c5e..7da4c5d9f09 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2003/04/20 08:26:15 rh Exp $
+# $NetBSD: Makefile,v 1.38 2003/05/02 11:56:14 wiz Exp $
#
DISTNAME= ggv-1.0.2
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ggv/1.0/}
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index a5ad0a0a749..4aa2d668354 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/25 06:34:01 rh Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:14 wiz Exp $
#
DISTNAME= ggv-2.0.0
+PKGREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ggv/2.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index 0f1deef772b..352875236c1 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/04/23 17:32:59 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:56:15 wiz Exp $
#
DISTNAME= gimp-print-4.2.5
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index b5d9226f015..49b7ac6fcfa 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2003/01/10 07:46:43 cjep Exp $
+# $NetBSD: Makefile,v 1.55 2003/05/02 11:56:15 wiz Exp $
#
DISTNAME= gnome-print-0.36
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-print/0.36/}
diff --git a/print/gnome-print/buildlink2.mk b/print/gnome-print/buildlink2.mk
index ebb029a88f3..6bb401be266 100644
--- a/print/gnome-print/buildlink2.mk
+++ b/print/gnome-print/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/12/24 06:10:22 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:56:15 wiz Exp $
.if !defined(GNOME_PRINT_BUILDLINK2_MK)
GNOME_PRINT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-print
-BUILDLINK_DEPENDS.gnome-print?= gnome-print>=0.36nb1
+BUILDLINK_DEPENDS.gnome-print?= gnome-print>=0.36nb2
BUILDLINK_PKGSRCDIR.gnome-print?= ../../print/gnome-print
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-print=gnome-print
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index cba4bf1a260..8f85b8c8b5e 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/03/12 13:03:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:56:15 wiz Exp $
#
DISTNAME= libgnomeprint-2.2.1.2
+PKGREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprint/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/print/libgnomeprint/buildlink2.mk b/print/libgnomeprint/buildlink2.mk
index 8db74c2d8f0..c1916600e5a 100644
--- a/print/libgnomeprint/buildlink2.mk
+++ b/print/libgnomeprint/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/03/12 13:03:30 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/05/02 11:56:15 wiz Exp $
#
# This Makefile fragment is included by packages that use libgnomeprint.
#
@@ -9,7 +9,7 @@
LIBGNOMEPRINT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgnomeprint
-BUILDLINK_DEPENDS.libgnomeprint?= libgnomeprint>=2.2.1.2
+BUILDLINK_DEPENDS.libgnomeprint?= libgnomeprint>=2.2.1.2nb1
BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
EVAL_PREFIX+= BUILDLINK_PREFIX.libgnomeprint=libgnomeprint
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 9dcc8c210de..fbb3d1a3360 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/03/12 13:03:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:56:16 wiz Exp $
#
DISTNAME= libgnomeprintui-2.2.1.2
+PKGREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/print/libgnomeprintui/buildlink2.mk b/print/libgnomeprintui/buildlink2.mk
index e2826d1c5ac..a88e1bc0438 100644
--- a/print/libgnomeprintui/buildlink2.mk
+++ b/print/libgnomeprintui/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/03/12 13:03:31 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/02 11:56:16 wiz Exp $
#
# This Makefile fragment is included by packages that use libgnomeprintui.
#
@@ -9,7 +9,7 @@
LIBGNOMEPRINTUI_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgnomeprintui
-BUILDLINK_DEPENDS.libgnomeprintui?= libgnomeprintui>=2.2.1.2
+BUILDLINK_DEPENDS.libgnomeprintui?= libgnomeprintui>=2.2.1.2nb1
BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
EVAL_PREFIX+= BUILDLINK_PREFIX.libgnomeprintui=libgnomeprintui
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 922052c1911..4c0b1aeedea 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:23 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:56:16 wiz Exp $
DISTNAME= scribus-0.7.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= http://web2.altmuehlnet.de/fschmid/
diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile
index acae04b7b8a..3fff6dce19e 100644
--- a/security/amavis-perl/Makefile
+++ b/security/amavis-perl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/28 15:33:13 tron Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:16 wiz Exp $
DISTNAME= amavisd-${VERSION}
PKGNAME= amavis-perl-${VERSION}
+PKGREVISION= 1
CATEGORIES= security mail
MASTER_SITES= http://www.amavis.org/dist/perl/ \
${MASTER_SITE_SOURCEFORGE:=amavis/}
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index a9f0498b434..0495b759dc5 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2003/01/10 07:48:48 cjep Exp $
+# $NetBSD: Makefile,v 1.42 2003/05/02 11:56:16 wiz Exp $
#
DISTNAME= gnupg-1.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ \
ftp://ftp.planetmirror.com/pub/gnupg/ \
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 59069ad7491..6d6aeeb5177 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:38 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:17 wiz Exp $
#
DISTNAME= gpa-0.4.3
+PKGREVISION= 1
CATEGORIES= x11 security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/alpha/gpa/
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index cd81f2ffc24..4c757236220 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/03/11 00:11:31 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:56:17 wiz Exp $
#
DISTNAME= gpgme-0.3.15
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/
diff --git a/security/gpgme/buildlink2.mk b/security/gpgme/buildlink2.mk
index f8bab6ad3c8..658d0edfa61 100644
--- a/security/gpgme/buildlink2.mk
+++ b/security/gpgme/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/03/11 00:11:31 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:56:17 wiz Exp $
#
.if !defined(GPGME_BUILDLINK2_MK)
GPGME_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gpgme
-BUILDLINK_DEPENDS.gpgme?= gpgme>=0.3.15
+BUILDLINK_DEPENDS.gpgme?= gpgme>=0.3.15nb1
BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme
EVAL_PREFIX+= BUILDLINK_PREFIX.gpgme=gpgme
diff --git a/security/gtk-systrace/Makefile b/security/gtk-systrace/Makefile
index 3fdbe127924..841a3ff772d 100644
--- a/security/gtk-systrace/Makefile
+++ b/security/gtk-systrace/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/18 03:49:56 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:17 wiz Exp $
#
DISTNAME= gtk-systrace-2002-12-01
+PKGREVISION= 1
PKGNAME= gtk-systrace-20021201
WRKSRC= ${WRKDIR}/notification-0.1
CATEGORIES= security x11
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 0f336e6068e..895cc685329 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/16 11:12:21 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:18 wiz Exp $
#
DISTNAME= kssh-0.7
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kssh/}
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index f9856b34195..bbaf32032a4 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:18 wiz Exp $
#
DISTNAME= nessus-core-${VERS}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/nessus-core
.include "../nessus/Makefile.common"
diff --git a/security/nessus-core/buildlink2.mk b/security/nessus-core/buildlink2.mk
index ae7bf65ad4d..9df6be4315b 100644
--- a/security/nessus-core/buildlink2.mk
+++ b/security/nessus-core/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/19 18:30:14 frueauf Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:56:19 wiz Exp $
#
.if !defined(NESSUS_CORE_BUILDLINK2_MK)
NESSUS_CORE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= nessus-core
-BUILDLINK_DEPENDS.nessus-core?= nessus-core>=1.2.7
+BUILDLINK_DEPENDS.nessus-core?= nessus-core>=1.2.7nb1
BUILDLINK_PKGSRCDIR.nessus-core?= ../../security/nessus-core
EVAL_PREFIX+= BUILDLINK_PREFIX.nessus-core=nessus-core
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index acdf9cba6f8..5054ded3da4 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:19 wiz Exp $
#
DISTNAME= nessus-plugins-${VERS}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/nessus-plugins
.include "../nessus/Makefile.common"
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index f90c8cf0c57..19e1cc0f960 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.13 2003/03/28 21:14:32 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:56:18 wiz Exp $
#
DISTNAME= nessus-${VERS}
+PKGREVISION= 1
MASTER_SITES= # empty
DISTFILES= # empty
.include "../nessus/Makefile.common"
COMMENT= The Nessus Network Security Scanner
-DEPENDS+= nessus-core-${VERS}:../nessus-core
-DEPENDS+= nessus-plugins-${VERS}:../nessus-plugins
+DEPENDS+= nessus-core-${VERS}nb1:../nessus-core
+DEPENDS+= nessus-plugins-${VERS}nb1:../nessus-plugins
USE_X11= yes
EXTRACT_ONLY= # empty
diff --git a/security/otpcalc/Makefile b/security/otpcalc/Makefile
index 71466f4f294..5b90f0daef2 100644
--- a/security/otpcalc/Makefile
+++ b/security/otpcalc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/11/15 00:15:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:19 wiz Exp $
#
DISTNAME= otpCalc-0.96
+PKGREVISION= 1
CATEGORIES= x11 security
MASTER_SITES= http://original.killa.net/infosec/otpCalc/
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index dffb33ba48b..3e15b681a08 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/07/13 21:35:15 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:56:19 wiz Exp $
#
DISTNAME= pam_ldap-150
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= security
MASTER_SITES= ftp://ftp.padl.com/pub/
@@ -10,7 +11,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.padl.com/pam_ldap.html
COMMENT= pluggable authentication module for LDAP directories
-DEPENDS+= openldap-[0-9]*:../../databases/openldap
+DEPENDS+= openldap>=2.0.27nb3:../../databases/openldap
DEPENDS+= PAM-[0-9]*:../../security/PAM
GNU_CONFIGURE= YES
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index c77d83c8fb1..c395c33d756 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/02/18 14:56:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:20 wiz Exp $
DISTNAME= seahorse-0.7.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=seahorse/}
@@ -11,7 +11,6 @@ COMMENT= GnuPG front end and bonobo component for Gnome
DEPENDS= gnupg>=1.2.1:../../security/gnupg
DEPENDS+= gnome2-dirs>=1.0:../../misc/gnome2-dirs
-BUILDLINK_DEPENDS.gpgme= gpgme>=0.3.14
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/sysutils/GWLib/buildlink2.mk b/sysutils/GWLib/buildlink2.mk
index e57fd9cbdda..1462cedd5ed 100644
--- a/sysutils/GWLib/buildlink2.mk
+++ b/sysutils/GWLib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/09/28 02:19:03 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:56:20 wiz Exp $
#
# This Makefile fragment is included by packages that use GWLib.
#
@@ -9,7 +9,7 @@
GWLIB_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= GWLib
-BUILDLINK_DEPENDS.GWLib?= GWLib>=0.4
+BUILDLINK_DEPENDS.GWLib?= GWLib>=0.4nb1
BUILDLINK_PKGSRCDIR.GWLib?= ../../sysutils/GWLib
EVAL_PREFIX+= BUILDLINK_PREFIX.GWLib=GWLib
diff --git a/sysutils/cfengine2/Makefile.common b/sysutils/cfengine2/Makefile.common
index e041daba313..78f90ae4f86 100644
--- a/sysutils/cfengine2/Makefile.common
+++ b/sysutils/cfengine2/Makefile.common
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2003/04/26 08:33:00 seb Exp $
+# $NetBSD: Makefile.common,v 1.4 2003/05/02 11:56:20 wiz Exp $
#
CFENGINE_VERSION= 2.0.6
DISTNAME= cfengine-${CFENGINE_VERSION}
+PKGREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
http://sunsite.utk.edu/ftp/pub/cfengine/cfengine-ftp/
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 00039c725a0..be93068b5df 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/11/10 00:35:08 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:56:20 wiz Exp $
#
DISTNAME= cdrdao-1.1.7.src
+PKGREVISION= 1
PKGNAME= gcdmaster-1.1.7
WRKSRC= ${WRKDIR}/cdrdao-1.1.7
CATEGORIES= sysutils
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index c0afea4cbd4..97fc0402c9c 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2003/02/15 08:34:20 salo Exp $
+# $NetBSD: Makefile,v 1.33 2003/05/02 11:56:21 wiz Exp $
#
DISTNAME= gcombust-0.1.54
+PKGREVISION= 1
CATEGORIES= x11 sysutils
MASTER_SITES= ${HOMEPAGE}
diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile
index f186006e77a..b3f5fa144f1 100644
--- a/sysutils/gentoo/Makefile
+++ b/sysutils/gentoo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/01/28 22:04:15 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:56:21 wiz Exp $
#
DISTNAME= gentoo-0.11.34
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gentoo/}
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 49f98bad7ec..5bbf0160cc6 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/02/15 09:33:03 salo Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:56:22 wiz Exp $
#
DISTNAME= gkrellm-1.2.13
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://web.wt.net/~billw/gkrellm/
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gkrellm/buildlink2.mk b/sysutils/gkrellm/buildlink2.mk
index b322cddbe3c..993f673c7f2 100644
--- a/sysutils/gkrellm/buildlink2.mk
+++ b/sysutils/gkrellm/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/09 14:17:59 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:56:22 wiz Exp $
#
.if !defined(GKRELLM_BUILDLINK2_MK)
GKRELLM_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gkrellm
-BUILDLINK_DEPENDS.gkrellm?= gkrellm>=1.2.11nb1
+BUILDLINK_DEPENDS.gkrellm?= gkrellm>=1.2.13nb1
BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm
EVAL_PREFIX+= BUILDLINK_PREFIX.gkrellm=gkrellm
diff --git a/sysutils/gkx86info/Makefile b/sysutils/gkx86info/Makefile
index be35d009437..815dce4aafb 100644
--- a/sysutils/gkx86info/Makefile
+++ b/sysutils/gkx86info/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/08/12 00:32:27 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:22 wiz Exp $
#
DISTNAME= gkx86info0.0.2
+PKGREVISION= 1
PKGNAME= gkx86info-0.0.2
CATEGORIES= sysutils
MASTER_SITES= http://asdfnews.org/yargon/
@@ -10,7 +11,7 @@ MAINTAINER= ptiJo@noos.fr
HOMEPAGE= http://asdfnews.org/yargon/
COMMENT= gkrellm plugin that prints the current clock speed
-DEPENDS+= gkrellm>=1.2:../../sysutils/gkrellm
+DEPENDS+= gkrellm>=1.2.13nb1:../../sysutils/gkrellm
ONLY_FOR_PLATFORM= *-*-i386
diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index 54127d46105..03e94252f0f 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2002/12/24 06:10:24 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2003/05/02 11:56:22 wiz Exp $
PKGNAME= g${DISTNAME}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES+= gnome
COMMENT= GNOME version of Midnight Commander, a free Norton Commander Clone
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 6f3d1eebc03..2536fc8d2e6 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2003/04/29 04:54:08 cjep Exp $
+# $NetBSD: Makefile,v 1.29 2003/05/02 11:56:23 wiz Exp $
DISTNAME= gnome-vfs-1.0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/1.0/}
diff --git a/sysutils/gnome-vfs/buildlink2.mk b/sysutils/gnome-vfs/buildlink2.mk
index d526e3584de..ea8cb3cf244 100644
--- a/sysutils/gnome-vfs/buildlink2.mk
+++ b/sysutils/gnome-vfs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/01/10 12:41:33 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:56:23 wiz Exp $
.if !defined(GNOME_VFS_BUILDLINK2_MK)
GNOME_VFS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-vfs
-BUILDLINK_DEPENDS.gnome-vfs?= gnome-vfs>=1.0.2nb1
+BUILDLINK_DEPENDS.gnome-vfs?= gnome-vfs>=1.0.5nb2
BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-vfs=gnome-vfs
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index ec298df2dfd..1f3abb7d05c 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/04/27 14:44:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:56:23 wiz Exp $
#
DISTNAME= gnome-vfs-2.2.4
PKGNAME= ${DISTNAME:S/vfs/vfs2/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-vfs2/buildlink2.mk b/sysutils/gnome-vfs2/buildlink2.mk
index 99ffcd5062c..a7012516ad3 100644
--- a/sysutils/gnome-vfs2/buildlink2.mk
+++ b/sysutils/gnome-vfs2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/04/27 14:44:33 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:56:23 wiz Exp $
.if !defined(GNOME_VFS2_BUILDLINK2_MK)
GNOME_VFS2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-vfs2
-BUILDLINK_DEPENDS.gnome-vfs2?= gnome-vfs2>=2.2.4nb1
+BUILDLINK_DEPENDS.gnome-vfs2?= gnome-vfs2>=2.2.4nb2
BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-vfs2=gnome-vfs2
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 31343665384..9c997181799 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:24 wiz Exp $
#
DISTNAME= gtoaster1.0Beta5
+PKGREVISION= 1
PKGNAME= gnometoaster-1.0Beta5
WRKSRC= ${WRKDIR}/gtoaster
CATEGORIES= sysutils
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index fac15ab80dd..7e744c013b9 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:01 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:24 wiz Exp $
DISTNAME= grun-0.9.2
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://www.geocities.com/ResearchTriangle/Facility/1468/sg/
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index e8d279be190..f16848cd4b9 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2003/01/10 07:51:59 cjep Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:56:24 wiz Exp $
DISTNAME= gtop-1.0.13
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtop/1.0/}
diff --git a/sysutils/gworkspace/Makefile.common b/sysutils/gworkspace/Makefile.common
index cb30ccbf7ab..c4de32e9aff 100644
--- a/sysutils/gworkspace/Makefile.common
+++ b/sysutils/gworkspace/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2003/03/29 12:42:28 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/05/02 11:56:25 wiz Exp $
#
DISTNAME= gworkspace-0.4
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/gworkspace
CATEGORIES?= sysutils gnustep
MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/ \
diff --git a/sysutils/koncd/Makefile b/sysutils/koncd/Makefile
index 7ac9d058805..0e8137949f6 100644
--- a/sysutils/koncd/Makefile
+++ b/sysutils/koncd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/09/20 12:03:46 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:25 wiz Exp $
DISTNAME= koncd-0.7.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${HOMEPAGE}download/
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index c03ef27cd11..c0fd7f90f4c 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2001/02/17 17:42:15 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2003/05/02 11:56:25 wiz Exp $
# FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
#
+PKGREVISION= 1
COMMENT= Midnight Commander, a free Norton Commander Clone
CONFIGURE_ARGS+= --without-x
diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index e8517a44a0c..cd8efed1d3d 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/10/19 10:54:58 rh Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:26 wiz Exp $
#
DISTNAME= medusa-0.5.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/medusa/0.5/} \
http://download.eazel.com/source/
diff --git a/sysutils/medusa/buildlink2.mk b/sysutils/medusa/buildlink2.mk
index f7770dd6ade..7392ac4ad1f 100644
--- a/sysutils/medusa/buildlink2.mk
+++ b/sysutils/medusa/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:43 uebayasi Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:56:26 wiz Exp $
#
# This Makefile fragment is included by packages that use medusa.
#
@@ -9,7 +9,7 @@
MEDUSA_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= medusa
-BUILDLINK_DEPENDS.medusa?= medusa>=0.5.1nb1
+BUILDLINK_DEPENDS.medusa?= medusa>=0.5.1nb2
BUILDLINK_PKGSRCDIR.medusa?= ../../sysutils/medusa
EVAL_PREFIX+= BUILDLINK_PREFIX.medusa=medusa
diff --git a/sysutils/mtoolsfm/Makefile b/sysutils/mtoolsfm/Makefile
index 09e0a7d3706..66aa5bebfb6 100644
--- a/sysutils/mtoolsfm/Makefile
+++ b/sysutils/mtoolsfm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/13 11:57:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:26 wiz Exp $
#
DISTNAME= MToolsFM-1.9-3
+PKGREVISION= 1
PKGNAME= mtoolsfm-1.9.3
CATEGORIES= sysutils
MASTER_SITES= http://www.core-coutainville.org/MToolsFM/archive/SOURCES/
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 119d4aad50a..282b14f3e07 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/27 16:05:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:26 wiz Exp $
#
DISTNAME= nautilus-2.2.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/rox-archive/Makefile b/sysutils/rox-archive/Makefile
index 1bc4d57a9de..37e240a3897 100644
--- a/sysutils/rox-archive/Makefile
+++ b/sysutils/rox-archive/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:27 wiz Exp $
#
DISTNAME= Archive-0.1.2
+PKGREVISION= 1
PKGNAME= rox-archive-0.1.2
WRKSRC= ${WRKDIR}/Archive
CATEGORIES= sysutils
@@ -12,7 +13,7 @@ MAINTAINER= rxg@netbsd.org
HOMEPAGE= http://rox.sourceforge.net/
COMMENT= simple archiver
-DEPENDS+= rox-lib>=0.1.4:../../sysutils/rox-lib
+DEPENDS+= rox-lib>=0.1.4nb1:../../sysutils/rox-lib
DIST_SUBDIR= rox
diff --git a/sysutils/rox-edit/Makefile b/sysutils/rox-edit/Makefile
index bb93f83c777..059fd44e59a 100644
--- a/sysutils/rox-edit/Makefile
+++ b/sysutils/rox-edit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:27 wiz Exp $
#
DISTNAME= Edit-0.1.2
+PKGREVISION= 1
PKGNAME= rox-edit-0.1.2
WRKSRC= ${WRKDIR}/Edit
CATEGORIES= sysutils
diff --git a/sysutils/rox-lib/Makefile b/sysutils/rox-lib/Makefile
index 946b975dad9..b8d69710a1b 100644
--- a/sysutils/rox-lib/Makefile
+++ b/sysutils/rox-lib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:27 wiz Exp $
#
DISTNAME= ROX-Lib-0.1.4
+PKGREVISION= 1
PKGNAME= rox-lib-0.1.4
WRKSRC= ${WRKDIR}/ROX-Lib
CATEGORIES= sysutils
diff --git a/sysutils/rox-memo/Makefile b/sysutils/rox-memo/Makefile
index 25f41edca8f..264475a33f0 100644
--- a/sysutils/rox-memo/Makefile
+++ b/sysutils/rox-memo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:28 wiz Exp $
#
DISTNAME= Memo-1.0.0
+PKGREVISION= 1
PKGNAME= rox-memo-1.0.0
WRKSRC= ${WRKDIR}/Memo
CATEGORIES= sysutils
diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile
index 496c4744d26..cb0d94a467b 100644
--- a/sysutils/rox-session/Makefile
+++ b/sysutils/rox-session/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:28 wiz Exp $
#
DISTNAME= ROX-Session-0.1.14
PKGNAME= rox-session-0.1.14
-PKGREVISION= 3
+PKGREVISION= 4
WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Session/src
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/rox-system/Makefile b/sysutils/rox-system/Makefile
index a6d4ad95525..830607c2a8a 100644
--- a/sysutils/rox-system/Makefile
+++ b/sysutils/rox-system/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:28 wiz Exp $
#
DISTNAME= System-0.1.2
+PKGREVISION= 1
PKGNAME= rox-system-0.1.2
WRKSRC= ${WRKDIR}/System/src
CATEGORIES= misc
diff --git a/sysutils/rox-wallpaper/Makefile b/sysutils/rox-wallpaper/Makefile
index dbaf3bd98d2..a9e8be18a32 100644
--- a/sysutils/rox-wallpaper/Makefile
+++ b/sysutils/rox-wallpaper/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:29 wiz Exp $
#
DISTNAME= Wallpaper-0.1.1
+PKGREVISION= 1
PKGNAME= rox-wallpaper-0.1.1
WRKSRC= ${WRKDIR}/Wallpaper
CATEGORIES= sysutils
diff --git a/sysutils/rox-wrappers/Makefile b/sysutils/rox-wrappers/Makefile
index cace32d8410..5b079b4dab3 100644
--- a/sysutils/rox-wrappers/Makefile
+++ b/sysutils/rox-wrappers/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:29 wiz Exp $
#
DISTNAME= Wrappers-1.0.2
PKGNAME= rox-wrappers-1.0.2
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/Wrappers
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
@@ -13,7 +13,7 @@ MAINTAINER= rxg@netbsd.org
HOMEPAGE= http://rox.sourceforge.net/
COMMENT= some example Wrapper applications
-DEPENDS+= rox>=1.2.0nb2:../../sysutils/rox
+DEPENDS+= rox>=1.2.0nb5:../../sysutils/rox
DIST_SUBDIR= rox
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index d2516c7cf81..a5b523688cb 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:56:27 wiz Exp $
#
DISTNAME= rox-1.2.0
-PKGREVISION= 4
+PKGREVISION= 5
WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Filer/src
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/screentest/Makefile b/sysutils/screentest/Makefile
index 0328b716abd..575220844da 100644
--- a/sysutils/screentest/Makefile
+++ b/sysutils/screentest/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/08 23:15:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:29 wiz Exp $
#
DISTNAME= screentest-1.0
+PKGREVISION= 1
CATEGORIES= sysutils x11
MASTER_SITES= ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/screentest/
diff --git a/sysutils/toshutils/Makefile b/sysutils/toshutils/Makefile
index 684ec80589b..aca1b0387c0 100644
--- a/sysutils/toshutils/Makefile
+++ b/sysutils/toshutils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:42:20 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:30 wiz Exp $
#
DISTNAME= toshutils-991217
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.ne426pd.in2home.co.uk/
@@ -9,7 +10,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.buzzard.org.uk/toshiba/
COMMENT= NetBSD port of the Toshiba(tm) Linux Utilities
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
ONLY_FOR_PLATFORM= *-*-i386
GNU_CONFIGURE= YES
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index 76babc9ff7b..624b6ecf45f 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/24 13:36:20 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:30 wiz Exp $
#
DISTNAME= vifm-0.1
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vifm/}
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index ca347c7682b..0a6340f4c1e 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/01/28 22:04:20 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:56:30 wiz Exp $
DISTNAME= xcdroast-0.98alpha13
+PKGREVISION= 1
PKGNAME= xcdroast-0.98a13
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/}
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index efdf2eca560..f49827f8f08 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/01/15 00:25:47 salo Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:30 wiz Exp $
#
DISTNAME= gtkspell-2.0.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= textproc devel
MASTER_SITES= http://gtkspell.sourceforge.net/download/
diff --git a/textproc/gtkspell/buildlink2.mk b/textproc/gtkspell/buildlink2.mk
index e54323ca718..067001ad5e6 100644
--- a/textproc/gtkspell/buildlink2.mk
+++ b/textproc/gtkspell/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/15 00:25:47 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:56:31 wiz Exp $
#
# This Makefile fragment is included by packages that use gtkspell.
#
@@ -9,7 +9,7 @@
GTKSPELL_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtkspell
-BUILDLINK_DEPENDS.gtkspell?= gtkspell>=2.0.2nb1
+BUILDLINK_DEPENDS.gtkspell?= gtkspell>=2.0.2nb3
BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell
EVAL_PREFIX+= BUILDLINK_PREFIX.gtkspell=gtkspell
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 30f1e492145..606c478494e 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2003/04/10 09:34:04 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2003/05/02 11:56:31 wiz Exp $
DISTNAME= libxml2-${LIBXML_VERSION}
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/2.5/}
diff --git a/textproc/libxml2/buildlink2.mk b/textproc/libxml2/buildlink2.mk
index b9f00f6dea1..484654040c8 100644
--- a/textproc/libxml2/buildlink2.mk
+++ b/textproc/libxml2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/24 20:40:16 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:56:31 wiz Exp $
.if !defined(LIBXML2_BUILDLINK2_MK)
LIBXML2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libxml2
-BUILDLINK_DEPENDS.libxml2?= libxml2>=2.5.3
+BUILDLINK_DEPENDS.libxml2?= libxml2>=2.5.6nb1
BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2
EVAL_PREFIX+= BUILDLINK_PREFIX.libxml2=libxml2
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 42f1e9f5bda..8409032d7dc 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/04/10 09:44:45 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/05/02 11:56:31 wiz Exp $
DISTNAME= libxslt-1.0.29
+PKGREVISION= 1
PKGNAME= ${DISTNAME}
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxslt/1.0/}
diff --git a/textproc/libxslt/buildlink2.mk b/textproc/libxslt/buildlink2.mk
index 05190e3bf10..f039404e82d 100644
--- a/textproc/libxslt/buildlink2.mk
+++ b/textproc/libxslt/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/02/24 20:45:19 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/05/02 11:56:31 wiz Exp $
.if !defined(LIBXSLT_BUILDLINK2_MK)
LIBXSLT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libxslt
-BUILDLINK_DEPENDS.libxslt?= libxslt>=1.0.26
+BUILDLINK_DEPENDS.libxslt?= libxslt>=1.0.29nb1
BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt
EVAL_PREFIX+= BUILDLINK_PREFIX.libxslt=libxslt
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index 5b88c132926..e485865d506 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/10/05 00:50:35 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:32 wiz Exp $
#
DISTNAME= XML-LibXML-1.31
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
#SVR4_PKGNAME=
CATEGORIES= textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=XML/}
diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile
index 8744355241d..cee43da5185 100644
--- a/textproc/php4-domxml/Makefile
+++ b/textproc/php4-domxml/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/10/05 00:15:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:32 wiz Exp $
MODNAME= domxml
CATEGORIES+= textproc
PHP_PKG_VERS= # empty
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= PHP4 extension for DOM support
USE_BUILDLINK2= YES
diff --git a/textproc/py-xmltools/Makefile b/textproc/py-xmltools/Makefile
index 59994274740..c29d71e66b2 100644
--- a/textproc/py-xmltools/Makefile
+++ b/textproc/py-xmltools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/04 12:49:17 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:32 wiz Exp $
#
DISTNAME= xmltools-1.3.7
+PKGREVISION= 1
PKGNAME= ${PYPKGPREFIX}-xmltools-1.3.7
CATEGORIES= textproc
MASTER_SITES= http://www.logilab.org/ftp/pub/xmltools/
diff --git a/textproc/pyDict/Makefile b/textproc/pyDict/Makefile
index 39b3c403210..be2318662f4 100644
--- a/textproc/pyDict/Makefile
+++ b/textproc/pyDict/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:32 wiz Exp $
DISTNAME= pyDict-0.2.5.1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/dict
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pydict/}
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 68e0247018f..35bea7d6b3a 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/02/18 14:39:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:56:33 wiz Exp $
#
DISTNAME= scrollkeeper-0.3.12
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scrollkeeper/} \
${MASTER_SITE_GNOME:=sources/scrollkeeper/0.3/}
diff --git a/textproc/scrollkeeper/buildlink2.mk b/textproc/scrollkeeper/buildlink2.mk
index 0fafedbe46b..5fb219f8db7 100644
--- a/textproc/scrollkeeper/buildlink2.mk
+++ b/textproc/scrollkeeper/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/02/18 14:39:02 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:56:33 wiz Exp $
.if !defined(SCROLLKEEPER_BUILDLINK2_MK)
SCROLLKEEPER_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= scrollkeeper
-BUILDLINK_DEPENDS.scrollkeeper?= scrollkeeper>=0.3.12
+BUILDLINK_DEPENDS.scrollkeeper?= scrollkeeper>=0.3.12nb1
BUILDLINK_PKGSRCDIR.scrollkeeper?= ../../textproc/scrollkeeper
EVAL_PREFIX+= BUILDLINK_PREFIX.scrollkeeper=scrollkeeper
diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile
index 81966f9d03c..8c103de1fba 100644
--- a/time/asclock-gtk/Makefile
+++ b/time/asclock-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:22 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:56:33 wiz Exp $
#
DISTNAME= asclock-gtk-2.1.10beta
+PKGREVISION= 1
PKGNAME= asclock-gtk-2.1.10
WRKSRC= ${WRKDIR}/asclock-gtk
CATEGORIES= x11 time
diff --git a/time/wmfishtime/Makefile b/time/wmfishtime/Makefile
index 6e26d5b1f8c..f2b9e766c5b 100644
--- a/time/wmfishtime/Makefile
+++ b/time/wmfishtime/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/01/19 10:27:56 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:33 wiz Exp $
#
DISTNAME= wmfishtime-1.23
+PKGREVISION= 1
CATEGORIES= time x11
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/
diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile
index 4f7fd64171a..aca9f0ef662 100644
--- a/wm/amaterus/Makefile
+++ b/wm/amaterus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:26 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:56:34 wiz Exp $
DISTNAME= amaterus-0.34.1
+PKGREVISION= 1
CATEGORIES= wm
MASTER_SITES= http://www.taiyaki.org/src/
diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile
index 94ec2718417..9ada37010ef 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:28 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:34 wiz Exp $
DISTNAME= bbrun-1.3
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun
CATEGORIES= wm x11
MASTER_SITES= http://www.dwave.net/~jking/bbrun/
diff --git a/wm/econf/Makefile b/wm/econf/Makefile
index b50635c8bb7..274a1760cd5 100644
--- a/wm/econf/Makefile
+++ b/wm/econf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/04/27 12:38:51 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:34 wiz Exp $
#
DISTNAME= enlightenment-conf-0.15
PKGNAME= econf-0.15
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 wm
MASTER_SITES= ftp://www.rasterman.com/pub/enlightenment/enlightenment/
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index a3215601dee..3f0385aa114 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/04/27 12:42:52 cjep Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:56:35 wiz Exp $
DISTNAME= enlightenment-0.16.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome wm
MASTER_SITES= ftp://ftp.enlightenment.org/pub/e/enlightenment/
diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 1ec1b9f728e..75cbf577701 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2003/04/10 07:22:35 bouyer Exp $
+# $NetBSD: Makefile,v 1.32 2003/05/02 11:56:35 wiz Exp $
# FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
#
DISTNAME= fvwm-${FVWM_VER}
PKGNAME= fvwm2-${FVWM_VER}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/ \
diff --git a/wm/icepref/Makefile b/wm/icepref/Makefile
index 9c5b9a08a8a..5a5fbceaacc 100644
--- a/wm/icepref/Makefile
+++ b/wm/icepref/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:36 wiz Exp $
#
DISTNAME= icepref-1.1
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/icepref
CATEGORIES= wm
MASTER_SITES= ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index 54dd41f154d..684ab8d65c2 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/01/09 20:12:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:56:36 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-gnome-/}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Small, fast and light-weight window manager (GNOME version)
CONFLICTS+= icewm-[0-9]*
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 1b74f3f44e6..c87c11efdd2 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/02/14 20:59:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:36 wiz Exp $
#
DISTNAME= metacity-2.4.34
+PKGREVISION= 1
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.4/}
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/metacity/buildlink2.mk b/wm/metacity/buildlink2.mk
index b8bf8b4b1cb..640af5414a6 100644
--- a/wm/metacity/buildlink2.mk
+++ b/wm/metacity/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/02/14 20:59:44 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:56:36 wiz Exp $
#
# This Makefile fragment is included by packages that use metacity.
#
@@ -9,7 +9,7 @@
METACITY_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= metacity
-BUILDLINK_DEPENDS.metacity?= metacity>=2.4.34
+BUILDLINK_DEPENDS.metacity?= metacity>=2.4.34nb1
BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity
EVAL_PREFIX+= BUILDLINK_PREFIX.metacity=metacity
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index 41e3751a507..00821dd6490 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/09/06 12:25:15 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:36 wiz Exp $
#
DISTNAME= qvwm-1.1.11
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wm
MASTER_SITES= ftp://www.qvwm.org/pub/qvwm/
diff --git a/wm/sawfish-replibs/Makefile b/wm/sawfish-replibs/Makefile
index 11f51156386..69f9357f590 100644
--- a/wm/sawfish-replibs/Makefile
+++ b/wm/sawfish-replibs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/01/10 01:02:37 mycroft Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:56:37 wiz Exp $
#
PKGNAME= sawfish-replibs-${SF_VERS}
-#PKGREVISION= 2
+PKGREVISION= 1
COMMENT= librep Lisp libraries for sawfish
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 0b8a9c845dc..cbc4db202e9 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2003/01/10 01:05:05 mycroft Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:56:37 wiz Exp $
#
PKGNAME= sawfish-${SF_VERS}
-#PKGREVISION= 2
+PKGREVISION= 1
COMMENT= GNOME-aware window manager that is fully configurable in Lisp
-DEPENDS+= sawfish-replibs-${SF_VERS}:../../wm/sawfish-replibs
+DEPENDS+= sawfish-replibs-${SF_VERS}nb1:../../wm/sawfish-replibs
USE_X11BASE= # defined
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index c656f50e972..2ac2c5b3a46 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.13 2003/01/10 07:54:44 cjep Exp $
+# $NetBSD: Makefile.common,v 1.14 2003/05/02 11:56:37 wiz Exp $
DISTNAME= sawfish-${SF_VERS}-gtk1
+PKGREVISION= 1
SF_VERS= 1.2
CATEGORIES= x11 gnome wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sawmill/}
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 62ae39bd6aa..48f7713c4ec 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/01/13 13:53:46 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:37 wiz Exp $
#
DISTNAME= waimea-0.4.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=waimea/}
diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index eebbd992d62..c4b37c1cfef 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/12/18 20:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:38 wiz Exp $
#
DISTNAME= whiteBOX-0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wm x11
MASTER_SITES= http://whitebox.sourceforge.net/dist/
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 04460f577eb..2f257b89e94 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/04/26 09:49:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:56:38 wiz Exp $
#
DISTNAME= wmakerconf-2.8.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 wm windowmaker
MASTER_SITES= http://ulli.on.openave.net/wmakerconf/
EXTRACT_SUFX= .tar.bz2
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 1144c4de26a..980264eded4 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/03/22 06:46:19 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/02 11:56:38 wiz Exp $
#
DISTNAME= amaya-src-7.2
+PKGREVISION= 1
PKGNAME= amaya-7.2
WRKSRC= ${WRKDIR}/Amaya/work
CATEGORIES= www
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index d0a87ad1f83..7c4482d3423 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/02/17 22:46:01 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:56:39 wiz Exp $
DISTNAME= auth_ldap-1.6.0
+PKGREVISION= 1
PKGNAME= ap-auth-ldap-1.6.0
SVR4_PKGNAME= apldap
CATEGORIES= www databases
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 5b63e9c70b5..1d7a4f3e7f1 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/15 16:23:23 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:39 wiz Exp $
#
DISTNAME= subversion-0.20.1
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/^/ap2-/}
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/files/documents/15/3440/
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 92235a2f5e9..8d6de40e2e9 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2003/02/20 17:34:49 salo Exp $
+# $NetBSD: Makefile,v 1.29 2003/05/02 11:56:39 wiz Exp $
#
DISTNAME= bluefish-0.9
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/ \
http://student.wau.nl/~olivier/bluefish/download/ \
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 2ea6e835f7c..e68850dcf9d 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/02/14 16:59:53 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:56:40 wiz Exp $
DISTNAME= cadaver-0.21.0
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.webdav.org/cadaver/
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index a565696f1c5..de925601512 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/04/11 20:26:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:56:40 wiz Exp $
#
DISTNAME= dillo-0.7.1.2
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/dillo-0.7.1
CATEGORIES= www
MASTER_SITES= http://dillo.auriga.wearlab.de/download/
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 953d6cf0626..bf3ab06c3e1 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/10/09 00:04:27 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:40 wiz Exp $
DISTNAME= fcgi-2.2.2
+PKGREVISION= 1
CATEGORIES= www devel
MASTER_SITES= http://fastcgi.com/dist/
diff --git a/www/fcgi/buildlink2.mk b/www/fcgi/buildlink2.mk
index 087ba88efeb..5284477c846 100644
--- a/www/fcgi/buildlink2.mk
+++ b/www/fcgi/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/01/07 12:45:51 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:56:40 wiz Exp $
#
# This Makefile fragment is included by packages that use fcgi.
#
@@ -7,7 +7,7 @@
FCGI_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= fcgi
-BUILDLINK_DEPENDS.fcgi?= fcgi>=2.2.2
+BUILDLINK_DEPENDS.fcgi?= fcgi>=2.2.2nb1
BUILDLINK_PKGSRCDIR.fcgi?= ../../www/fcgi
EVAL_PREFIX+= BUILDLINK_PREFIX.fcgi=fcgi
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index ebf5bc43d01..426e35871d8 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2003/04/24 13:03:17 taya Exp $
+# $NetBSD: Makefile,v 1.48 2003/05/02 11:56:41 wiz Exp $
DISTNAME= galeon-1.2.10
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/}
diff --git a/www/galway/Makefile b/www/galway/Makefile
index 9b1f6f55383..5297fd2c7f9 100644
--- a/www/galway/Makefile
+++ b/www/galway/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/02/05 04:15:47 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:41 wiz Exp $
#
DISTNAME= galway-0.33
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www x11 gnome
MASTER_SITES= http://erin.netpedia.net/download/
EXTRACT_SUFX= .tgz
@@ -11,7 +11,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://erin.netpedia.net/galway.html
COMMENT= Web editor programmed in Scheme
-DEPENDS+= guile-gtk-[0-9]*:../../devel/guile-gtk
+DEPENDS+= guile-gtk>=0.19nb2:../../devel/guile-gtk
USE_BUILDLINK2= yes
NO_BUILD= yes
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 813d536b22a..bf2c0fd0780 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/10/19 10:54:59 rh Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:56:41 wiz Exp $
#
DISTNAME= glibwww-0.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www gnome devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glibwww/0.2/}
@@ -10,8 +10,6 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.gnome.org/
COMMENT= event register functions that use the glib event loop
-BUILDLINK_DEPENDS.gnome-libs= gnome-libs>=1.4.1.2nb1
-
USE_BUILDLINK2= YES
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/www/glibwww/buildlink2.mk b/www/glibwww/buildlink2.mk
index 48f896af394..0bdde5bc5aa 100644
--- a/www/glibwww/buildlink2.mk
+++ b/www/glibwww/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:25 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:56:41 wiz Exp $
.if !defined(GLIBWWW_BUILDLINK2_MK)
GLIBWWW_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= glibwww
-BUILDLINK_DEPENDS.glibwww?= glibwww>=0.2nb1
+BUILDLINK_DEPENDS.glibwww?= glibwww>=0.2nb3
BUILDLINK_PKGSRCDIR.glibwww?= ../../www/glibwww
EVAL_PREFIX+= BUILDLINK_PREFIX.glibwww=glibwww
diff --git a/www/gtkasp2php/Makefile b/www/gtkasp2php/Makefile
index e36c3bcd821..bf810f89560 100644
--- a/www/gtkasp2php/Makefile
+++ b/www/gtkasp2php/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/10/13 11:44:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:42 wiz Exp $
DISTNAME= asp2php-0.76.10
+PKGREVISION= 1
PKGNAME= gtk${DISTNAME}
CATEGORIES= www
MASTER_SITES= http://65.108.58.129/asp2php/
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index a66c6d477a9..f7cecf3ec39 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2003/04/27 12:47:00 cjep Exp $
+# $NetBSD: Makefile,v 1.29 2003/05/02 11:56:42 wiz Exp $
DISTNAME= gtkhtml-1.1.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkhtml/1.1/}
EXTRACT_SUFX= .tar.bz2
@@ -10,8 +10,6 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Lightweight HTML rendering/printing/editing engine
-BUILDLINK_DEPENDS.gal?= gal>=0.21
-
USE_BUILDLINK2= YES
USE_X11BASE= YES
USE_GMAKE= YES
diff --git a/www/gtkhtml/buildlink2.mk b/www/gtkhtml/buildlink2.mk
index bc0f38421a5..e1caebed76a 100644
--- a/www/gtkhtml/buildlink2.mk
+++ b/www/gtkhtml/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/01/09 11:36:03 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:56:42 wiz Exp $
.if !defined(GTKHTML_BUILDLINK2_MK)
GTKHTML_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtkhtml
-BUILDLINK_DEPENDS.gtkhtml?= gtkhtml>=1.1.7
+BUILDLINK_DEPENDS.gtkhtml?= gtkhtml>=1.1.7nb2
BUILDLINK_PKGSRCDIR.gtkhtml?= ../../www/gtkhtml
EVAL_PREFIX+= BUILDLINK_PREFIX.gtkhtml=gtkhtml
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 5033bd5c12f..a9d0641b8ac 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/11/05 13:13:04 martti Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/02 11:56:42 wiz Exp $
#
DISTNAME= gateway-${KANNEL_VER}
+PKGREVISION= 1
PKGNAME= kannel-${KANNEL_VER}
CATEGORIES= www net
MASTER_SITES= http://www.kannel.org/download/${KANNEL_VER}/
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 97138fa002e..d39dc75bd41 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/15 17:15:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:43 wiz Exp $
#
DISTNAME= libgtkhtml-2.2.1
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtkhtml/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/libgtkhtml/buildlink2.mk b/www/libgtkhtml/buildlink2.mk
index c5853cf1331..f08c8514d56 100644
--- a/www/libgtkhtml/buildlink2.mk
+++ b/www/libgtkhtml/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/03/15 17:15:37 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:56:43 wiz Exp $
#
# This Makefile fragment is included by packages that use libgtkhtml.
#
@@ -9,7 +9,7 @@
LIBGTKHTML_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libgtkhtml
-BUILDLINK_DEPENDS.libgtkhtml?= libgtkhtml>=2.2.1
+BUILDLINK_DEPENDS.libgtkhtml?= libgtkhtml>=2.2.1nb1
BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml
EVAL_PREFIX+= BUILDLINK_PREFIX.libgtkhtml=libgtkhtml
diff --git a/www/mozilla-stable/Makefile b/www/mozilla-stable/Makefile
index 4b52db37f87..fbca3450288 100644
--- a/www/mozilla-stable/Makefile
+++ b/www/mozilla-stable/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/01/22 10:52:55 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:56:44 wiz Exp $
MOZILLA= mozilla-stable
MOZILLA_BIN= mozilla-bin
MOZ_VER= 1.0.2
EXTRACT_SUFX= .tar.bz2
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Stable branch of mozilla, open source browser
diff --git a/www/mozilla-stable/buildlink2.mk b/www/mozilla-stable/buildlink2.mk
index 7d704a41cd6..2247dd8878c 100644
--- a/www/mozilla-stable/buildlink2.mk
+++ b/www/mozilla-stable/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/03/29 19:11:06 jmc Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:56:44 wiz Exp $
#
.if !defined(MOZILLA_STABLE_BUILDLINK2_MK)
MOZILLA_STABLE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= mozilla-stable
-BUILDLINK_DEPENDS.mozilla-stable?= mozilla-stable>=1.0.1nb1
+BUILDLINK_DEPENDS.mozilla-stable?= mozilla-stable>=1.0.2nb3
BUILDLINK_PKGSRCDIR.mozilla-stable?= ../../www/mozilla-stable
EVAL_PREFIX+= BUILDLINK_PREFIX.mozilla-stable=mozilla-stable
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 60152448aeb..502e760ca7a 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.116 2003/03/17 16:07:32 taya Exp $
+# $NetBSD: Makefile,v 1.117 2003/05/02 11:56:43 wiz Exp $
MOZILLA= mozilla
MOZILLA_BIN= mozilla-bin
MOZ_VER= 1.3
+PKGREVISION= 1
EXTRACT_SUFX= .tar.bz2
COMMENT= Open-source version of the Netscape browser
diff --git a/www/mozilla/buildlink2.mk b/www/mozilla/buildlink2.mk
index eefe71c4bc1..9682aadb5f9 100644
--- a/www/mozilla/buildlink2.mk
+++ b/www/mozilla/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/03/18 03:24:01 taya Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/02 11:56:43 wiz Exp $
#
.if !defined(MOZILLA_BUILDLINK2_MK)
MOZILLA_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= mozilla
-BUILDLINK_DEPENDS.mozilla?= mozilla>=1.3
+BUILDLINK_DEPENDS.mozilla?= mozilla>=1.3nb1
BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla
EVAL_PREFIX+= BUILDLINK_PREFIX.mozilla=mozilla
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 3eaa774973c..8521905b849 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/01/30 10:52:55 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:56:44 wiz Exp $
DISTNAME= neon-0.23.7
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.webdav.org/neon/
diff --git a/www/neon/buildlink2.mk b/www/neon/buildlink2.mk
index 23ebc0eaab9..150962accd3 100644
--- a/www/neon/buildlink2.mk
+++ b/www/neon/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/01/22 16:23:39 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:56:45 wiz Exp $
.if !defined(NEON_BUILDLINK2_MK)
NEON_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= neon
-BUILDLINK_DEPENDS.neon?= neon>=0.23.6
+BUILDLINK_DEPENDS.neon?= neon>=0.23.7nb1
BUILDLINK_PKGSRCDIR.neon?= ../../www/neon
EVAL_PREFIX+= BUILDLINK_PREFIX.neon=neon
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 0dd64c2f5f9..a6a1ebf1dff 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:30 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:45 wiz Exp $
#
DISTNAME= Apache-Gallery-0.4.1
+PKGREVISION= 1
PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5aga
CATEGORIES= www graphics
diff --git a/www/phoenix/Makefile b/www/phoenix/Makefile
index 78b7115cc32..000f154421d 100644
--- a/www/phoenix/Makefile
+++ b/www/phoenix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/03/31 02:39:48 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:56:45 wiz Exp $
MOZILLA= phoenix
MOZILLA_BIN= phoenix-bin
-PKGREVISION= 5
+PKGREVISION= 6
MOZ_VER= 0.5
EXTRACT_SUFX= .tar.bz2
DISTNAME= mozilla-phoenix-${MOZ_VER}
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index ed29ff50965..466415bb54e 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/10/25 11:01:29 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:45 wiz Exp $
DISTNAME= pycurl-7.10.1
+PKGREVISION= 1
PKGNAME= ${PYPKGPREFIX}-curl-7.10.1
CATEGORIES= www
MASTER_SITES= http://pycurl.sourceforge.net/download/
diff --git a/www/quanta-docs/Makefile b/www/quanta-docs/Makefile
index 15c7d52365f..d96a8b13231 100644
--- a/www/quanta-docs/Makefile
+++ b/www/quanta-docs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:46 wiz Exp $
DISTNAME= quanta-docs-1.0
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quanta/}
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index f817893c29b..86ee77626f2 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:56:46 wiz Exp $
DISTNAME= quanta-2.0-pr2
PKGNAME= quanta-1.9.9.2
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/quanta
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quanta/}
diff --git a/www/quanta3/Makefile b/www/quanta3/Makefile
index 0ed8c86abe3..f62bb00c38f 100644
--- a/www/quanta3/Makefile
+++ b/www/quanta3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/04/01 12:27:11 markd Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:46 wiz Exp $
DISTNAME= quanta-3.1.1
+PKGREVISION= 1
CATEGORIES= www
COMMENT= HTML editor suitable for experienced web developers
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index f8e765f193e..7d3a93c6c8d 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/22 03:28:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:47 wiz Exp $
#
PKGNAME= w3m-img-${W3M_BASE_VERS}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= multilingualized version of a pager/text-based browser w3m with inline image support
CONFLICTS+= w3m-[0-9]*
diff --git a/www/zope25-AbracadabraObject/Makefile b/www/zope25-AbracadabraObject/Makefile
index 9a387c541d8..e2985f4c34f 100644
--- a/www/zope25-AbracadabraObject/Makefile
+++ b/www/zope25-AbracadabraObject/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/11/27 16:22:59 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:47 wiz Exp $
DISTNAME= AbracadabraObject-1.5.0
+PKGREVISION= 1
PKGNAME= zope25-AbracadabraObject-1.5.0
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/mjablonski/AbracadabraObject/
diff --git a/www/zope25-BTreeFolder/Makefile b/www/zope25-BTreeFolder/Makefile
index 87d89eb07c8..4816fbec83a 100644
--- a/www/zope25-BTreeFolder/Makefile
+++ b/www/zope25-BTreeFolder/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/23 17:15:57 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:47 wiz Exp $
DISTNAME= BTreeFolder-0.2
+PKGREVISION= 1
PKGNAME= zope25-BTreeFolder-0.2
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/hathawsh/BTreeFolder/
diff --git a/www/zope25-CMF/Makefile b/www/zope25-CMF/Makefile
index 752b2b8515e..421b0e6bf22 100644
--- a/www/zope25-CMF/Makefile
+++ b/www/zope25-CMF/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/04/23 14:36:15 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:47 wiz Exp $
DISTNAME= CMF-1.3.1
+PKGREVISION= 1
PKGNAME= zope25-CMF-1.3.1
WRKSRC= ${WRKDIR}/CMF-1.3.1
CATEGORIES= www
diff --git a/www/zope25-CMFPlone/Makefile b/www/zope25-CMFPlone/Makefile
index 13fad27e9cd..356500bb95f 100644
--- a/www/zope25-CMFPlone/Makefile
+++ b/www/zope25-CMFPlone/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/04/23 14:57:04 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:48 wiz Exp $
DISTNAME= CMFPlone1.0.1
+PKGREVISION= 1
PKGNAME= zope25-CMFPlone-1.0.1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=/plone/}
diff --git a/www/zope25-Calendar/Makefile b/www/zope25-Calendar/Makefile
index fa81e532728..4d40a792c1f 100644
--- a/www/zope25-Calendar/Makefile
+++ b/www/zope25-Calendar/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/14 15:42:21 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:48 wiz Exp $
DISTNAME= Calendar-1.0.10
+PKGREVISION= 1
PKGNAME= zope25-Calendar-1.0.10
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/jdavid/Calendar/
diff --git a/www/zope25-DocumentLibrary/Makefile b/www/zope25-DocumentLibrary/Makefile
index 7d29e61eb64..8ece0e18095 100644
--- a/www/zope25-DocumentLibrary/Makefile
+++ b/www/zope25-DocumentLibrary/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/12/02 15:17:59 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:48 wiz Exp $
DISTNAME= DocumentLibrary-1.0rc1
+PKGREVISION= 1
PKGNAME= zope25-DocumentLibrary-1.0rc1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/Kaivo/DocumentLibrary/
diff --git a/www/zope25-EasyImage/Makefile b/www/zope25-EasyImage/Makefile
index fdca264448b..50c92330996 100644
--- a/www/zope25-EasyImage/Makefile
+++ b/www/zope25-EasyImage/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/10/24 21:56:32 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:49 wiz Exp $
DISTNAME= EasyImage15
+PKGREVISION= 1
PKGNAME= zope25-EasyImage-1.5
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/regebro/easyimage/
diff --git a/www/zope25-ExternalEditor/Makefile b/www/zope25-ExternalEditor/Makefile
index ca50919794e..4a8993746c3 100644
--- a/www/zope25-ExternalEditor/Makefile
+++ b/www/zope25-ExternalEditor/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/14 18:35:32 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:49 wiz Exp $
DISTNAME= ExternalEditor-0.6
+PKGREVISION= 1
PKGNAME= zope25-ExternalEditor-0.6
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/Caseman/ExternalEditor/
diff --git a/www/zope25-FileSystemSite/Makefile b/www/zope25-FileSystemSite/Makefile
index 77c4a8ce11c..63572949b08 100644
--- a/www/zope25-FileSystemSite/Makefile
+++ b/www/zope25-FileSystemSite/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/29 17:34:46 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:49 wiz Exp $
DISTNAME= FileSystemSite-1.1
+PKGREVISION= 1
PKGNAME= zope25-FileSystemSite-1.1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/k_vertigo/Products/FileSystemSite/
diff --git a/www/zope25-Formulator/Makefile b/www/zope25-Formulator/Makefile
index 04bfd98a63e..1bfe2c845aa 100644
--- a/www/zope25-Formulator/Makefile
+++ b/www/zope25-Formulator/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/01/10 11:27:56 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:49 wiz Exp $
DISTNAME= Formulator-1.3.1
+PKGREVISION= 1
PKGNAME= zope25-Formulator-1.3.1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/faassen/Formulator/
diff --git a/www/zope25-Fortune/Makefile b/www/zope25-Fortune/Makefile
index d18b49c2d95..63e489e3f01 100644
--- a/www/zope25-Fortune/Makefile
+++ b/www/zope25-Fortune/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/01 17:55:43 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:50 wiz Exp $
#
DISTNAME= Fortune-0.5.2
+PKGREVISION= 1
PKGNAME= zope25-Fortune-0.5.2
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/lalo/Fortune/
diff --git a/www/zope25-JPicture/Makefile b/www/zope25-JPicture/Makefile
index 4a5ef18532c..a9f679eee6a 100644
--- a/www/zope25-JPicture/Makefile
+++ b/www/zope25-JPicture/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/10/24 21:56:33 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:50 wiz Exp $
DISTNAME= JPicture-2_0
+PKGREVISION= 1
PKGNAME= zope25-JPicture-2.0
CATEGORIES= www
MASTER_SITES= http://www.dataflake.org/software/jpicture/
diff --git a/www/zope25-KnowledgeKit/Makefile b/www/zope25-KnowledgeKit/Makefile
index c5318ce9820..d6026fad871 100644
--- a/www/zope25-KnowledgeKit/Makefile
+++ b/www/zope25-KnowledgeKit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/01 18:03:16 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:50 wiz Exp $
#
DISTNAME= KnowledgeKit-1.6.7
+PKGREVISION= 1
PKGNAME= zope25-KnowledgeKit-1.6.7
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/Bill/Products/KnowledgeKit/
diff --git a/www/zope25-LocalFS/Makefile b/www/zope25-LocalFS/Makefile
index 7a09bcf560c..4b947a09f5a 100644
--- a/www/zope25-LocalFS/Makefile
+++ b/www/zope25-LocalFS/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/04/23 16:25:17 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:50 wiz Exp $
DISTNAME= LocalFS-1-0-0
+PKGREVISION= 1
PKGNAME= zope25-LocalFS-1.0.0
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=localfs/}
diff --git a/www/zope25-MetaPublisher/Makefile b/www/zope25-MetaPublisher/Makefile
index 12401edd5fc..962d44314e4 100644
--- a/www/zope25-MetaPublisher/Makefile
+++ b/www/zope25-MetaPublisher/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/14 15:56:04 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:51 wiz Exp $
DISTNAME= MetaPublisher128
+PKGREVISION= 1
PKGNAME= zope25-MetaPublisher-1.2.8
CATEGORIES= www
MASTER_SITES= http://www.beehive.de/downloads/
diff --git a/www/zope25-ParsedXML/Makefile b/www/zope25-ParsedXML/Makefile
index 0eb7cfa61c0..c4aa1a48f1c 100644
--- a/www/zope25-ParsedXML/Makefile
+++ b/www/zope25-ParsedXML/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/01/10 11:30:06 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:51 wiz Exp $
DISTNAME= ParsedXML-1.3.1
+PKGREVISION= 1
PKGNAME= zope25-ParsedXML-1.3.1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/faassen/ParsedXML/
diff --git a/www/zope25-Photo/Makefile b/www/zope25-Photo/Makefile
index 2e26f8513b2..b61ddb7fd53 100644
--- a/www/zope25-Photo/Makefile
+++ b/www/zope25-Photo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/14 16:01:07 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:51 wiz Exp $
DISTNAME= Photo-1.2.3
+PKGREVISION= 1
PKGNAME= zope25-Photo-1.2.3
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/rbickers/Photo/
diff --git a/www/zope25-PropertyFolder/Makefile b/www/zope25-PropertyFolder/Makefile
index 22befc81250..3b30f454eed 100644
--- a/www/zope25-PropertyFolder/Makefile
+++ b/www/zope25-PropertyFolder/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/11/27 16:27:03 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:51 wiz Exp $
DISTNAME= PropertyFolder-1.2.1
+PKGREVISION= 1
PKGNAME= zope25-PropertyFolder-1.2.1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/mjablonski/PropertyFolder/
diff --git a/www/zope25-PropertyObject/Makefile b/www/zope25-PropertyObject/Makefile
index 4c913b96663..926d181cd2a 100644
--- a/www/zope25-PropertyObject/Makefile
+++ b/www/zope25-PropertyObject/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/11/27 16:27:04 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:52 wiz Exp $
DISTNAME= PropertyObject-1.2.1
+PKGREVISION= 1
PKGNAME= zope25-PropertyObject-1.2.1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/mjablonski/PropertyObject/
diff --git a/www/zope25-RDFSummary/Makefile b/www/zope25-RDFSummary/Makefile
index dba43c7038e..fab31f01e59 100644
--- a/www/zope25-RDFSummary/Makefile
+++ b/www/zope25-RDFSummary/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/16 17:03:12 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:53 wiz Exp $
#
DISTNAME= RDFSummary-2.3
+PKGREVISION= 1
PKGNAME= zope25-RDFSummary-2.3
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/EIONET/RDFSummary/
diff --git a/www/zope25-Silva/Makefile b/www/zope25-Silva/Makefile
index d30118e183f..6fd7c98369b 100644
--- a/www/zope25-Silva/Makefile
+++ b/www/zope25-Silva/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/12/02 15:18:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:53 wiz Exp $
DISTNAME= Silva-0.8.6.1
+PKGREVISION= 1
PKGNAME= zope25-Silva-0.8.6.1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/faassen/Silva/
diff --git a/www/zope25-Squishdot/Makefile b/www/zope25-Squishdot/Makefile
index 21521c76d46..be1e882e024 100644
--- a/www/zope25-Squishdot/Makefile
+++ b/www/zope25-Squishdot/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/23 16:15:02 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:53 wiz Exp $
#
DISTNAME= Squishdot-1-5-0
+PKGREVISION= 1
PKGNAME= zope25-Squishdot-1.5.0
CATEGORIES= www
MASTER_SITES= http://squishdot.org/Download/
diff --git a/www/zope25-TinyTablePlus/Makefile b/www/zope25-TinyTablePlus/Makefile
index 50f27f2b190..c97e83c3fab 100644
--- a/www/zope25-TinyTablePlus/Makefile
+++ b/www/zope25-TinyTablePlus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/01 17:58:27 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:53 wiz Exp $
#
DISTNAME= TinyTablePlus-0.9
+PKGREVISION= 1
PKGNAME= zope25-TinyTablePlus-0.9
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/hathawsh/TinyTablePlus/
diff --git a/www/zope25-XMLWidgets/Makefile b/www/zope25-XMLWidgets/Makefile
index 2724382e412..516f72344e8 100644
--- a/www/zope25-XMLWidgets/Makefile
+++ b/www/zope25-XMLWidgets/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/12/02 15:18:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:56:54 wiz Exp $
DISTNAME= XMLWidgets-0.8.3
+PKGREVISION= 1
PKGNAME= zope25-XMLWidgets-0.8.3
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/faassen/XMLWidgets/
diff --git a/www/zope25-ZMySQLDA/Makefile b/www/zope25-ZMySQLDA/Makefile
index 928adc7f0b9..c00ddd06ba6 100644
--- a/www/zope25-ZMySQLDA/Makefile
+++ b/www/zope25-ZMySQLDA/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/23 16:25:18 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:54 wiz Exp $
#
DISTNAME= ZMySQLDA-2.0.8
+PKGREVISION= 1
PKGNAME= zope25-ZMySQLDA-2.0.8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mysql-python/}
diff --git a/www/zope25-ZNavigator/Makefile b/www/zope25-ZNavigator/Makefile
index 7f0f3ac1ea3..538b931c958 100644
--- a/www/zope25-ZNavigator/Makefile
+++ b/www/zope25-ZNavigator/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/01 18:01:37 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:54 wiz Exp $
#
DISTNAME= ZNavigator-2.02
+PKGREVISION= 1
PKGNAME= zope25-ZNavigator-2.02
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/jonas/ZNavigator/
diff --git a/www/zope25-ZPhotoSlides/Makefile b/www/zope25-ZPhotoSlides/Makefile
index 7e9fd1142d2..ae58f7f3580 100644
--- a/www/zope25-ZPhotoSlides/Makefile
+++ b/www/zope25-ZPhotoSlides/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/04/23 15:24:46 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:56:54 wiz Exp $
DISTNAME= ZPhotoSlides-1.1
+PKGREVISION= 1
PKGNAME= zope25-ZPhotoSlides-1.1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/p3b/ZPhotoSlides/
diff --git a/www/zope25-ZPsycopgDA/Makefile b/www/zope25-ZPsycopgDA/Makefile
index f1c54e43684..1aebad9a211 100644
--- a/www/zope25-ZPsycopgDA/Makefile
+++ b/www/zope25-ZPsycopgDA/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:55 wiz Exp $
#
DISTNAME= psycopg-1.0.14
+PKGREVISION= 1
PKGNAME= zope25-ZPsycopgDA-1.0.14
WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www
diff --git a/www/zope25-ZWeather/Makefile b/www/zope25-ZWeather/Makefile
index 719484a8088..e72d2c93234 100644
--- a/www/zope25-ZWeather/Makefile
+++ b/www/zope25-ZWeather/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/14 15:59:24 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:55 wiz Exp $
DISTNAME= ZWeather-0_0_1
+PKGREVISION= 1
PKGNAME= zope25-ZWeather-0.0.1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/TheJester/ZWeather/
diff --git a/www/zope25-ZWeatherApplet/Makefile b/www/zope25-ZWeatherApplet/Makefile
index 60362baf5a8..0d5bb0ef023 100644
--- a/www/zope25-ZWeatherApplet/Makefile
+++ b/www/zope25-ZWeatherApplet/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/04/23 15:57:55 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:56:55 wiz Exp $
DISTNAME= ZWeatherApplet-1.51
+PKGREVISION= 1
PKGNAME= zope25-ZWeatherApplet-1.51
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=/zweatherapplet/}
diff --git a/www/zope25-ZWiki/Makefile b/www/zope25-ZWiki/Makefile
index 18f018f9be9..85ca1a3e733 100644
--- a/www/zope25-ZWiki/Makefile
+++ b/www/zope25-ZWiki/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/04/23 15:49:25 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:56 wiz Exp $
DISTNAME= ZWiki-0.17.0
+PKGREVISION= 1
PKGNAME= zope25-ZWiki-0.17.0
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/simon/ZWiki/
diff --git a/www/zope25-Zippy/Makefile b/www/zope25-Zippy/Makefile
index a48dc492a3a..db7eb7571ee 100644
--- a/www/zope25-Zippy/Makefile
+++ b/www/zope25-Zippy/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/01 17:53:32 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:56 wiz Exp $
#
DISTNAME= Zippy
+PKGREVISION= 1
PKGNAME= zope25-Zippy-0
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/michel/Products/Zippy/
diff --git a/www/zope25-colorz/Makefile b/www/zope25-colorz/Makefile
index 3145940a8b4..3a59791f2c6 100644
--- a/www/zope25-colorz/Makefile
+++ b/www/zope25-colorz/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/29 17:36:15 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:56:56 wiz Exp $
DISTNAME= colorz10b2
+PKGREVISION= 1
PKGNAME= zope25-colorz-1.0b2
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/maxm/productList/colorz/
diff --git a/www/zope25/Makefile b/www/zope25/Makefile
index 144927962a3..4ccc67a3125 100644
--- a/www/zope25/Makefile
+++ b/www/zope25/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/17 19:06:13 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:56:47 wiz Exp $
#
DISTNAME= Zope-2.6.1-src
+PKGREVISION= 1
PKGNAME= zope-2.6.1
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Products/Zope/2.6.1/
diff --git a/x11/acidlaunch/Makefile b/x11/acidlaunch/Makefile
index 0703f965731..a2ea410ac12 100644
--- a/x11/acidlaunch/Makefile
+++ b/x11/acidlaunch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/10/05 00:08:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:56 wiz Exp $
#
DISTNAME= acidlaunch-0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://linuxgamers.net/download/
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 149b73c0438..4d53441d20c 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2003/04/27 12:49:56 cjep Exp $
+# $NetBSD: Makefile,v 1.47 2003/05/02 11:56:57 wiz Exp $
DISTNAME= control-center-1.4.0.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/1.4/}
diff --git a/x11/controlcenter/buildlink2.mk b/x11/controlcenter/buildlink2.mk
index 894c1314dd1..541ec99207a 100644
--- a/x11/controlcenter/buildlink2.mk
+++ b/x11/controlcenter/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/09/23 19:57:30 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:56:57 wiz Exp $
.if !defined(CONTROLCENTER_BUILDLINK2_MK)
CONTROLCENTER_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= controlcenter
-BUILDLINK_DEPENDS.controlcenter?= control-center>=1.4.0.4
+BUILDLINK_DEPENDS.controlcenter?= control-center>=1.4.0.4nb2
BUILDLINK_PKGSRCDIR.controlcenter?= ../../x11/controlcenter
DEPENDS+= ${BUILDLINK_DEPENDS.controlcenter}:../../x11/controlcenter
diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index 095e5696a89..d6c37f2fa70 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2003/04/27 12:51:03 cjep Exp $
+# $NetBSD: Makefile.common,v 1.7 2003/05/02 11:56:57 wiz Exp $
#
DISTNAME= dfm-0.99.9
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/dfm
MASTER_SITES= http://www.kaisersite.de/dfm/
diff --git a/x11/egtk/Makefile b/x11/egtk/Makefile
index 779d2e73827..00ad4d8a60a 100644
--- a/x11/egtk/Makefile
+++ b/x11/egtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:31 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:56:57 wiz Exp $
#
DISTNAME= eGTK_0.3.4
+PKGREVISION= 1
PKGNAME= egtk-0.3.4
WRKSRC= ${WRKDIR}/eGTK
CATEGORIES= x11
@@ -11,7 +12,7 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.netlabs.net/hp/richieb/gtk_eiffel.html
COMMENT= Eiffel/GTK+ interface for SmallEiffel
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
DEPENDS+= smalleiffel-[0-9]*:../../lang/smalleiffel
USE_X11= yes
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 49a1ab13586..9d3cb6ce8c7 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2003/04/10 20:10:20 grant Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/02 11:56:58 wiz Exp $
#
DISTNAME= Eterm-0.9.2
PKGNAME= ${DISTNAME:S/^E/e/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.eterm.org/pub/Eterm/ \
ftp://alien.eterm.org/pub/Eterm/ \
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 13b0b1122ec..89e8e513878 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/12/07 02:39:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:56:58 wiz Exp $
#
DISTNAME= gdkxft-1.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gdkxft/}
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 80e67b9f11d..6c1137e6d4f 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2003/01/28 22:04:34 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2003/05/02 11:56:58 wiz Exp $
DISTNAME= gdm-2.2.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.2/} \
${MASTER_SITE_LOCAL}
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index fd072443352..da27beabe95 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/03/01 11:49:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:56:59 wiz Exp $
#
DISTNAME= gnomemm-1.2.2
PKGNAME= ${DISTNAME:S/mm/--/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkmm/}
diff --git a/x11/gnome--/buildlink2.mk b/x11/gnome--/buildlink2.mk
index dcb7f33f287..278e2553a30 100644
--- a/x11/gnome--/buildlink2.mk
+++ b/x11/gnome--/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/03/01 14:11:52 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:56:59 wiz Exp $
.if !defined(GNOMEMM_BUILDLINK2_MK)
GNOMEMM_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnomemm
-BUILDLINK_DEPENDS.gnomemm?= gnome-->=1.2.2
+BUILDLINK_DEPENDS.gnomemm?= gnome-->=1.2.2nb2
BUILDLINK_PKGSRCDIR.gnomemm?= ../../x11/gnome--
EVAL_PREFIX+= BUILDLINK_PREFIX.gnomemm=gnome--
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index cf927dcd150..26b4c3eef8a 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2003/04/20 13:50:30 rh Exp $
+# $NetBSD: Makefile,v 1.28 2003/05/02 11:56:59 wiz Exp $
#
DISTNAME= gnome-applets-1.4.0.4
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/1.4/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index fb34046d910..9ee029a0b9d 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.88 2003/04/20 10:43:51 rh Exp $
+# $NetBSD: Makefile,v 1.89 2003/05/02 11:56:59 wiz Exp $
#
.include "Makefile.common"
-PKGREVISION= 4
+PKGREVISION= 5
COMMENT= Core component of GNU Network Object Management Environment
diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common
index 47ce4fe6019..d90a612a721 100644
--- a/x11/gnome-core/Makefile.common
+++ b/x11/gnome-core/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1 2003/04/20 10:43:51 rh Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/05/02 11:57:00 wiz Exp $
#
DISTNAME= gnome-core-1.4.2
+PKGREVISION= 1
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-core/1.4/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-core/buildlink2.mk b/x11/gnome-core/buildlink2.mk
index c1398b6fa9b..934a9868858 100644
--- a/x11/gnome-core/buildlink2.mk
+++ b/x11/gnome-core/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/04/20 10:43:51 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/02 11:57:00 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-core.
#
@@ -9,7 +9,7 @@
GNOME_CORE_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-core
-BUILDLINK_DEPENDS.gnome-core?= gnome-core>=1.4.2nb4
+BUILDLINK_DEPENDS.gnome-core?= gnome-core>=1.4.2nb5
BUILDLINK_PKGSRCDIR.gnome-core?= ../../x11/gnome-core
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-core=gnome-core
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 4f56d5fddb8..fd4853d5138 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/02/14 20:53:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:57:00 wiz Exp $
#
DISTNAME= gnome-desktop-2.2.0.1
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-desktop/buildlink2.mk b/x11/gnome-desktop/buildlink2.mk
index bbcc0fb8cfb..f75142f35cf 100644
--- a/x11/gnome-desktop/buildlink2.mk
+++ b/x11/gnome-desktop/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 20:53:42 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:57:00 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-desktop.
#
@@ -9,7 +9,7 @@
GNOME_DESKTOP_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-desktop
-BUILDLINK_DEPENDS.gnome-desktop?= gnome-desktop>=2.2.0.1
+BUILDLINK_DEPENDS.gnome-desktop?= gnome-desktop>=2.2.0.1nb1
BUILDLINK_PKGSRCDIR.gnome-desktop?= ../../x11/gnome-desktop
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-desktop=gnome-desktop
diff --git a/x11/gnome-gkrellm/Makefile b/x11/gnome-gkrellm/Makefile
index 6765863bba2..680a25de995 100644
--- a/x11/gnome-gkrellm/Makefile
+++ b/x11/gnome-gkrellm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:56 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:00 wiz Exp $
DISTNAME= gkrellm-gnome
PKGNAME= gnome-gkrellm-0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= gnome sysutils
MASTER_SITES= http://web.wt.net/~billw/gkrellm/Plugins/
@@ -10,8 +10,8 @@ MAINTAINER= damon@netbsd.org
HOMEPAGE= http://web.wt.net/~billw/gkrellm/Plugins.html
COMMENT= gkrellm gnome plugin
-DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm
-DEPENDS+= gnome-libs>=1.4.1.2nb1:../gnome-libs
+DEPENDS+= gkrellm>=1.2.13nb1:../../sysutils/gkrellm
+DEPENDS+= gnome-libs>=1.4.1.4nb4:../gnome-libs
USE_GMAKE= yes
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index c8a0ed6f227..ca17babca66 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2003/02/05 05:06:37 jlam Exp $
+# $NetBSD: Makefile,v 1.85 2003/05/02 11:57:01 wiz Exp $
DISTNAME= gnome-libs-1.4.1.4
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-libs/1.4/}
diff --git a/x11/gnome-libs/buildlink2.mk b/x11/gnome-libs/buildlink2.mk
index 34332d4e784..0417e7d1f8e 100644
--- a/x11/gnome-libs/buildlink2.mk
+++ b/x11/gnome-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/10/23 17:09:10 bouyer Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:57:01 wiz Exp $
.if !defined(GNOME_LIBS_BUILDLINK2_MK)
GNOME_LIBS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-libs
-BUILDLINK_DEPENDS.gnome-libs?= gnome-libs>=1.4.1.4
+BUILDLINK_DEPENDS.gnome-libs?= gnome-libs>=1.4.1.4nb4
BUILDLINK_PKGSRCDIR.gnome-libs?= ../../x11/gnome-libs
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-libs=gnome-libs
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index f2748825db4..e5a0c4203f1 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/20 14:06:43 rh Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:57:01 wiz Exp $
#
DISTNAME= gnome-panel-2.2.1
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-panel/buildlink2.mk b/x11/gnome-panel/buildlink2.mk
index 1262074529b..d2a3cfac5fb 100644
--- a/x11/gnome-panel/buildlink2.mk
+++ b/x11/gnome-panel/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/02/14 21:05:27 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:57:01 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-panel.
#
@@ -9,7 +9,7 @@
GNOME_PANEL_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-panel
-BUILDLINK_DEPENDS.gnome-panel?= gnome-panel>=2.2.0.1
+BUILDLINK_DEPENDS.gnome-panel?= gnome-panel>=2.2.1nb1
BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-panel=gnome-panel
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index b17c54366e0..22b1670ba5b 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2003/04/20 14:26:01 rh Exp $
+# $NetBSD: Makefile,v 1.34 2003/05/02 11:57:02 wiz Exp $
DISTNAME= gnome-python-1.4.4
PKGNAME= ${PYPKGPREFIX}-gnome-1.4.4
-#PKGREVISION= 3
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python/1.4/}
diff --git a/x11/gnome-python/buildlink2.mk b/x11/gnome-python/buildlink2.mk
index 89edb152b92..4ed0562a91a 100644
--- a/x11/gnome-python/buildlink2.mk
+++ b/x11/gnome-python/buildlink2.mk
@@ -1,7 +1,7 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:10:31 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:57:02 wiz Exp $
.include "../../lang/python/pyversion.mk"
BUILDLINK_PACKAGES+= pygnome
-BUILDLINK_DEPENDS.pygnome?= ${PYPKGPREFIX}-gnome>=1.4.0nb3
+BUILDLINK_DEPENDS.pygnome?= ${PYPKGPREFIX}-gnome>=1.4.4nb1
BUILDLINK_PKGSRCDIR.pygnome?= ../../x11/gnome-python
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 09fc4708e32..f3a05e494e4 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/04/20 13:59:34 rh Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:57:02 wiz Exp $
#
DISTNAME= gnome-session-2.2.1
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-users-guide/Makefile b/x11/gnome-users-guide/Makefile
index ccb33035cd3..e53157b009f 100644
--- a/x11/gnome-users-guide/Makefile
+++ b/x11/gnome-users-guide/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/10/19 10:55:02 rh Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:57:02 wiz Exp $
DISTNAME= users-guide-1.2
PKGNAME= gnome-users-guide-1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/users-guide/1.2/}
@@ -10,7 +10,7 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.gnome.org/users-guide/project.shtml
COMMENT= User documentation for GNOME
-DEPENDS+= gnome-libs>=1.4.1.2nb1:../gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.4nb4:../gnome-libs
GNU_CONFIGURE= YES
USE_X11BASE= YES
diff --git a/x11/gnome1-panel/Makefile b/x11/gnome1-panel/Makefile
index b2a69fbe880..2dd6e795002 100644
--- a/x11/gnome1-panel/Makefile
+++ b/x11/gnome1-panel/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/04/20 10:29:22 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:03 wiz Exp $
#
.include "../../x11/gnome-core/Makefile.common"
PKGNAME= ${DISTNAME:S/-core/-panel/}
+PKGREVISION= 1
COMMENT= gnome-panel component split out from gnome-core
diff --git a/x11/gnome1-panel/buildlink2.mk b/x11/gnome1-panel/buildlink2.mk
index f34d4bddb77..6092514faf9 100644
--- a/x11/gnome1-panel/buildlink2.mk
+++ b/x11/gnome1-panel/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/20 09:10:11 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:57:03 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-panel.
#
@@ -9,7 +9,7 @@
GNOME_PANEL_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-panel
-BUILDLINK_DEPENDS.gnome-panel?= gnome-panel>=1.4.2
+BUILDLINK_DEPENDS.gnome-panel?= gnome-panel>=1.4.2nb1
BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome1-panel
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-panel=gnome-panel
diff --git a/x11/gnome1-session/Makefile b/x11/gnome1-session/Makefile
index b570c8931f7..37b627c5f57 100644
--- a/x11/gnome1-session/Makefile
+++ b/x11/gnome1-session/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/04/20 09:08:19 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:03 wiz Exp $
#
.include "../../x11/gnome-core/Makefile.common"
PKGNAME= ${DISTNAME:S/-core/-session/}
+PKGREVISION= 1
COMMENT= Gnome-session component split out from gnome-core
diff --git a/x11/gnome1-session/buildlink2.mk b/x11/gnome1-session/buildlink2.mk
index a2c5a611a2b..f5e2b858a25 100644
--- a/x11/gnome1-session/buildlink2.mk
+++ b/x11/gnome1-session/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/20 09:05:26 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:57:03 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome-session.
#
@@ -9,7 +9,7 @@
GNOME_SESSION_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome-session
-BUILDLINK_DEPENDS.gnome-session?= gnome-session>=1.4.2
+BUILDLINK_DEPENDS.gnome-session?= gnome-session>=1.4.2nb1
BUILDLINK_PKGSRCDIR.gnome-session?= ../../x11/gnome1-session
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-session=gnome-session
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index e4e2ffc068a..7c16e525124 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/20 23:19:23 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:57:03 wiz Exp $
#
DISTNAME= gnome-applets-2.2.1
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/2.2/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index a177f2dfd24..a6a80e173c8 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/04/20 13:52:54 rh Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:57:04 wiz Exp $
#
DISTNAME= control-center-2.2.1
+PKGREVISION= 1
PKGNAME= gnome2-${DISTNAME}
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.2/}
diff --git a/x11/gnome2-control-center/buildlink2.mk b/x11/gnome2-control-center/buildlink2.mk
index 25e911f642d..1924de5b5c5 100644
--- a/x11/gnome2-control-center/buildlink2.mk
+++ b/x11/gnome2-control-center/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 21:03:41 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:57:04 wiz Exp $
#
# This Makefile fragment is included by packages that use gnome2-control-center.
#
@@ -9,7 +9,7 @@
GNOME2_CONTROL_CENTER_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnome2-control-center
-BUILDLINK_DEPENDS.gnome2-control-center?= gnome2-control-center>=2.2.0.1
+BUILDLINK_DEPENDS.gnome2-control-center?= gnome2-control-center>=2.2.1nb1
BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome2-control-center=gnome2-control-center
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 7eadd7a1496..f31aa94498d 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/02/18 14:56:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:57:04 wiz Exp $
#
DISTNAME= gnome-terminal-2.0.1
PKGNAME= ${DISTNAME:S/-/2-/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index ae4084362af..385ba0706fc 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/01 08:37:43 rh Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:04 wiz Exp $
#
DISTNAME= gnustep-back-0.8.5
+PKGREVISION= 1
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
diff --git a/x11/gnustep-back/buildlink2.mk b/x11/gnustep-back/buildlink2.mk
index 9c61852c307..9f1d1ad8c63 100644
--- a/x11/gnustep-back/buildlink2.mk
+++ b/x11/gnustep-back/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/03 04:12:03 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:57:04 wiz Exp $
#
.if !defined(GNUSTEP_BACK_BUILDLINK2_MK)
GNUSTEP_BACK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnustep-back
-BUILDLINK_DEPENDS.gnustep-back?= gnustep-back>=0.8.3
+BUILDLINK_DEPENDS.gnustep-back?= gnustep-back>=0.8.5nb1
BUILDLINK_PKGSRCDIR.gnustep-back?= ../../x11/gnustep-back
EVAL_PREFIX+= BUILDLINK_PREFIX.gnustep-back=gnustep-back
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 41b1c94cfea..d024e9e81a0 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/01 08:35:15 rh Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:04 wiz Exp $
#
DISTNAME= gnustep-gui-0.8.5
+PKGREVISION= 1
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
diff --git a/x11/gnustep-gui/buildlink2.mk b/x11/gnustep-gui/buildlink2.mk
index 9f4b0808c16..ddbd7510ec8 100644
--- a/x11/gnustep-gui/buildlink2.mk
+++ b/x11/gnustep-gui/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/04/01 08:35:15 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:57:05 wiz Exp $
#
.if !defined(GNUSTEP_GUI_BUILDLINK2_MK)
GNUSTEP_GUI_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gnustep-gui
-BUILDLINK_DEPENDS.gnustep-gui?= gnustep-gui>=0.8.5
+BUILDLINK_DEPENDS.gnustep-gui?= gnustep-gui>=0.8.5nb1
BUILDLINK_PKGSRCDIR.gnustep-gui?= ../../x11/gnustep-gui
EVAL_PREFIX+= BUILDLINK_PREFIX.gnustep-gui=gnustep-gui
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index d36fc04db78..fc099090371 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/07 03:00:40 jmc Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:57:05 wiz Exp $
#
DISTNAME= Preferences-1.2.0
-PKGREVISION= 2
+PKGREVISION= 3
PKGNAME= gnustep-${DISTNAME:S/P/p/}
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prefsapp/}
diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile
index 52675917eae..76cd5fd3796 100644
--- a/x11/gtk+extra/Makefile
+++ b/x11/gtk+extra/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/09/22 10:30:00 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:57:05 wiz Exp $
#
DISTNAME= gtk+extra-0.99.17
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://gtkextra.sourceforge.net/src/
diff --git a/x11/gtk+extra/buildlink2.mk b/x11/gtk+extra/buildlink2.mk
index cd28f8f2169..89b11b12f46 100644
--- a/x11/gtk+extra/buildlink2.mk
+++ b/x11/gtk+extra/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:30 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:57:05 wiz Exp $
.if !defined(GTKEXTRA_BUILDLINK2_MK)
GTKEXTRA_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtkextra
-BUILDLINK_DEPENDS.gtkextra?= gtk+extra>=0.99.17
+BUILDLINK_DEPENDS.gtkextra?= gtk+extra>=0.99.17nb1
BUILDLINK_PKGSRCDIR.gtkextra?= ../../x11/gtk+extra
EVAL_PREFIX+= BUILDLINK_PREFIX.gtkextra=gtk+extra
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index 84ae07ddcc4..821bcb00c80 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2003/03/01 11:49:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2003/05/02 11:57:06 wiz Exp $
#
DISTNAME= gtkmm-1.2.10
PKGNAME= gtk---1.2.10
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkmm/} \
${MASTER_SITE_GNOME:=sources/gtkmm/1.2/}
diff --git a/x11/gtk--/buildlink2.mk b/x11/gtk--/buildlink2.mk
index fee8dbc4b83..b148264f38a 100644
--- a/x11/gtk--/buildlink2.mk
+++ b/x11/gtk--/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/03/01 14:11:52 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:57:06 wiz Exp $
.if !defined(GTKMM_BUILDLINK2_MK)
GTKMM_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtkmm
-BUILDLINK_DEPENDS.gtkmm?= gtk-->=1.2.10
+BUILDLINK_DEPENDS.gtkmm?= gtk-->=1.2.10nb2
BUILDLINK_PKGSRCDIR.gtkmm?= ../../x11/gtk--
EVAL_PREFIX+= BUILDLINK_PREFIX.gtkmm=gtkmm
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 714e9c88038..8aeb84a733c 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/01/10 08:46:53 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:57:06 wiz Exp $
DISTNAME= gtk-engines-0.12
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-engines/0.12/}
@@ -15,8 +15,6 @@ USE_X11BASE= # defined
USE_LIBTOOL= # defined
SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-BUILDLINK_DEPENDS.gtk= gtk+>=1.2.9
-
.include "../../x11/gtk/buildlink2.mk"
.include "../../graphics/imlib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 89dcc30fc27..ebdb3514e67 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2003/04/27 12:51:35 cjep Exp $
+# $NetBSD: Makefile,v 1.81 2003/05/02 11:57:05 wiz Exp $
DISTNAME= gtk+-1.2.10
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/x11/gtk/buildlink2.mk b/x11/gtk/buildlink2.mk
index cb71327cd63..8e33eb1dfc7 100644
--- a/x11/gtk/buildlink2.mk
+++ b/x11/gtk/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/11/04 14:40:04 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/02 11:57:05 wiz Exp $
.if !defined(GTK_BUILDLINK2_MK)
GTK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtk
-BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.8
+BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.10nb4
BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk
EVAL_PREFIX+= BUILDLINK_PREFIX.gtk=gtk
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index d73e439b2af..2a9090d1ffe 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/01/18 10:49:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:57:07 wiz Exp $
#
DISTNAME= gtk-engines-2.2.0
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-engines/2.2/}
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 77d8f4bf77f..da79f223730 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/02/15 11:02:29 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:57:07 wiz Exp $
#
DISTNAME= gtk+-2.2.1
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.2/ \
diff --git a/x11/gtk2/buildlink2.mk b/x11/gtk2/buildlink2.mk
index 6fad03c8029..5fadc15fef9 100644
--- a/x11/gtk2/buildlink2.mk
+++ b/x11/gtk2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/01/11 18:23:46 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/02 11:57:07 wiz Exp $
.if !defined(GTK2_BUILDLINK2_MK)
GTK2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtk2
-BUILDLINK_DEPENDS.gtk2?= gtk2+>=2.2.0
+BUILDLINK_DEPENDS.gtk2?= gtk2+>=2.2.1nb1
BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2
EVAL_PREFIX+= BUILDLINK_PREFIX.gtk2=gtk2
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index 9d56fa7dc7f..3af8c130140 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2003/03/09 19:28:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.27 2003/05/02 11:57:07 wiz Exp $
DISTNAME= gtkglarea-1.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 graphics
MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/
diff --git a/x11/gtkglarea/buildlink2.mk b/x11/gtkglarea/buildlink2.mk
index a8f12e03603..9e374a7c10f 100644
--- a/x11/gtkglarea/buildlink2.mk
+++ b/x11/gtkglarea/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/03/12 22:07:29 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:57:08 wiz Exp $
.if !defined(GTKGLAREA_BUILDLINK2_MK)
GTKGLAREA_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtkglarea
-BUILDLINK_DEPENDS.gtkglarea?= gtkglarea>=1.2.2
+BUILDLINK_DEPENDS.gtkglarea?= gtkglarea>=1.2.2nb2
BUILDLINK_PKGSRCDIR.gtkglarea?= ../../x11/gtkglarea
EVAL_PREFIX+= BUILDLINK_PREFIX.gtkglarea=gtkglarea
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 556cae9eb1b..657ff14d8a0 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/15 20:32:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:08 wiz Exp $
#
DISTNAME= gtkmm-2.2.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkmm/}
diff --git a/x11/gtkmm/buildlink2.mk b/x11/gtkmm/buildlink2.mk
index 7151df167c2..d2b1b0b52d4 100644
--- a/x11/gtkmm/buildlink2.mk
+++ b/x11/gtkmm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/03/01 14:33:09 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:57:08 wiz Exp $
#
# This Makefile fragment is included by packages that use gtkmm.
#
@@ -9,7 +9,7 @@
GTKMM_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtkmm
-BUILDLINK_DEPENDS.gtkmm?= gtkmm>=2.2.0
+BUILDLINK_DEPENDS.gtkmm?= gtkmm>=2.2.1nb1
BUILDLINK_PKGSRCDIR.gtkmm?= ../../x11/gtkmm
EVAL_PREFIX+= BUILDLINK_PREFIX.gtkmm=gtkmm
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index e9a9a0fa396..4bbee4359ab 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:06:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:57:09 wiz Exp $
DISTNAME= gtkstep-1.10
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://ulli.linuxave.net/gtkstep/
EXTRACT_SUFX= .tar.bz2
@@ -9,7 +10,7 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://ulli.linuxave.net/gtkstep/index.html
COMMENT= GTK theme-engine to yield a NEXTSTEP(tm) look and feel
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
GNU_CONFIGURE= # defined
USE_X11BASE= # defined
diff --git a/x11/gtoolkit/Makefile.common b/x11/gtoolkit/Makefile.common
index 066ecd7094c..cbe156e7873 100644
--- a/x11/gtoolkit/Makefile.common
+++ b/x11/gtoolkit/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2002/11/09 13:43:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/05/02 11:57:09 wiz Exp $
#
DISTNAME= gtoolkit-0.9.5
+PKGREVISION= 1
CATEGORIES?= x11
MASTER_SITES?= ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/
diff --git a/x11/gtoolkit/buildlink2.mk b/x11/gtoolkit/buildlink2.mk
index 50af624b3e9..b5558e592d9 100644
--- a/x11/gtoolkit/buildlink2.mk
+++ b/x11/gtoolkit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/11/09 05:19:28 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:57:09 wiz Exp $
#
# This Makefile fragment is included by packages that use gtoolkit.
#
@@ -9,7 +9,7 @@
GTOOLKIT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= gtoolkit
-BUILDLINK_DEPENDS.gtoolkit?= gtoolkit>=0.9.5
+BUILDLINK_DEPENDS.gtoolkit?= gtoolkit>=0.9.5nb1
BUILDLINK_PKGSRCDIR.gtoolkit?= ../../x11/gtoolkit
EVAL_PREFIX+= BUILDLINK_PREFIX.gtoolkit=gtoolkit
diff --git a/x11/hot-babe/Makefile b/x11/hot-babe/Makefile
index 26d63018caf..890a2895c86 100644
--- a/x11/hot-babe/Makefile
+++ b/x11/hot-babe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/11/05 07:59:31 simonb Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:57:09 wiz Exp $
#
DISTNAME= hot-babe-0.1.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://dindinx.net/hotbabe/downloads/
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index f7d27cf6a39..6f77a165cfc 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/28 08:59:29 skrll Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:57:10 wiz Exp $
DISTNAME= kde-2.2.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,16 +10,16 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= "meta-package" for the KDE integrated X11 desktop
-DEPENDS+= kdeartwork-2.2.2:../../misc/kdeartwork2
-DEPENDS+= kdeaddons-2.2.2:../../misc/kdeaddons2
-DEPENDS+= kdeadmin-2.2.2nb2:../../misc/kdeadmin2
-DEPENDS+= kdegames-2.2.2nb1:../../games/kdegames2
-DEPENDS+= kdegraphics-2.2.2nb2:../../graphics/kdegraphics2
-DEPENDS+= kdemultimedia-2.2.2nb1:../../audio/kdemultimedia2
-DEPENDS+= kdenetwork-2.2.2nb4:../../net/kdenetwork2
-DEPENDS+= kdepim-2.2.2nb2:../../misc/kdepim2
-DEPENDS+= kdetoys-2.2.2nb1:../../games/kdetoys2
-DEPENDS+= kdeutils-2.2.2nb1:../../misc/kdeutils2
+DEPENDS+= kdeartwork-2.2.2nb1:../../misc/kdeartwork2
+DEPENDS+= kdeaddons-2.2.2nb1:../../misc/kdeaddons2
+DEPENDS+= kdeadmin-2.2.2nb3:../../misc/kdeadmin2
+DEPENDS+= kdegames-2.2.2nb2:../../games/kdegames2
+DEPENDS+= kdegraphics-2.2.2nb3:../../graphics/kdegraphics2
+DEPENDS+= kdemultimedia-2.2.2nb2:../../audio/kdemultimedia2
+DEPENDS+= kdenetwork-2.2.2nb5:../../net/kdenetwork2
+DEPENDS+= kdepim-2.2.2nb3:../../misc/kdepim2
+DEPENDS+= kdetoys-2.2.2nb2:../../games/kdetoys2
+DEPENDS+= kdeutils-2.2.2nb2:../../misc/kdeutils2
EXTRACT_ONLY= # empty
USE_X11BASE= yes
diff --git a/x11/kde3-i18n-af/Makefile b/x11/kde3-i18n-af/Makefile
index 2b00f7b59d8..d790604da24 100644
--- a/x11/kde3-i18n-af/Makefile
+++ b/x11/kde3-i18n-af/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:10 wiz Exp $
DISTNAME= kde-i18n-af-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-af
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ar/Makefile b/x11/kde3-i18n-ar/Makefile
index ab03dd62883..910d8a1c7d2 100644
--- a/x11/kde3-i18n-ar/Makefile
+++ b/x11/kde3-i18n-ar/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:11 wiz Exp $
DISTNAME= kde-i18n-ar-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-ar
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-bg/Makefile b/x11/kde3-i18n-bg/Makefile
index a3a326fa70c..df6556effb5 100644
--- a/x11/kde3-i18n-bg/Makefile
+++ b/x11/kde3-i18n-bg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:11 wiz Exp $
DISTNAME= kde-i18n-bg-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-bg
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-bs/Makefile b/x11/kde3-i18n-bs/Makefile
index 9b875c9ec7e..6b36dd7a018 100644
--- a/x11/kde3-i18n-bs/Makefile
+++ b/x11/kde3-i18n-bs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:11 wiz Exp $
DISTNAME= kde-i18n-bs-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-bs
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ca/Makefile b/x11/kde3-i18n-ca/Makefile
index 2a6bd53053b..0b4cee2b842 100644
--- a/x11/kde3-i18n-ca/Makefile
+++ b/x11/kde3-i18n-ca/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:12 wiz Exp $
DISTNAME= kde-i18n-ca-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-ca
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-cs/Makefile b/x11/kde3-i18n-cs/Makefile
index f6b27ec2e1d..3ef6002e734 100644
--- a/x11/kde3-i18n-cs/Makefile
+++ b/x11/kde3-i18n-cs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:12 wiz Exp $
DISTNAME= kde-i18n-cs-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-cs
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-da/Makefile b/x11/kde3-i18n-da/Makefile
index 82a0fb8f70f..bc3330806c1 100644
--- a/x11/kde3-i18n-da/Makefile
+++ b/x11/kde3-i18n-da/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:12 wiz Exp $
DISTNAME= kde-i18n-da-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-da
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-de/Makefile b/x11/kde3-i18n-de/Makefile
index 413f5f70a29..39436c0c8a4 100644
--- a/x11/kde3-i18n-de/Makefile
+++ b/x11/kde3-i18n-de/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:12 wiz Exp $
DISTNAME= kde-i18n-de-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-de
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-el/Makefile b/x11/kde3-i18n-el/Makefile
index c200a6a9040..d0a9f2853df 100644
--- a/x11/kde3-i18n-el/Makefile
+++ b/x11/kde3-i18n-el/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:13 wiz Exp $
DISTNAME= kde-i18n-el-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-el
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-en_GB/Makefile b/x11/kde3-i18n-en_GB/Makefile
index 44b75681f5d..50cdbd47592 100644
--- a/x11/kde3-i18n-en_GB/Makefile
+++ b/x11/kde3-i18n-en_GB/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:13 wiz Exp $
DISTNAME= kde-i18n-en_GB-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-en_GB
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-eo/Makefile b/x11/kde3-i18n-eo/Makefile
index dd4cf0f41cd..2bf0b0fa7a2 100644
--- a/x11/kde3-i18n-eo/Makefile
+++ b/x11/kde3-i18n-eo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:13 wiz Exp $
DISTNAME= kde-i18n-eo-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-eo
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-es/Makefile b/x11/kde3-i18n-es/Makefile
index b9ad58c4b19..f572a39ef98 100644
--- a/x11/kde3-i18n-es/Makefile
+++ b/x11/kde3-i18n-es/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:13 wiz Exp $
DISTNAME= kde-i18n-es-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-es
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-et/Makefile b/x11/kde3-i18n-et/Makefile
index 8582da8a885..cd755c50a12 100644
--- a/x11/kde3-i18n-et/Makefile
+++ b/x11/kde3-i18n-et/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:14 wiz Exp $
DISTNAME= kde-i18n-et-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-et
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-eu/Makefile b/x11/kde3-i18n-eu/Makefile
index 90912d2026b..16f41aae88f 100644
--- a/x11/kde3-i18n-eu/Makefile
+++ b/x11/kde3-i18n-eu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:14 wiz Exp $
DISTNAME= kde-i18n-eu-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-eu
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-fa/Makefile b/x11/kde3-i18n-fa/Makefile
index 1215782fa38..38847270c13 100644
--- a/x11/kde3-i18n-fa/Makefile
+++ b/x11/kde3-i18n-fa/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:14 wiz Exp $
DISTNAME= kde-i18n-fa-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-fa
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-fi/Makefile b/x11/kde3-i18n-fi/Makefile
index f34a1028276..6a63221965f 100644
--- a/x11/kde3-i18n-fi/Makefile
+++ b/x11/kde3-i18n-fi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:15 wiz Exp $
DISTNAME= kde-i18n-fi-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-fi
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-fr/Makefile b/x11/kde3-i18n-fr/Makefile
index c15775fd34b..4a397ca9e6a 100644
--- a/x11/kde3-i18n-fr/Makefile
+++ b/x11/kde3-i18n-fr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:15 wiz Exp $
DISTNAME= kde-i18n-fr-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-fr
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-he/Makefile b/x11/kde3-i18n-he/Makefile
index 0d8c15a1062..d15d39fb17e 100644
--- a/x11/kde3-i18n-he/Makefile
+++ b/x11/kde3-i18n-he/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:15 wiz Exp $
DISTNAME= kde-i18n-he-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-he
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-hu/Makefile b/x11/kde3-i18n-hu/Makefile
index 29814b5479b..e5439dbed77 100644
--- a/x11/kde3-i18n-hu/Makefile
+++ b/x11/kde3-i18n-hu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:16 wiz Exp $
DISTNAME= kde-i18n-hu-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-hu
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-it/Makefile b/x11/kde3-i18n-it/Makefile
index 97a64ecde5f..f4ed43dc75d 100644
--- a/x11/kde3-i18n-it/Makefile
+++ b/x11/kde3-i18n-it/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:16 wiz Exp $
DISTNAME= kde-i18n-it-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-it
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ja/Makefile b/x11/kde3-i18n-ja/Makefile
index 4c695ae6ffd..fe3bf2abdfa 100644
--- a/x11/kde3-i18n-ja/Makefile
+++ b/x11/kde3-i18n-ja/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:16 wiz Exp $
DISTNAME= kde-i18n-ja-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-ja
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-lt/Makefile b/x11/kde3-i18n-lt/Makefile
index 5ff38d8e0d0..8a420689373 100644
--- a/x11/kde3-i18n-lt/Makefile
+++ b/x11/kde3-i18n-lt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:16 wiz Exp $
DISTNAME= kde-i18n-lt-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-lt
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-mt/Makefile b/x11/kde3-i18n-mt/Makefile
index d64a3a7b610..37cc921cb02 100644
--- a/x11/kde3-i18n-mt/Makefile
+++ b/x11/kde3-i18n-mt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:17 wiz Exp $
DISTNAME= kde-i18n-mt-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-mt
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-nb/Makefile b/x11/kde3-i18n-nb/Makefile
index ef96a68e536..1e63025b5f5 100644
--- a/x11/kde3-i18n-nb/Makefile
+++ b/x11/kde3-i18n-nb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:17 wiz Exp $
DISTNAME= kde-i18n-nb-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-nb
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-nl/Makefile b/x11/kde3-i18n-nl/Makefile
index b7759851fa3..6743fbf36c8 100644
--- a/x11/kde3-i18n-nl/Makefile
+++ b/x11/kde3-i18n-nl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:17 wiz Exp $
DISTNAME= kde-i18n-nl-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-nl
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-nn/Makefile b/x11/kde3-i18n-nn/Makefile
index 4edb624e27a..ed0757055ed 100644
--- a/x11/kde3-i18n-nn/Makefile
+++ b/x11/kde3-i18n-nn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:18 wiz Exp $
DISTNAME= kde-i18n-nn-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-nn
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-nso/Makefile b/x11/kde3-i18n-nso/Makefile
index 20605c306fc..39fe33245e4 100644
--- a/x11/kde3-i18n-nso/Makefile
+++ b/x11/kde3-i18n-nso/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:18 wiz Exp $
DISTNAME= kde-i18n-nso-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-nso
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-pl/Makefile b/x11/kde3-i18n-pl/Makefile
index 37ed01effe1..7e08e6332f9 100644
--- a/x11/kde3-i18n-pl/Makefile
+++ b/x11/kde3-i18n-pl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:18 wiz Exp $
DISTNAME= kde-i18n-pl-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-pl
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-pt/Makefile b/x11/kde3-i18n-pt/Makefile
index e0cd2564179..1e2ce7b8c53 100644
--- a/x11/kde3-i18n-pt/Makefile
+++ b/x11/kde3-i18n-pt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:18 wiz Exp $
DISTNAME= kde-i18n-pt-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-pt
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-pt_BR/Makefile b/x11/kde3-i18n-pt_BR/Makefile
index f800cef7c84..73a6358112b 100644
--- a/x11/kde3-i18n-pt_BR/Makefile
+++ b/x11/kde3-i18n-pt_BR/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:19 wiz Exp $
DISTNAME= kde-i18n-pt_BR-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-pt_BR
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ro/Makefile b/x11/kde3-i18n-ro/Makefile
index b4884e40176..7ffb184e9b9 100644
--- a/x11/kde3-i18n-ro/Makefile
+++ b/x11/kde3-i18n-ro/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:19 wiz Exp $
DISTNAME= kde-i18n-ro-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-ro
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ru/Makefile b/x11/kde3-i18n-ru/Makefile
index 3e683f5871e..22565e009dc 100644
--- a/x11/kde3-i18n-ru/Makefile
+++ b/x11/kde3-i18n-ru/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:19 wiz Exp $
DISTNAME= kde-i18n-ru-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-ru
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-sk/Makefile b/x11/kde3-i18n-sk/Makefile
index fa5ffe7a9a5..2edc2492d87 100644
--- a/x11/kde3-i18n-sk/Makefile
+++ b/x11/kde3-i18n-sk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:19 wiz Exp $
DISTNAME= kde-i18n-sk-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-sk
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-sl/Makefile b/x11/kde3-i18n-sl/Makefile
index 92c29aa541d..ffb7e6d156b 100644
--- a/x11/kde3-i18n-sl/Makefile
+++ b/x11/kde3-i18n-sl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:20 wiz Exp $
DISTNAME= kde-i18n-sl-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-sl
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-sr/Makefile b/x11/kde3-i18n-sr/Makefile
index 5ffaf2cd989..49254d563da 100644
--- a/x11/kde3-i18n-sr/Makefile
+++ b/x11/kde3-i18n-sr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:20 wiz Exp $
DISTNAME= kde-i18n-sr-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-sr
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-sv/Makefile b/x11/kde3-i18n-sv/Makefile
index 4fdd5a683d7..71971a5fc99 100644
--- a/x11/kde3-i18n-sv/Makefile
+++ b/x11/kde3-i18n-sv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:20 wiz Exp $
DISTNAME= kde-i18n-sv-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-sv
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ta/Makefile b/x11/kde3-i18n-ta/Makefile
index c38ed8a20d2..cbcffc044ea 100644
--- a/x11/kde3-i18n-ta/Makefile
+++ b/x11/kde3-i18n-ta/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:20 wiz Exp $
DISTNAME= kde-i18n-ta-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-ta
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-th/Makefile b/x11/kde3-i18n-th/Makefile
index 1a857d31af8..bd3b8d44169 100644
--- a/x11/kde3-i18n-th/Makefile
+++ b/x11/kde3-i18n-th/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:21 wiz Exp $
DISTNAME= kde-i18n-th-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-th
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-tr/Makefile b/x11/kde3-i18n-tr/Makefile
index 6a6bbd0de5d..c831f4fccfd 100644
--- a/x11/kde3-i18n-tr/Makefile
+++ b/x11/kde3-i18n-tr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:21 wiz Exp $
DISTNAME= kde-i18n-tr-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-tr
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-uk/Makefile b/x11/kde3-i18n-uk/Makefile
index c5c4f8bd255..f1e8e832d95 100644
--- a/x11/kde3-i18n-uk/Makefile
+++ b/x11/kde3-i18n-uk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:23 wiz Exp $
DISTNAME= kde-i18n-uk-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-uk
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ven/Makefile b/x11/kde3-i18n-ven/Makefile
index 95de854ed73..b43361b5e04 100644
--- a/x11/kde3-i18n-ven/Makefile
+++ b/x11/kde3-i18n-ven/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:24 wiz Exp $
DISTNAME= kde-i18n-ven-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-ven
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-vi/Makefile b/x11/kde3-i18n-vi/Makefile
index cbfdf6a9327..3d45948eb34 100644
--- a/x11/kde3-i18n-vi/Makefile
+++ b/x11/kde3-i18n-vi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:24 wiz Exp $
DISTNAME= kde-i18n-vi-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-vi
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-xh/Makefile b/x11/kde3-i18n-xh/Makefile
index dbc77a325eb..70b0119b67c 100644
--- a/x11/kde3-i18n-xh/Makefile
+++ b/x11/kde3-i18n-xh/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:24 wiz Exp $
DISTNAME= kde-i18n-xh-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-xh
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-zh_CN/Makefile b/x11/kde3-i18n-zh_CN/Makefile
index 40af201b359..97116433f2e 100644
--- a/x11/kde3-i18n-zh_CN/Makefile
+++ b/x11/kde3-i18n-zh_CN/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:25 wiz Exp $
DISTNAME= kde-i18n-zh_CN-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-zh_CN
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-zh_TW/Makefile b/x11/kde3-i18n-zh_TW/Makefile
index 3f71a4be320..4c96d155cf5 100644
--- a/x11/kde3-i18n-zh_TW/Makefile
+++ b/x11/kde3-i18n-zh_TW/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:25 wiz Exp $
DISTNAME= kde-i18n-zh_TW-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-zh_TW
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-zu/Makefile b/x11/kde3-i18n-zu/Makefile
index 0d9e57b4247..2350845b9c8 100644
--- a/x11/kde3-i18n-zu/Makefile
+++ b/x11/kde3-i18n-zu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:25 wiz Exp $
DISTNAME= kde-i18n-zu-${_KDE_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/kde-i18n-zu
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 1ffbf27cc29..2b2d8e3f9b0 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/04/10 13:13:26 markd Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/02 11:57:10 wiz Exp $
DISTNAME= kde-3.1.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,18 +10,18 @@ MAINTAINER= skrll@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= "meta-package" for the KDE integrated X11 desktop
-DEPENDS+= kdeartwork-3.1.1:../../misc/kdeartwork3
-DEPENDS+= kdeaddons-3.1.1:../../misc/kdeaddons3
-DEPENDS+= kdeadmin-3.1.1:../../misc/kdeadmin3
-DEPENDS+= kdeedu-3.1.1:../../misc/kdeedu3
-DEPENDS+= kdegames-3.1.1:../../games/kdegames3
-DEPENDS+= kdegraphics-3.1.1nb2:../../graphics/kdegraphics3
-DEPENDS+= kdemultimedia-3.1.1nb1:../../audio/kdemultimedia3
-DEPENDS+= kdenetwork-3.1.1:../../net/kdenetwork3
-DEPENDS+= kdepim-3.1.1:../../misc/kdepim3
-DEPENDS+= kdetoys-3.1.1:../../games/kdetoys3
-DEPENDS+= kdeutils-3.1.1:../../misc/kdeutils3
-DEPENDS+= quanta-3.1.1:../../www/quanta3
+DEPENDS+= kdeartwork-3.1.1nb1:../../misc/kdeartwork3
+DEPENDS+= kdeaddons-3.1.1nb1:../../misc/kdeaddons3
+DEPENDS+= kdeadmin-3.1.1nb1:../../misc/kdeadmin3
+DEPENDS+= kdeedu-3.1.1nb1:../../misc/kdeedu3
+DEPENDS+= kdegames-3.1.1nb1:../../games/kdegames3
+DEPENDS+= kdegraphics-3.1.1nb3:../../graphics/kdegraphics3
+DEPENDS+= kdemultimedia-3.1.1nb2:../../audio/kdemultimedia3
+DEPENDS+= kdenetwork-3.1.1nb1:../../net/kdenetwork3
+DEPENDS+= kdepim-3.1.1nb1:../../misc/kdepim3
+DEPENDS+= kdetoys-3.1.1nb1:../../games/kdetoys3
+DEPENDS+= kdeutils-3.1.1nb1:../../misc/kdeutils3
+DEPENDS+= quanta-3.1.1nb1:../../www/quanta3
EXTRACT_ONLY= # empty
USE_BUILDLINK2= yes
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index fcf4d37cf76..b7b25449306 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2003/03/28 20:37:17 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2003/05/02 11:57:25 wiz Exp $
DISTNAME= kdebase-2.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Base modules for the KDE 2 integrated X11 desktop
diff --git a/x11/kdebase2/buildlink2.mk b/x11/kdebase2/buildlink2.mk
index b2455d234a2..1bb7ef377e8 100644
--- a/x11/kdebase2/buildlink2.mk
+++ b/x11/kdebase2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/10/26 13:09:07 bouyer Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/05/02 11:57:26 wiz Exp $
.if !defined(KDEBASE2_BUILDLINK2_MK)
KDEBASE2_BUILDLINK2_MK= # defined
@@ -7,7 +7,7 @@ KDEBASE2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdebase2
BUILDLINK_PKGBASE.kdebase2?= kdebase
-BUILDLINK_DEPENDS.kdebase2?= kdebase>=2.2.2nb1
+BUILDLINK_DEPENDS.kdebase2?= kdebase>=2.2.2nb2
BUILDLINK_PKGSRCDIR.kdebase2?= ../../x11/kdebase2
EVAL_PREFIX+= BUILDLINK_PREFIX.kdebase2=kdebase
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 29105f4ea0a..9b6293ab46b 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2003/04/10 13:13:26 markd Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:57:26 wiz Exp $
DISTNAME= kdebase-3.1.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
diff --git a/x11/kdebase3/buildlink2.mk b/x11/kdebase3/buildlink2.mk
index 7a3f80e8025..a68ef9de725 100644
--- a/x11/kdebase3/buildlink2.mk
+++ b/x11/kdebase3/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/04/10 13:13:26 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:57:26 wiz Exp $
.if !defined(KDEBASE3_BUILDLINK2_MK)
KDEBASE3_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdebase3
BUILDLINK_PKGBASE.kdebase3?= kdebase
-BUILDLINK_DEPENDS.kdebase3?= kdebase>=3.1.1nb1
+BUILDLINK_DEPENDS.kdebase3?= kdebase>=3.1.1nb2
BUILDLINK_PKGSRCDIR.kdebase3?= ../../x11/kdebase3
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 5904869a623..7bb1a18bc81 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2002/12/14 03:43:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.48 2003/05/02 11:57:26 wiz Exp $
DISTNAME= kdelibs-2.2.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -9,8 +9,6 @@ COMMENT= Support libraries for the KDE integrated X11 desktop
CONFLICTS= arts-[1-9]*
-BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2
-
USE_BUILDLINK2= YES
USE_CXX= YES
USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096}
diff --git a/x11/kdelibs2/buildlink2.mk b/x11/kdelibs2/buildlink2.mk
index a6363cee571..703cd79bd0a 100644
--- a/x11/kdelibs2/buildlink2.mk
+++ b/x11/kdelibs2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.13 2003/03/13 14:19:22 hubertf Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2003/05/02 11:57:27 wiz Exp $
.if !defined(KDELIBS2_BUILDLINK2_MK)
KDELIBS2_BUILDLINK2_MK= # defined
@@ -8,7 +8,7 @@ KDELIBS2_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdelibs2
BUILDLINK_PKGBASE.kdelibs2?= kdelibs
.if !defined(BUILDLINK_DEPENDS.kdelibs2)
-BUILDLINK_DEPENDS.kdelibs2+= kdelibs>=2.2.2nb4
+BUILDLINK_DEPENDS.kdelibs2+= kdelibs>=2.2.2nb5
BUILDLINK_DEPENDS.kdelibs2+= kdelibs<3.0 # qt2-designer-kde wants KDE_2_
.endif
BUILDLINK_PKGSRCDIR.kdelibs2?= ../../x11/kdelibs2
@@ -25,8 +25,8 @@ BUILDLINK_FILES_CMD.kdelibs2= \
KDEDIR= ${BUILDLINK_PREFIX.kdelibs2}
-BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9
-BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2
+BUILDLINK_DEPENDS.audiofile= libaudiofile>=2.2.2nb5
+BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.2.2nb5
USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096}
.include "../../audio/libaudiofile/buildlink2.mk"
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 6a3d2893ccd..8f2d05ea139 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2003/04/10 13:13:25 markd Exp $
+# $NetBSD: Makefile,v 1.26 2003/05/02 11:57:27 wiz Exp $
DISTNAME= kdelibs-3.1.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -9,8 +9,6 @@ COMMENT= Support libraries for the KDE integrated X11 desktop
CONFLICTS+= koffice3<=1.1.1
-BUILDLINK_DEPENDS.qt3-libs= qt3-libs>=3.1.1
-
USE_BUILDLINK2= YES
USE_CXX= YES
USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096}
diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk
index 952d7ecc04b..f7f7451defa 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.13 2003/04/10 13:13:26 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2003/05/02 11:57:27 wiz Exp $
.if !defined(KDELIBS3_BUILDLINK2_MK)
KDELIBS3_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdelibs3
BUILDLINK_PKGBASE.kdelibs3?= kdelibs
-BUILDLINK_DEPENDS.kdelibs3?= kdelibs>=3.1.1nb1
+BUILDLINK_DEPENDS.kdelibs3?= kdelibs>=3.1.1nb2
BUILDLINK_PKGSRCDIR.kdelibs3?= ../../x11/kdelibs3
.include "../../mk/bsd.prefs.mk"
@@ -17,8 +17,8 @@ BUILDLINK_FILES_CMD.kdelibs3= \
KDEDIR= ${BUILDLINK_PREFIX.kdelibs3}
-BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9
-BUILDLINK_DEPENDS.qt3-libs= qt3-libs>=3.1.1
+BUILDLINK_DEPENDS.audiofile= libaudiofile>=3.1.1nb2
+BUILDLINK_DEPENDS.qt3-libs= qt3-libs>=3.1.1nb2
USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096}
.include "../../audio/libaudiofile/buildlink2.mk"
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index ecb1ab100cf..9617c520a81 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/03/03 04:17:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/05/02 11:57:27 wiz Exp $
DISTNAME= kterm-6.2.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
@@ -28,7 +28,6 @@ BUILD_DEFS+= KTERM_USE_WALLPAPER
. if ${KTERM_USE_WALLPAPER} == "imlib"
SITES_KTerm-BGP-Imlib-1.0.patch.gz= http://delegate.uec.ac.jp:8081/club/mma/%7Etakkun/fun/handling/
PATCHFILES+= KTerm-BGP-Imlib-1.0.patch.gz
-BUILDLINK_DEPENDS.imlib?= imlib>=1.9.4
. include "../../graphics/imlib/buildlink2.mk"
. elif ${KTERM_USE_WALLPAPER} == "YES"
SITES_KTerm-BGP-1.0.patch.gz= http://delegate.uec.ac.jp:8081/club/mma/%7Etakkun/fun/handling/
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 030c28f5850..0ad96c9240a 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/17 11:56:22 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:27 wiz Exp $
#
DISTNAME= lablgtk-1.2.5
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
diff --git a/x11/lablgtk/buildlink2.mk b/x11/lablgtk/buildlink2.mk
index a0b0612269c..549fc601e28 100644
--- a/x11/lablgtk/buildlink2.mk
+++ b/x11/lablgtk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/10/16 16:45:37 dillo Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:57:28 wiz Exp $
#
# This Makefile fragment is included by packages that use lablgtk.
@@ -6,7 +6,7 @@
LABLGTK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= lablgtk
-BUILDLINK_DEPENDS.lablgtk?= lablgtk>=1.2.5
+BUILDLINK_DEPENDS.lablgtk?= lablgtk>=1.2.5nb1
BUILDLINK_PKGSRCDIR.lablgtk?= ../../x11/lablgtk
EVAL_PREFIX+= BUILDLINK_PREFIX.lablgtk=lablgtk
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index 4676f0c37bb..ae99a265d61 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 06:10:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:28 wiz Exp $
#
DISTNAME= libzvt-2.0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libzvt/2.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/libzvt/buildlink2.mk b/x11/libzvt/buildlink2.mk
index 3067e517d48..00b9072ca93 100644
--- a/x11/libzvt/buildlink2.mk
+++ b/x11/libzvt/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:10:34 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:57:28 wiz Exp $
#
# This Makefile fragment is included by packages that use libzvt.
#
@@ -9,7 +9,7 @@
LIBZVT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= libzvt
-BUILDLINK_DEPENDS.libzvt?= libzvt>=2.0.1nb1
+BUILDLINK_DEPENDS.libzvt?= libzvt>=2.0.1nb2
BUILDLINK_PKGSRCDIR.libzvt?= ../../x11/libzvt
EVAL_PREFIX+= BUILDLINK_PREFIX.libzvt=libzvt
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 46bc2d81b16..1386e924711 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/02/05 23:28:58 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:57:28 wiz Exp $
DISTNAME= mlterm-2.6.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/}
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 2c02a5d6db8..a65278e6383 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/02/18 14:56:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:57:29 wiz Exp $
DISTNAME= multi-gnome-terminal-1.6.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= gnome x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=multignometerm/}
diff --git a/x11/p5-gtk/Makefile b/x11/p5-gtk/Makefile
index 2fcf0db8da2..7959820da36 100644
--- a/x11/p5-gtk/Makefile
+++ b/x11/p5-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/10/13 11:43:59 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:57:29 wiz Exp $
#
DISTNAME= Gtk-Perl-0.7008
+PKGREVISION= 1
PKGNAME= p5-gtk-0.7008
SVR4_PKGNAME= p5gtk
WRKSRC= ${WRKDIR}/${DISTNAME}/Gtk
diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index 8dfcb878aed..628cd4436d5 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/10/09 14:35:38 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:57:29 wiz Exp $
#
DISTNAME= wxPython-2.2.2
PKGNAME= ${PYPKGPREFIX}-wxWindows-2.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxpython/}
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 08ec6cd7f31..ff48d7466df 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/10/07 11:33:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:29 wiz Exp $
#
DISTNAME= pygtk-0.6.9
PKGNAME= ${PYPKGPREFIX}-gtk-0.6.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/python/
diff --git a/x11/pygtk/buildlink2.mk b/x11/pygtk/buildlink2.mk
index 1901c38587e..443125a94d3 100644
--- a/x11/pygtk/buildlink2.mk
+++ b/x11/pygtk/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/11/15 05:29:26 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:57:30 wiz Exp $
.if !defined(PY_GTK_BUILDLINK2_MK)
.include "../../lang/python/pyversion.mk"
BUILDLINK_PACKAGES+= pygtk
-BUILDLINK_DEPENDS.pygtk?= ${PYPKGPREFIX}-gtk-[0-9]*
+BUILDLINK_DEPENDS.pygtk?= ${PYPKGPREFIX}-gtk>=0.6.9nb2
BUILDLINK_PKGSRCDIR.pygtk?= ../../x11/pygtk
.endif # PY_GTK_BUILDLINK2_MK
diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile
index 46e6ff51fcd..bda1afbae5e 100644
--- a/x11/qt2-designer-kde/Makefile
+++ b/x11/qt2-designer-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/08/25 18:40:42 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:57:30 wiz Exp $
#
PKGNAME= qt2-designer-kde-${QTVERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Visual (WYSIWYG) QT GUI builder with KDE widget support
CONFLICTS+= qt2-designer-[0-9]*
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 54bb44e31b6..7921b78c4f6 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.14 2003/03/18 08:36:24 skrll Exp $
+# $NetBSD: Makefile.common,v 1.15 2003/05/02 11:57:30 wiz Exp $
#
DISTNAME= qt-x11-free-${QTVERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.bero.org/pub/qt/source/
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
index fe0ccbfc643..5c8fed10976 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.13 2003/03/18 08:36:24 skrll Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2003/05/02 11:57:30 wiz Exp $
.if !defined(QT3_LIBS_BUILDLINK2_MK)
QT3_LIBS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= qt3-libs
-BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.1.2
+BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.1.2nb1
BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs
EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-libs=qt3-libs
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index 2193b2a871b..ab3247bc578 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/02/18 19:16:55 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:31 wiz Exp $
#
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-mysql-${QTVERSION}
+PKGREVISION= 1
COMMENT= QT mysql driver
CONFIGURE_ARGS+= -I${QTDIR}/include \
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index c94b6af27e7..1cfd89971bf 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2003/04/06 21:34:40 jmc Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:57:31 wiz Exp $
#
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-psql-${QTVERSION}
+PKGREVISION= 1
COMMENT= QT postgresql driver
CONFIGURE_ARGS+= -I${QTDIR}/include \
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index ba0d74b611e..17d7f5a593a 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2003/03/18 08:36:25 skrll Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:57:31 wiz Exp $
#
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-tools-${QTVERSION}
+PKGREVISION= 1
COMMENT= QT GUI (WYSIWYG) builder and other tools
CONFIGURE_ARGS+= -I${QTDIR}/include \
diff --git a/x11/qt3-tools/buildlink2.mk b/x11/qt3-tools/buildlink2.mk
index 720b30adf9c..c6304587ccc 100644
--- a/x11/qt3-tools/buildlink2.mk
+++ b/x11/qt3-tools/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/03/18 08:36:26 skrll Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:57:31 wiz Exp $
.if !defined(QT3_TOOLS_BUILDLINK2_MK)
QT3_TOOLS_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= qt3-tools
-BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.1.2
+BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.1.2nb1
BUILDLINK_PKGSRCDIR.qt3-tools?= ../../x11/qt3-tools
EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-tools=qt3-tools
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 26bf763ad7f..47f0ef1a9b9 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/03/28 21:14:40 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:57:30 wiz Exp $
DISTNAME= qt3-${QTVERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= # empty
DISTFILES= # empty
@@ -9,9 +10,9 @@ COMMENT= "meta-package" for the QT GUI C++ toolkit
.include "./Makefile.common"
-DEPENDS+= qt3-libs-${QTVERSION}:../../x11/qt3-libs
-DEPENDS+= qt3-tools-${QTVERSION}:../../x11/qt3-tools
-DEPENDS+= qt3-docs-${QTVERSION}:../../x11/qt3-docs
+DEPENDS+= qt3-libs-${QTVERSION}nb1:../../x11/qt3-libs
+DEPENDS+= qt3-tools-${QTVERSION}nb1:../../x11/qt3-tools
+DEPENDS+= qt3-docs-${QTVERSION}nb1:../../x11/qt3-docs
USE_BUILDLINK2= yes
USE_X11BASE= yes
diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index abd2940e4e6..7ecb5db6def 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/10/08 13:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:57:32 wiz Exp $
#
DISTNAME= rep-gtk-0.15
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rep-gtk/}
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 7ee53dab3d2..9a7db303430 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2003/03/29 12:43:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/05/02 11:57:32 wiz Exp $
# FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.16 2000/10/15 15:45:59 knu Exp
DISTNAME= ruby-gtk-0.25
PKGNAME= ${RUBY_PKGNAMEPREFIX}gtk-0.25
-PKGREVISION= 2
+PKGREVISION= 3
WRKSRC= ${WRKDIR}/${DISTNAME:S/ruby-//}
CATEGORIES= x11
MASTER_SITES= http://www.ruby-lang.org/gtk/download/
@@ -19,7 +19,7 @@ USE_RUBY_EXTCONF= yes
INSTALL_TARGET= site-install
-DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib
+DEPENDS+= imlib>=1.9.14nb3:../../graphics/imlib
DOCS_EN= README README.EXT doc/rbbr.rb
DOCS_JA= README.ja README.EXT.ja
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index 15941d90309..da57b2b5aed 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/04/06 19:58:55 salo Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/02 11:57:32 wiz Exp $
#
DISTNAME= wxGTK-2.4.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://biolpc22.york.ac.uk/pub/2.4.0/
diff --git a/x11/wxGTK/buildlink2.mk b/x11/wxGTK/buildlink2.mk
index e5f307721e4..31318a76571 100644
--- a/x11/wxGTK/buildlink2.mk
+++ b/x11/wxGTK/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/03/31 18:25:09 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:57:32 wiz Exp $
#
# This Makefile fragment is included by packages that use wxGTK.
#
@@ -9,7 +9,7 @@
WXGTK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= wxGTK
-BUILDLINK_DEPENDS.wxGTK?= wxGTK>=2.4.0
+BUILDLINK_DEPENDS.wxGTK?= wxGTK>=2.4.0nb1
BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK
EVAL_PREFIX+= BUILDLINK_PREFIX.wxGTK=wxGTK
diff --git a/x11/xbindkeys-config/Makefile b/x11/xbindkeys-config/Makefile
index c26dc45d84a..fdd86e60d31 100644
--- a/x11/xbindkeys-config/Makefile
+++ b/x11/xbindkeys-config/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/01/03 15:27:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:57:32 wiz Exp $
DISTNAME= xbindkeys_config-0.1.2
+PKGREVISION= 1
PKGNAME= xbindkeys-config-0.1.2
CATEGORIES= x11
MASTER_SITES= http://www.netchampagne.com/xbindkeys_config/
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index bccfd94df39..0c0584056d6 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:07:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:33 wiz Exp $
DISTNAME= Xdialog-1.4.6
+PKGREVISION= 1
PKGNAME= xdialog-1.4.6
CATEGORIES= misc x11
MASTER_SITES= http://xdialog.free.fr/
@@ -10,7 +11,7 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://xdialog.free.fr/
COMMENT= X11 drop-in replacement for the curses dialog program
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
+DEPENDS+= gtk+>=1.2.10nb4:../../x11/gtk
USE_X11BASE= # defined
USE_GMAKE= # defined
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index ba13ba6c711..de87ba08814 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2003/04/27 12:52:41 cjep Exp $
+# $NetBSD: Makefile,v 1.32 2003/05/02 11:57:33 wiz Exp $
DISTNAME= xfce-3.8.18
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.xfce.org/archive/
diff --git a/x11/xmms-osd/Makefile b/x11/xmms-osd/Makefile
index c1a4f1097f1..a7a6a5f273b 100644
--- a/x11/xmms-osd/Makefile
+++ b/x11/xmms-osd/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/12 12:15:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:57:33 wiz Exp $
#
.include "../xosd/Makefile.common"
PKGNAME= ${DISTNAME:S/xosd/xmms-osd/}
+PKGREVISION= 1
COMMENT= XMMS plugin that shows current status on your desktop
CONFLICTS= xosd<=2.2.0
diff --git a/x11/xosd/Makefile b/x11/xosd/Makefile
index 7100e10bddb..30afae19d3d 100644
--- a/x11/xosd/Makefile
+++ b/x11/xosd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/22 19:06:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:57:34 wiz Exp $
#
.include "Makefile.common"
+PKGREVISION= 1
COMMENT= Library to display shaped text on your X display
diff --git a/x11/xosd/buildlink2.mk b/x11/xosd/buildlink2.mk
index d68729a0c6e..a4457519780 100644
--- a/x11/xosd/buildlink2.mk
+++ b/x11/xosd/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/04/22 19:06:12 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:57:34 wiz Exp $
#
# This Makefile fragment is included by packages that use xosd.
#
@@ -9,7 +9,7 @@
XOSD_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= xosd
-BUILDLINK_DEPENDS.xosd?= xosd>=2.2.1
+BUILDLINK_DEPENDS.xosd?= xosd>=2.2.1nb1
BUILDLINK_PKGSRCDIR.xosd?= ../../x11/xosd
EVAL_PREFIX+= BUILDLINK_PREFIX.xosd=xosd
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 02a4cbe3921..f70fe638ab9 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/02/15 10:48:27 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:57:34 wiz Exp $
#
PKGNAME= ${DISTNAME:S/-/-gnome-/}
+PKGREVISION= 1
COMMENT= Screen saver and locker for the X window system (with GNOME support)
CONFLICTS+= xscreensaver-[0-9]*
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 60c192601e6..c925df80b80 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2003/02/15 10:48:26 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2003/05/02 11:57:34 wiz Exp $
#
+PKGREVISION= 1
+
COMMENT= Screen saver and locker for the X window system
CONFLICTS+= xscreensaver-gnome-[0-9]*
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index ab63bc0c53d..a35b158e4ab 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2002/08/25 21:52:58 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:57:35 wiz Exp $
DISTNAME= xteddy-2.0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 games
MASTER_SITES= http://www.ITN.LiU.SE/~stegu/xteddy/
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index def8206de28..150738a8023 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/12/07 02:39:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:57:35 wiz Exp $
DISTNAME= xvattr-1.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/