summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/audacity/Makefile5
-rw-r--r--audio/gdcd/Makefile5
-rw-r--r--audio/gkrellm-xmms/Makefile3
-rw-r--r--audio/gnome-media/Makefile5
-rw-r--r--audio/gqmpeg/Makefile3
-rw-r--r--audio/kdemultimedia/Makefile5
-rw-r--r--audio/kdemultimedia2/Makefile5
-rw-r--r--audio/krio/Makefile7
-rw-r--r--audio/timidity/Makefile3
-rw-r--r--audio/wsoundprefs/Makefile3
-rw-r--r--audio/wsoundserver/Makefile3
-rw-r--r--audio/xsidplay/Makefile3
-rw-r--r--cad/boolean/Makefile5
-rw-r--r--cad/geda-utils/Makefile5
-rw-r--r--cad/geda/Makefile5
-rw-r--r--cad/gnetlist/Makefile5
-rw-r--r--cad/gschem/Makefile5
-rw-r--r--cad/gsymcheck/Makefile5
-rw-r--r--cad/gwave/Makefile5
-rw-r--r--cad/libgeda/Makefile5
-rw-r--r--cad/oregano/Makefile3
-rw-r--r--cad/qcad/Makefile3
-rw-r--r--cad/vipec/Makefile3
-rw-r--r--cad/xcircuit/Makefile3
-rw-r--r--chat/everybuddy-gnome/Makefile3
-rw-r--r--chat/gaim/Makefile3
-rw-r--r--chat/gnomeicu/Makefile5
-rw-r--r--chat/kicq/Makefile5
-rw-r--r--chat/kxicq/Makefile5
-rw-r--r--chat/kyahoo/Makefile3
-rw-r--r--chat/xchat/Makefile3
-rw-r--r--comms/hylafax/Makefile4
-rw-r--r--comms/mgetty+sendfax/Makefile3
-rw-r--r--comms/tkhylafax/Makefile3
-rw-r--r--converters/doc2html/Makefile3
-rw-r--r--converters/psiconv/Makefile3
-rw-r--r--converters/wv/Makefile3
-rw-r--r--databases/gtranscript/Makefile5
-rw-r--r--databases/kmysqladmin/Makefile3
-rw-r--r--databases/kpsql/Makefile5
-rw-r--r--databases/rrdtool/Makefile5
-rw-r--r--databases/unixodbc-DataManager/Makefile3
-rw-r--r--databases/unixodbc-ODBCConfig/Makefile3
-rw-r--r--devel/GConf/Makefile3
-rw-r--r--devel/GConf/buildlink.mk4
-rw-r--r--devel/bonobo-conf/Makefile3
-rw-r--r--devel/bonobo-conf/buildlink.mk4
-rw-r--r--devel/bonobo/Makefile3
-rw-r--r--devel/bonobo/buildlink.mk4
-rw-r--r--devel/c-cpp-reference/Makefile3
-rw-r--r--devel/cervisia/Makefile5
-rw-r--r--devel/cervisia2/Makefile5
-rw-r--r--devel/cvsgraph/Makefile3
-rw-r--r--devel/cweb/Makefile3
-rw-r--r--devel/doxygen/Makefile3
-rw-r--r--devel/eel/Makefile5
-rw-r--r--devel/gal/Makefile3
-rw-r--r--devel/gal/buildlink.mk4
-rw-r--r--devel/glade/Makefile3
-rw-r--r--devel/gnome-objc/Makefile3
-rw-r--r--devel/gtkdiff/Makefile3
-rw-r--r--devel/kdbg/Makefile3
-rw-r--r--devel/kdebindings2/Makefile3
-rw-r--r--devel/kdesdk2/Makefile5
-rw-r--r--devel/kdevelop-base/Makefile11
-rw-r--r--devel/kdevelop/Makefile3
-rw-r--r--devel/libglade/Makefile3
-rw-r--r--devel/libglade/buildlink.mk4
-rw-r--r--devel/libgtop/Makefile6
-rw-r--r--devel/oaf/Makefile3
-rw-r--r--devel/oaf/buildlink.mk4
-rw-r--r--devel/uml/Makefile5
-rw-r--r--editors/abiword/Makefile3
-rw-r--r--editors/gnotepad/Makefile3
-rw-r--r--editors/ted-cs/Makefile3
-rw-r--r--editors/ted-da/Makefile3
-rw-r--r--editors/ted-de/Makefile3
-rw-r--r--editors/ted-en-gb/Makefile3
-rw-r--r--editors/ted-en-us/Makefile3
-rw-r--r--editors/ted-es/Makefile3
-rw-r--r--editors/ted-fr/Makefile3
-rw-r--r--editors/ted-it/Makefile3
-rw-r--r--editors/ted-nl/Makefile3
-rw-r--r--editors/ted-no/Makefile3
-rw-r--r--editors/ted-pt/Makefile3
-rw-r--r--editors/ted-sv/Makefile3
-rw-r--r--editors/ted/Makefile3
-rw-r--r--editors/treetext/Makefile3
-rw-r--r--editors/xemacs-packages/Makefile3
-rw-r--r--editors/xemacs/Makefile5
-rw-r--r--emulators/mmix/Makefile3
-rw-r--r--emulators/zsnes/Makefile4
-rw-r--r--finance/emma/Makefile5
-rw-r--r--finance/gkrellm-stock/Makefile3
-rw-r--r--finance/gnofin/Makefile5
-rw-r--r--finance/gnucash/Makefile9
-rw-r--r--games/amor/Makefile5
-rw-r--r--games/backgammon/Makefile5
-rw-r--r--games/clanbomber/Makefile4
-rw-r--r--games/crossfire-cli/Makefile5
-rw-r--r--games/crossfire-srv/Makefile5
-rw-r--r--games/freeciv-client-gtk/Makefile3
-rw-r--r--games/gnocatan/Makefile3
-rw-r--r--games/gnome-breakout/Makefile5
-rw-r--r--games/gnome-chess/Makefile3
-rw-r--r--games/gnome-games/Makefile3
-rw-r--r--games/kdegames/Makefile5
-rw-r--r--games/kdegames2/Makefile5
-rw-r--r--games/kdetoys/Makefile5
-rw-r--r--games/kdetoys2/Makefile5
-rw-r--r--games/knights/Makefile3
-rw-r--r--games/kulki/Makefile3
-rw-r--r--games/nethack-qt/Makefile3
-rw-r--r--games/nethack/Makefile3
-rw-r--r--games/pacman/Makefile3
-rw-r--r--graphics/ImageMagick/Makefile3
-rw-r--r--graphics/ImageMagick/buildlink.mk4
-rw-r--r--graphics/SDL-image/Makefile3
-rw-r--r--graphics/alevt/Makefile5
-rw-r--r--graphics/autotrace/Makefile3
-rw-r--r--graphics/aview-x11/Makefile3
-rw-r--r--graphics/aview/Makefile4
-rw-r--r--graphics/clanlib/Makefile3
-rw-r--r--graphics/clanlib/buildlink.mk4
-rw-r--r--graphics/denemo/Makefile3
-rw-r--r--graphics/dia/Makefile9
-rw-r--r--graphics/dx/Makefile3
-rw-r--r--graphics/dxsamples/Makefile3
-rw-r--r--graphics/ee/Makefile3
-rw-r--r--graphics/eog/Makefile13
-rw-r--r--graphics/feh/Makefile3
-rw-r--r--graphics/fly/Makefile5
-rw-r--r--graphics/fnlib/Makefile3
-rw-r--r--graphics/fnlib/buildlink.mk4
-rw-r--r--graphics/gd/Makefile3
-rw-r--r--graphics/gd/buildlink.mk4
-rw-r--r--graphics/gdchart/Makefile3
-rw-r--r--graphics/gdk-pixbuf-gnome/Makefile5
-rw-r--r--graphics/gdk-pixbuf-gnome/buildlink.mk4
-rw-r--r--graphics/gdk-pixbuf/Makefile3
-rw-r--r--graphics/gdk-pixbuf/Makefile.common3
-rw-r--r--graphics/gdk-pixbuf/buildlink.mk4
-rw-r--r--graphics/gfract/Makefile3
-rw-r--r--graphics/gif2png/Makefile3
-rw-r--r--graphics/gimp-base/Makefile3
-rw-r--r--graphics/gimp-base/buildlink.mk6
-rw-r--r--graphics/gimp-data/Makefile3
-rw-r--r--graphics/gimp/Makefile6
-rw-r--r--graphics/giram/Makefile5
-rw-r--r--graphics/gnome-iconedit/Makefile9
-rw-r--r--graphics/gphoto/Makefile5
-rw-r--r--graphics/gqview/Makefile5
-rw-r--r--graphics/graphviz/Makefile4
-rw-r--r--graphics/gtkam/Makefile6
-rw-r--r--graphics/hp2xx/Makefile5
-rw-r--r--graphics/iGMT/Makefile6
-rw-r--r--graphics/imlib/Makefile3
-rw-r--r--graphics/imlib/buildlink.mk4
-rw-r--r--graphics/imlib2/Makefile3
-rw-r--r--graphics/imlib2/buildlink.mk4
-rw-r--r--graphics/impress/Makefile3
-rw-r--r--graphics/kdegraphics/Makefile5
-rw-r--r--graphics/kdegraphics2/Makefile5
-rw-r--r--graphics/libgdgeda/Makefile5
-rw-r--r--graphics/librsvg/Makefile5
-rw-r--r--graphics/libwmf/Makefile3
-rw-r--r--graphics/libwmf/buildlink.mk4
-rw-r--r--graphics/magicpoint/Makefile3
-rw-r--r--graphics/mgl/Makefile5
-rw-r--r--graphics/moz-flash/Makefile5
-rw-r--r--graphics/mplayer/Makefile4
-rw-r--r--graphics/netpbm/Makefile3
-rw-r--r--graphics/netpbm/buildlink.mk4
-rw-r--r--graphics/ogle_gui/Makefile5
-rw-r--r--graphics/p5-GD/Makefile3
-rw-r--r--graphics/p5-GDGraph/Makefile3
-rw-r--r--graphics/p5-GDGraph3d/Makefile3
-rw-r--r--graphics/p5-GDTextUtil/Makefile3
-rw-r--r--graphics/p5-GIFgraph/Makefile3
-rw-r--r--graphics/p5-PerlMagick/Makefile3
-rw-r--r--graphics/php3-gd/Makefile4
-rw-r--r--graphics/php4-gd/Makefile4
-rw-r--r--graphics/ploticus/Makefile5
-rw-r--r--graphics/plotutils/Makefile5
-rw-r--r--graphics/png2html/Makefile3
-rw-r--r--graphics/povray/Makefile5
-rw-r--r--graphics/ppmtoxvpic/Makefile3
-rw-r--r--graphics/pstoedit/Makefile5
-rw-r--r--graphics/py-gd/Makefile5
-rw-r--r--graphics/py-gdchart/Makefile3
-rw-r--r--graphics/py-gimp/Makefile3
-rw-r--r--graphics/rayshade/Makefile5
-rw-r--r--graphics/sane-frontends/Makefile3
-rw-r--r--graphics/scigraphica/Makefile3
-rw-r--r--graphics/sodipodi/Makefile3
-rw-r--r--graphics/urt/Makefile5
-rw-r--r--graphics/vid/Makefile3
-rw-r--r--graphics/xart/Makefile4
-rw-r--r--graphics/xfig/Makefile3
-rw-r--r--graphics/xli/Makefile5
-rw-r--r--graphics/xpaint/Makefile5
-rw-r--r--graphics/xsane/Makefile5
-rw-r--r--graphics/xv/Makefile6
-rw-r--r--graphics/xzgv/Makefile3
-rw-r--r--graphics/yplot/Makefile3
-rw-r--r--japanese/texfamily-share/Makefile3
-rw-r--r--japanese/texfamily/Makefile3
-rw-r--r--japanese/vfxdvik/Makefile3
-rw-r--r--lang/gb/Makefile3
-rw-r--r--lang/gb/buildlink.mk4
-rw-r--r--lang/kaffe/Makefile3
-rw-r--r--mail/balsa/Makefile11
-rw-r--r--mail/evolution/Makefile9
-rw-r--r--mail/spruce/Makefile5
-rw-r--r--mail/wmbiff/Makefile5
-rw-r--r--mail/wmmail/Makefile5
-rw-r--r--math/R/Makefile3
-rw-r--r--math/gnumeric/Makefile3
-rw-r--r--math/gnumeric0/Makefile3
-rw-r--r--math/grace/Makefile3
-rw-r--r--math/guppi/Makefile9
-rw-r--r--math/octave-current/Makefile3
-rw-r--r--math/octave/Makefile3
-rw-r--r--math/p5-Math-Pari/Makefile3
-rw-r--r--math/pari/Makefile3
-rw-r--r--meta-pkgs/edesktop/Makefile3
-rw-r--r--meta-pkgs/netbsd-doc-print/Makefile3
-rw-r--r--misc/gkrellm-moon/Makefile3
-rw-r--r--misc/gkrellm-weather/Makefile3
-rw-r--r--misc/gnome-pim/Makefile5
-rw-r--r--misc/gnome-utils/Makefile5
-rw-r--r--misc/hitchhiker/Makefile5
-rw-r--r--misc/kdeadmin2/Makefile5
-rw-r--r--misc/kdepim2/Makefile5
-rw-r--r--misc/kdeutils/Makefile5
-rw-r--r--misc/kdeutils2/Makefile5
-rw-r--r--misc/koffice/Makefile5
-rw-r--r--misc/ktail/Makefile5
-rw-r--r--misc/siag/Makefile3
-rw-r--r--misc/xtide/Makefile5
-rw-r--r--net/etherape/Makefile3
-rw-r--r--net/gkrellm-ping/Makefile3
-rw-r--r--net/gkrellm-snmp/Makefile3
-rw-r--r--net/gkrellm-wireless/Makefile3
-rw-r--r--net/gnapster/Makefile3
-rw-r--r--net/gnubile/Makefile5
-rw-r--r--net/gtm/Makefile5
-rw-r--r--net/kdenetwork/Makefile5
-rw-r--r--net/kdenetwork2/Makefile5
-rw-r--r--net/kmap/Makefile5
-rw-r--r--net/mrtg/Makefile5
-rw-r--r--net/neat/Makefile3
-rw-r--r--net/netsaint-base/Makefile5
-rw-r--r--net/netsaint-plugin-cluster/Makefile3
-rw-r--r--net/netsaint-plugin-snmp/Makefile3
-rw-r--r--net/netsaint-plugins/Makefile3
-rw-r--r--net/nsca/Makefile3
-rw-r--r--news/knews/Makefile6
-rw-r--r--news/pan/Makefile3
-rw-r--r--print/apsfilter/Makefile5
-rw-r--r--print/auctex/Makefile3
-rw-r--r--print/cups/Makefile3
-rw-r--r--print/cups/buildlink.mk4
-rw-r--r--print/cupsomatic-ppds/Makefile5
-rw-r--r--print/cupsomatic/Makefile5
-rw-r--r--print/foomatic-gswrapper/Makefile3
-rw-r--r--print/ggv/Makefile3
-rw-r--r--print/ghostscript-nox11/Makefile4
-rw-r--r--print/ghostscript-nox11/Makefile.common3
-rw-r--r--print/ghostscript/Makefile4
-rw-r--r--print/gimp-print/Makefile3
-rw-r--r--print/gnome-print/Makefile3
-rw-r--r--print/gnome-print/buildlink.mk4
-rw-r--r--print/gv/Makefile3
-rw-r--r--print/html2ps/Makefile6
-rw-r--r--print/if-psprint/Makefile3
-rw-r--r--print/lgrind/Makefile3
-rw-r--r--print/lilypond/Makefile3
-rw-r--r--print/lyx/Makefile3
-rw-r--r--print/magicfilter/Makefile5
-rw-r--r--print/mgv/Makefile3
-rw-r--r--print/pdflib/Makefile3
-rw-r--r--print/pdflib/Makefile.common3
-rw-r--r--print/pdflib/buildlink.mk4
-rw-r--r--print/php3-pdflib/Makefile4
-rw-r--r--print/php4-pdflib/Makefile3
-rw-r--r--print/stylewriter/Makefile3
-rw-r--r--print/tcl-pdflib/Makefile3
-rw-r--r--print/teTeX-bin/Makefile6
-rw-r--r--print/teTeX/Makefile3
-rw-r--r--print/tex-eurosym/Makefile3
-rw-r--r--print/tex-hugelatex/Makefile3
-rw-r--r--print/tex-jadetex/Makefile4
-rw-r--r--print/transfig/Makefile3
-rw-r--r--print/xpp/Makefile3
-rw-r--r--security/p5-Crypt-DSA/Makefile3
-rw-r--r--security/p5-Crypt-OpenPGP/Makefile3
-rw-r--r--security/p5-Crypt-Primes/Makefile3
-rw-r--r--security/p5-Crypt-RSA/Makefile3
-rw-r--r--security/p5-Crypt-Random/Makefile3
-rw-r--r--sysutils/fsviewer/Makefile3
-rw-r--r--sysutils/gcdmaster/Makefile7
-rw-r--r--sysutils/gcombust/Makefile3
-rw-r--r--sysutils/gkrellm/Makefile4
-rw-r--r--sysutils/gmc/Makefile5
-rw-r--r--sysutils/gnome-vfs/Makefile3
-rw-r--r--sysutils/gnome-vfs/buildlink.mk4
-rw-r--r--sysutils/gtop/Makefile7
-rw-r--r--sysutils/kapm/Makefile6
-rw-r--r--sysutils/kdf/Makefile5
-rw-r--r--sysutils/klavg/Makefile5
-rw-r--r--sysutils/koncd/Makefile5
-rw-r--r--sysutils/medusa/Makefile3
-rw-r--r--sysutils/ups-nut-cgi/Makefile3
-rw-r--r--sysutils/xcdroast/Makefile5
-rw-r--r--sysutils/xnc/Makefile3
-rw-r--r--textproc/latex2html/Makefile5
-rw-r--r--time/korganizer/Makefile5
-rw-r--r--time/kworldwatch/Makefile5
-rw-r--r--wm/afterstep/Makefile3
-rw-r--r--wm/bbkeys-qt/Makefile3
-rw-r--r--wm/econf/Makefile3
-rw-r--r--wm/enlightenment/Makefile3
-rw-r--r--wm/ethemes/Makefile3
-rw-r--r--wm/icewm-gnome/Makefile3
-rw-r--r--wm/qvwm/Makefile3
-rw-r--r--wm/sawfish-replibs/Makefile3
-rw-r--r--wm/sawfish/Makefile3
-rw-r--r--wm/sawfish/Makefile.common5
-rw-r--r--wm/windowmaker/Makefile3
-rw-r--r--wm/windowmaker/buildlink.mk4
-rw-r--r--wm/wmakerconf/Makefile3
-rw-r--r--wm/wmextra/Makefile5
-rw-r--r--wm/wmthemes/Makefile5
-rw-r--r--www/Mosaic/Makefile3
-rw-r--r--www/amaya/Makefile3
-rw-r--r--www/apc-gui/Makefile3
-rw-r--r--www/arena/Makefile6
-rw-r--r--www/bluefish/Makefile11
-rw-r--r--www/chimera/Makefile3
-rw-r--r--www/dillo/Makefile3
-rw-r--r--www/galeon/Makefile4
-rw-r--r--www/glibwww/Makefile5
-rw-r--r--www/glibwww/buildlink.mk4
-rw-r--r--www/gtkhtml/Makefile3
-rw-r--r--www/gtkhtml/buildlink.mk4
-rw-r--r--www/htmldoc/Makefile5
-rw-r--r--www/openacs/Makefile5
-rw-r--r--www/p5-Template-Toolkit/Makefile3
-rw-r--r--www/quanta-docs/Makefile3
-rw-r--r--www/quanta/Makefile5
-rw-r--r--www/skipstone/Makefile5
-rw-r--r--www/webalizer/Makefile3
-rw-r--r--x11/XmHTML/Makefile3
-rw-r--r--x11/aterm/Makefile3
-rw-r--r--x11/controlcenter/Makefile5
-rw-r--r--x11/controlcenter/buildlink.mk4
-rw-r--r--x11/dfm/Makefile.common3
-rw-r--r--x11/ebuilder/Makefile3
-rw-r--r--x11/eterm/Makefile3
-rw-r--r--x11/fox/Makefile3
-rw-r--r--x11/fox/buildlink.mk4
-rw-r--r--x11/gdm/Makefile7
-rw-r--r--x11/gnome--/Makefile5
-rw-r--r--x11/gnome-applets/Makefile7
-rw-r--r--x11/gnome-core/Makefile3
-rw-r--r--x11/gnome-core/buildlink.mk4
-rw-r--r--x11/gnome-gkrellm/Makefile5
-rw-r--r--x11/gnome-libs/Makefile3
-rw-r--r--x11/gnome-libs/buildlink.mk4
-rw-r--r--x11/gnome-python/Makefile7
-rw-r--r--x11/gnome-users-guide/Makefile5
-rw-r--r--x11/gnome/Makefile7
-rw-r--r--x11/gtk-engines/Makefile3
-rw-r--r--x11/kde/Makefile17
-rw-r--r--x11/kde2/Makefile19
-rw-r--r--x11/kdebase/Makefile5
-rw-r--r--x11/kdebase2/Makefile5
-rw-r--r--x11/kdebase2/buildlink.mk4
-rw-r--r--x11/kdelibdocs2/Makefile5
-rw-r--r--x11/kdelibs/Makefile5
-rw-r--r--x11/kdelibs2/Makefile5
-rw-r--r--x11/kdelibs2/buildlink.mk6
-rw-r--r--x11/khostchooser/Makefile5
-rw-r--r--x11/multi-gnome-terminal/Makefile3
-rw-r--r--x11/py-wxWindows/Makefile3
-rw-r--r--x11/pygtk/Makefile3
-rw-r--r--x11/qt2-designer-kde/Makefile6
-rw-r--r--x11/qt2-designer/Makefile6
-rw-r--r--x11/qt2-designer/buildlink.mk4
-rw-r--r--x11/qt2-docs/Makefile5
-rw-r--r--x11/qt2-examples/Makefile5
-rw-r--r--x11/qt2-libs/Makefile4
-rw-r--r--x11/qt2-libs/buildlink.mk4
-rw-r--r--x11/qt2/Makefile13
-rw-r--r--x11/qt3-docs/Makefile5
-rw-r--r--x11/qt3-libs/Makefile3
-rw-r--r--x11/qt3-libs/Makefile.common3
-rw-r--r--x11/qt3-libs/buildlink.mk2
-rw-r--r--x11/qt3-tools/Makefile5
-rw-r--r--x11/qt3-tools/buildlink.mk4
-rw-r--r--x11/qt3/Makefile7
-rw-r--r--x11/qtarch/Makefile7
-rw-r--r--x11/qwt/Makefile5
-rw-r--r--x11/rep-gtk/Makefile9
-rw-r--r--x11/ruby-fox/Makefile3
-rw-r--r--x11/ruby-gtk/Makefile5
-rw-r--r--x11/wmessage/Makefile3
-rw-r--r--x11/wterm/Makefile3
-rw-r--r--x11/wxGTK/Makefile3
-rw-r--r--x11/wxGTK/buildlink.mk4
-rw-r--r--x11/xdaemon2/Makefile3
-rw-r--r--x11/xfce/Makefile5
-rw-r--r--x11/xscreensaver-gnome/Makefile5
-rw-r--r--x11/xscreensaver/Makefile.common5
-rw-r--r--x11/xteddy2/Makefile3
416 files changed, 1037 insertions, 685 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index acf5e797dc4..5619acd1b77 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/11/17 06:36:14 itohy Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:36:35 fredb Exp $
#
DISTNAME= audacity-src-0.96
PKGNAME= audacity-0.96
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://prdownloads.sourceforge.net/audacity/
EXTRACT_SUFX= .tgz
@@ -11,7 +12,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://audacity.sourceforge.net/
COMMENT= audio editor
-DEPENDS+= wxGTK-[0-9]*:../../x11/wxGTK
+DEPENDS+= wxGTK>=2.2.7nb1:../../x11/wxGTK
DEPENDS+= pth-[0-9]*:../../devel/pth
DEPENDS+= id3lib-[0-9]*:../../audio/id3lib
DEPENDS+= libmpeg3-[0-9]*:../../devel/libmpeg3
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index c48588f2711..3d93d72715a 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/12/06 04:21:37 jmc Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:36:36 fredb Exp $
#
DISTNAME= gdcd-0.2.1
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://cdcd.undergrid.net/gdcd/source_archive/
@@ -10,7 +11,7 @@ HOMEPAGE= http://cdcd.undergrid.net/
COMMENT= CD player for the X Window System using the GIMP Tool Kit (GTK)
DEPENDS+= gtk+-1.2.*:../../x11/gtk
-DEPENDS+= imlib-[0-9]*:../../graphics/imlib
+DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib
DEPENDS+= libcdaudio>0.99.4:../../audio/libcdaudio
USE_X11BASE= YES
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index f88479e4cb4..812901c7480 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/11/01 15:28:44 damon Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:36 fredb Exp $
DISTNAME= gkrellmms-0.5.5
PKGNAME= gkrellm-xmms-0.5.5
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/gkrellmms
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 771331aa747..3175efa1c21 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2001/08/13 18:38:55 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:36:36 fredb Exp $
DISTNAME= gnome-media-1.2.3
+PKGREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-media/}
@@ -8,7 +9,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Set of audio/multimedia applications for GNOME
-DEPENDS+= gnome-core>=1.2.0:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index d257d9b6185..74fc3ec7890 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2002/03/12 00:30:52 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2002/03/13 17:36:36 fredb Exp $
#
DISTNAME= gqmpeg-0.14.1
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
diff --git a/audio/kdemultimedia/Makefile b/audio/kdemultimedia/Makefile
index 37179ed830f..c4ed4cbc81c 100644
--- a/audio/kdemultimedia/Makefile
+++ b/audio/kdemultimedia/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 13:30:43 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:36:37 fredb Exp $
DISTNAME= kdemultimedia-1.1.2
+PKGREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/
@@ -10,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= KDE audio tools
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index c3c34954474..978ec648c23 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2001/12/14 15:54:44 skrll Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:36:37 fredb Exp $
DISTNAME= kdemultimedia-2.2.2
+PKGREVISION= 1
CATEGORIES= audio
COMMENT= KDE audio tools
.include "../../x11/kde2/Makefile.kde2"
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
DEPENDS+= xanim>=2.80.0:../../graphics/xanim
BUILDLINK_DEPENDS.pth= pth>=1.4.0
diff --git a/audio/krio/Makefile b/audio/krio/Makefile
index 1b40806b314..4f6a4022b2c 100644
--- a/audio/krio/Makefile
+++ b/audio/krio/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/12/15 20:25:35 agc Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:36:37 fredb Exp $
DISTNAME= Krio-19990721
PKGNAME= krio-19990721
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ftp://ftp.13th-floor.org/pub/krio/
@@ -16,8 +17,8 @@ USE_X11BASE= yes
RIODIR= ${_PKGSRCDIR}/audio/rio/${WRKDIR:T}/rio107
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= kdelibs-1.1.2nb1:../../x11/kdelibs
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= qt1-1.44:../../x11/qt1
DEPENDS+= tiff-[0-9]*:../../graphics/tiff
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index e66f2f9238f..428fa2441e8 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2002/01/24 00:49:46 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2002/03/13 17:36:37 fredb Exp $
#
DISTNAME= TiMidity++-2.11.3
PKGNAME= ${DISTNAME:S/TiMidity++/timidity/}
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.goice.co.jp/member/mo/timidity/dist/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index a82e186a67c..fb28ab15f60 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/09/12 05:59:46 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:36:38 fredb Exp $
DISTNAME= WSoundPrefs-1.1.1
PKGNAME= wsoundprefs-1.1.1
+PKGREVISION= 1
CATEGORIES= audio wm
MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 93f361d4752..6fdfa145611 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:44 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:36:38 fredb Exp $
#
DISTNAME= WSoundServer-0.4.0
PKGNAME= wsoundserver-0.4.0
+PKGREVISION= 1
CATEGORIES= audio wm
MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 7a1587c5e1b..920739ef47c 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2001/10/24 22:10:46 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2002/03/13 17:36:38 fredb Exp $
#
DISTNAME= xsidplay-1_5_4
PKGNAME= xsidplay-1.5.4
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/xsidplay-1.5.4
CATEGORIES= audio x11
MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 94af91ce40c..6eb7c992111 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:46:16 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:38 fredb Exp $
#
DISTNAME= boolean
PKGNAME= boolean-${REL}
+PKGREVISION= 1
CATEGORIES= cad graphics
MASTER_SITES= http://www.xs4all.nl/~kholwerd/download/boolzip/
EXTRACT_SUFX= .zip
@@ -11,7 +12,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.1:../../x11/wxGTK
+DEPENDS+= wxGTK>=2.2.7nb1:../../x11/wxGTK
DIST_SUBDIR= ${PKGNAME}
REL= 6.2
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index b96d3c65156..3c9777782e3 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/07/17 03:03:57 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:36:39 fredb Exp $
#
DISTNAME= geda-utils-${PKGVERSION}
CATEGORIES= cad
+PKGREVISION= 1
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
http://www.geda.seul.org/devel/${PKGVERSION}/ \
@@ -12,7 +13,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.geda.seul.org/
COMMENT= Set of utilites for gEDA
-DEPENDS+= libgeda-${PKGVERSION}:../../cad/libgeda
+DEPENDS+= libgeda-${PKGVERSION}nb1:../../cad/libgeda
CONFLICTS+= gEDA<19991011
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index ac51a389121..35da165d05d 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2001/07/17 02:55:03 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.16 2002/03/13 17:36:39 fredb Exp $
#
DISTNAME= gEDA-${PKGVERSION}
CATEGORIES= cad
+PKGREVISION= 1
MASTER_SITES= # empty
DISTFILES= # empty
@@ -13,7 +14,7 @@ COMMENT= Toolset for automating electronic design
DEPENDS+= gschem-${PKGVERSION}:../../cad/gschem
DEPENDS+= gnetlist-${PKGVERSION}:../../cad/gnetlist
DEPENDS+= gsymcheck-${PKGVERSION}:../../cad/gsymcheck
-DEPENDS+= geda-utils-${PKGVERSION}:../../cad/geda-utils
+DEPENDS+= geda-utils-${PKGVERSION}nb1:../../cad/geda-utils
DEPENDS+= geda-docs-20010304:../../cad/geda-docs
USE_X11BASE= yes
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 4f48c7f6d2b..250d91ba0c8 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2001/07/17 03:02:51 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:39 fredb Exp $
#
DISTNAME= geda-gnetlist-${PKGVERSION}
PKGNAME= gnetlist-${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}/ \
@@ -16,7 +17,7 @@ COMMENT= Netlist generation program
DIST_SUBDIR= geda
PKGVERSION= 20010708
-DEPENDS+= libgeda-${PKGVERSION}:../../cad/libgeda
+DEPENDS+= libgeda-${PKGVERSION}nb1:../../cad/libgeda
DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols
CONFLICTS+= gEDA<19991011
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index 1f6a5f24280..ab3fafc2386 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2001/07/17 03:01:09 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:39 fredb Exp $
#
DISTNAME= geda-gschem-${PKGVERSION}
PKGNAME= gschem-${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}/ \
@@ -13,7 +14,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.geda.seul.org/
COMMENT= Schematic capture tool
-DEPENDS+= libgeda-${PKGVERSION}:../../cad/libgeda
+DEPENDS+= libgeda-${PKGVERSION}nb1:../../cad/libgeda
DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols
CONFLICTS+= gEDA<19991011
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index cedea2f9ba6..e432c964761 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2001/07/17 02:59:06 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:39 fredb Exp $
#
DISTNAME= geda-gsymcheck-${PKGVERSION}
PKGNAME= gsymcheck-${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}/ \
@@ -13,7 +14,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.geda.seul.org/
COMMENT= EDA (Electronic Design Automation) symbol checker
-DEPENDS+= libgeda-${PKGVERSION}:../../cad/libgeda
+DEPENDS+= libgeda-${PKGVERSION}nb1:../../cad/libgeda
DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols
CONFLICTS+= gEDA<19991011
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index 4d26a97ca52..13cbfa71d35 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/10/23 01:39:16 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:36:40 fredb Exp $
#
DISTNAME= gwave-20011021
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://www.cs.unc.edu/~tell/dist/
@@ -10,7 +11,7 @@ HOMEPAGE= http://www.cs.unc.edu/~tell/gwave/
COMMENT= viewer for spice-like simulator output and other analog data
DEPENDS+= guile-gtk>=0.19:../../devel/guile-gtk
-DEPENDS+= plotutils-[0-9]*:../../graphics/plotutils
+DEPENDS+= plotutils>=2.4.1nb1:../../graphics/plotutils
GNU_CONFIGURE= YES
# LDFLAGS to get -lreadline
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 34781625b6f..06ee0f9d153 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:17:46 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:36:40 fredb 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}/ \
@@ -14,7 +15,7 @@ COMMENT= Library of shared modules for gEDA
DEPENDS+= guile>=1.3.0:../../lang/guile
DEPENDS+= libstroke-[0-9]*:../../devel/libstroke
-DEPENDS+= libgdgeda>=1.8:../../graphics/libgdgeda
+DEPENDS+= libgdgeda>=1.8nb1:../../graphics/libgdgeda
DEPENDS+= gtk+>=1.2.3:../../x11/gtk
CONFLICTS+= gEDA<19991011
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 7e3f0ebf321..067604f88cd 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/01/21 21:44:34 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:40 fredb Exp $
#
DISTNAME= oregano-0.20
+PKGREVISION= 1
CATEGORIES= cad gnome
MASTER_SITES= http://www.dtek.chalmers.se/~d4hult/oregano/download/
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index d786a5b8981..8f7fe785847 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:40 fredb Exp $
DISTNAME= qcad-1.4.7-src
PKGNAME= qcad-1.4.7
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://www.qcad.org/archives/
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 2c5d3e8bdd0..2b74350e95c 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2001/10/24 22:10:47 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2002/03/13 17:36:40 fredb Exp $
#
DISTNAME= vipec-2.0.4
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://netfold.com/~vipec/public_ftp/stable/
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 7c0e4ba7982..c4fd8f353f9 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/05/03 22:02:59 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:36:41 fredb Exp $
DISTNAME= xcircuit-2.2.0
+PKGREVISION= 1
CATEGORIES= cad graphics
MASTER_SITES= http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
diff --git a/chat/everybuddy-gnome/Makefile b/chat/everybuddy-gnome/Makefile
index 2956ae1ac29..5789377b95e 100644
--- a/chat/everybuddy-gnome/Makefile
+++ b/chat/everybuddy-gnome/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/12/19 14:10:04 tron Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:36:41 fredb Exp $
.include "../everybuddy/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-gnome-/}
+PKGREVISION= 1
CONFLICTS+= everybuddy-[0-9]*
COMMENT+= with GNOME support
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index c7db942f86c..fadb40af595 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/02/17 22:31:18 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:36:41 fredb Exp $
#
DISTNAME= gaim-0.52
+PKGREVISION= 1
CATEGORIES= chat x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/} \
ftp://ftp.marko.net/pub/gaim/
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index b9bf9f4fd5b..4d36fdb6671 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:21 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:36:41 fredb Exp $
DISTNAME= gnomeicu-0.96
+PKGREVISION= 1
CATEGORIES= chat gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
EXTRACT_SUFX= .tar.bz2
@@ -10,7 +11,7 @@ HOMEPAGE= http://gnomeicu.sourceforge.net/
COMMENT= GNOME ICQ client
DEPENDS+= gdbm>=1.8.0:../../databases/gdbm
-DEPENDS+= gnome-core>=1.2.0:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
DEPENDS+= libiconv>=1.5:../../converters/libiconv
GNU_CONFIGURE= YES
diff --git a/chat/kicq/Makefile b/chat/kicq/Makefile
index e1ab788a3b3..af433646ebf 100644
--- a/chat/kicq/Makefile
+++ b/chat/kicq/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/11/06 11:57:19 tron Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:36:41 fredb Exp $
DISTNAME= kicq-1.0.0
+PKGREVISION= 1
CATEGORIES= chat kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kicq/}
@@ -10,7 +11,7 @@ COMMENT= KDE ICQ client
BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf
DEPENDS+= icqlib>=1.0.0:../../chat/icqlib
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/chat/kxicq/Makefile b/chat/kxicq/Makefile
index e7ebc533192..b55b31ba28f 100644
--- a/chat/kxicq/Makefile
+++ b/chat/kxicq/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:21 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:36:42 fredb Exp $
DISTNAME= kxicq-03132000
+PKGREVISION= 1
CATEGORIES= chat kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kxicq/}
@@ -9,7 +10,7 @@ HOMEPAGE= http://www.kxicq.org/
COMMENT= KDE ICQ client
DEPENDS+= esound>=0.2.7:../../audio/esound
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/chat/kyahoo/Makefile b/chat/kyahoo/Makefile
index 003b3c61243..ece58785e36 100644
--- a/chat/kyahoo/Makefile
+++ b/chat/kyahoo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/12/04 06:14:58 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:42 fredb Exp $
DISTNAME= kyahoo-0.7
+PKGREVISION= 1
CATEGORIES= chat kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kyahoo/}
EXTRACT_SUFX= .tgz
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 4285f48c45b..bc2f2742583 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2002/01/18 14:37:20 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:36:43 fredb Exp $
DISTNAME= xchat-1.8.7
+PKGREVISION= 1
CATEGORIES= chat x11 gnome
MASTER_SITES= ${HOMEPAGE}files/source/1.8/
EXTRACT_SUFX= .tar.bz2
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 77d84688231..00f0cb33132 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2001/11/29 01:12:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.24 2002/03/13 17:36:43 fredb Exp $
#
DISTNAME= hylafax-4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= comms
MASTER_SITES= ftp://ftp.hylafax.org/source/ \
ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 326db852663..bc32100d2d5 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2002/03/09 17:17:05 fredb Exp $
+# $NetBSD: Makefile,v 1.22 2002/03/13 17:36:43 fredb Exp $
# FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
#
DISTNAME= mgetty1.1.28-Jan10
PKGNAME= mgetty-1.1.28
+PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \
ftp://alpha.greenie.net/pub/mgetty/source/1.1/
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 591e9953647..6b4bc5a6922 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2001/07/27 10:54:05 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:36:44 fredb Exp $
# FreeBSD Id: Makefile,v 1.6 1998/08/07 23:56:12 asami Exp
#
DISTNAME= tkhylafax-3.1
+PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= ftp://ftp.sgi.com/sgi/fax/contrib/tkhylafax/ \
ftp://ftp.tuwien.ac.at/infosys/fax/hylafax/contrib/tkhylafax/ \
diff --git a/converters/doc2html/Makefile b/converters/doc2html/Makefile
index a40ac3a41f8..6d219b83c1b 100644
--- a/converters/doc2html/Makefile
+++ b/converters/doc2html/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/12/11 03:42:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:36:44 fredb Exp $
#
DISTNAME= doc2html
PKGNAME= doc2html-3.0
+PKGREVISION= 1
CATEGORIES= converters
MASTER_SITES= http://www.htdig.org/files/contrib/parsers/
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 19f8cdbe4cf..4eddbfe1f4c 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2001/12/19 20:08:51 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:36:44 fredb Exp $
#
DISTNAME= psiconv-0.8.2
+PKGREVISION= 1
CATEGORIES= converters
MASTER_SITES= http://huizen.dds.nl/~frodol/psiconv/
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 3454a7ef980..f717eb24637 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2001/12/10 14:30:14 taca Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/13 17:36:44 fredb Exp $
#
DISTNAME= wv-0.7.0
+PKGREVISION= 1
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
diff --git a/databases/gtranscript/Makefile b/databases/gtranscript/Makefile
index 5edb7688797..407d8a475c1 100644
--- a/databases/gtranscript/Makefile
+++ b/databases/gtranscript/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:17:52 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:36:44 fredb Exp $
#
DISTNAME= gtranscript-0.0.1
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://gtranscript.linuxbox.com/ \
ftp://ftp.matrix.com.br/pub/linuxberg/files/gnome/office/ \
@@ -17,7 +18,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://gtranscript.linuxbox.com/
COMMENT= SQL Database Client with GNOME frontend
-DEPENDS+= gnome-core-[0-9]*:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
DEPENDS+= postgresql-{6.5.3*,7.0*,lib-[0-9]*}:../../databases/postgresql-lib
GNU_CONFIGURE= YES
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 4dc2c423875..ca61cf723de 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/12/04 06:14:58 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:36:45 fredb Exp $
DISTNAME= kmysqladmin-0.5.1
+PKGREVISION= 1
CATEGORIES= databases kde
MASTER_SITES= http://www.webeifer.de/alwin/programs/download/kmysqladmin/
diff --git a/databases/kpsql/Makefile b/databases/kpsql/Makefile
index 88733584f9f..4701b3e22b0 100644
--- a/databases/kpsql/Makefile
+++ b/databases/kpsql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/27 23:17:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:36:45 fredb Exp $
#
DISTNAME= kpsql-1.0
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://www.mutinybaysoftware.com/downloads/
EXTRACT_SUFX= .tgz
@@ -10,7 +11,7 @@ MAINTAINER= wulf@netbsd.org
HOMEPAGE= http://www.mutinybaysoftware.com/kpsql.html
COMMENT= Interactive Query Tool for PostgreSQL
-DEPENDS+= kdebase>=1.1:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
DEPENDS+= postgresql-{6.5.3*,7.0*,lib-[0-9]*}:../../databases/postgresql-lib
#
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index e4e58173a93..367ea390ad1 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2001/09/24 13:12:18 wulf Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:36:45 fredb Exp $
#
DISTNAME= rrdtool-1.0.33
+PKGREVISION= 1
CATEGORIES= databases graphics net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
@@ -10,7 +11,7 @@ HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool
COMMENT= Data analysis tool generating graphical representations
DEPENDS+= cgilib-0.5:../../www/cgilib
-DEPENDS+= gd>=1.7.3:../../graphics/gd
+DEPENDS+= gd>=1.8.4nb1:../../graphics/gd
DEPENDS+= jpeg-6*:../../graphics/jpeg
# IEEE math not good enough on alpha
diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile
index f8260e2889a..9e4711766cc 100644
--- a/databases/unixodbc-DataManager/Makefile
+++ b/databases/unixodbc-DataManager/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/12/03 08:09:05 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:45 fredb Exp $
PKGNAME= unixodbc-DataManager-${ODBC_BASE_VERS}
+PKGREVISION= 1
COMMENT= GUI tool for unixODBC data source management
USE_BUILDLINK_ONLY= YES
diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile
index f787d193a80..fde95f6bfe2 100644
--- a/databases/unixodbc-ODBCConfig/Makefile
+++ b/databases/unixodbc-ODBCConfig/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/12/03 08:09:06 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:46 fredb Exp $
PKGNAME= unixodbc-ODBCConfig-${ODBC_BASE_VERS}
+PKGREVISION= 1
COMMENT= GUI tool for unixODBC driver configuration
USE_BUILDLINK_ONLY= YES
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index acca769a1b3..e002f90dfbb 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2002/01/15 23:59:46 rh Exp $
+# $NetBSD: Makefile,v 1.25 2002/03/13 17:36:46 fredb Exp $
#
DISTNAME= GConf-1.0.7
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/GConf/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/GConf/buildlink.mk b/devel/GConf/buildlink.mk
index bbc2346d3e2..4c89ad93d29 100644
--- a/devel/GConf/buildlink.mk
+++ b/devel/GConf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/01/13 11:45:31 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/03/13 17:36:46 fredb Exp $
#
# This Makefile fragment is included by packages that use gconf.
#
@@ -17,7 +17,7 @@ GCONF_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gconf?= GConf>=0.6.6
+BUILDLINK_DEPENDS.gconf?= GConf>=1.0.7nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gconf}:../../devel/GConf
EVAL_PREFIX+= BUILDLINK_PREFIX.gconf=gconf
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index e721e4e2d2b..4de53297eb3 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/01/16 01:37:48 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:36:47 fredb Exp $
DISTNAME= bonobo-conf-0.14
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/bonobo-conf/}
diff --git a/devel/bonobo-conf/buildlink.mk b/devel/bonobo-conf/buildlink.mk
index 9c3993f345a..07c1f8a5a05 100644
--- a/devel/bonobo-conf/buildlink.mk
+++ b/devel/bonobo-conf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/01/16 01:37:48 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:36:47 fredb Exp $
#
# This Makefile fragment is included by packages that use bonobo-conf.
#
@@ -17,7 +17,7 @@ BONOBO_CONF_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.bonobo-conf?= bonobo-conf>0.14
+BUILDLINK_DEPENDS.bonobo-conf?= bonobo-conf>0.14nb1
DEPENDS+= ${BUILDLINK_DEPENDS.bonobo-conf}:../../devel/bonobo-conf
EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo-conf=bonobo-conf
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 77be3736364..6a0c7096aff 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2002/01/16 00:03:21 rh Exp $
+# $NetBSD: Makefile,v 1.23 2002/03/13 17:36:46 fredb Exp $
#
DISTNAME= bonobo-1.0.18
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/bonobo/}
diff --git a/devel/bonobo/buildlink.mk b/devel/bonobo/buildlink.mk
index a82fd8ea548..2c9abdb6cb1 100644
--- a/devel/bonobo/buildlink.mk
+++ b/devel/bonobo/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/01/16 00:12:43 rh Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/03/13 17:36:47 fredb Exp $
#
# This Makefile fragment is included by packages that use bonobo.
#
@@ -17,7 +17,7 @@ BONOBO_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.bonobo?= bonobo>=1.0.18
+BUILDLINK_DEPENDS.bonobo?= bonobo>=1.0.18nb1
DEPENDS+= ${BUILDLINK_DEPENDS.bonobo}:../../devel/bonobo
EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo=bonobo
diff --git a/devel/c-cpp-reference/Makefile b/devel/c-cpp-reference/Makefile
index a4620da3006..d3069c60c79 100644
--- a/devel/c-cpp-reference/Makefile
+++ b/devel/c-cpp-reference/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/12/17 08:26:43 skrll Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:47 fredb Exp $
#
DISTNAME= c_cpp_reference-2.0.1
PKGNAME= ${DISTNAME:S/_/-/g}
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ftp://ftp.e-technik.fh-muenchen.de/pub/unix/ide/KDevelop/
diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index 3c70ee0d5a7..5e8c0af8399 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2001/03/05 05:29:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:36:47 fredb Exp $
#
DISTNAME= cervisia-1.0
+PKGREVISION= 1
CATEGORIES= kde devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cervisia/} \
ftp://ftp.kde.org/pub/kde/unstable/apps/utils/
@@ -10,7 +11,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://cervisia.sourceforge.net/
COMMENT= Graphical frontend for the CVS client
-DEPENDS+= kde-1.1.2:../../x11/kde
+DEPENDS+= kde-1.1.2nb1:../../x11/kde
DEPENDS+= cvs>=1.10:../../devel/cvs
USE_X11BASE= yes # To get this near KDE
diff --git a/devel/cervisia2/Makefile b/devel/cervisia2/Makefile
index 6cecd72c3c1..8b30a9523f5 100644
--- a/devel/cervisia2/Makefile
+++ b/devel/cervisia2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/11/13 21:14:12 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:36:47 fredb Exp $
DISTNAME= cervisia-1.4.1
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cervisia/}
@@ -8,7 +9,7 @@ MAINTAINER= wulf@netbsd.org
HOMEPAGE= http://cervisia.sourceforge.net/
COMMENT= Graphical frontend for the CVS client
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
USE_GMAKE= YES
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 60aabf8f2ad..5a5d08196bf 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/03/01 12:24:43 martti Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:48 fredb Exp $
#
DISTNAME= cvsgraph-1.2.0
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.akhphd.au.dk/~bertho/cvsgraph/release/
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index a74a22a848b..57ee7c7ea4b 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:19 agc Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:36:48 fredb Exp $
#
# XXX This package needs to be installed with the same PREFIX as teTeX
#
DISTNAME= cweb-3.63
+PKGREVISION= 1
CATEGORIES= devel lang
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=web/cweb/}
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 20fb1cc0cbc..df066e86324 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/09/04 22:05:49 groo Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:48 fredb Exp $
DISTNAME= doxygen-1.2.10.src
PKGNAME= doxygen-1.2.10
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index c563771f692..2018a9db527 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/08/14 08:11:11 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:48 fredb Exp $
#
DISTNAME= eel-1.0.1
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/eel/}/
EXTRACT_SUFX= .tar.bz2
@@ -10,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.eazel.com/
COMMENT= Eazel Extenstions Library
-DEPENDS+= librsvg>=1.0.1:../../graphics/librsvg
+DEPENDS+= librsvg>=1.0.1nb1:../../graphics/librsvg
BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 352d2021f2f..aef32977427 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2002/01/16 03:20:18 rh Exp $
+# $NetBSD: Makefile,v 1.21 2002/03/13 17:36:48 fredb Exp $
DISTNAME= gal-0.19
+PKGREVISION= 1
CATEGORIES= gnome devel
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/gal/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gal/buildlink.mk b/devel/gal/buildlink.mk
index 5b62ba0ffc8..78ccf735d3d 100644
--- a/devel/gal/buildlink.mk
+++ b/devel/gal/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/05 06:58:46 rh Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/03/13 17:36:49 fredb Exp $
#
# This Makefile fragment is included by packages that use gal.
#
@@ -17,7 +17,7 @@ GAL_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gal?= gal>=0.13
+BUILDLINK_DEPENDS.gal?= gal>=0.19nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gal}:../../devel/gal
EVAL_PREFIX+= BUILDLINK_PREFIX.gal=gal
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 35c5152c026..6becd452a0d 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2001/10/06 17:30:59 rh Exp $
+# $NetBSD: Makefile,v 1.25 2002/03/13 17:36:49 fredb Exp $
# FreeBSD Id: Makefile,v 1.10 1998/11/18 17:35:16 vanilla Exp
#
DISTNAME= glade-0.6.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://glade.pn.org/ \
${MASTER_SITE_GNOME:=stable/sources/glade/}
diff --git a/devel/gnome-objc/Makefile b/devel/gnome-objc/Makefile
index 0cf528a211a..e4089e9ff5f 100644
--- a/devel/gnome-objc/Makefile
+++ b/devel/gnome-objc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/01/24 18:31:34 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:36:49 fredb Exp $
#
DISTNAME= gnome-objc-1.0.40
+PKGREVISION= 1
CATEGORIES= devel lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-objc/}
diff --git a/devel/gtkdiff/Makefile b/devel/gtkdiff/Makefile
index 9f005d348aa..072dd8a4523 100644
--- a/devel/gtkdiff/Makefile
+++ b/devel/gtkdiff/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/01/21 11:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:36:49 fredb Exp $
#
DISTNAME= gtkdiff-1.6.0
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= http://www.ainet.or.jp/~inoue/software/gtkdiff/
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 3d1e404ff4c..d825ea612bc 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2001/12/04 20:45:31 skrll Exp $
+# $NetBSD: Makefile,v 1.28 2002/03/13 17:36:50 fredb Exp $
DISTNAME= kdbg-1.2.2
+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 298648f282f..a3dd35ba111 100644
--- a/devel/kdebindings2/Makefile
+++ b/devel/kdebindings2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/11/13 21:15:31 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:50 fredb Exp $
DISTNAME= kdebindings-2.2.1
+PKGREVISION= 1
CATEGORIES= devel
COMMENT= Additional language bindings for KDE integrated X11 desktop
diff --git a/devel/kdesdk2/Makefile b/devel/kdesdk2/Makefile
index 0c475edd94d..d8d6aeaf0a2 100644
--- a/devel/kdesdk2/Makefile
+++ b/devel/kdesdk2/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2001/12/04 16:14:17 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:50 fredb Exp $
DISTNAME= kdesdk-2.2.2
+PKGREVISION= 1
CATEGORIES= devel
COMMENT= Support applications and tools used by KDE developers
.include "../../x11/kde2/Makefile.kde2"
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
LTCONFIG_OVERRIDE+= ${WRKSRC}/kapptemplate/admin/ltconfig
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 851cb1bec6a..db1e09d191d 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/12/04 20:45:31 skrll Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:36:51 fredb Exp $
DISTNAME= kdevelop-2.0.2
PKGNAME= ${DISTNAME:S/-/-base-/}
+PKGREVISION= 1
CATEGORIES= devel kde
COMMENT= Base modules for IDE for Unix/X11/KDE
@@ -13,11 +14,11 @@ BUILD_USES_MSGFMT= yes
USE_BUILDLINK_ONLY= yes
DEPENDS+= automake>=1.4:../../devel/automake
DEPENDS+= kdoc-2.2.2:../../textproc/kdoc
-DEPENDS+= htdig>=3.1.5:../../www/htdig
+DEPENDS+= htdig>=3.1.6:../../www/htdig
DEPENDS+= a2ps>=4.12:../../print/a2ps
-DEPENDS+= kdelibdocs>=2.2.2:../../x11/kdelibdocs2
-DEPENDS+= qt2-designer-kde>=2.3.1:../../x11/qt2-designer-kde
-DEPENDS+= kdesdk>=2.2.2:../../devel/kdesdk2
+DEPENDS+= kdelibdocs>=2.2.2nb1:../../x11/kdelibdocs2
+DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
+DEPENDS+= kdesdk>=2.2.2nb1:../../devel/kdesdk2
CONFLICTS+= kdevelop<=1.3
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 0dafd5da693..39179dd5434 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2001/12/24 14:42:24 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2002/03/13 17:36:50 fredb Exp $
DISTNAME= kdevelop-2.0.2
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index ebf469b2f54..ff4e6458df8 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2001/10/24 22:10:53 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2002/03/13 17:36:51 fredb Exp $
#
DISTNAME= libglade-0.17
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/libglade/}
diff --git a/devel/libglade/buildlink.mk b/devel/libglade/buildlink.mk
index 225281a7435..fc9106871c6 100644
--- a/devel/libglade/buildlink.mk
+++ b/devel/libglade/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/10/09 12:30:23 rh Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/03/13 17:36:51 fredb Exp $
#
# This Makefile fragment is included by packages that use libglade.
#
@@ -17,7 +17,7 @@ LIBGLADE_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.libglade?= libglade>=0.17
+BUILDLINK_DEPENDS.libglade?= libglade>=0.17nb1
DEPENDS+= ${BUILDLINK_DEPENDS.libglade}:../../devel/libglade
EVAL_PREFIX+= BUILDLINK_PREFIX.libglade=libglade
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 5a60b7eae55..cca59f6800f 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2002/02/18 15:14:13 seb Exp $
+# $NetBSD: Makefile,v 1.59 2002/03/13 17:36:51 fredb Exp $
DISTNAME= libgtop-1.0.12
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/libgtop/}
@@ -11,7 +11,7 @@ COMMENT= library to retrieve system information, used in GNOME
BUILD_DEPENDS= perl>=${PERL5_REQD}:../../lang/perl5
BUILD_USES_MSGFMT= yes
-DEPENDS+= gnome-libs-[0-9]*:../../x11/gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
DEPENDS+= guile-[0-9]*:../../lang/guile
NOT_FOR_PLATFORM= SunOS-*-*
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 6c2a06accdb..5af1259e5a9 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/01/15 23:55:37 rh Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:36:51 fredb Exp $
#
DISTNAME= oaf-0.6.7
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/oaf/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/oaf/buildlink.mk b/devel/oaf/buildlink.mk
index caf22a420fc..76eeb5d7183 100644
--- a/devel/oaf/buildlink.mk
+++ b/devel/oaf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2002/01/15 23:55:38 rh Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/03/13 17:36:52 fredb Exp $
#
# This Makefile fragment is included by packages that use oaf.
#
@@ -17,7 +17,7 @@ OAF_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.oaf?= oaf>=0.6.7
+BUILDLINK_DEPENDS.oaf?= oaf>=0.6.7nb1
DEPENDS+= ${BUILDLINK_DEPENDS.oaf}:../../devel/oaf
EVAL_PREFIX+= BUILDLINK_PREFIX.oaf=oaf
diff --git a/devel/uml/Makefile b/devel/uml/Makefile
index 4bfc3b3b6ab..923e017d459 100644
--- a/devel/uml/Makefile
+++ b/devel/uml/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/12/04 10:01:44 wulf Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:36:52 fredb Exp $
DISTNAME= uml-1.0.3-1
PKGNAME= uml-1.0.3
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=uml/}
@@ -10,7 +11,7 @@ MAINTAINER= wulf@netbsd.org
HOMEPAGE= http://uml.sourceforge.net/
COMMENT= UML Modelling tool
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
USE_GMAKE= YES
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 5f226f00fd0..7d1434ea911 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2002/02/25 10:00:07 martti Exp $
+# $NetBSD: Makefile,v 1.43 2002/03/13 17:36:52 fredb Exp $
#
# According to AbiSource's explanation of their trademark rights,
# compilations/distributions of AbiWord not provided by AbiSource must
@@ -7,6 +7,7 @@
DISTNAME= abiword-${ABIWORD_VERS}
PKGNAME= abiword-personal-${ABIWORD_VERS}
+PKGREVISION= 1
ABIWORD_VERS= 0.99.2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=abiword/}
diff --git a/editors/gnotepad/Makefile b/editors/gnotepad/Makefile
index bbf85c7ba72..2ef18735971 100644
--- a/editors/gnotepad/Makefile
+++ b/editors/gnotepad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/12/12 18:10:14 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:36:52 fredb Exp $
DISTNAME= gnotepad+-1.3.3
PKGNAME= ${DISTNAME:S/+//}
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnotepad/}
diff --git a/editors/ted-cs/Makefile b/editors/ted-cs/Makefile
index 282b472f2ac..87d161beff1 100644
--- a/editors/ted-cs/Makefile
+++ b/editors/ted-cs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:53 fredb Exp $
DISTNAME= Ted_cs_CZ
PKGNAME= ted-cs-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-da/Makefile b/editors/ted-da/Makefile
index 9e3787a9cae..f6875ed3bdb 100644
--- a/editors/ted-da/Makefile
+++ b/editors/ted-da/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:53 fredb Exp $
DISTNAME= Ted_da_DK
PKGNAME= ted-da-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-de/Makefile b/editors/ted-de/Makefile
index 5309f4300e7..e01e1d21105 100644
--- a/editors/ted-de/Makefile
+++ b/editors/ted-de/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:53 fredb Exp $
DISTNAME= Ted_de_DE
PKGNAME= ted-de-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-en-gb/Makefile b/editors/ted-en-gb/Makefile
index cc749904fac..6871a90827d 100644
--- a/editors/ted-en-gb/Makefile
+++ b/editors/ted-en-gb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:53 fredb Exp $
DISTNAME= Ted_en_GB
PKGNAME= ted-en-gb-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile
index 97dead66d44..4abe6820dd8 100644
--- a/editors/ted-en-us/Makefile
+++ b/editors/ted-en-us/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:53 fredb Exp $
DISTNAME= ted-2.10.src
PKGNAME= ted-en-us-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/Ted-2.10
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-es/Makefile b/editors/ted-es/Makefile
index fb38541fa8e..dfcadb87b9b 100644
--- a/editors/ted-es/Makefile
+++ b/editors/ted-es/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:54 fredb Exp $
DISTNAME= Ted_es_ES
PKGNAME= ted-es-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-fr/Makefile b/editors/ted-fr/Makefile
index 10cf5fe56fc..0af05fa3053 100644
--- a/editors/ted-fr/Makefile
+++ b/editors/ted-fr/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:54 fredb Exp $
DISTNAME= Ted_fr_FR
PKGNAME= ted-fr-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-it/Makefile b/editors/ted-it/Makefile
index 1241cbd65ba..78675efabf6 100644
--- a/editors/ted-it/Makefile
+++ b/editors/ted-it/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:54 fredb Exp $
DISTNAME= Ted_it_IT
PKGNAME= ted-it-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-nl/Makefile b/editors/ted-nl/Makefile
index 184bfb516ce..ab92a3d6b32 100644
--- a/editors/ted-nl/Makefile
+++ b/editors/ted-nl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:54 fredb Exp $
DISTNAME= Ted_nl_NL
PKGNAME= ted-nl-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-no/Makefile b/editors/ted-no/Makefile
index 61fb92dd707..ab415298734 100644
--- a/editors/ted-no/Makefile
+++ b/editors/ted-no/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:55 fredb Exp $
DISTNAME= Ted_no_NO
PKGNAME= ted-no-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-pt/Makefile b/editors/ted-pt/Makefile
index 0ee5e56a711..90465d71d30 100644
--- a/editors/ted-pt/Makefile
+++ b/editors/ted-pt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:55 fredb Exp $
DISTNAME= Ted_pt_PT
PKGNAME= ted-pt-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted-sv/Makefile b/editors/ted-sv/Makefile
index d34b7ca8345..f8ed0bd73da 100644
--- a/editors/ted-sv/Makefile
+++ b/editors/ted-sv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/19 17:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:55 fredb Exp $
DISTNAME= Ted_sv_SE
PKGNAME= ted-sv-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index b9c5d9a0ee9..09189c12738 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/09/08 19:55:44 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:52 fredb Exp $
DISTNAME= ted-2.10.src
PKGNAME= ted-2.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/Ted-2.10
CATEGORIES= editors
MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/ \
diff --git a/editors/treetext/Makefile b/editors/treetext/Makefile
index 4dfc8665b56..3bdb1a1257b 100644
--- a/editors/treetext/Makefile
+++ b/editors/treetext/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/05 17:18:52 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:36:55 fredb Exp $
#
DISTNAME= TreeText-0.3.3-src
PKGNAME= ${DISTNAME:C/-src//}
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://www.ab.wakwak.com/~tino/fox/treetext/
EXTRACT_SUFX= .zip
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 0aea76665a0..2ce1d6b4314 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2002/01/27 19:13:18 magick Exp $
+# $NetBSD: Makefile,v 1.20 2002/03/13 17:36:56 fredb Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1999/06/22 22:16:53 gj Exp
DISTNAME= xemacs-packages
PKGNAME= xemacs-packages-1.8
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/packages/ \
ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index da9e2f92647..561dfaa2b2e 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2001/12/02 14:42:25 tron Exp $
+# $NetBSD: Makefile,v 1.38 2002/03/13 17:36:55 fredb Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
DISTNAME= xemacs-21.1.14
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/xemacs-21.1/ \
ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/xemacs-21.1/ \
@@ -16,7 +17,7 @@ HOMEPAGE= http://www.xemacs.org/
COMMENT= XEmacs text editor version 21
DEPENDS+= gdbm>=1.7.3:../../databases/gdbm
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= tiff-[0-9]*:../../graphics/tiff
DEPENDS+= jpeg-[0-9]*:../../graphics/jpeg
diff --git a/emulators/mmix/Makefile b/emulators/mmix/Makefile
index e5851947383..d4997c573e2 100644
--- a/emulators/mmix/Makefile
+++ b/emulators/mmix/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:03 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:36:56 fredb Exp $
DISTNAME= mmix
PKGNAME= mmix-20000918
+PKGREVISION= 1
CATEGORIES= emulators devel lang
MASTER_SITES= http://www-cs-faculty.stanford.edu/~knuth/programs/
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index b52daf9bdf8..9e1f9b325c9 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/01/29 10:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:36:56 fredb Exp $
#
DISTNAME= zsnes1337src
PKGNAME= zsnes-1.337
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://prdownloads.sourceforge.net/zsnes/
diff --git a/finance/emma/Makefile b/finance/emma/Makefile
index 1d20e077ee2..ea1088d9217 100644
--- a/finance/emma/Makefile
+++ b/finance/emma/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/01/29 19:41:30 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:36:56 fredb Exp $
#
DISTNAME= emma-0.8-1
PKGNAME= emma-0.8.1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/emma-0.7
CATEGORIES= finance
MASTER_SITES= ${HOMEPAGE}emma/packages/
@@ -12,7 +13,7 @@ HOMEPAGE= http://rainbow.mimuw.edu.pl/~la181249/
COMMENT= Money management program
BUILD_DEPENDS+= automake>=1.4:../../devel/automake
-DEPENDS+= gnome-libs-[0-9]*:../../x11/gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
USE_X11BASE= YES
GNU_CONFIGURE= YES
diff --git a/finance/gkrellm-stock/Makefile b/finance/gkrellm-stock/Makefile
index 220b2d9b323..a251328598c 100644
--- a/finance/gkrellm-stock/Makefile
+++ b/finance/gkrellm-stock/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/11/01 15:30:54 damon Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:36:57 fredb Exp $
DISTNAME= gkrellstock-0.2
PKGNAME= gkrellm-stock-0.2
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/gkrellStock-0.2
CATEGORIES= finance
MASTER_SITES= http://www.geocities.com/m_muthukumar/
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index f611c2b7fe1..4c6ffe6f790 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/09/27 23:18:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:36:57 fredb Exp $
#
DISTNAME= gnofin-0.8.4
+PKGREVISION= 1
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnofin/}
@@ -11,7 +12,7 @@ COMMENT= Personal checking/savings account management program
BUILD_USES_MSGFMT= yes
DEPENDS+= gtk+-1.2.*:../../x11/gtk
-DEPENDS+= gnome-libs-[0-9]*:../../x11/gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
DEPENDS+= libxml>=1.8.10:../../textproc/libxml
USE_X11= yes
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 930c45c7dac..6c4e5947475 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2002/03/12 19:02:28 mjl Exp $
+# $NetBSD: Makefile,v 1.23 2002/03/13 17:36:58 fredb Exp $
DISTNAME= gnucash-1.6.6
+PKGREVISION= 1
CATEGORIES= finance
MASTER_SITES= http://www.linas.org/pub/gnucash/gnucash/sources/stable/ \
ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
@@ -12,13 +13,13 @@ COMMENT= Personal double-entry accounting program
DEPENDS+= eperl-2.2.14:../../textproc/eperl
DEPENDS+= g-wrap>=1.1.10:../../devel/g-wrap
-DEPENDS+= guppi>=0.35.5nb1:../../math/guppi
+DEPENDS+= guppi>=0.40.0nb1:../../math/guppi
DEPENDS+= libperl>=${LIBPERL5_REQD}:../../lang/libperl
DEPENDS+= popt>=1.5:../../devel/popt
DEPENDS+= swig-1.1p5:../../devel/swig
DEPENDS+= glib>=0.99.7:../../devel/glib
-DEPENDS+= gdk-pixbuf>=0.2.5:../../graphics/gdk-pixbuf
-DEPENDS+= gnome-print>=0.21:../../print/gnome-print
+DEPENDS+= gdk-pixbuf>=0.11.0nb1:../../graphics/gdk-pixbuf
+DEPENDS+= gnome-print>=0.29nb1:../../print/gnome-print
BUILD_DEPENDS+= bison>=1.28:../../devel/bison
diff --git a/games/amor/Makefile b/games/amor/Makefile
index d9c430e1f46..45d58436854 100644
--- a/games/amor/Makefile
+++ b/games/amor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 15:10:42 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:36:58 fredb Exp $
#
DISTNAME= amor-0.6
+PKGREVISION= 1
CATEGORIES= games kde
MASTER_SITES= http://www.powerup.com.au/~mjones/amor/
EXTRACT_SUFX= .tgz
@@ -10,7 +11,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.powerup.com.au/~mjones/amor/index.html
COMMENT= Small blob that sits on top of your active window
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= yes # To get this near KDE
GNU_CONFIGURE= yes
diff --git a/games/backgammon/Makefile b/games/backgammon/Makefile
index 9d89efc9d2a..844abf7d12f 100644
--- a/games/backgammon/Makefile
+++ b/games/backgammon/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:42 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:36:59 fredb Exp $
#
DISTNAME= bacKgammon-1.9.1b
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=backgammon/}
@@ -9,7 +10,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://bacKgammon.sourceforge.net/
COMMENT= KDE frontend for first internet backgammon server (FIBS)
-DEPENDS+= kde-1.*:../../x11/kde
+DEPENDS+= kde-1.1.2nb1:../../x11/kde
GNU_CONFIGURE= yes
EVAL_PREFIX+= QT1DIR=qt1 KDEBASEDIR=kdebase
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index be506288110..2350db45009 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:36:59 fredb Exp $
DISTNAME= clanbomber-1.01
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games x11
MASTER_SITES= http://www.clanbomber.de/files/
diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index b0210548804..c5a5a4252d6 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/12/05 15:00:45 agc Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:36:59 fredb Exp $
#
DISTNAME= crossfire-client-1.0.0
+PKGREVISION= 1
CATEGORIES= games x11
MASTER_SITES= ftp://ftp.ifi.uio.no/pub/crossfire/
DISTFILES= ${CF_SRC} ${CF_SND} ${CF_RAW}
@@ -11,7 +12,7 @@ HOMEPAGE= http://crossfire.real-time.com/
COMMENT= Client for X11 game similar to gauntlet and nethack
DEPENDS+= gtk+>=1.2.4:../../x11/gtk
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
EXTRACT_ONLY= ${CF_SRC}
diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index faf4a08bf3d..783a043a604 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2001/12/05 15:00:45 agc Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:36:59 fredb Exp $
#
DISTNAME= crossfire-1.0.0
PKGNAME= crossfire-server-1.0.0
+PKGREVISION= 1
CATEGORIES= games x11
MASTER_SITES= ftp://ftp.scruz.net/users/mwedel/public/
DISTFILES= ${CF_SRC} ${CF_MAPS}
@@ -11,7 +12,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://crossfire.real-time.com/
COMMENT= X11 multi/single player game similar to gauntlet and nethack
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= dmalloc-[0-9]*:../../devel/dmalloc
EXTRACT_ONLY= ${CF_SRC}
diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index a5f7ebaf14e..9e22ed01a5c 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/10/24 22:10:55 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:36:59 fredb 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/gnocatan/Makefile b/games/gnocatan/Makefile
index 68415ae54aa..a7ad013f5b5 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/10/13 06:50:47 veego Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:00 fredb Exp $
#
DISTNAME= gnocatan-0.6.1
+PKGREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnocatan/}
diff --git a/games/gnome-breakout/Makefile b/games/gnome-breakout/Makefile
index 0db45173683..d3b9efcbad1 100644
--- a/games/gnome-breakout/Makefile
+++ b/games/gnome-breakout/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:06 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:00 fredb Exp $
#
DISTNAME= gnome-breakout-0.5.2
+PKGREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= http://www.senet.com.au/~alcaron/
@@ -9,7 +10,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.senet.com.au/~alcaron/software.html
COMMENT= gnome version of the classic breakout game
-DEPENDS+= gnome-core-[0-9]*:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
GNU_CONFIGURE= YES
USE_X11BASE= YES
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index 5a7c37c082c..9b713dc491a 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:56 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:00 fredb Exp $
DISTNAME= gnome-chess-0.3.3
+PKGREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-chess/}
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 96a71ca6182..c48c9edc2fd 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2001/12/12 14:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:00 fredb Exp $
DISTNAME= gnome-games-1.4.0.3
+PKGREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-games/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile
index d9fc028b207..bce6d6c2037 100644
--- a/games/kdegames/Makefile
+++ b/games/kdegames/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2001/02/16 15:10:52 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2002/03/13 17:37:00 fredb Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp
#
DISTNAME= kdegames-1.1.2
+PKGREVISION= 1
CATEGORIES= games kde
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/
@@ -12,7 +13,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= Games for the KDE integrated X11 desktop
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
DEPENDS+= qwspritefield-1.6:../../x11/qwspritefield
USE_X11BASE= yes
diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile
index 6327b081b33..a9c4525e27c 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2001/12/03 15:37:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:01 fredb Exp $
DISTNAME= kdegames-2.2.2
+PKGREVISION= 1
CATEGORIES= games
COMMENT= Games for the KDE integrated X11 desktop
.include "../../x11/kde2/Makefile.kde2"
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile
index 9e6a46126be..e24461f7ef3 100644
--- a/games/kdetoys/Makefile
+++ b/games/kdetoys/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:07 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:01 fredb Exp $
DISTNAME= kdetoys-1.1.2
+PKGREVISION= 1
CATEGORIES= games kde
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/
@@ -10,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= Toys for the KDE integrated X11 desktop
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
CONFLICTS= kworldwatch-[0-9]*
diff --git a/games/kdetoys2/Makefile b/games/kdetoys2/Makefile
index c330ce44689..e862e427096 100644
--- a/games/kdetoys2/Makefile
+++ b/games/kdetoys2/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2001/12/03 15:37:15 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:01 fredb Exp $
DISTNAME= kdetoys-2.2.2
+PKGREVISION= 1
CATEGORIES= games
COMMENT= Toys for the KDE integrated X11 desktop
.include "../../x11/kde2/Makefile.kde2"
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 517413a9948..897b7e2804e 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/12/04 06:14:59 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:01 fredb Exp $
DISTNAME= knights-0.4.6
+PKGREVISION= 1
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=knights/}
EXTRACT_SUFX= .tar.gz
diff --git a/games/kulki/Makefile b/games/kulki/Makefile
index 035b08473e1..7217cb3f333 100644
--- a/games/kulki/Makefile
+++ b/games/kulki/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:56 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:01 fredb Exp $
#
DISTNAME= kulki-1.01
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.cs.put.poznan.pl/adanilecki/
EXTRACT_SUFX= .tgz
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index a88e357cbd8..d8ffb1defc3 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2001/12/15 20:25:36 agc Exp $
+# $NetBSD: Makefile,v 1.31 2002/03/13 17:37:02 fredb Exp $
#
.include "../nethack-lib/Makefile.common"
PKGNAME= nethack-qt-${NETHACK_VERSION}
+PKGREVISION= 1
CATEGORIES+= x11
COMMENT= The QT-Enhanced X11 version of NetHack
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 1c1914bc385..fe58af9806c 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 15:10:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:02 fredb Exp $
.include "../nethack-lib/Makefile.common"
DISTNAME= nethack-all-${NETHACK_VERSION}
+PKGREVISION= 1
CATEGORIES+= x11
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/games/pacman/Makefile b/games/pacman/Makefile
index 0ba7e6fe691..ad906ccdb13 100644
--- a/games/pacman/Makefile
+++ b/games/pacman/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/01/11 10:17:21 skrll Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:02 fredb Exp $
DISTNAME= Pacman-0.3-CVS-00-11-17
PKGNAME= Pacman-0.3
+PKGREVISION= 1
CATEGORIES= games x11
MASTER_SITES= http://dark.x.dtu.dk/~mbn/clanlib/download/snapshots/Games/
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 1526dab13b8..7a495fc5eba 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2002/02/10 12:50:59 abs Exp $
+# $NetBSD: Makefile,v 1.82 2002/03/13 17:37:02 fredb Exp $
DISTNAME= ImageMagick-5.3.9
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/ImageMagick/buildlink.mk b/graphics/ImageMagick/buildlink.mk
index 9ca5440b434..b08907034be 100644
--- a/graphics/ImageMagick/buildlink.mk
+++ b/graphics/ImageMagick/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/10/03 20:56:47 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2002/03/13 17:37:03 fredb Exp $
#
# This Makefile fragment is included by packages that use ImageMagick.
#
@@ -17,7 +17,7 @@ IMAGEMAGICK_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.ImageMagick?= ImageMagick>=5.2.8
+BUILDLINK_DEPENDS.ImageMagick?= ImageMagick>=5.3.9nb1
DEPENDS+= ${BUILDLINK_DEPENDS.ImageMagick}:../../graphics/ImageMagick
EVAL_PREFIX+= BUILDLINK_PREFIX.ImageMagick=ImageMagick
diff --git a/graphics/SDL-image/Makefile b/graphics/SDL-image/Makefile
index 608ec7994f6..64cad0200aa 100644
--- a/graphics/SDL-image/Makefile
+++ b/graphics/SDL-image/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/10/24 22:10:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:03 fredb Exp $
#
DISTNAME= SDL_image-1.2.0
PKGNAME= ${DISTNAME:S/_/-/}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/
diff --git a/graphics/alevt/Makefile b/graphics/alevt/Makefile
index 361315436c3..13aa72ae77b 100644
--- a/graphics/alevt/Makefile
+++ b/graphics/alevt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/05/22 09:32:19 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:03 fredb Exp $
DISTNAME= alevt-1.6.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/video/}
@@ -8,7 +9,7 @@ MAINTAINER= magick@bundy.zhadum.de
HOMEPAGE= http://user.exit.de/froese/
COMMENT= Teletext decoder and browser for Brooktree 848 compatible TV cards
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= fxtv>=1.02:../../graphics/fxtv
ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 8dfaec51df6..95ddabfffb3 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/01/03 14:03:01 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:03 fredb Exp $
#
DISTNAME= autotrace-0.29
+PKGREVISION= 1
CATEGORIES= graphics cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=autotrace/}
diff --git a/graphics/aview-x11/Makefile b/graphics/aview-x11/Makefile
index d18d70281db..662e13df4c9 100644
--- a/graphics/aview-x11/Makefile
+++ b/graphics/aview-x11/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/02/05 21:34:56 agc Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:04 fredb Exp $
#
DISTNAME= aview-1.3.0rc1
PKGNAME= aview-x11-1.3.0.1
+PKGREVISION= 1
CATEGORIES= graphics converters x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aa-project/}
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index c0e93ad1d5d..3dbc14e2c60 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/02/05 21:34:55 agc Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:03 fredb Exp $
#
DISTNAME= aview-1.3.0rc1
PKGNAME= aview-1.3.0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics converters
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aa-project/}
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index be24fc3249a..1aa6d9eb167 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2001/10/24 22:10:59 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2002/03/13 17:37:04 fredb Exp $
DISTNAME= ClanLib-0.4.4
+PKGREVISION= 1
CATEGORIES= graphics games devel x11
MASTER_SITES= http://dark.x.dtu.dk/~mbn/clanlib/download/
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index c0277b9a946..1ffc8624f6a 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:48 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/03/13 17:37:04 fredb Exp $
#
# This Makefile fragment is included by packages that use ClanLib.
#
@@ -17,7 +17,7 @@ CLANLIB_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.ClanLib?= ClanLib>=0.4.4
+BUILDLINK_DEPENDS.ClanLib?= ClanLib>=0.4.4nb1
DEPENDS+= ${BUILDLINK_DEPENDS.ClanLib}:../../graphics/clanlib
EVAL_PREFIX+= BUILDLINK_PREFIX.ClanLib=ClanLib
diff --git a/graphics/denemo/Makefile b/graphics/denemo/Makefile
index 21f9f61b956..4305f4708dd 100644
--- a/graphics/denemo/Makefile
+++ b/graphics/denemo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:09 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:04 fredb Exp $
#
DISTNAME= denemo-0.5.4
+PKGREVISION= 1
CATEGORIES= graphics print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=denemo/}
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 9f878117fee..f934d82d166 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/08/26 01:27:14 mjl Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:04 fredb Exp $
DISTNAME= dia-0.88.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/dia/}
@@ -8,10 +9,10 @@ MAINTAINER= jmcneill@invisible.yi.org
HOMEPAGE= http://www.lysator.liu.se/~alla/dia/
COMMENT= program for creating diagrams of all kinds
-DEPENDS+= gnome-libs>=1.2.3:../../x11/gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
DEPENDS+= libxml>=1.8.9:../../textproc/libxml
-DEPENDS+= gnome-print>=0.20:../../print/gnome-print
-DEPENDS+= gdk-pixbuf>=0.8.0nb1:../../graphics/gdk-pixbuf
+DEPENDS+= gnome-print>=0.29nb1:../../print/gnome-print
+DEPENDS+= gdk-pixbuf>=0.11.0nb1:../../graphics/gdk-pixbuf
USE_X11= yes
USE_GMAKE= yes
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index a56bedd6ba3..25383edb716 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2002/02/13 12:43:56 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:37:04 fredb Exp $
DISTNAME= dx-4.1.3
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.research.ibm.com/dx/srcDownload/srcArchive/
diff --git a/graphics/dxsamples/Makefile b/graphics/dxsamples/Makefile
index a138638e96e..b1006da76a3 100644
--- a/graphics/dxsamples/Makefile
+++ b/graphics/dxsamples/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/02/05 22:24:22 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:05 fredb Exp $
DISTNAME= dxsamples-4.1.3
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.research.ibm.com/dx/srcDownload/srcArchive/
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index 0633fcd06ea..30cb6367a74 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2002/01/24 15:44:12 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2002/03/13 17:37:05 fredb Exp $
DISTNAME= ee-0.3.12
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/ee/}
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 13e27b9ebda..cea638ce22c 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/22 01:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:05 fredb Exp $
DISTNAME= eog-0.6
+PKGREVISION= 1
CATEGORIES= gnome graphics x11
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/eog/}
@@ -8,11 +9,11 @@ MAINTAINER= epg@pobox.com
HOMEPAGE= http://www.gnome.org/
COMMENT= Eye of GNOME: an image viewing and cataloging program
-DEPENDS+= bonobo>=0.37:../../devel/bonobo
-DEPENDS+= GConf>=1.0:../../devel/GConf
-DEPENDS+= gdk-pixbuf-gnome>=0.10.1:../../graphics/gdk-pixbuf-gnome
-DEPENDS+= gnome-print>=0.28:../../print/gnome-print
-DEPENDS+= libglade>=0.16:../../devel/libglade
+DEPENDS+= bonobo>=1.0.18nb1:../../devel/bonobo
+DEPENDS+= GConf>=1.0.7nb1:../../devel/GConf
+DEPENDS+= gdk-pixbuf-gnome>=0.11.0nb1:../../graphics/gdk-pixbuf-gnome
+DEPENDS+= gnome-print>=0.29nb1:../../print/gnome-print
+DEPENDS+= libglade>=0.17nb1:../../devel/libglade
GNU_CONFIGURE= YES
USE_X11BASE= YES
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 9bf00564007..a6a6ae9c5db 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/08/28 11:17:55 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:05 fredb Exp $
#
DISTNAME= feh-1.1.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.linuxbrit.co.uk/downloads/
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index b41d6bc6946..e45078d4715 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:34 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/03/13 17:37:05 fredb Exp $
DISTNAME= fly-1.6.5
+PKGREVISION= 1
CATEGORIES= graphics www
MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/
@@ -9,7 +10,7 @@ HOMEPAGE= http://www.unimelb.edu.au/fly/fly.html
COMMENT= command-file interface for creating and modifying PNG images
BUILD_DEPENDS+= gif2png-2.4.2:../../graphics/gif2png
-DEPENDS+= gd>=1.8.1:../../graphics/gd
+DEPENDS+= gd>=1.8.4nb1:../../graphics/gd
EVAL_PREFIX+= XPMDIR=xpm
USE_X11= yes # (perhaps) -lXpm
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 886bed2d365..5761c024e58 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:00 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:06 fredb Exp $
DISTNAME= fnlib-0.5
+PKGREVISION= 1
CATEGORIES= x11 graphics
MASTER_SITES= ftp://ftp.enlightenment.org/pub/e/enlightenment/libs/
diff --git a/graphics/fnlib/buildlink.mk b/graphics/fnlib/buildlink.mk
index 731482c2262..8108b7e03c4 100644
--- a/graphics/fnlib/buildlink.mk
+++ b/graphics/fnlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/27 13:33:27 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/03/13 17:37:06 fredb Exp $
#
# This Makefile fragment is included by packages that use fnlib.
#
@@ -15,7 +15,7 @@
.if !defined(FNLIB_BUILDLINK_MK)
FNLIB_BUILDLINK_MK= # defined
-BUILDLINK_DEPENDS.fnlib?= fnlib>=0.5
+BUILDLINK_DEPENDS.fnlib?= fnlib>=0.5nb1
DEPENDS+= ${BUILDLINK_DEPENDS.fnlib}:../../graphics/fnlib
EVAL_PREFIX+= BUILDLINK_PREFIX.fnlib=fnlib
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 1bf3bf1060f..5a2607cf6e0 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2002/01/21 16:29:25 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:06 fredb Exp $
#
DISTNAME= gd-1.8.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/
diff --git a/graphics/gd/buildlink.mk b/graphics/gd/buildlink.mk
index 2ef60b43c6b..1aadb5e7a02 100644
--- a/graphics/gd/buildlink.mk
+++ b/graphics/gd/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/27 13:33:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/03/13 17:37:06 fredb Exp $
#
# This Makefile fragment is included by packages that use gd.
#
@@ -17,7 +17,7 @@ GD_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gd?= gd>=1.8.3
+BUILDLINK_DEPENDS.gd?= gd>=1.8.4nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gd}:../../graphics/gd
EVAL_PREFIX+= BUILDLINK_PREFIX.gd=gd
diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index ba9a0dccfc7..5d744f125ff 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/10/18 11:39:23 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:06 fredb Exp $
#
DISTNAME= gdchart0.10.1dev
PKGNAME= gdchart-0.10.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.fred.net/brv/chart/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 884a46bc94f..be8ad3abe06 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2001/10/03 22:36:39 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:07 fredb Exp $
.include "../gdk-pixbuf/Makefile.common"
PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
+PKGREVISION= 1
COMMENT= the GNOME image loading library GNOME canvas support add-on
CONFLICTS+= gdk-pixbuf<0.10.1
USE_BUILDLINK_ONLY= # defined
-BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.10.1
+BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1
do-install:
${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \
diff --git a/graphics/gdk-pixbuf-gnome/buildlink.mk b/graphics/gdk-pixbuf-gnome/buildlink.mk
index f4743686bfe..00e77a0ec90 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:49 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/03/13 17:37:07 fredb Exp $
#
# This Makefile fragment is included by packages that use gdk-pixbuf-gnome.
#
@@ -17,7 +17,7 @@ GDK_PIXBUF_GNOME_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gdk-pixbuf-gnome?= gdk-pixbuf-gnome>=0.8.0nb1
+BUILDLINK_DEPENDS.gdk-pixbuf-gnome?= gdk-pixbuf-gnome>=0.11.0nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gdk-pixbuf-gnome}:../../graphics/gdk-pixbuf-gnome
EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf-gnome=gdk-pixbuf-gnome
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index ebacc362efb..cb0e1c173e9 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2001/10/03 22:36:39 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/03/13 17:37:06 fredb Exp $
#
PKGNAME= ${DISTNAME}
+PKGREVISION= 1
COMMENT= the GNOME image loading library
USE_BUILDLINK_ONLY= # defined
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index daee26c1fd1..c68d408b187 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.19 2002/02/27 07:13:16 jlam Exp $
+# $NetBSD: Makefile.common,v 1.20 2002/03/13 17:37:06 fredb Exp $
#
DISTNAME= gdk-pixbuf-0.11.0
+PKGREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index b48d4df187c..9b254b27746 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2001/10/03 20:56:50 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.12 2002/03/13 17:37:07 fredb Exp $
#
# This Makefile fragment is included by packages that use gdk-pixbuf.
#
@@ -17,7 +17,7 @@ GDK_PIXBUF_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gdk-pixbuf?= gdk-pixbuf>=0.8.0nb1
+BUILDLINK_DEPENDS.gdk-pixbuf?= gdk-pixbuf>=0.11.0nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gdk-pixbuf}:../../graphics/gdk-pixbuf
EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index d5434d1a36d..fee4b93dff3 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:01 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:07 fredb Exp $
#
DISTNAME= gfract-0.21
+PKGREVISION= 1
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/gif2png/Makefile b/graphics/gif2png/Makefile
index 29875b010d2..3c2acb21d55 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2001/06/25 23:54:31 zuntum Exp $
+# $NetBSD: Makefile,v 1.19 2002/03/13 17:37:07 fredb Exp $
DISTNAME= gif2png-2.4.2
+PKGREVISION= 1
CATEGORIES= graphics converters
MASTER_SITES= http://www.tuxedo.org/~esr/gif2png/ \
${MASTER_SITE_SUNSITE:=apps/graphics/convert/}
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index 2bef18b17b3..1a8b7f0670d 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/15 20:52:36 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:08 fredb Exp $
DISTNAME= gimp-1.2.3
PKGNAME= gimp-base-1.2.3
+PKGREVISION= 1
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/buildlink.mk b/graphics/gimp-base/buildlink.mk
index 54d7508f0a5..15cb6389556 100644
--- a/graphics/gimp-base/buildlink.mk
+++ b/graphics/gimp-base/buildlink.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/02/15 20:52:36 drochner Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:37:08 fredb Exp $
#
-# This Makefile fragment is included by packages that use gtk.
+# This Makefile fragment is included by packages that use gimp.
#
# To use this Makefile fragment, simply:
#
@@ -17,7 +17,7 @@ GIMPBASE_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gimpbase?= gimp-base>=1.2.3
+BUILDLINK_DEPENDS.gimpbase?= gimp-base>=1.2.3nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gimpbase}:../../graphics/gimp-base
EVAL_PREFIX+= BUILDLINK_PREFIX.gimpbase=gimp-base
diff --git a/graphics/gimp-data/Makefile b/graphics/gimp-data/Makefile
index 8c273469b5a..29d8fd189fa 100644
--- a/graphics/gimp-data/Makefile
+++ b/graphics/gimp-data/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/15 20:54:23 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:08 fredb Exp $
DISTNAME= gimp-data-extras-1.2.0
PKGNAME= gimp-data-1.2
+PKGREVISION= 1
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 032d0706220..bd6c61ae356 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2002/02/15 20:55:58 drochner Exp $
+# $NetBSD: Makefile,v 1.81 2002/03/13 17:37:07 fredb Exp $
DISTNAME= gimp-1.2.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
DISTFILES= # nothing
@@ -11,7 +11,7 @@ COMMENT= Image manipulation program similar to Photoshop[tm]
NO_BUILD= yes
-DEPENDS+= gimp-base-1.2.3:../../graphics/gimp-base
+DEPENDS+= gimp-base-1.2.3nb1:../../graphics/gimp-base
DEPENDS+= gimp-data>=1.2:../../graphics/gimp-data
DEPENDS+= gimp-print>=4.2.0:../../print/gimp-print
DEPENDS+= gimp-print-escputil>=4.2.0:../../print/gimp-print-escputil
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index bb5540ab109..84cf7327d85 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2002/01/25 19:20:28 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/13 17:37:08 fredb Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
DISTNAME= Giram-0.1.2
PKGNAME= giram-0.1.2
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.minet.net/pub/giram/
@@ -11,7 +12,7 @@ HOMEPAGE= http://www.minet.net/giram/
COMMENT= Giram is Really A Modeller
DEPENDS+= esound-[0-9]*:../../audio/esound
-DEPENDS+= gnome-libs-[0-9]*:../../x11/gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
DEPENDS+= povray-[0-9]*:../../graphics/povray
USE_X11= yes
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index f4e6e943930..dd583d12e72 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/06/11 06:34:36 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:08 fredb Exp $
#
DISTNAME= gnome-iconedit-1.2.0
+PKGREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= http://www.webtribe.net/i/iain/
@@ -9,9 +10,9 @@ MAINTAINER= wiz@netbsd.org
COMMENT= icon editor based on GNOME libraries
BUILD_USES_MSGFMT= yes
-DEPENDS+= gdk-pixbuf>=0.7.0:../../graphics/gdk-pixbuf
-DEPENDS+= gnome-libs>=1.2.0:../../x11/gnome-libs
-DEPENDS+= oaf>=0.6.0:../../devel/oaf
+DEPENDS+= gdk-pixbuf>=0.11.0nb1:../../graphics/gdk-pixbuf
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
+DEPENDS+= oaf>=0.6.7nb1:../../devel/oaf
GNU_CONFIGURE= YES
USE_GMAKE= YES
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 4decf6e0c71..456d78252f8 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/06/11 06:34:36 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:08 fredb Exp $
DISTNAME= gphoto-0.4.3
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.gphoto.net/dist/
@@ -8,7 +9,7 @@ MAINTAINER= jmcm@cs.cmu.edu
HOMEPAGE= http://www.gphoto.org/
COMMENT= Download and view files from various digital cameras
-DEPENDS+= imlib>=1.9.8:../../graphics/imlib
+DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib
USE_X11BASE= yes
USE_LIBTOOL= yes
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index ed35bc2bbb9..e7b608ac7a7 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2002/01/07 16:23:02 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2002/03/13 17:37:09 fredb Exp $
#
DISTNAME= gqview-1.0.1
+PKGREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/}
@@ -17,7 +18,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=no
CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
-BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.9.0
+BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../graphics/gdk-pixbuf/buildlink.mk"
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 4e5c31e23aa..53094865cdc 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/03/10 23:58:40 seb Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:09 fredb Exp $
#
DISTNAME= graphviz-1.8.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.research.att.com/sw/tools/graphviz/dist/
EXTRACT_SUFX= .tgz
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 1a71de4f967..33108e2bcdb 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/03/04 14:36:54 martti Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:09 fredb Exp $
DISTNAME= gtkam-0.1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-nls
CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_CONFIG_H -I${WRKSRC}
-BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.9.0
+BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../graphics/gdk-pixbuf/buildlink.mk"
diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index 8fb8f6dde19..98ab22dc7b7 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:20 seb Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:09 fredb Exp $
#
DISTNAME= hp2xx-3.4.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNU:=hp2xx/}
@@ -9,7 +10,7 @@ MAINTAINER= dmcmahill@netbsd.org
HOMEPAGE= http://www.gnu.org/software/hp2xx/hp2xx.html
COMMENT= HPGL converter and previewer
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= tiff-[0-9]*:../../graphics/tiff
USE_X11= yes
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index a1713256227..ca9c16d6866 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:10 fredb Exp $
DISTNAME= igmt_v1.2
PKGNAME= iGMT-1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://op.gfz-potsdam.de/igmt/
@@ -15,7 +15,7 @@ DEPENDS+= tcl>=8.0:../../lang/tcl
DEPENDS+= tk>=8.0:../../x11/tk
DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript
DEPENDS+= gv-[0-9]*:../../print/gv
-DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
+DEPENDS+= ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
WRKSRC= ${WRKDIR}/igmt_1.2
NO_BUILD= yes
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 9095e4a5803..50f4b55a6c5 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2002/03/11 08:03:04 skrll Exp $
+# $NetBSD: Makefile,v 1.64 2002/03/13 17:37:10 fredb Exp $
#
DISTNAME= imlib-1.9.11
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/imlib/}
diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk
index f41abd1162c..535f38c8715 100644
--- a/graphics/imlib/buildlink.mk
+++ b/graphics/imlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/10/03 20:56:50 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/03/13 17:37:10 fredb Exp $
#
# This Makefile fragment is included by packages that use imlib.
#
@@ -17,7 +17,7 @@ IMLIB_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.imlib?= imlib>=1.9.8
+BUILDLINK_DEPENDS.imlib?= imlib>=1.9.11nb1
DEPENDS+= ${BUILDLINK_DEPENDS.imlib}:../../graphics/imlib
EVAL_PREFIX+= BUILDLINK_PREFIX.imlib=imlib
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index bc79a68e861..dd9c21c0600 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/16 10:49:52 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:11 fredb Exp $
#
DISTNAME= imlib2-1.0.3
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
diff --git a/graphics/imlib2/buildlink.mk b/graphics/imlib2/buildlink.mk
index 72b6a4661b1..33a638a8bdf 100644
--- a/graphics/imlib2/buildlink.mk
+++ b/graphics/imlib2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:50 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/03/13 17:37:11 fredb Exp $
#
# This Makefile fragment is included by packages that use imlib2.
#
@@ -17,7 +17,7 @@ IMLIB2_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.imlib2?= imlib2>=1.0.3
+BUILDLINK_DEPENDS.imlib2?= imlib2>=1.0.3nb1
DEPENDS+= ${BUILDLINK_DEPENDS.imlib2}:../../graphics/imlib2
EVAL_PREFIX+= BUILDLINK_PREFIX.imlib2=imlib2
diff --git a/graphics/impress/Makefile b/graphics/impress/Makefile
index 0566d5695b1..56ecaaa0f06 100644
--- a/graphics/impress/Makefile
+++ b/graphics/impress/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/13 14:38:05 manu Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:11 fredb Exp $
#
DISTNAME= imp1.1b9
PKGNAME= impress-1.1b9
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.ntlug.org/~ccox/impress/
diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile
index d2c37bd7be4..8beeed70426 100644
--- a/graphics/kdegraphics/Makefile
+++ b/graphics/kdegraphics/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2001/02/16 15:22:25 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2002/03/13 17:37:11 fredb Exp $
#
DISTNAME= kdegraphics-1.1.2
+PKGREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/
@@ -11,7 +12,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= Graphics programs for the KDE integrated X11 desktop
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index afb0c185b5e..4766bd0d181 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2001/12/03 15:37:16 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:11 fredb Exp $
DISTNAME= kdegraphics-2.2.2
+PKGREVISION= 1
CATEGORIES= graphics
COMMENT= Graphics programs for the KDE integrated X11 desktop
.include "../../x11/kde2/Makefile.kde2"
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
DEPENDS+= ghostscript>=6.01:../../print/ghostscript
#DEPENDS+= gPhoto2
#DEPENDS+= gpio
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index 32da5156c47..fd3b422e347 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/07/17 02:51:43 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:12 fredb Exp $
#
DISTNAME= libgdgeda-1.8
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/support/
@@ -9,7 +10,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.geda.seul.org/
COMMENT= Modified version of the gd packages for use with gEDA
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 05287eaf3eb..1a3746841c6 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/08/14 07:56:43 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:12 fredb Exp $
#
DISTNAME= librsvg-1.0.1
+PKGREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/librsvg/}
EXTRACT_SUFX= .tar.bz2
@@ -10,7 +11,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.levien.com/svg/
COMMENT= Raph's SVG library
-DEPENDS+= gnome-core>1.4.0:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
DEPENDS+= freetype2>=2.0.1:../../graphics/freetype2
GNU_CONFIGURE= YES
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 75bd53ed94c..87d344e7661 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2001/12/10 13:56:42 taca Exp $
+# $NetBSD: Makefile,v 1.29 2002/03/13 17:37:12 fredb Exp $
#
DISTNAME= libwmf-0.2.2
+PKGREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
diff --git a/graphics/libwmf/buildlink.mk b/graphics/libwmf/buildlink.mk
index 693a0f89941..79b27e6f02b 100644
--- a/graphics/libwmf/buildlink.mk
+++ b/graphics/libwmf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/10/15 15:47:43 kei Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/03/13 17:37:12 fredb Exp $
#
# This Makefile fragment is included by packages that use libwmf.
#
@@ -17,7 +17,7 @@ LIBWMF_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.libwmf?= libwmf>=0.2.1
+BUILDLINK_DEPENDS.libwmf?= libwmf>=0.2.2nb1
BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.libwmf}:../../graphics/libwmf
EVAL_PREFIX+= BUILDLINK_PREFIX.libwmf=libwmf
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index 5d90b16cd81..fc2026ebbed 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2001/09/30 05:11:57 itojun Exp $
+# $NetBSD: Makefile,v 1.29 2002/03/13 17:37:12 fredb Exp $
DISTNAME= magicpoint-1.09a
+PKGREVISION= 1
CATEGORIES= x11 graphics
MASTER_SITES= ftp://ftp.mew.org/pub/MagicPoint/
diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index a94dcc95713..d14b7d39cd2 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/05/22 09:32:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:12 fredb Exp $
#
DISTNAME= mgl2-alpha-020
PKGNAME= mgl-0.2.0a
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://at.sakura.ne.jp/~suz/arc/
@@ -11,7 +12,7 @@ HOMEPAGE= http://www.netbsd.org/Ports/hpcmips/mgl2.html
COMMENT= Graphics library for NEC Mobilegear/PocketBSD, NetBSD/hpcmips
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= libungif>=4.1.0:../../graphics/libungif
DEPENDS+= mglfonts>=0.1:../../fonts/mglfonts
diff --git a/graphics/moz-flash/Makefile b/graphics/moz-flash/Makefile
index bb742a568ea..56057da3aa0 100644
--- a/graphics/moz-flash/Makefile
+++ b/graphics/moz-flash/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/12/01 01:42:20 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:13 fredb Exp $
#
PKGNAME= moz-flash-1.0
+PKGREVISION= 1
MAINTAINER= joda@netbsd.org
COMMENT= Mozilla open source flash(tm) plugin
@@ -12,7 +13,7 @@ FILESDIR= ${.CURDIR}/${LIBFLASHDIR}/files
DISTINFO_FILE= ${.CURDIR}/${LIBFLASHDIR}/distinfo
DEPENDS+= libflash>=0.4.10nb1:${LIBFLASHDIR}
-DEPENDS+= mozilla-[0-9]*:../../www/mozilla
+DEPENDS+= mozilla>=0.9.9:../../www/mozilla
USE_X11BASE= yes
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index b21ea25cc26..15923a4630a 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/01/30 10:44:21 zuntum Exp $
+# $NetBSD: Makefile,v 1.19 2002/03/13 17:37:13 fredb Exp $
DISTNAME= MPlayer-0.60
PKGNAME= mplayer-0.60
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://mp.dev.hu/MPlayer/releases/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index d0459c53ddb..fba2db70eec 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2001/07/14 16:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2002/03/13 17:37:13 fredb Exp $
DISTNAME= netpbm-9.7
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/}
EXTRACT_SUFX= .tgz
diff --git a/graphics/netpbm/buildlink.mk b/graphics/netpbm/buildlink.mk
index 41a58d3a53d..1370009e6ff 100644
--- a/graphics/netpbm/buildlink.mk
+++ b/graphics/netpbm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/03/13 17:37:13 fredb Exp $
#
# This Makefile fragment is included by packages that use netpbm.
#
@@ -17,7 +17,7 @@ NETPBM_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.netpbm?= netpbm>=9.7
+BUILDLINK_DEPENDS.netpbm?= netpbm>=9.7nb1
DEPENDS+= ${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm
EVAL_PREFIX+= BUILDLINK_PREFIX.netpbm=netpbm
diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile
index ce221271c77..e9a746471fd 100644
--- a/graphics/ogle_gui/Makefile
+++ b/graphics/ogle_gui/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/12/12 01:32:33 enami Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:13 fredb Exp $
DISTNAME= ogle_gui-0.8.2
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
@@ -14,7 +15,7 @@ DEPENDS+= ogle>=0.8.2:../../graphics/ogle
# buildlink file for libglade would also link it with libxml1.
# This would result in an core dump. Thats why ogle_gui dlopens
# libglade.
-DEPENDS+= libglade>=0.17:../../devel/libglade
+DEPENDS+= libglade>=0.17nb1:../../devel/libglade
CONFIGURE_ARGS+=--bindir=${PREFIX}/lib/ogle
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index dca15a2b990..84c0863380f 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2002/02/28 21:20:41 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:37:13 fredb Exp $
#
DISTNAME= GD-1.32
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5bd
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/}
diff --git a/graphics/p5-GDGraph/Makefile b/graphics/p5-GDGraph/Makefile
index 5a292025c4d..f0e34478d05 100644
--- a/graphics/p5-GDGraph/Makefile
+++ b/graphics/p5-GDGraph/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:58 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:14 fredb Exp $
#
DISTNAME= GDGraph-1.33
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5gdg
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/}
diff --git a/graphics/p5-GDGraph3d/Makefile b/graphics/p5-GDGraph3d/Makefile
index a287e9f60a4..746b9760d93 100644
--- a/graphics/p5-GDGraph3d/Makefile
+++ b/graphics/p5-GDGraph3d/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:59 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:14 fredb Exp $
DISTNAME= GDGraph3d-0.55
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5gd3
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/}
diff --git a/graphics/p5-GDTextUtil/Makefile b/graphics/p5-GDTextUtil/Makefile
index 6e57047e23d..36125b5576a 100644
--- a/graphics/p5-GDTextUtil/Makefile
+++ b/graphics/p5-GDTextUtil/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:49:59 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:14 fredb Exp $
#
DISTNAME= GDTextUtil-0.80
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5gdt
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/}
diff --git a/graphics/p5-GIFgraph/Makefile b/graphics/p5-GIFgraph/Makefile
index 41b7254ac1a..49e708bb7f4 100644
--- a/graphics/p5-GIFgraph/Makefile
+++ b/graphics/p5-GIFgraph/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/22 22:03:37 he Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:14 fredb Exp $
#
DISTNAME= GIFgraph-1.20
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5gig
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GIFgraph/}
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index eec4c1589a3..b4ed0c99cef 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2001/12/15 20:25:36 agc Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:37:14 fredb Exp $
DISTNAME= ImageMagick-5.3.9
PKGNAME= p5-PerlMagick-5.3.9
+PKGREVISION= 1
SVR4_PKGNAME= p5pma
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/graphics/php3-gd/Makefile b/graphics/php3-gd/Makefile
index 86cb074e0b6..d7975cba2d4 100644
--- a/graphics/php3-gd/Makefile
+++ b/graphics/php3-gd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/10 13:06:44 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:15 fredb Exp $
MODNAME= gd
CATEGORIES+= graphics
-PKGREVISION= # empty
+PKGREVISION= 1
COMMENT= PHP3 extension for GD graphics library
USE_BUILDLINK_ONLY= yes
diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile
index 9ab3bc1c731..5a94d775a86 100644
--- a/graphics/php4-gd/Makefile
+++ b/graphics/php4-gd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/02/28 06:17:58 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:15 fredb Exp $
MODNAME= gd
CATEGORIES+= graphics
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= PHP4 extension for GD graphics library
USE_BUILDLINK_ONLY= YES
diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile
index 2ff109ba070..a4fb3a0ccbf 100644
--- a/graphics/ploticus/Makefile
+++ b/graphics/ploticus/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2001/07/08 08:09:39 rh Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:15 fredb Exp $
#
DISTNAME= plsrc141
PKGNAME= ploticus-1.41
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.sgpr.net/download/ \
http://gd.tuwien.ac.at/visual/ploticus/download/
@@ -12,7 +13,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.sgpr.net/
COMMENT= Versatile data visualization engine
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
NO_CONFIGURE= YES
USE_X11= YES
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 946451e7f82..d8f8ae4e34b 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2002/02/18 15:14:21 seb Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/13 17:37:15 fredb Exp $
#
DISTNAME= plotutils-2.4.1
+PKGREVISION= 1
CATEGORIES= devel graphics x11
MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/}
@@ -9,7 +10,7 @@ MAINTAINER= dmcmahill@netbsd.org
HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html
COMMENT= Programs and library for plotting scientific data
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-libplotter
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index a48a6faa41d..65e5f4460bd 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/06/29 22:49:52 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:15 fredb Exp $
#
DISTNAME= png2html-1.1
+PKGREVISION= 1
CATEGORIES= graphics www
MASTER_SITES= http://www.engr.mun.ca/~holden/
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 20f3a16f4c3..73d7622d9b5 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2001/05/22 09:32:22 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:37:16 fredb Exp $
# FreeBSD Id: Makefile,v 1.9 1998/08/20 18:56:00 jseger Exp
DISTNAME= povray31
PKGNAME= povray-3.1g
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/Official/Unix/ \
ftp://www.hensa.ac.uk/mirrors/povray/povray/Official-3.0/Unix/\
@@ -14,7 +15,7 @@ MAINTAINER= pooka@netbsd.org
HOMEPAGE= http://www.povray.org/
COMMENT= Persistence of Vision Ray Tracer
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
USE_X11= yes
diff --git a/graphics/ppmtoxvpic/Makefile b/graphics/ppmtoxvpic/Makefile
index 3efc3b80ecf..f190668f185 100644
--- a/graphics/ppmtoxvpic/Makefile
+++ b/graphics/ppmtoxvpic/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/05 01:51:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:16 fredb Exp $
#
PKGNAME= ppmtoxvpic-0.99.9
+PKGREVISION= 1
CATEGORIES= graphics
MAINTAINER= hubertf@netbsd.org
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 7250b5e72db..342f048f664 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:16 fredb Exp $
DISTNAME= pstoedit_3_20
PKGNAME= pstoedit-3.20
+PKGREVISION= 1
CATEGORIES= converters graphics print
MASTER_SITES= http://www.geocities.com/SiliconValley/Network/1958/pstoedit/
EXTRACT_SUFX= .zip
@@ -11,7 +12,7 @@ HOMEPAGE= http://www.geocities.com/SiliconValley/Network/1958/pstoedit/
COMMENT= Convert PostScript / PDF into various vector graphic formats
# Requires C++ support of plotutils.
-DEPENDS+= plotutils-2.4.1:../../graphics/plotutils
+DEPENDS+= plotutils>=2.4.1nb1:../../graphics/plotutils
# Any ghostscript pkg will probably do, if not a font pkg.
DEPENDS+= ghostscript-[^f]*:../../print/ghostscript
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index d2c8396d004..ea908520695 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/01/19 17:49:14 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:16 fredb Exp $
DISTNAME= gdmodule.c
PKGNAME= ${PYPKGPREFIX}-gd-1.3
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://starship.python.net/~richard/gdmodule/
DISTFILES= gdmodule.c
@@ -10,7 +11,7 @@ MAINTAINER= tsarna@netbsd.org
HOMEPAGE= http://starship.python.net/~richard/gdmodule/
COMMENT= Python interface to gd graphics library
-DEPENDS+= gd>=1.8.3:../../graphics/gd
+DEPENDS+= gd>=1.8.4nb1:../../graphics/gd
WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}
diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile
index e2830977676..33ece07b2c8 100644
--- a/graphics/py-gdchart/Makefile
+++ b/graphics/py-gdchart/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/01/17 12:36:21 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:16 fredb Exp $
#
DISTNAME= gdchart-py-0.6
PKGNAME= ${PYPKGPREFIX}-gdchart-0.6
+PKGREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= http://athani.pair.com/msteed/software/gdchart/
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 05feaeacecb..71bc7402807 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/18 11:57:17 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:17 fredb Exp $
#
DISTNAME= pygimp-1.2
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.daa.com.au/pub/james/pygimp/
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 82afa9d6a50..547a0700ac1 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2001/02/25 04:17:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:17 fredb Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1998/05/26 04:04:11 mph Exp
#
DISTNAME= rayshade.4.0
PKGNAME= rayshade-4.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://graphics.stanford.edu/pub/rayshade/ \
ftp://ftp.princeton.edu/pub/Graphics/rayshade.4.0/
@@ -12,7 +13,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= packages@netbsd.org
COMMENT= Extensible system for creating ray-traced images
-DEPENDS+= urt-3.1b1:../../graphics/urt
+DEPENDS+= urt-3.1b1nb1:../../graphics/urt
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 996467f180f..68cd1e855fe 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/02/10 00:52:18 rh Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:17 fredb Exp $
.include "../../graphics/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 fe5c9d49bca..a835e1b6402 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/01/26 17:46:35 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:17 fredb Exp $
#
DISTNAME= scigraphica-0.8.0
+PKGREVISION= 1
CATEGORIES= graphics math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/}
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index aa6b2daf0f8..78fb67fe45b 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/01/03 14:20:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:17 fredb Exp $
#
DISTNAME= sodipodi-0.23
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sodipodi/}
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index c9d7d35350c..1017f7f3d85 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2001/12/05 15:00:46 agc Exp $
+# $NetBSD: Makefile,v 1.24 2002/03/13 17:37:18 fredb Exp $
# FreeBSD Id: Makefile,v 1.6 1998/02/11 08:48:26 tg Exp
DISTNAME= urt
PKGNAME= urt-3.1b1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cs.utah.edu/pub/dept/OLD/pub/
DISTFILES= urt-3.1b.tar.Z urt-doc.tar urt-img.tar
@@ -15,7 +16,7 @@ MAINTAINER= packages@netbsd.org
COMMENT= Utah raster toolkit - a toolkit and library for raster image processing
#DEPENDS+= tiff-[0-9]*:../tiff # netpbm will pull in tiff.
-DEPENDS+= netpbm-9.*:../netpbm
+DEPENDS+= netpbm>=9.7nb1:../../graphics/netpbm
EXTRACT_ONLY= urt-3.1b.tar.Z
diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile
index a133f6bd332..b2f1e0622bc 100644
--- a/graphics/vid/Makefile
+++ b/graphics/vid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/18 03:06:16 wulf Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:18 fredb Exp $
#
DISTNAME= vid-1.0.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://members.home.com/housel/
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index 687fc8f0f33..21b16e5db0c 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2001/11/29 01:12:37 hubertf Exp $
+# $NetBSD: Makefile,v 1.26 2002/03/13 17:37:18 fredb Exp $
#
DISTNAME= xart19980415
PKGNAME= xart-19980415
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/19980415
CATEGORIES= graphics x11
MASTER_SITES= http://linux01.gwdg.de/~rhohen/linux/
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index f359d10ebc2..da6a990c56b 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2001/08/23 04:26:54 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2002/03/13 17:37:18 fredb Exp $
#
DISTNAME= xfig.3.2.3d.full
PKGNAME= xfig-3.2.3.4
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/xfig.3.2.3d
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/drawing_tools/xfig/} \
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 6e9fc7f097c..ad6defe71f0 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/09/09 20:36:31 agc Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:18 fredb Exp $
-DISTNAME= xli-1.16nb1
+DISTNAME= xli-1.16
+PKGREVISION= 2
CATEGORIES= graphics x11
MASTER_SITES= ftp://ftp.libpng.org/pub/png/src/ \
${MASTER_SITE_XCONTRIB:=applications/}
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 41d4eb6a1be..34ca0b763ba 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2002/02/05 22:08:26 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2002/03/13 17:37:19 fredb Exp $
# FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
DISTNAME= xpaint-2.6.2
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/xpaint
CATEGORIES= graphics x11
MASTER_SITES= http://home.worldonline.dk/~torsten/xpaint/
@@ -12,7 +13,7 @@ COMMENT= Simple paint program
DEPENDS+= tiff-[0-9]*:../../graphics/tiff
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
USE_IMAKE= YES
USE_XPM= YES
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 34d0d3bfc6d..f85929e5a2b 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2001/10/15 21:28:42 veego Exp $
+# $NetBSD: Makefile,v 1.32 2002/03/13 17:37:19 fredb Exp $
#
DISTNAME= xsane-0.80
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.xsane.org/download/ \
http://gd.tuwien.ac.at/hci/sane/xsane/ \
@@ -20,7 +21,7 @@ COMMENT= New improved frontend for SANE
BUILD_USES_MSGFMT= yes
BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.5
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= tiff-[0-9]*:../../graphics/tiff
DEPENDS+= gimp>=1.0.4:../../graphics/gimp
DEPENDS+= sane-backends>=1.0.4:../../graphics/sane-backends
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 84a8dff8662..f89dc4d3f32 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2001/11/29 01:12:37 hubertf Exp $
+# $NetBSD: Makefile,v 1.41 2002/03/13 17:37:19 fredb Exp $
DISTNAME= xv-3.10a
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics x11
MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ \
ftp://ftp.kuis.kyoto-u.ac.jp/X11/contrib/clients/xv/ \
@@ -16,7 +16,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.trilon.com/xv/
COMMENT= X11 program that displays images of various formats
-DEPENDS+= png>=1.0.11:../png
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= tiff-[0-9]*:../../graphics/tiff
USE_IMAKE= YES
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index e6863ef4b5d..14c5001e7f5 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:21 seb Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:19 fredb Exp $
DISTNAME= xzgv-0.7
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://xzgv.browser.org/ \
ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/
diff --git a/graphics/yplot/Makefile b/graphics/yplot/Makefile
index c3b240678f5..a5cf84dbf1b 100644
--- a/graphics/yplot/Makefile
+++ b/graphics/yplot/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/01/19 13:40:54 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:20 fredb Exp $
DISTNAME= yplot-1.1.0
+PKGREVISION= 1
CATEGORIES= graphics math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yplot/}
diff --git a/japanese/texfamily-share/Makefile b/japanese/texfamily-share/Makefile
index c0d59c6bafd..faceb295ee1 100644
--- a/japanese/texfamily-share/Makefile
+++ b/japanese/texfamily-share/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/10/24 00:29:32 kei Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:20 fredb Exp $
DISTNAME= TeXfamily-share-1.2.1nb1
+PKGREVISION= 1
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \
ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2.1/ \
diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile
index aaa7fc8d1a2..479280ad5ef 100644
--- a/japanese/texfamily/Makefile
+++ b/japanese/texfamily/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/12/15 20:25:36 agc Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:20 fredb Exp $
DISTNAME= TeXfamily-1.2.1nb1
+PKGREVISION= 1
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \
ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2.1/ \
diff --git a/japanese/vfxdvik/Makefile b/japanese/vfxdvik/Makefile
index 8c8efb9cb95..8ddb225446f 100644
--- a/japanese/vfxdvik/Makefile
+++ b/japanese/vfxdvik/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/10/31 01:41:03 kei Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:20 fredb Exp $
#
DISTNAME= xdvik-22.15
PKGNAME= ja-vfxdvik-22.15
+PKGREVISION= 1
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/
diff --git a/lang/gb/Makefile b/lang/gb/Makefile
index b1648b4c608..873cea517ed 100644
--- a/lang/gb/Makefile
+++ b/lang/gb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/10/01 07:34:04 rh Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:21 fredb Exp $
#
DISTNAME= gb-0.0.20
+PKGREVISION= 1
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/gb/}
diff --git a/lang/gb/buildlink.mk b/lang/gb/buildlink.mk
index 57fed03f988..c58153b8ff9 100644
--- a/lang/gb/buildlink.mk
+++ b/lang/gb/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:51 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/03/13 17:37:21 fredb Exp $
#
# This Makefile fragment is included by packages that use gb.
#
@@ -17,7 +17,7 @@ GB_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gb?= gb>=0.0.20
+BUILDLINK_DEPENDS.gb?= gb>=0.0.20nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gb}:../../lang/gb
EVAL_PREFIX+= BUILDLINK_PREFIX.gb=gb
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 860155e2293..a302df05c84 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2002/02/27 03:02:35 tv Exp $
+# $NetBSD: Makefile,v 1.37 2002/03/13 17:37:21 fredb Exp $
#
DISTNAME= kaffe-1.0.6
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index f9b9fef210a..98e2e82bf33 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2002/03/11 05:55:24 jmc Exp $
+# $NetBSD: Makefile,v 1.16 2002/03/13 17:37:21 fredb Exp $
#
DISTNAME= balsa-1.2.4
+PKGREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \
ftp://ftp.newton.cx/pub/balsa/
@@ -11,12 +12,12 @@ HOMEPAGE= http://www.balsa.net/
COMMENT= GNOME EMail client
DEPENDS+= glib>=1.2.1:../../devel/glib
-DEPENDS+= imlib>=1.9.2:../../graphics/imlib
-DEPENDS+= gnome-libs>=1.2.1:../../x11/gnome-libs
-DEPENDS+= gnome-print>=0.25:../../print/gnome-print
+DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
+DEPENDS+= gnome-print>=0.29nb1:../../print/gnome-print
DEPENDS+= libpspell>=0.8.3:../../textproc/libpspell
DEPENDS+= pcre-[0-9]*:../../devel/pcre
-DEPENDS+= gtkhtml-[0-9]*:../../www/gtkhtml
+DEPENDS+= gtkhtml>=1.0.1nb1:../../www/gtkhtml
DEPENDS+= libiconv-*:../../converters/libiconv
GNU_CONFIGURE= yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 3b95b4c5113..7e656148aee 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2001/12/03 07:58:47 tron Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:22 fredb Exp $
DISTNAME= evolution-0.15
+PKGREVISION= 1
CATEGORIES= mail time gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/evolution/}
EXTRACT_SUFX= .tar.bz2
@@ -10,11 +11,11 @@ HOMEPAGE= http://www.ximian.com/products/ximian_evolution/
COMMENT= GNOME mailer, calendar, contact manager, and communications tool
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-DEPENDS+= bonobo-conf>=0.11:../../devel/bonobo-conf
+DEPENDS+= bonobo-conf>=0.14nb1:../../devel/bonobo-conf
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.9.0
-BUILDLINK_DEPENDS.gdk-pixbuf-gnome= gdk-pixbuf-gnome>=0.9.0
+BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1
+BUILDLINK_DEPENDS.gdk-pixbuf-gnome= gdk-pixbuf-gnome>=0.11.0nb1
# Using a wildcard here doesn't make sence because the version number of
# "db3" is hardcoded in the "configure" script.
BUILDLINK_DEPENDS.db3= db3-3.11.2
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 85f7a5805bf..bfe9ae8c685 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/12/30 14:05:48 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:22 fredb Exp $
#
DISTNAME= spruce-0.5.17
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=spruce/}
@@ -9,7 +10,7 @@ MAINTAINER= mellon@isc.org
HOMEPAGE= http://spruce.sourceforge.net/
COMMENT= MIME-aware, GNOME-based email program
-DEPENDS+= gnome-libs>=1.0.56:../../x11/gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 0c944fb01da..2d9a23a3169 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:23 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:22 fredb Exp $
DISTNAME= wmbiff-0.3.1
+PKGREVISION= 1
CATEGORIES= mail x11
MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=wmbiff/)
@@ -8,7 +9,7 @@ MAINTAINER= magick@zhadum.de
HOMEPAGE= http://sourceforge.net/projects/wmbiff/
COMMENT= xbuffy like "mail-checker" for WindowMaker
-DEPENDS+= windowmaker-[0-9]*:../../wm/windowmaker
+DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker
USE_X11= YES
USE_XPM= YES
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index ee245e0e823..8b4f058cb14 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2001/10/11 17:04:28 tron Exp $
+# $NetBSD: Makefile,v 1.22 2002/03/13 17:37:22 fredb Exp $
DISTNAME= WMMail.app-0.64
PKGNAME= wmmail-0.64
+PKGREVISION= 1
CATEGORIES= mail x11
MASTER_SITES= http://www.eecg.utoronto.ca/~chanb/WMMail.app/
@@ -10,7 +11,7 @@ HOMEPAGE= http://www.eecg.toronto.edu/cgi-bin/cgiwrap/chanb/index.cgi?wmmail
COMMENT= xbiff like "mail-checker" for WindowMaker
DEPENDS+= libproplist>=0.10.1:../../devel/libproplist
-DEPENDS+= windowmaker-[0-9]*:../../wm/windowmaker
+DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/math/R/Makefile b/math/R/Makefile
index d33050edc71..d67c998893a 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2002/03/01 10:46:53 markd Exp $
+# $NetBSD: Makefile,v 1.31 2002/03/13 17:37:23 fredb Exp $
DISTNAME= R-1.4.1
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= http://lib.stat.cmu.edu/R/CRAN/src/base/ \
http://cran.r-project.org/src/base/ \
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 1feb52b6996..77c8b5a80ea 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2002/03/04 07:51:21 jmc Exp $
+# $NetBSD: Makefile,v 1.46 2002/03/13 17:37:23 fredb Exp $
#
DISTNAME= gnumeric-1.0.4
+PKGREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnumeric/}
diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile
index 283cb6f8692..da64613f4f8 100644
--- a/math/gnumeric0/Makefile
+++ b/math/gnumeric0/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/01/29 12:36:46 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:23 fredb Exp $
#
DISTNAME= gnumeric-0.75
+PKGREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnumeric/}
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 7ee908aee7c..94adcbef5a8 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2001/10/24 22:11:04 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:23 fredb Exp $
#
DISTNAME= grace-5.1.4
+PKGREVISION= 1
CATEGORIES= math graphics x11
MASTER_SITES= ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ \
ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/ \
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 5d1e233e8f9..76235ee174d 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/01/28 09:36:52 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:37:23 fredb Exp $
DISTNAME= Guppi-0.40.0
PKGNAME= ${DISTNAME:S/G/g/}
+PKGREVISION= 1
CATEGORIES= math graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/Guppi/}
EXTRACT_SUFX= .tar.bz2
@@ -11,9 +12,9 @@ HOMEPAGE= http://www.gnome.org/guppi/
COMMENT= Plot program with integrated statistics capabilities
DEPENDS+= gnumeric>=0.75:../../math/gnumeric0
-BUILDLINK_DEPENDS.gnome-core= gnome-core>=1.4
-BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0
-BUILDLINK_DEPENDS.gdk-pixbuf-gnome= gdk-pixbuf-gnome>=0.11.0
+BUILDLINK_DEPENDS.gnome-core= gnome-core>=1.4.0.4nb1
+BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1
+BUILDLINK_DEPENDS.gdk-pixbuf-gnome= gdk-pixbuf-gnome>=0.11.0nb1
GNU_CONFIGURE= YES
USE_GMAKE= YES
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index b4fc80b2f9e..ef033179b94 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:32 seb Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:24 fredb Exp $
DISTNAME= octave-2.1.33
PKGNAME= octave-2.1.34
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ \
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 45e0419dccd..8e01446e0af 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2002/02/18 15:14:33 seb Exp $
+# $NetBSD: Makefile,v 1.30 2002/03/13 17:37:24 fredb Exp $
# FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
DISTNAME= octave-2.0.16
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/ \
ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/ \
diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index 9cdf0fe2478..56082143d78 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/12/15 20:25:37 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:24 fredb Exp $
#
DISTNAME= Math-Pari-2.001804
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5mpa
CATEGORIES= math perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Math/}
diff --git a/math/pari/Makefile b/math/pari/Makefile
index e0a2aca3a46..77dd25546f1 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/11/30 01:18:12 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:24 fredb Exp $
DISTNAME= pari-2.1.1
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://www.gn-50uma.de/gn/gn-50uma.de/pari-2.1/ \
http://www.gn-50uma.de/ftp/pari-2.1/
diff --git a/meta-pkgs/edesktop/Makefile b/meta-pkgs/edesktop/Makefile
index ff745309dd9..d3c507b462e 100644
--- a/meta-pkgs/edesktop/Makefile
+++ b/meta-pkgs/edesktop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2001/02/17 17:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/13 17:37:25 fredb Exp $
#
DISTNAME= edesktop-1.0
+PKGREVISION= 1
CATEGORIES= meta-pkgs x11
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/meta-pkgs/netbsd-doc-print/Makefile b/meta-pkgs/netbsd-doc-print/Makefile
index 67a7823a436..3d621f4aff5 100644
--- a/meta-pkgs/netbsd-doc-print/Makefile
+++ b/meta-pkgs/netbsd-doc-print/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/10/04 18:50:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:25 fredb Exp $
#
DISTNAME= netbsd-doc-print-1.1
+PKGREVISION= 1
CATEGORIES= meta-pkgs
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/misc/gkrellm-moon/Makefile b/misc/gkrellm-moon/Makefile
index a7979fbffc0..88541d73b51 100644
--- a/misc/gkrellm-moon/Makefile
+++ b/misc/gkrellm-moon/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/11/01 15:31:52 damon Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:25 fredb Exp $
DISTNAME= gkrellmoon-0.3
PKGNAME= gkrellm-moon-0.3
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gkrellmoon/}
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index bd8c49ff0d1..445334e2c01 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/11/01 15:32:28 damon Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:25 fredb Exp $
DISTNAME= gkrellweather-0.2.7
PKGNAME= gkrellm-weather-0.2.7
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://www.cse.unsw.edu.au/~flam/repository/c/gkrellm/
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index f03bd6bf9b9..215ab3df2a8 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2001/09/27 23:18:25 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2002/03/13 17:37:25 fredb Exp $
#
DISTNAME= gnome-pim-1.4.0
+PKGREVISION= 1
CATEGORIES= misc x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-pim/}
@@ -10,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Personal Information Manager for GNOME
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-DEPENDS+= gnome-core>1.4.0:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
USE_GMAKE= YES
USE_LIBTOOL= YES
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index a2299e7f0ba..5b610c7c607 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,6 +1,7 @@
-## $NetBSD: Makefile,v 1.43 2001/12/12 16:20:48 wiz Exp $
+## $NetBSD: Makefile,v 1.44 2002/03/13 17:37:26 fredb Exp $
DISTNAME= gnome-utils-1.4.1
+PKGREVISION= 1
CATEGORIES= misc x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-utils/}
@@ -10,7 +11,7 @@ COMMENT= Set of useful GNOME utilities and applications
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
BUILD_DEPENDS+= xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
-DEPENDS+= libgtop>=1.0.12:../../devel/libgtop
+DEPENDS+= libgtop>=1.0.12nb2:../../devel/libgtop
USE_GMAKE= YES
USE_X11BASE= YES
diff --git a/misc/hitchhiker/Makefile b/misc/hitchhiker/Makefile
index 5eaa65dbf34..1b209e04032 100644
--- a/misc/hitchhiker/Makefile
+++ b/misc/hitchhiker/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:09:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:26 fredb Exp $
#
DISTNAME= hh2000-0.6
PKGNAME= hitchhiker-0.6
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hitchhiker/}
@@ -10,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://hirame.hiram.edu/~worleyam
COMMENT= Astronomical simulation and visualization program
-DEPENDS+= gnome-libs>=1.2.8:../../x11/gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
DEPENDS+= gtkglarea>=1.2.1:../../x11/gtkglarea
GNU_CONFIGURE= yes
diff --git a/misc/kdeadmin2/Makefile b/misc/kdeadmin2/Makefile
index e353deb1fc1..f3b4a593f22 100644
--- a/misc/kdeadmin2/Makefile
+++ b/misc/kdeadmin2/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2001/12/03 15:37:15 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:26 fredb Exp $
DISTNAME= kdeadmin-2.2.2
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Utilities for the KDE integrated X11 desktop
.include "../../x11/kde2/Makefile.kde2"
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
diff --git a/misc/kdepim2/Makefile b/misc/kdepim2/Makefile
index c71ae808c0b..3b3f32fa250 100644
--- a/misc/kdepim2/Makefile
+++ b/misc/kdepim2/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2001/12/03 21:52:45 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:26 fredb Exp $
DISTNAME= kdepim-2.2.2
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Personal Information Management tools for the KDE desktop
.include "../../x11/kde2/Makefile.kde2"
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
LTCONFIG_OVERRIDE+= ${WRKSRC}/libical/ltconfig
diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index e41425aae28..e761d902f37 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2001/02/17 18:09:09 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2002/03/13 17:37:26 fredb Exp $
# FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
#
DISTNAME= kdeutils-1.1.2
+PKGREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/
@@ -12,7 +13,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= Various utilities for the KDE integrated X11 desktop
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 87b5dbaa165..d4794169169 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2001/12/03 15:37:15 skrll Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:27 fredb Exp $
DISTNAME= kdeutils-2.2.2
+PKGREVISION= 1
COMMENT= Utilities for the KDE integrated X11 desktop
.include "../../x11/kde2/Makefile.kde2"
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 5ebb7ec3c62..f47793e2828 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/12/21 21:19:28 skrll Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:27 fredb Exp $
DISTNAME= koffice-1.1.1
+PKGREVISION= 1
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/ \
@@ -12,7 +13,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.koffice.org/
COMMENT= KDE Office Suite with text processor, spreadsheet, etc.
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
diff --git a/misc/ktail/Makefile b/misc/ktail/Makefile
index 5e1b42dbeda..6296d9b7092 100644
--- a/misc/ktail/Makefile
+++ b/misc/ktail/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/12/04 06:14:59 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:27 fredb Exp $
DISTNAME= ktail-0.5.1
+PKGREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= http://www.franken.de/users/duffy1/rjakob/
@@ -8,7 +9,7 @@ MAINTAINER= zuntum@netbsd.org
HOMEPAGE= http://www.franken.de/users/duffy1/rjakob/
COMMENT= ktail monitors multiple files and/or command output in one window
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
BUILD_USES_MSGFMT= YES
USE_BUILDLINK_ONLY= YES
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 71531d37c5e..129a7a50b97 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2001/11/30 00:55:17 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2002/03/13 17:37:27 fredb Exp $
#
DISTNAME= siag-3.1.20
+PKGREVISION= 1
CATEGORIES= misc textproc math
MASTER_SITES= ftp://ftp.edu.stockholm.se/pub/siag/
diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile
index ed2879b9d11..55bf8afdd27 100644
--- a/misc/xtide/Makefile
+++ b/misc/xtide/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/01/21 14:01:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:27 fredb Exp $
DISTNAME= xtide-2.4
PKGNAME= ${DISTNAME}
+PKGREVISION= 1
CATEGORIES= misc x11
MASTER_SITES= ftp://ftp.flaterco.com/xtide/
DISTFILES= ${XTIDE_SRC} harmonics.txt.gz offsets.xml.gz
@@ -10,7 +11,7 @@ MAINTAINER= paul@whooppee.com
HOMEPAGE= http://www.flaterco.com/
COMMENT= X11 tide predictor
-DEPENDS+= png>0.96:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
EXTRACT_ONLY= ${XTIDE_SRC}
XTIDE_SRC= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 6799b7d46dd..ef4e96ef08f 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/11/11 22:06:45 damon Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:28 fredb Exp $
DISTNAME= etherape-0.8.2
+PKGREVISION= 1
CATEGORIES= gnome net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/}
diff --git a/net/gkrellm-ping/Makefile b/net/gkrellm-ping/Makefile
index 4e2c9c35ba6..f0ff506a199 100644
--- a/net/gkrellm-ping/Makefile
+++ b/net/gkrellm-ping/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/11/01 15:34:28 damon Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:28 fredb Exp $
DISTNAME= gkrellmPing-0.2-3
PKGNAME= gkrellm-ping-0.2.3
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/gkrellmPing
CATEGORIES= net sysutils
MASTER_SITES= http://gkrellmping.dweb.ro/downloads/
diff --git a/net/gkrellm-snmp/Makefile b/net/gkrellm-snmp/Makefile
index ba4e1c16902..3fb4ac90ea9 100644
--- a/net/gkrellm-snmp/Makefile
+++ b/net/gkrellm-snmp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/11/01 15:33:02 damon Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:28 fredb Exp $
DISTNAME= gkrellm_snmp-0.18
PKGNAME= gkrellm-snmp-0.18
+PKGREVISION= 1
CATEGORIES= net sysutils
MASTER_SITES= http://triq.net/gkrellm/
diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index 4d4691a4ff2..86eaa8c5487 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/11/01 15:33:36 damon Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:28 fredb Exp $
DISTNAME= gkrellmwireless-0.2.2
PKGNAME= gkrellm-wireless-0.2.2
+PKGREVISION= 1
CATEGORIES= net sysutils
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index 2e3959dd07c..f4d51f33aa6 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2001/12/12 18:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/13 17:37:29 fredb Exp $
DISTNAME= gnapster-1.5.0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.faradic.net/~jasta/files/
diff --git a/net/gnubile/Makefile b/net/gnubile/Makefile
index 4ae7c0fcc1d..283b22d1bb1 100644
--- a/net/gnubile/Makefile
+++ b/net/gnubile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:27 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:30 fredb Exp $
DISTNAME= gnubile-0.20
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://gnutella.wego.com/file_depot/0-10000000/110000-120000/116705/folder/127699/
@@ -8,7 +9,7 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://gnutella.wego.com/
COMMENT= Unix Gnutella client for GNOME
-DEPENDS+= gnome-core-[0-9]*:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
USE_GMAKE= YES
USE_X11= YES
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index 853a73196a9..f0c358ba4a0 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2001/10/05 21:34:33 magick Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:30 fredb Exp $
DISTNAME= gtm-0.4.10
+PKGREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtm/}
@@ -8,7 +9,7 @@ MAINTAINER= magick@zhadum.de
HOMEPAGE= http://gtm.sourceforge.net/
COMMENT= Gnome Transfer Manager
-DEPENDS+= gnome-core-[0-9]*:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
DEPENDS+= wget-[0-9]*:../../net/wget
GNU_CONFIGURE= YES
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 77ac7a42990..70cc4b40a95 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2001/06/12 06:56:35 tron Exp $
+# $NetBSD: Makefile,v 1.58 2002/03/13 17:37:30 fredb Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
#
DISTNAME= kdenetwork-1.1.2
+PKGREVISION= 1
CATEGORIES= net kde
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/
@@ -15,7 +16,7 @@ COMMENT= Network modules for the KDE integrated X11 desktop
DEPENDS= gdbm>=1.7.3:../../databases/gdbm
DEPENDS+= uulib>=0.5.13:../../converters/uulib
DEPENDS+= kdesupport-1.1.2:../../converters/kdesupport
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index daf04832376..f024f182382 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2001/12/03 15:37:17 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:30 fredb Exp $
DISTNAME= kdenetwork-2.2.2
+PKGREVISION= 1
CATEGORIES= net
COMMENT= Network modules for the KDE integrated X11 desktop
.include "../../x11/kde2/Makefile.kde2"
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK_ONLY= YES
diff --git a/net/kmap/Makefile b/net/kmap/Makefile
index 796ce70de52..e90ab7a6094 100644
--- a/net/kmap/Makefile
+++ b/net/kmap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 18:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:31 fredb Exp $
#
DISTNAME= kmap-0.5.6
+PKGREVISION= 1
CATEGORIES= kde net security
MASTER_SITES= http://www.islc.net/~icszepp/kmap/
@@ -9,7 +10,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.islc.net/~icszepp/kmap/
COMMENT= KDE based frontend for the popular portscanning utility nmap
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
DEPENDS+= nmap>=2.12:../../net/nmap
USE_X11BASE= yes # To get this near KDE
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index e939cc355fa..71523bb84bd 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2001/11/07 18:26:50 bouyer Exp $
+# $NetBSD: Makefile,v 1.30 2002/03/13 17:37:31 fredb Exp $
#
DISTNAME= mrtg-2.9.17
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/ \
http://gd.tuwien.ac.at/infosys/network/tools/mrtg/pub/ \
@@ -16,7 +17,7 @@ MAINTAINER= bouyer@netbsd.org
HOMEPAGE= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
COMMENT= The Multi-Router Traffic Grapher
-DEPENDS= gd>=1.8.1:../../graphics/gd
+DEPENDS= gd>=1.8.4nb1:../../graphics/gd
USE_PERL5= YES
PERL5_REQD= 5.6.0
diff --git a/net/neat/Makefile b/net/neat/Makefile
index fefc35c7ea3..0eee9d657a1 100644
--- a/net/neat/Makefile
+++ b/net/neat/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/14 18:05:12 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:31 fredb Exp $
#
DISTNAME= neatv4.6
PKGNAME= ${DISTNAME:S/v/-/}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/neat4
CATEGORIES= net
MASTER_SITES= ftp://netsaint.sourceforge.net/pub/netsaint/contrib/addons/
diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index 9beeaef1052..420b013d03d 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/01/31 18:58:40 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:31 fredb Exp $
#
DISTNAME= netsaint-0.0.6
PKGNAME= ${DISTNAME:S/-/-base-/}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://netsaint.sourceforge.net/download/
@@ -10,7 +11,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.netsaint.org/
COMMENT= network monitor
-DEPENDS+= gd>1.8.1:../../graphics/gd
+DEPENDS+= gd>1.8.4nb1:../../graphics/gd
USE_PERL5= YES
diff --git a/net/netsaint-plugin-cluster/Makefile b/net/netsaint-plugin-cluster/Makefile
index e1daf7a784a..d2429ff621b 100644
--- a/net/netsaint-plugin-cluster/Makefile
+++ b/net/netsaint-plugin-cluster/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:28 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:32 fredb Exp $
#
DISTNAME= check_cluster
PKGNAME= netsaint-plugin-cluster-20001207
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://netsaint.sourceforge.net/download/alpha/
EXTRACT_SUFX= .c
diff --git a/net/netsaint-plugin-snmp/Makefile b/net/netsaint-plugin-snmp/Makefile
index 945e16a45fd..61e5d7493a9 100644
--- a/net/netsaint-plugin-snmp/Makefile
+++ b/net/netsaint-plugin-snmp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/02/01 17:06:02 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:32 fredb Exp $
#
DISTNAME= netsaint-plugins-1.2.8-4
PKGNAME= netsaint-plugin-snmp-1.2.8.4
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netsaintplug/}
diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile
index 9035fbf526a..3d9b7133fb4 100644
--- a/net/netsaint-plugins/Makefile
+++ b/net/netsaint-plugins/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:29 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:32 fredb Exp $
#
DISTNAME= netsaint-plugins-1.2.8-4
PKGNAME= netsaint-plugins-1.2.8.4
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netsaintplug/}
diff --git a/net/nsca/Makefile b/net/nsca/Makefile
index 8f96ad92384..c6742b53ce2 100644
--- a/net/nsca/Makefile
+++ b/net/nsca/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:29 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:32 fredb Exp $
#
DISTNAME= nsca-1.1.0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://netsaint.sourceforge.net/download/
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 5703d2555d0..3aef70891dc 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2001/12/02 14:40:20 tron Exp $
+# $NetBSD: Makefile,v 1.38 2002/03/13 17:37:32 fredb Exp $
DISTNAME= knews-1.0b.1
PKGNAME= knews-1.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= news x11
MASTER_SITES= http://www.matematik.su.se/~kjj/
@@ -12,7 +12,7 @@ COMMENT= X11 newsreader with support for threading and MIME
DEPENDS+= faces>=1.6.1:../../mail/faces
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
CONFLICTS= knews-1.0b0
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 30c8fe57347..1b60c2ac677 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/03/01 02:25:36 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:33 fredb Exp $
#
DISTNAME= pan-0.11.2
+PKGREVISION= 1
CATEGORIES= news gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/pan/} \
http://pan.rebelbase.com/download/${DISTNAME:C/pan-//}/SOURCE/
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 8b8e44a4002..6ab8ed09f68 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/03/09 13:58:03 martti Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:33 fredb Exp $
#
DISTNAME= apsfilter-7.2.2
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.apsfilter.org/download/
@@ -14,7 +15,7 @@ DEPENDS+= ghostscript>=6.01:../../print/ghostscript
#DEPENDS+= html2ps-[0-9]*:../../print/html2ps
DEPENDS+= transfig-[0-9]*:../../print/transfig
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
+DEPENDS+= netpbm>=9.7nb1:../../graphics/netpbm
DEPENDS+= a2ps-[0-9]*:../../print/a2ps
DEPENDS+= psutils-[0-9]*:../../print/psutils
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 9179b56b6bd..85281e9ba4b 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:37 seb Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:33 fredb Exp $
DISTNAME= auctex-10.0g
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.sunsite.auc.dk/pub/emacs/auctex/ftp/auctex/
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 8dc66929300..29a9501c610 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2002/02/18 11:26:15 martti Exp $
+# $NetBSD: Makefile,v 1.48 2002/03/13 17:37:33 fredb Exp $
DISTNAME= cups-${DIST_VERS}-source
PKGNAME= cups-${VERS}
+PKGREVISION= 1
BASE_VERS= 1.1.14
DIST_VERS= ${BASE_VERS}
VERS= ${DIST_VERS:S/-/./g}
diff --git a/print/cups/buildlink.mk b/print/cups/buildlink.mk
index a0352b35627..694cf18ca32 100644
--- a/print/cups/buildlink.mk
+++ b/print/cups/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2002/01/31 17:51:27 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.12 2002/03/13 17:37:33 fredb Exp $
#
# This Makefile fragment is included by packages that use libcups.
#
@@ -17,7 +17,7 @@ CUPS_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.cups?= cups>=1.1.1
+BUILDLINK_DEPENDS.cups?= cups>=1.1.14nb1
DEPENDS+= ${BUILDLINK_DEPENDS.cups}:../../print/cups
EVAL_PREFIX+= BUILDLINK_PREFIX.cups=cups
diff --git a/print/cupsomatic-ppds/Makefile b/print/cupsomatic-ppds/Makefile
index be1f2ad1c30..d70d2e9f310 100644
--- a/print/cupsomatic-ppds/Makefile
+++ b/print/cupsomatic-ppds/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/05/15 22:34:16 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:34 fredb Exp $
DISTNAME= all-com-ppds
PKGNAME= cupsomatic-ppds-20010515
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/cupsomatic-ppd
CATEGORIES= print
@@ -27,7 +28,7 @@ CONFLICTS+= cupsomatic-200012??
DIST_SUBDIR= ${PKGNAME}
-DEPENDS+= cups>=1.1.1:../../print/cups
+DEPENDS+= cups>=1.1.14nb1:../../print/cups
DEPENDS+= cupsomatic-[0-9]*:../../print/cupsomatic
NO_CONFIGURE= # defined
diff --git a/print/cupsomatic/Makefile b/print/cupsomatic/Makefile
index 4be6c4b7192..746885e2f33 100644
--- a/print/cupsomatic/Makefile
+++ b/print/cupsomatic/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/02/13 18:55:53 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:33 fredb Exp $
DISTNAME= cupsomatic
PKGNAME= ${DISTNAME}-2.2
+PKGREVISION= 1
CATEGORIES= print
EXTRACT_SUFX= # empty
@@ -25,7 +26,7 @@ CONFLICTS+= cupsomatic-200012??
DIST_SUBDIR= ${PKGNAME}
-DEPENDS+= cups>=1.1.10:../../print/cups
+DEPENDS+= cups>=1.1.14nb1:../../print/cups
DEPENDS+= foomatic-gswrapper>=1.2:../../print/foomatic-gswrapper
DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
DEPENDS+= mpage-[0-9]*:../../print/mpage
diff --git a/print/foomatic-gswrapper/Makefile b/print/foomatic-gswrapper/Makefile
index 7e44d0df6e3..5a92affaf05 100644
--- a/print/foomatic-gswrapper/Makefile
+++ b/print/foomatic-gswrapper/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/12/24 22:32:00 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:34 fredb Exp $
DISTNAME= foomatic-gswrapper
PKGNAME= ${DISTNAME}-1.2
+PKGREVISION= 1
CATEGORIES= print
EXTRACT_SUFX= # empty
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index fb7a1e73f63..2d110f7767b 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2001/10/06 17:20:05 rh Exp $
+# $NetBSD: Makefile,v 1.23 2002/03/13 17:37:34 fredb Exp $
#
DISTNAME= ggv-1.0.1
+PKGREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/ggv/}
diff --git a/print/ghostscript-nox11/Makefile b/print/ghostscript-nox11/Makefile
index 1f254d752c7..36d30b83c58 100644
--- a/print/ghostscript-nox11/Makefile
+++ b/print/ghostscript-nox11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/02/03 21:27:20 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:34 fredb Exp $
PKGNAME= ghostscript-nox11-${GS_VERS}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Aladdin Postscript interpreter without X11 drivers
CONFLICTS= ghostscript{,-x11}-[0-9]*
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index cb924daade1..b5ae939a3cb 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.29 2002/02/03 21:27:20 jlam Exp $
+# $NetBSD: Makefile.common,v 1.30 2002/03/13 17:37:35 fredb Exp $
DISTNAME= ghostscript-${GS_VERS}
+PKGREVISION= 1
GS_VERS= 6.01
CATEGORIES= print
MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 0f73146a56a..cc29dfd7051 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/02/03 21:27:19 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:34 fredb Exp $
PKGNAME= ghostscript-${GS_VERS}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Aladdin Postscript interpreter
CONFLICTS= ghostscript{,-x11,-nox11}-[0-9]*
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index d64290be913..3d9b85386c7 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/15 20:48:07 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:35 fredb Exp $
#
DISTNAME= gimp-print-4.2.0
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://prdownloads.sourceforge.net/gimp-print/
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 574fa8f1334..18fe7deff0f 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2001/10/24 22:11:05 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2002/03/13 17:37:35 fredb Exp $
#
DISTNAME= gnome-print-0.29
+PKGREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-print/}
diff --git a/print/gnome-print/buildlink.mk b/print/gnome-print/buildlink.mk
index b70a0e1ca0d..d5d09427dd2 100644
--- a/print/gnome-print/buildlink.mk
+++ b/print/gnome-print/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/10/03 20:56:52 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/03/13 17:37:35 fredb Exp $
#
# This Makefile fragment is included by packages that use gnome-print.
#
@@ -17,7 +17,7 @@ GNOME_PRINT_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gnome-print?= gnome-print>=0.29
+BUILDLINK_DEPENDS.gnome-print?= gnome-print>=0.29nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gnome-print}:../../print/gnome-print
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-print=gnome-print
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 353c1626cdd..18b304e393d 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2002/01/28 05:18:41 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2002/03/13 17:37:35 fredb Exp $
# FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
#
DISTNAME= gv-3.5.8
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/
diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index 2a64a0440ea..8c31612279c 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/12/01 10:13:47 kleink Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:35 fredb Exp $
#
DISTNAME= html2ps-1.0b1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.tdb.uu.se/~jan/
@@ -10,7 +10,7 @@ MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://www.tdb.uu.se/~jan/html2ps.html
COMMENT= HTML to PostScript converter
-DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
+DEPENDS+= ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
diff --git a/print/if-psprint/Makefile b/print/if-psprint/Makefile
index 1b631b2ceb4..45ab2c4ba2a 100644
--- a/print/if-psprint/Makefile
+++ b/print/if-psprint/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:44 agc Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:36 fredb Exp $
#
DISTNAME= if-psprint-1.4
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 9c7826f5763..a833ff48d37 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/02/17 17:51:46 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:37:36 fredb Exp $
DISTNAME= lgrind
PKGNAME= lgrind-3.5
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tar.bz2
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 25aa1b86638..011b944b85a 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:38 seb Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:36 fredb Exp $
#
DISTNAME= lilypond-1.3.119
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 14cc0bef352..4286ccbce2b 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2002/01/18 11:02:32 martti Exp $
+# $NetBSD: Makefile,v 1.41 2002/03/13 17:37:37 fredb Exp $
# FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
#
DISTNAME= lyx-1.1.6fix4
PKGNAME= lyx-1.1.6.4
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 38cca51d073..f22fa3afe3a 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2001/09/27 23:18:36 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2002/03/13 17:37:37 fredb Exp $
DISTNAME= magicfilter-1.2
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/printing/}
@@ -9,7 +10,7 @@ COMMENT= customizable, extensible automatic printer filter
DEPENDS+= a2ps-[0-9]*:../../print/a2ps
DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
-DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
+DEPENDS+= netpbm>=9.7nb1:../../graphics/netpbm
DEPENDS+= teTeX-bin-[0-9]*:../../print/teTeX-bin
DEPENDS+= papersize-[0-9]*:../../print/papersize
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index e790b823652..5dd229c512c 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:06 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:37 fredb Exp $
DISTNAME= mgv-3.1.5
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.trends.net/~mu/srcs/
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index d1c5e5b8bbf..1bfc839c0cd 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2001/12/03 08:14:20 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:37 fredb Exp $
.include "Makefile.common"
PKGNAME= pdflib-${PDFLIB_BASE_VERS}
+PKGREVISION= 1
COMMENT= C library to produce PDF files
USE_BUILDLINK_ONLY= YES
diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common
index 20f9bb6ba14..95a816b0b84 100644
--- a/print/pdflib/Makefile.common
+++ b/print/pdflib/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2001/12/04 15:56:42 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/03/13 17:37:37 fredb Exp $
DISTNAME= pdflib-${PDFLIB_DIST_VERS}
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.pdflib.com/pdflib/download/
diff --git a/print/pdflib/buildlink.mk b/print/pdflib/buildlink.mk
index 95e5935a0a4..b7d3b467ca9 100644
--- a/print/pdflib/buildlink.mk
+++ b/print/pdflib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/10/03 20:56:52 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/03/13 17:37:37 fredb Exp $
#
# This Makefile fragment is included by packages that use pdflib.
#
@@ -17,7 +17,7 @@ PDFLIB_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.pdflib?= pdflib>=4.0.1
+BUILDLINK_DEPENDS.pdflib?= pdflib>=4.0.1nb1
DEPENDS+= ${BUILDLINK_DEPENDS.pdflib}:../../print/pdflib
EVAL_PREFIX+= BUILDLINK_PREFIX.pdflib=pdflib
diff --git a/print/php3-pdflib/Makefile b/print/php3-pdflib/Makefile
index 7eeb97fc3df..de546577168 100644
--- a/print/php3-pdflib/Makefile
+++ b/print/php3-pdflib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/10 13:10:26 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:38 fredb Exp $
MODNAME= pdf
CATEGORIES+= print
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= PHP3 extension for PDFlib on-the-fly PDF generation
USE_BUILDLINK_ONLY= yes
diff --git a/print/php4-pdflib/Makefile b/print/php4-pdflib/Makefile
index 8ada848996d..761ea3f6216 100644
--- a/print/php4-pdflib/Makefile
+++ b/print/php4-pdflib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/02/28 06:18:38 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:38 fredb Exp $
MODNAME= pdf
PKGNAME= php-pdflib-${PHP_BASE_VERS}
+PKGREVISION= 1
CATEGORIES+= print
PKGREVISION= # empty
COMMENT= PHP4 extension for PDFlib on-the-fly PDF generation
diff --git a/print/stylewriter/Makefile b/print/stylewriter/Makefile
index 47e9eb8f9e2..b27b841f062 100644
--- a/print/stylewriter/Makefile
+++ b/print/stylewriter/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2002/01/28 02:30:08 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:37:38 fredb Exp $
#
DISTNAME= stylewriter
PKGNAME= stylewriter-0.9.9
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index 31926ef4074..bf62d498e5e 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/12/03 08:14:21 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:38 fredb Exp $
.include "../pdflib/Makefile.common"
PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS}
+PKGREVISION= 1
COMMENT= Tcl interface to PDFlib for generating PDF files
USE_BUILDLINK_ONLY= YES
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index 910c0c99ab2..0209272e680 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2002/02/18 15:14:39 seb Exp $
+# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:39 fredb Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
#
DISTNAME= teTeX-src-1.0.7
PKGNAME= teTeX-bin-1.0.7
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/teTeX-1.0
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
@@ -17,7 +17,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
DEPENDS+= teTeX-share>=1.0.2nb1:../teTeX-share
DEPENDS+= dialog-0.6z:../../misc/dialog
DEPENDS+= libwww>=5.3.2nb1:../../www/libwww
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
CONFLICTS+= omega-[0-9]*
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index c7b9f83a54b..b0c29f8b658 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2002/01/28 15:25:12 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2002/03/13 17:37:39 fredb Exp $
#
DISTNAME= teTeX-1.0.7nb1
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/print/tex-eurosym/Makefile b/print/tex-eurosym/Makefile
index 0b115795765..37a6dba753f 100644
--- a/print/tex-eurosym/Makefile
+++ b/print/tex-eurosym/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/04 14:51:50 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:39 fredb Exp $
#
DISTNAME= eurosym-1.0
PKGNAME= tex-${DISTNAME}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/eurosym
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/print/tex-hugelatex/Makefile b/print/tex-hugelatex/Makefile
index f64ec942198..f1847f157b5 100644
--- a/print/tex-hugelatex/Makefile
+++ b/print/tex-hugelatex/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/10/21 21:58:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:39 fredb Exp $
#
DISTNAME= hugelatex-1.0
PKGNAME= tex-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= # none
DISTFILES= # nada
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index 648484d0a1c..41ba7f6dde4 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/11/29 01:12:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:39 fredb Exp $
#
DISTNAME= jadetex-2.20
PKGNAME= tex-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= http://www.tug.org/applications/jadetex/
EXTRACT_SUFX= .zip
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index b6a85102dcc..f34471eb77e 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2001/08/06 15:41:13 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:40 fredb Exp $
#
DISTNAME= transfig.3.2.3d
PKGNAME= transfig-3.2.3.4
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= graphics print
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/drawing_tools/transfig/} \
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 3d6b843e715..30071ff3575 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:06 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/03/13 17:37:40 fredb Exp $
DISTNAME= xpp-1.0
+PKGREVISION= 1
CATEGORIES= print x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cups/}
diff --git a/security/p5-Crypt-DSA/Makefile b/security/p5-Crypt-DSA/Makefile
index 3a973511224..a72d11a76f2 100644
--- a/security/p5-Crypt-DSA/Makefile
+++ b/security/p5-Crypt-DSA/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:36 veego Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:40 fredb Exp $
#
DISTNAME= Crypt-DSA-0.12
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5dsa
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 6fcadfbb467..7377e80f9e1 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:36 veego Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:40 fredb Exp $
#
DISTNAME= Crypt-OpenPGP-0.17
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5pgp
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index c2959aab5b1..d7be91367c0 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:36 veego Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:41 fredb Exp $
#
DISTNAME= Crypt-Primes-0.49
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5cpr
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile
index 81908e443b9..774f1f3cdb7 100644
--- a/security/p5-Crypt-RSA/Makefile
+++ b/security/p5-Crypt-RSA/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:36 veego Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:41 fredb Exp $
#
DISTNAME= Crypt-RSA-1.47
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5rsa
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
diff --git a/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile
index fca3b902953..d991cfebfb6 100644
--- a/security/p5-Crypt-Random/Makefile
+++ b/security/p5-Crypt-Random/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:37 veego Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:42 fredb Exp $
#
DISTNAME= Crypt-Random-1.11
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5cra
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/}
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 00bbb93b697..fa70856dba6 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:06 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:42 fredb Exp $
#
DISTNAME= FSViewer.app-0.2.3
PKGNAME= FSViewer-0.2.3
+PKGREVISION= 1
CATEGORIES= sysutils x11
MASTER_SITES= http://www.csn.ul.ie/~clernong/download/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} icons.tar.gz
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index c73a7e64154..8aaf94be721 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:42 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:42 fredb Exp $
#
DISTNAME= cdrdao-1.1.5.src
PKGNAME= gcdmaster-1.1.5
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/cdrdao-1.1.5
CATEGORIES= sysutils
MASTER_SITES= http://prdownloads.sourceforge.net/cdrdao/
@@ -14,8 +15,8 @@ COMMENT= GUI for cdrdao with some editing capability
BUILD_DEPENDS+= pccts-1.33.22:../../devel/pccts
DEPENDS+= cdrdao-1.1.5:../../sysutils/cdrdao
DEPENDS+= gtk---[0-9]*:../../x11/gtk--
-DEPENDS+= gnome---[0-9]*:../../x11/gnome--
-DEPENDS+= libglade-[0-9]*:../../devel/libglade
+DEPENDS+= gnome---1.1.19nb1:../../x11/gnome--
+DEPENDS+= libglade-0.17nb1:../../devel/libglade
USE_X11BASE= yes
GNU_CONFIGURE= YES
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index e42642d8a80..2683bb0f6c5 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2001/09/27 23:18:42 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2002/03/13 17:37:42 fredb Exp $
#
DISTNAME= gcombust-0.1.42
+PKGREVISION= 1
CATEGORIES= x11 sysutils
MASTER_SITES= ${HOMEPAGE}
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 3c8a9713ed2..2e5a5009ba4 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2002/02/13 23:14:03 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:42 fredb Exp $
#
DISTNAME= gkrellm-1.2.4
PKGNAME= ${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://web.wt.net/~billw/gkrellm/
diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index 8d7f05334a9..657c4112f82 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.25 2001/09/27 23:18:43 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2002/03/13 17:37:43 fredb Exp $
PKGNAME= g${DISTNAME}
+PKGREVISION= 1
CATEGORIES+= gnome
COMMENT= GNOME version of Midnight Commander, a free Norton Commander Clone
-DEPENDS+= gnome-core-[0-9]*:../../x11/gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
USE_X11BASE= # defined
CONFIGURE_ARGS+= --with-tm-x-support
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 7a5d55d6d84..c3f2adfcc89 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2001/10/07 11:45:02 rh Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:43 fredb Exp $
DISTNAME= gnome-vfs-1.0.2
+PKGREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-vfs/}
diff --git a/sysutils/gnome-vfs/buildlink.mk b/sysutils/gnome-vfs/buildlink.mk
index 0f205debeb9..062afb01dc5 100644
--- a/sysutils/gnome-vfs/buildlink.mk
+++ b/sysutils/gnome-vfs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/10/10 13:44:29 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/03/13 17:37:43 fredb Exp $
#
# This Makefile fragment is included by packages that use gnome-vfs.
#
@@ -17,7 +17,7 @@ GNOME_VFS_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gnome-vfs?= gnome-vfs>=1.0.2
+BUILDLINK_DEPENDS.gnome-vfs?= gnome-vfs>=1.0.2nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gnome-vfs}:../../sysutils/gnome-vfs
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-vfs=gnome-vfs
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index ad5289d6075..d2d806969de 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2001/04/24 18:33:29 rh Exp $
+# $NetBSD: Makefile,v 1.19 2002/03/13 17:37:43 fredb Exp $
DISTNAME= gtop-1.0.13
+PKGREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gtop/}
@@ -9,8 +10,8 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME system monitor - top like, memory graphs, process viewer
BUILD_USES_MSGFMT= yes
-DEPENDS+= gnome-core>1.4.0:../../x11/gnome-core
-DEPENDS+= libgtop>=1.0.12:../../devel/libgtop
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
+DEPENDS+= libgtop>=1.0.12nb2:../../devel/libgtop
OSVERSION_SPECIFIC= YES
USE_GMAKE= YES
diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile
index 320a07bb0b7..15a3e060cfc 100644
--- a/sysutils/kapm/Makefile
+++ b/sysutils/kapm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:43 fredb Exp $
#
DISTNAME= kapm-0.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils x11 kde
MASTER_SITES= ftp://bodnar42.dhs.org/pub/kapm/
@@ -14,7 +14,7 @@ COMMENT= Monitor a laptop's battery status and perform other APM tasks
IGNORE+= "APM is not available for ${MACHINE_PLATFORM}"
.endif
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= YES # to get things near KDE
GNU_CONFIGURE= YES
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 0e09f680834..e96e5b15113 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:43 fredb Exp $
#
DISTNAME= kdf-0.5.1
+PKGREVISION= 1
CATEGORIES= sysutils kde
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/stable/1.1.2/apps/utils/
EXTRACT_SUFX= .tgz
@@ -11,7 +12,7 @@ HOMEPAGE= http://www.edu.uni-klu.ac.at/~mkropfbe
COMMENT= Shows disk usage graphically and lets you mount/umount devices
BUILD_USES_MSGFMT= yes
-DEPENDS+= kde-1.1.2:../../x11/kde
+DEPENDS+= kde-1.1.2nb1:../../x11/kde
USE_LIBINTL= YES
USE_X11BASE= YES
diff --git a/sysutils/klavg/Makefile b/sysutils/klavg/Makefile
index 2e1203eab26..c329a53ba4b 100644
--- a/sysutils/klavg/Makefile
+++ b/sysutils/klavg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:42:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:44 fredb Exp $
#
DISTNAME= klavg-1.1
+PKGREVISION= 1
CATEGORIES= kde sysutils
MASTER_SITES= ftp://ftp.crocodile.org/pub/
@@ -9,7 +10,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.crocodile.org/software.html
COMMENT= Xload for the KDE panel
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= yes
WRKSRC= ${WRKDIR}/klavg
diff --git a/sysutils/koncd/Makefile b/sysutils/koncd/Makefile
index 99841163d61..c8380b5dfce 100644
--- a/sysutils/koncd/Makefile
+++ b/sysutils/koncd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/12/04 06:15:00 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:44 fredb Exp $
DISTNAME= koncd-0.7.1
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${HOMEPAGE}download/
@@ -8,7 +9,7 @@ MAINTAINER= wulf@netbsd.org
HOMEPAGE= http://www.koncd.de/
COMMENT= Frontend to the fabulous cdrecord and mkisofs programs
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
DEPENDS+= cdrecord>=1.9:../../sysutils/cdrecord
USE_BUILDLINK_ONLY= YES
diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index d9a73023456..fb5c593911b 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/01/03 14:49:22 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:44 fredb Exp $
#
DISTNAME= medusa-0.5.1
+PKGREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/medusa/} \
http://download.eazel.com/source/
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index 978c28de3e9..38259b16c1b 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/01/03 14:48:59 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:44 fredb Exp $
DISTNAME= nut-0.45.3
PKGNAME= ups-nut-cgi-0.45.3
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.exploits.org/nut/release/
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index db5b1dc0a9c..393fecf2473 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:44 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:45 fredb Exp $
DISTNAME= xcdroast-0.98alpha9
PKGNAME= xcdroast-0.98a9
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/}
@@ -9,7 +10,7 @@ MAINTAINER= frueauf@netbsd.org
HOMEPAGE= http://www.xcdroast.org/
COMMENT= graphical user interface for the command-line cdrecord-tools
-DEPENDS+= imlib-[0-9]*:../../graphics/imlib
+eEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib
DEPENDS+= cdrecord-1.10:../../sysutils/cdrecord
USE_X11= YES
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 6c9a3d22415..61fd3e3e52b 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/10/24 22:11:07 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:45 fredb Exp $
DISTNAME= xnc-4.4.5.src
PKGNAME= xnc-4.4.5
+PKGREVISION= 1
CATEGORIES= sysutils x11
MASTER_SITES= http://www.xnc.dubna.su/src/
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 42da35aa7a1..64fe9fae7ca 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:37:31 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:45 fredb Exp $
DISTNAME= latex2html-99.2beta8
+PKGREVISION= 1
CATEGORIES= textproc converters
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=support/latex2html/}
@@ -10,7 +11,7 @@ COMMENT= LaTeX to HTML converter
DEPENDS+= teTeX-bin>=1.0.6:../../print/teTeX-bin
DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
-DEPENDS+= netpbm>=9.7:../../graphics/netpbm
+DEPENDS+= netpbm>=9.7nb1:../../graphics/netpbm
USE_PERL5= # defined
GNU_CONFIGURE= # defined
diff --git a/time/korganizer/Makefile b/time/korganizer/Makefile
index e034f0e6be4..0e5c1726be5 100644
--- a/time/korganizer/Makefile
+++ b/time/korganizer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:45 fredb Exp $
DISTNAME= korganizer-1.1.2
+PKGREVISION= 1
CATEGORIES= kde time
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/stable/1.1.2/distribution/tar/generic/source/bz2/ \
ftp://ftp.de.kde.org/pub/kde/stable/1.1.2/distribution/tar/generic/source/bz2/
@@ -10,7 +11,7 @@ MAINTAINER= drochner@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= Organizer application for the KDE integrated X11 desktop
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/time/kworldwatch/Makefile b/time/kworldwatch/Makefile
index b3d2918afba..6f8192bb6a1 100644
--- a/time/kworldwatch/Makefile
+++ b/time/kworldwatch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:45 fredb Exp $
#
DISTNAME= kworldwatch-0.6
+PKGREVISION= 1
CATEGORIES= x11 kde time
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/stable/1.1.2/apps/utils/
EXTRACT_SUFX= .tgz
@@ -10,7 +11,7 @@ MAINTAINER= hubertf@netbsd.org
COMMENT= Revolving world map indicating the time in each part of the world
BUILD_USES_MSGFMT= yes
-DEPENDS+= kdebase-1.1.2:../../x11/kdebase
+DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase
CONFLICTS+= kdetoys-[0-9]*
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index 417dac471b4..021d149a721 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2002/03/04 19:16:05 fredb Exp $
+# $NetBSD: Makefile,v 1.20 2002/03/13 17:37:46 fredb Exp $
DISTNAME= AfterStep-1.8.11
PKGNAME= afterstep-1.8.11
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= ftp://ftp.afterstep.org/stable/ \
ftp://ftp.digex.net/pub/X11/window-managers/afterstep/AfterStep/stable/
diff --git a/wm/bbkeys-qt/Makefile b/wm/bbkeys-qt/Makefile
index 4182d8a668c..0072f3487e0 100644
--- a/wm/bbkeys-qt/Makefile
+++ b/wm/bbkeys-qt/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/06/26 21:01:59 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:46 fredb Exp $
#
.include "../bbkeys/Makefile.common"
PKGNAME= bbkeys-qt-1.2
+PKGREVISION= 1
COMMENT= Qt-based configuration utility for bbkeys
DEPENDS+= bbkeys-0.3.5:../bbkeys
diff --git a/wm/econf/Makefile b/wm/econf/Makefile
index 5a4af57be63..be80e99fe0a 100644
--- a/wm/econf/Makefile
+++ b/wm/econf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/01/24 15:22:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:46 fredb Exp $
#
DISTNAME= enlightenment-conf-0.15
PKGNAME= econf-0.15
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= ftp://www.rasterman.com/pub/enlightenment/enlightenment/
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 63be6ffa60b..86385fa114f 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:46 fredb Exp $
DISTNAME= enlightenment-0.16.4
+PKGREVISION= 1
CATEGORIES= x11 gnome wm
MASTER_SITES= ftp://ftp.enlightenment.org/pub/e/enlightenment/
diff --git a/wm/ethemes/Makefile b/wm/ethemes/Makefile
index f04286e921b..f66b686e999 100644
--- a/wm/ethemes/Makefile
+++ b/wm/ethemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/30 09:49:31 jmc Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:46 fredb Exp $
#
# There is no distinfo file since the files change contents so often on the
@@ -6,6 +6,7 @@
#
DISTNAME= ethemes-0.1
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= ftp://themes.org/pub/themes/e/
DISTFILES= ${E_THEMES}
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index 6f23212aec5..60dbb28c6fd 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/02/27 13:54:27 tron Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:47 fredb Exp $
PKGNAME= ${DISTNAME:S/-/-gnome-/:S/-2/.2/}
+PKGREVISION= 1
COMMENT= Small, fast and light-weight window manager (GNOME version)
CONFLICTS+= icewm-[0-9]*
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index e70a94b5ceb..dfb689c2340 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/08/16 14:52:28 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:47 fredb Exp $
#
DISTNAME= qvwm-1.1.11
+PKGREVISION= 1
CATEGORIES= wm
MASTER_SITES= ftp://www.qvwm.org/pub/qvwm/
diff --git a/wm/sawfish-replibs/Makefile b/wm/sawfish-replibs/Makefile
index 71d37d7adc9..4d67210b65c 100644
--- a/wm/sawfish-replibs/Makefile
+++ b/wm/sawfish-replibs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:47 fredb Exp $
#
PKGNAME= sawfish-replibs-${SF_VERS}
+PKGREVISION= 1
COMMENT= librep Lisp libraries for sawfish
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index b9661a9fb77..e5e8d56c129 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:44 seb Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:47 fredb Exp $
#
PKGNAME= sawfish-${SF_VERS}
+PKGREVISION= 1
COMMENT= GNOME-aware window manager that is fully configurable in Lisp
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index 1be4359718d..eb4a7c0401c 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2002/02/18 15:14:44 seb Exp $
+# $NetBSD: Makefile.common,v 1.7 2002/03/13 17:37:47 fredb Exp $
DISTNAME= sawfish-${SF_VERS}
+PKGREVISION= 1
SF_VERS= 1.0.1
CATEGORIES= x11 gnome wm
MASTER_SITES= http://prdownloads.sourceforge.net/sawmill/
@@ -10,7 +11,7 @@ HOMEPAGE= http://sawmill.sourceforge.net/
DEPENDS+= librep>=0.14:../../lang/librep
DEPENDS+= rep-gtk>=0.14:../../x11/rep-gtk
-DEPENDS+= imlib>=1.8.2:../../graphics/imlib
+DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib
DEPENDS+= control-center-[0-9]*:../../x11/controlcenter
USE_X11= # defined
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index de7866ebfb6..6c9b44e37d6 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2001/12/25 15:10:49 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2002/03/13 17:37:48 fredb Exp $
DISTNAME= WindowMaker-0.80.0
PKGNAME= windowmaker-0.80.0
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= ftp://ftp.windowmaker.org/pub/source/release/ \
ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
diff --git a/wm/windowmaker/buildlink.mk b/wm/windowmaker/buildlink.mk
index 9fcbe761568..94494ab8cf1 100644
--- a/wm/windowmaker/buildlink.mk
+++ b/wm/windowmaker/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/10/05 14:16:37 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/03/13 17:37:48 fredb Exp $
#
# This Makefile fragment is included by packages that use windowmaker.
#
@@ -17,7 +17,7 @@ WINDOWMAKER_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.windowmaker?= windowmaker>=0.70.0
+BUILDLINK_DEPENDS.windowmaker?= windowmaker>=0.80.0nb1
DEPENDS+= ${BUILDLINK_DEPENDS.windowmaker}:../../wm/windowmaker
EVAL_PREFIX+= BUILDLINK_PREFIX.windowmaker=windowmaker
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 434d8511ac4..5bf667e28ba 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:10 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:49 fredb Exp $
#
DISTNAME= wmakerconf-2.8.1
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= http://ulli.on.openave.net/wmakerconf/
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/wmextra/Makefile b/wm/wmextra/Makefile
index 2423d0bb236..efa01068f2f 100644
--- a/wm/wmextra/Makefile
+++ b/wm/wmextra/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:49 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:49 fredb Exp $
#
DISTNAME= WindowMaker-extra-0.1
PKGNAME= wmextra-0.1
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= ftp://ftp.windowmaker.org/pub/beta/srcs/ \
ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
@@ -11,7 +12,7 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.windowmaker.org/
COMMENT= Extras for window manager Window Maker
-DEPENDS+= windowmaker-[0-9]*:../../wm/windowmaker
+DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker
USE_X11BASE= yes
GNU_CONFIGURE= yes
diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile
index 888a33fcfdb..cf236802dc9 100644
--- a/wm/wmthemes/Makefile
+++ b/wm/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/12/19 15:35:40 tron Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:49 fredb Exp $
#
# There is no distinfo file since the files change contents so often on the
@@ -6,6 +6,7 @@
#
DISTNAME= wmthemes-0.62nb1
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= http://download.themes.org/wm/
DISTFILES= ${THEME_FILES}
@@ -14,7 +15,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://wm.themes.org/
COMMENT= Themes for the window manager WindowMaker
-DEPENDS+= windowmaker-[0-9]*:../../wm/windowmaker
+DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker
DIST_SUBDIR= wmthemes
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 0a9b61670bb..2e5ffbf7dfe 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2001/10/24 22:11:10 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2002/03/13 17:37:49 fredb Exp $
# FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
#
DISTNAME= Mosaic-src-2.7b5
PKGNAME= mosaic-2.7b5
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/Mosaic-src
CATEGORIES= www
MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 4e5f3383772..05c421ee7f5 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:10 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/03/13 17:37:49 fredb Exp $
DISTNAME= amaya-src-5.1
PKGNAME= amaya-5.1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/Amaya/work
CATEGORIES= www
MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile
index b5f02daa8b7..f4f7a879cf6 100644
--- a/www/apc-gui/Makefile
+++ b/www/apc-gui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/12/02 06:56:46 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:50 fredb Exp $
DISTNAME= apc_gui-1.0.3
PKGNAME= ${DISTNAME:S/_/-/}
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://apc.neuropeans.com/download/
diff --git a/www/arena/Makefile b/www/arena/Makefile
index a24eaca1e70..66e7b7012b9 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2001/11/29 01:12:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.42 2002/03/13 17:37:50 fredb Exp $
DISTNAME= arena-0.3.62
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/Arena-0.3.62
CATEGORIES= www
MASTER_SITES= ftp://ftp.yggdrasil.com/pub/dist/web/arena/
@@ -13,7 +13,7 @@ COMMENT= Experimental HTML 3 browser, supports math and style sheets
BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= libwww>=5.3.2nb1:../../www/libwww
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 5d2d119439b..92f747bf985 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2002/02/06 03:29:05 jmc Exp $
+# $NetBSD: Makefile,v 1.23 2002/03/13 17:37:50 fredb Exp $
DISTNAME= bluefish-0.7
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/ \
http://student.wau.nl/~olivier/bluefish/download/ \
@@ -15,13 +16,13 @@ HOMEPAGE= http://bluefish.openoffice.nl/
COMMENT= GTK HTML editor for the experienced web designer
DEPENDS+= gtk+>=1.2.7:../../x11/gtk
-DEPENDS+= imlib-[0-9]*:../../graphics/imlib
+DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib
DEPENDS+= weblint-[0-9]*:../../www/weblint
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= png-[0-9]*:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= tiff-[0-9]*:../../graphics/tiff
-DEPENDS+= gnome-libs-[0-9]*:../../x11/gnome-libs
-DEPENDS+= gdk-pixbuf-[0-9]*:../../graphics/gdk-pixbuf
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
+DEPENDS+= gdk-pixbuf-0.11.0nb1:../../graphics/gdk-pixbuf
BUILD_USES_MSGFMT= YES
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 5439b95a048..9ecf43b8147 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/06/26 14:14:53 zuntum Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:50 fredb Exp $
#
DISTNAME= chimera-2.0a19
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera-alpha/
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 200eef5b96d..63c23fc68e9 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/02/12 20:06:34 reinoud Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:51 fredb Exp $
#
DISTNAME= dillo-0.6.4
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dillo/}
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index c41051f5cb6..0d68d3b02fa 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/03/13 16:14:56 taya Exp $
+# $NetBSD: Makefile,v 1.27 2002/03/13 17:37:51 fredb Exp $
DISTNAME= galeon-1.2.0
CATEGORIES= www
@@ -12,7 +12,7 @@ CONFLICTS= galeon-current-[0-9]*
BUILD_DEPENDS+= xml-i18n-tools>=0.8.1:../../textproc/xml-i18n-tools
DEPENDS+= scrollkeeper>=0.2:../../textproc/scrollkeeper
-DEPENDS+= mozilla>=0.9.8:../mozilla
+DEPENDS+= mozilla>=0.9.9:../../www/mozilla
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 75a0ddf3920..f07172bca9b 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/10/06 14:30:05 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:51 fredb Exp $
#
DISTNAME= glibwww-0.2
+PKGREVISION= 1
CATEGORIES= www gnome devel
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/glibwww/}
@@ -9,7 +10,7 @@ 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.2.3
+BUILDLINK_DEPENDS.gnome-libs= gnome-libs>=1.4.1.2nb1
BUILDLINK_DEPENDS.libwww= libwww>=5.2.8
USE_BUILDLINK_ONLY= YES
diff --git a/www/glibwww/buildlink.mk b/www/glibwww/buildlink.mk
index 95e932b9ead..6956be93423 100644
--- a/www/glibwww/buildlink.mk
+++ b/www/glibwww/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/06 14:30:05 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:37:51 fredb Exp $
#
# This Makefile fragment is included by packages that use glibwww.
#
@@ -17,7 +17,7 @@ GLIBWWW_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.glibwww?= glibwww>=0.2
+BUILDLINK_DEPENDS.glibwww?= glibwww>=0.2nb1
DEPENDS+= ${BUILDLINK_DEPENDS.glibwww}:../../www/glibwww
EVAL_PREFIX+= BUILDLINK_PREFIX.glibwww=glibwww
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 820375f2f5d..9411d10ec02 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2002/01/17 11:15:32 martti Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/13 17:37:51 fredb Exp $
DISTNAME= gtkhtml-1.0.1
+PKGREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=unstable/sources/gtkhtml/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/gtkhtml/buildlink.mk b/www/gtkhtml/buildlink.mk
index 131aa34783a..282d134f487 100644
--- a/www/gtkhtml/buildlink.mk
+++ b/www/gtkhtml/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/01/17 11:15:32 martti Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/03/13 17:37:51 fredb Exp $
#
# This Makefile fragment is included by packages that use gtkhtml.
#
@@ -17,7 +17,7 @@ GTKHTML_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gtkhtml?= gtkhtml>=1.0.1
+BUILDLINK_DEPENDS.gtkhtml?= gtkhtml>=1.0.1nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gtkhtml}:../../www/gtkhtml
EVAL_PREFIX+= BUILDLINK_PREFIX.gtkhtml=gtkhtml
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index b3e75f71802..aa0527f3a7e 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2001/06/11 06:34:55 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:52 fredb Exp $
#
DISTNAME= ${PKGNAME}-source
PKGNAME= htmldoc-1.7
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= www
MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/1.7/
@@ -12,7 +13,7 @@ HOMEPAGE= http://www.easysw.com/~mike/htmldoc/
COMMENT= Converts HTML to indexed HTML, PDF and/or PostScript
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
NOT_FOR_PLATFORM= NetBSD-1.[3-4]*-alpha #ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown
diff --git a/www/openacs/Makefile b/www/openacs/Makefile
index 1a82e149fc8..c2b3c9d486a 100644
--- a/www/openacs/Makefile
+++ b/www/openacs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/03/04 19:41:08 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:52 fredb Exp $
#
DISTNAME= openacs-3.2.5
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= # none
EXTRACT_SUFX= .tgz
@@ -13,7 +14,7 @@ COMMENT= TCL-based web programming environment
# Would also work with AOLServer, but there's no package for that.
DEPENDS+= ap-aolserver-1.1:../../www/ap-aolserver
DEPENDS+= postgresql-lib>=7.0:../../databases/postgresql-lib
-DEPENDS+= ImageMagick>=5.2.0:../../graphics/ImageMagick
+DEPENDS+= ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
DEPENDS+= unzip-[0-9]*:../../archivers/unzip
BUILD_DEPENDS+= postgresql-client>=7.0:../../databases/postgresql-client
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index 59aaea86f3e..957950eaf6f 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:51 veego Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:52 fredb Exp $
#
DISTNAME= Template-Toolkit-2.04
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5tto
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Template/}
diff --git a/www/quanta-docs/Makefile b/www/quanta-docs/Makefile
index edb2437a369..76644c22e13 100644
--- a/www/quanta-docs/Makefile
+++ b/www/quanta-docs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/01/21 11:26:09 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:53 fredb Exp $
DISTNAME= quanta-docs-1.0
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quanta/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 8fe0e19a0d2..05d4339e11b 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/12/04 06:15:01 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:52 fredb Exp $
DISTNAME= quanta-2.0-pr2
PKGNAME= quanta-1.9.9.2
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quanta/}
EXTRACT_SUFX= .tar.bz2
@@ -10,7 +11,7 @@ MAINTAINER= jmcneill@invisible.yi.org
HOMEPAGE= http://quanta.sourceforge.net/
COMMENT= HTML editor suitable for experienced web developers
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
BUILD_DEPENDS+= automake>=1.4:../../devel/automake
BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index f36a3341d24..fc26cbe0d93 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/03/10 10:47:16 jmc Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:53 fredb Exp $
#
DISTNAME= skipstone-0.7.9
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.muhri.net/skipstone/
@@ -9,7 +10,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.muhri.net/skipstone/
COMMENT= Gtk+ web browser that embeds Mozilla's renderer
-DEPENDS+= mozilla>=0.9.8:../../www/mozilla
+DEPENDS+= mozilla>=0.9.9:../../www/mozilla
USE_GMAKE= yes
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 404f8758f47..d2ee917b8ef 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2002/02/24 14:55:59 veego Exp $
+# $NetBSD: Makefile,v 1.20 2002/03/13 17:37:53 fredb Exp $
#
DISTNAME= webalizer-2.01-09-src
PKGNAME= webalizer-2.1.9
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \
ftp://webalizer.dexa.org/pub/webalizer/ \
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 29ba6b436f2..9b3780868c1 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2001/10/24 22:11:11 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2002/03/13 17:37:53 fredb Exp $
#
DISTNAME= XmHTML-1.1.7
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.xs4all.nl/~ripley/XmHTML/dist/
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 91577435494..7b7afe0e05c 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/12/11 16:02:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:53 fredb Exp $
#
DISTNAME= aterm-0.4.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aterm/}
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index e2abcb618cb..ed34ecb3b87 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2001/10/24 22:11:11 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:54 fredb Exp $
DISTNAME= control-center-1.4.0.1
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/control-center/}
@@ -11,7 +12,7 @@ COMMENT= GNOME control-center development library
DEPENDS+= scrollkeeper-[0-9]*:../../textproc/scrollkeeper
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.gnome-libs= gnome-libs>=1.2.13
+BUILDLINK_DEPENDS.gnome-libs= gnome-libs>=1.4.1.2nb1
USE_BUILDLINK_ONLY= YES
USE_X11BASE= YES
diff --git a/x11/controlcenter/buildlink.mk b/x11/controlcenter/buildlink.mk
index 63f4f6beb3d..119b09f6dbf 100644
--- a/x11/controlcenter/buildlink.mk
+++ b/x11/controlcenter/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/06 13:09:52 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:37:54 fredb Exp $
#
# This Makefile fragment is included by packages that use controlcenter.
#
@@ -17,7 +17,7 @@ CONTROLCENTER_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.controlcenter?= control-center>=1.4
+BUILDLINK_DEPENDS.controlcenter?= control-center>=1.4.0.1nb1
DEPENDS+= ${BUILDLINK_DEPENDS.controlcenter}:../../x11/controlcenter
EVAL_PREFIX+= BUILDLINK_PREFIX.controlcenter=controlcenter
diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index a45f6f7ab55..9621643c0a8 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2001/10/21 10:49:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/03/13 17:37:54 fredb Exp $
#
DISTNAME= dfm-0.99.9
+PKGREVISION= 1
MASTER_SITES= http://www.kaisersite.de/dfm/
WRKSRC= ${WRKDIR}/dfm
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index e0b5548408c..f66852e212b 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:11 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:54 fredb Exp $
#
DISTNAME= ebuilder-0.56d
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= x11 devel
MASTER_SITES= http://web.inter.nl.net/users/eavdmeer/src/
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 39fb3d5497d..7450c371967 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/12/11 15:37:48 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:54 fredb Exp $
DISTNAME= Eterm-0.8.10
PKGNAME= eterm-0.8.10
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.eterm.org/pub/Eterm/ \
ftp://alien.eterm.org/pub/Eterm/ \
diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index 9d11a96abf1..0b6a748861b 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/08/05 17:04:21 sakamoto Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:55 fredb Exp $
# FreeBSD Id: ports/x11-toolkits/fox/Makefile,v 1.14 2001/02/23 19:00:05 knu Exp
DISTNAME= fox-0.99.174
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
diff --git a/x11/fox/buildlink.mk b/x11/fox/buildlink.mk
index 251248396ce..8106a38f553 100644
--- a/x11/fox/buildlink.mk
+++ b/x11/fox/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/08/05 17:04:21 sakamoto Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:37:55 fredb Exp $
#
# This Makefile fragment is included by packages that use fox.
#
@@ -17,7 +17,7 @@ FOX_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.fox?= fox-*
+BUILDLINK_DEPENDS.fox?= fox>=0.99.174nb1
DEPENDS+= ${BUILDLINK_DEPENDS.fox}:../../x11/fox
EVAL_PREFIX+= BUILDLINK_PREFIX.fox=fox
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a1dbb4934af..99be9a0af54 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2001/09/30 07:39:48 tron Exp $
+# $NetBSD: Makefile,v 1.26 2002/03/13 17:37:55 fredb Exp $
DISTNAME= gdm-2.2.0
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gdm/} \
${MASTER_SITE_LOCAL}
@@ -10,8 +11,8 @@ MAINTAINER= mjl@netbsd.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Gnome Display Manager - a re-implementation of the xdm program
-DEPENDS+= gnome-libs-[0-9]*:../../x11/gnome-libs
-DEPENDS+= libglade>=0.16:../../devel/libglade
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
+DEPENDS+= libglade>=0.17nb1:../../devel/libglade
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index ef3d291966e..776b7e60bbb 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/02/14 13:50:44 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:55 fredb Exp $
#
DISTNAME= gnomemm-1.1.19
PKGNAME= gnome---1.1.19
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://prdownloads.sourceforge.net/gtkmm/
@@ -10,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://gtkmm.sourceforge.net/
COMMENT= C++ binding for the GNOME libraries
-DEPENDS+= gnome-libs-[0-9]*:../../x11/gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
DEPENDS+= libsigc++>=1.0.1:../../devel/libsigc++
DEPENDS+= gtk-->=1.2.5:../../x11/gtk--
BUILD_DEPENDS+= perl-*:../../lang/perl5
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 3ec92ae6654..df485e03c12 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2001/10/06 18:29:33 rh Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/13 17:37:55 fredb Exp $
#
DISTNAME= gnome-applets-1.4.0.4
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-applets/}
EXTRACT_SUFX= .tar.bz2
@@ -11,8 +12,8 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Applets for GNOME
BUILD_DEPENDS+= xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
-DEPENDS+= gnome-core>=1.4.0.4:../../x11/gnome-core
-DEPENDS+= libgtop>=1.0.12:../../devel/libgtop
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
+DEPENDS+= libgtop>=1.0.12nb2:../../devel/libgtop
USE_GMAKE= YES
USE_X11BASE= YES
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 6b20d6bbf01..f96c6a56088 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2001/10/24 22:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2002/03/13 17:37:56 fredb Exp $
DISTNAME= gnome-core-1.4.0.4
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-core/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-core/buildlink.mk b/x11/gnome-core/buildlink.mk
index cc7865936a9..26362cb9dea 100644
--- a/x11/gnome-core/buildlink.mk
+++ b/x11/gnome-core/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/10/06 15:58:06 rh Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/03/13 17:37:56 fredb Exp $
#
# This Makefile fragment is included by packages that use gnome-core.
#
@@ -17,7 +17,7 @@ GNOME_CORE_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gnome-core?= gnome-core>=1.0.53
+BUILDLINK_DEPENDS.gnome-core?= gnome-core>=1.4.0.4nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gnome-core}:../../x11/gnome-core
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-core=gnome-core
diff --git a/x11/gnome-gkrellm/Makefile b/x11/gnome-gkrellm/Makefile
index aefe51d94bc..6765863bba2 100644
--- a/x11/gnome-gkrellm/Makefile
+++ b/x11/gnome-gkrellm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/11/14 05:02:47 damon Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:56 fredb Exp $
DISTNAME= gkrellm-gnome
PKGNAME= gnome-gkrellm-0.1
+PKGREVISION= 1
CATEGORIES= gnome sysutils
MASTER_SITES= http://web.wt.net/~billw/gkrellm/Plugins/
@@ -10,7 +11,7 @@ HOMEPAGE= http://web.wt.net/~billw/gkrellm/Plugins.html
COMMENT= gkrellm gnome plugin
DEPENDS+= gkrellm-1.2.*:../../sysutils/gkrellm
-DEPENDS+= gnome-libs>=1.2.1:../gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../gnome-libs
USE_GMAKE= yes
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index cdf46da18a7..f35da072549 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2002/01/01 15:14:19 bjoern Exp $
+# $NetBSD: Makefile,v 1.75 2002/03/13 17:37:56 fredb Exp $
DISTNAME= gnome-libs-1.4.1.2
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-libs/}
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index 3b5237471c1..0f42035cde1 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.13 2001/10/21 19:41:16 rh Exp $
+# $NetBSD: buildlink.mk,v 1.14 2002/03/13 17:37:56 fredb Exp $
#
# This Makefile fragment is included by packages that use gnome-libs.
#
@@ -17,7 +17,7 @@ GNOME_LIBS_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.gnome-libs?= gnome-libs>=1.0.53
+BUILDLINK_DEPENDS.gnome-libs?= gnome-libs>=1.4.1.2nb1
DEPENDS+= ${BUILDLINK_DEPENDS.gnome-libs}:../../x11/gnome-libs
EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-libs=gnome-libs
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index f9a46b11968..39e71ac4ae4 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2002/02/12 21:49:56 jwise Exp $
+# $NetBSD: Makefile,v 1.23 2002/03/13 17:37:56 fredb Exp $
DISTNAME= gnome-python-1.4.0
PKGNAME= ${PYPKGPREFIX}-gnome-1.4.0
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-python/}
@@ -9,9 +10,9 @@ MAINTAINER= drochner@netbsd.org
HOMEPAGE= http://www.daa.com.au/~james/gnome/
COMMENT= Python Bindings for the GNU Network Object Model Environment
-DEPENDS+= gnome-core>1.4.0:../gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
DEPENDS+= gtkglarea-[0-9]*:../../x11/gtkglarea
-DEPENDS+= libglade-[0-9]*:../../devel/libglade
+DEPENDS+= libglade-0.17nb1:../../devel/libglade
CONFLICTS+= py-gtk-[0-9]*
CONFLICTS+= gnome-python-*
diff --git a/x11/gnome-users-guide/Makefile b/x11/gnome-users-guide/Makefile
index 65528f92dd0..21739845f83 100644
--- a/x11/gnome-users-guide/Makefile
+++ b/x11/gnome-users-guide/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 17:06:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:57 fredb Exp $
DISTNAME= users-guide-1.2
PKGNAME= gnome-users-guide-1.2
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/users-guide/}
@@ -9,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.2.1:../gnome-libs
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../gnome-libs
GNU_CONFIGURE= YES
USE_X11BASE= YES
diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile
index be5c6f7a1da..6e5a9d26375 100644
--- a/x11/gnome/Makefile
+++ b/x11/gnome/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2002/01/23 19:40:03 tron Exp $
+# $NetBSD: Makefile,v 1.28 2002/03/13 17:37:55 fredb Exp $
DISTNAME= gnome-1.4.0.5
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
@@ -9,7 +10,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnome.org/
COMMENT= "meta-package" for the GNU Network Object Model Environment
-DEPENDS+= gnome-core>=1.4.0.4:../gnome-core
+DEPENDS+= gnome-core>=1.4.0.4nb1:../../x11/gnome-core
DEPENDS+= ee>=0.3.12:../../graphics/ee
DEPENDS+= gdm>=2.2.0:../gdm
DEPENDS+= ggv>=1.0.1:../../print/ggv
@@ -23,7 +24,7 @@ DEPENDS+= gnome-media>=1.2.0:../../audio/gnome-media
DEPENDS+= gnome-pim>=1.4.0:../../misc/gnome-pim
DEPENDS+= gnome-users-guide>=1.2:../gnome-users-guide
DEPENDS+= gnome-utils>=1.4.1:../../misc/gnome-utils
-DEPENDS+= evolution>=0.15:../../mail/evolution
+DEPENDS+= evolution>=0.15nb1:../../mail/evolution
DEPENDS+= gnumeric>=0.75:../../math/gnumeric0
DEPENDS+= gtk-->=1.2.5:../gtk--
DEPENDS+= gtk-engines>=0.12:../gtk-engines
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 779e7fefc77..6df87ffbf9b 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/07/29 00:46:59 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:57 fredb Exp $
DISTNAME= gtk-engines-0.12
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gtk-engines/}
diff --git a/x11/kde/Makefile b/x11/kde/Makefile
index 434aaca3761..2a871c5a814 100644
--- a/x11/kde/Makefile
+++ b/x11/kde/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2001/02/17 17:06:32 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2002/03/13 17:37:57 fredb Exp $
# FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp
#
DISTNAME= kde-1.1.2
+PKGREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
@@ -11,13 +12,13 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= "meta-package" for the KDE integrated X11 desktop
-DEPENDS+= kdeutils-1.1.2:../../misc/kdeutils
-DEPENDS+= kdenetwork-1.1.2:../../net/kdenetwork
-DEPENDS+= kdegraphics-1.1.2:../../graphics/kdegraphics
-DEPENDS+= kdegames-1.1.2:../../games/kdegames
-DEPENDS+= kdemultimedia-1.1.2:../../audio/kdemultimedia
-DEPENDS+= kdetoys-1.1.2:../../games/kdetoys
-DEPENDS+= korganizer-1.1.2:../../time/korganizer
+DEPENDS+= kdeutils-1.1.2nb1:../../misc/kdeutils
+DEPENDS+= kdenetwork-1.1.2nb1:../../net/kdenetwork
+DEPENDS+= kdegraphics-1.1.2nb1:../../graphics/kdegraphics
+DEPENDS+= kdegames-1.1.2nb1:../../games/kdegames
+DEPENDS+= kdemultimedia-1.1.2nb1:../../audio/kdemultimedia
+DEPENDS+= kdetoys-1.1.2nb1:../../games/kdetoys
+DEPENDS+= korganizer-1.1.2nb1:../../time/korganizer
USE_X11= yes
EXTRACT_ONLY= # empty
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index 9e7232c8129..c43d9fa175d 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/12/03 15:37:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:57 fredb Exp $
DISTNAME= kde-2.2.2
+PKGREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
@@ -9,14 +10,14 @@ MAINTAINER= skrll@netbsd.org
HOMEPAGE= http://www.kde.org/
COMMENT= "meta-package" for the KDE integrated X11 desktop
-DEPENDS+= kdeadmin-2.2.2:../../misc/kdeadmin2
-DEPENDS+= kdegames-2.2.2:../../games/kdegames2
-DEPENDS+= kdegraphics-2.2.2:../../graphics/kdegraphics2
-DEPENDS+= kdemultimedia-2.2.2:../../audio/kdemultimedia2
-DEPENDS+= kdenetwork-2.2.2:../../net/kdenetwork2
-DEPENDS+= kdepim-2.2.2:../../misc/kdepim2
-DEPENDS+= kdetoys-2.2.2:../../games/kdetoys2
-DEPENDS+= kdeutils-2.2.2:../../misc/kdeutils2
+DEPENDS+= kdeadmin-2.2.2nb1:../../misc/kdeadmin2
+DEPENDS+= kdegames-2.2.2nb1:../../games/kdegames2
+DEPENDS+= kdegraphics-2.2.2nb1:../../graphics/kdegraphics2
+DEPENDS+= kdemultimedia-2.2.2nb1:../../audio/kdemultimedia2
+DEPENDS+= kdenetwork-2.2.2nb1:../../net/kdenetwork2
+DEPENDS+= kdepim-2.2.2nb1:../../misc/kdepim2
+DEPENDS+= kdetoys-2.2.2nb1:../../games/kdetoys2
+DEPENDS+= kdeutils-2.2.2nb1:../../misc/kdeutils2
EXTRACT_ONLY= # empty
USE_X11BASE= yes
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 72acecb030e..2bee1b7ac72 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2001/09/27 23:19:00 jlam Exp $
+# $NetBSD: Makefile,v 1.84 2002/03/13 17:37:57 fredb Exp $
# FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
DISTNAME= kdebase-1.1.2
+PKGREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
@@ -14,7 +15,7 @@ HOMEPAGE= http://www.kde.org/
COMMENT= Base modules for the KDE integrated X11 desktop
BUILD_USES_MSGFMT= yes
-DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs
+DEPENDS+= kdelibs-1.1.2nb1:../../x11/kdelibs
# kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase
# often do, so put the dependency here.
#
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 226f2c1008c..ec76dcd130e 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2001/12/07 18:13:41 skrll Exp $
+# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:58 fredb Exp $
DISTNAME= kdebase-2.2.2
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Base modules for the KDE 2 integrated X11 desktop
@@ -8,7 +9,7 @@ COMMENT= Base modules for the KDE 2 integrated X11 desktop
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/x11/kdebase2/buildlink.mk b/x11/kdebase2/buildlink.mk
index a735655586d..6ac3a81aff9 100644
--- a/x11/kdebase2/buildlink.mk
+++ b/x11/kdebase2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/11/13 21:10:46 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2002/03/13 17:37:58 fredb Exp $
#
# This Makefile fragment is included by packages that use kdebase2.
#
@@ -17,7 +17,7 @@ KDEBASE2_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.kdebase2?= kdebase-2.[1-9]*
+BUILDLINK_DEPENDS.kdebase2?= kdebase>=2.2.2nb1
DEPENDS+= ${BUILDLINK_DEPENDS.kdebase2}:../../x11/kdebase2
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdelibdocs2/Makefile b/x11/kdelibdocs2/Makefile
index 2d03fb247bd..da6f1f6f66c 100644
--- a/x11/kdelibdocs2/Makefile
+++ b/x11/kdelibdocs2/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2001/12/10 13:57:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:58 fredb Exp $
DISTNAME= kdelibs-2.2.2
PKGNAME= ${DISTNAME:S/kdelib/kdelibdoc/}
+PKGREVISION= 1
CATEGORIES= x11 devel
COMMENT= KDE library documentation
.include "../../x11/kde2/Makefile.kde2"
BUILD_DEPENDS+= kdoc>=2.2.2:../../textproc/kdoc
-DEPENDS+= qt2-docs>=2.3.1:../../x11/qt2-docs
+DEPENDS+= qt2-docs>=2.3.1nb2:../../x11/qt2-docs
USE_X11BASE= yes
NO_CONFIGURE= yes
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index d0eb253c264..1b50c0bbdc2 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2001/09/27 23:19:01 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2002/03/13 17:37:58 fredb Exp $
# FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
#
DISTNAME= kdelibs-1.1.2
+PKGREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/
@@ -13,7 +14,7 @@ HOMEPAGE= http://www.kde.org/
COMMENT= Support libraries for the KDE integrated X11 desktop
DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= png>=1.2.1:../../graphics/png
DEPENDS+= qt1-1.44:../../x11/qt1
DEPENDS+= tiff-[0-9]*:../../graphics/tiff
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 60b92a7036d..bad5e6283e0 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2002/02/15 09:26:32 skrll Exp $
+# $NetBSD: Makefile,v 1.33 2002/03/13 17:37:58 fredb Exp $
DISTNAME= kdelibs-2.2.2
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -8,7 +9,7 @@ COMMENT= Support libraries for the KDE integrated X11 desktop
BUILDLINK_DEPENDS.libxml2= libxml2>=2.4.8
BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9
-BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.0
+BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2
USE_BUILDLINK_ONLY= YES
USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096}
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
index 2873252ebba..d6accfde284 100644
--- a/x11/kdelibs2/buildlink.mk
+++ b/x11/kdelibs2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.19 2001/12/30 23:32:24 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.20 2002/03/13 17:37:58 fredb Exp $
#
# This Makefile fragment is included by packages that use kdelibs2.
#
@@ -17,7 +17,7 @@ KDELIBS2_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.kdelibs2?= kdelibs-2.[1-9]*
+BUILDLINK_DEPENDS.kdelibs2?= kdelibs>=2.2.2nb1
DEPENDS+= ${BUILDLINK_DEPENDS.kdelibs2}:../../x11/kdelibs2
.include "../../mk/bsd.prefs.mk"
@@ -36,7 +36,7 @@ BUILDLINK_KDEDIR= ${BUILDLINK_DIR}
KDEDIR= ${BUILDLINK_PREFIX.kdelibs2}
BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9
-BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.0
+BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2
USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096}
.include "../../audio/libaudiofile/buildlink.mk"
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index e002190fd8c..d9d238e9a68 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2001/09/27 23:19:01 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:59 fredb Exp $
#
DISTNAME= khostchooser-0.3
+PKGREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/1.1.2/apps/network/
EXTRACT_SUFX= .tgz
@@ -10,7 +11,7 @@ MAINTAINER= root@garbled.net
COMMENT= KDE Chooser replacement for X
BUILD_USES_MSGFMT= yes
-DEPENDS+= kdelibs-1.1.2:../../x11/kdelibs
+DEPENDS+= kdelibs-1.1.2nb1:../../x11/kdelibs
DEPENDS+= libungif-[0-9]*:../../graphics/libungif
WRKSRC= ${WRKDIR}/khostchooser
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index e11fb29378b..bbf5efca53b 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/01/03 14:13:25 damon Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:59 fredb Exp $
DISTNAME= multi-gnome-terminal-1.3.4
+PKGREVISION= 1
CATEGORIES= gnome x11
MASTER_SITES= http://multignometerm.sourceforge.net/
diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index a5954e70153..7e81565b375 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/01/18 10:50:42 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:59 fredb Exp $
#
DISTNAME= wxPython-2.2.2
PKGNAME= ${PYPKGPREFIX}-wxWindows-2.2.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxpython/}
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 35058da3139..987b945152d 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/18 11:55:02 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:59 fredb Exp $
#
DISTNAME= pygtk-0.6.9
PKGNAME= ${PYPKGPREFIX}-gtk-0.6.9
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/python/
diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile
index 54a19482d1c..11b06769ce1 100644
--- a/x11/qt2-designer-kde/Makefile
+++ b/x11/qt2-designer-kde/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:38:01 fredb Exp $
#
.include "../qt2-libs/Makefile.common"
PKGNAME= qt2-designer-kde-${QTVERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Visual (WYSIWYG) QT GUI builder with KDE widget support
CONFLICTS+= qt2-designer-[0-9]*
USE_BUILDLINK_ONLY= yes
-BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}
+BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2
ALL_TARGET= sub-tools
diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index 5691ce53e8d..8e55a32f581 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.15 2001/11/29 01:12:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.16 2002/03/13 17:38:01 fredb Exp $
#
.include "../qt2-libs/Makefile.common"
PKGNAME= qt2-designer-${QTVERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Visual (WYSIWYG) QT GUI builder
CONFLICTS+= qt2-designer-kde-[0-9]*
USE_BUILDLINK_ONLY= yes
-BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}
+BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2
ALL_TARGET= sub-tools
diff --git a/x11/qt2-designer/buildlink.mk b/x11/qt2-designer/buildlink.mk
index 92c97f7e430..34f7a660cb5 100644
--- a/x11/qt2-designer/buildlink.mk
+++ b/x11/qt2-designer/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/01/06 10:37:43 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/03/13 17:38:01 fredb Exp $
#
# This Makefile fragment is included by packages that use qt2-designer.
#
@@ -18,7 +18,7 @@ QT2_DESIGNER_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
BUILDLINK_DEPENDS.qt2-designer?= \
- {qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
+ {qt2-designer>=2.3.1nb2,qt2-designer-kde>=2.3.1nb2}
DEPENDS+= ${BUILDLINK_DEPENDS.qt2-designer}:../../x11/qt2-designer
EVAL_PREFIX+= BUILDLINK_PREFIX.qt2-designer=qt2-designer
diff --git a/x11/qt2-docs/Makefile b/x11/qt2-docs/Makefile
index 4eb8ea23d13..fbe6cfd64b9 100644
--- a/x11/qt2-docs/Makefile
+++ b/x11/qt2-docs/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2001/11/16 09:09:34 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:38:01 fredb Exp $
#
PKGNAME= qt2-docs-${QTVERSION}
+PKGREVISION= 2
COMMENT= Documentation for the QT C++ X GUI toolkit
.include "../qt2-libs/Makefile.common"
USE_BUILDLINK_ONLY= yes
-BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}
+BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/x11/qt2-examples/Makefile b/x11/qt2-examples/Makefile
index 93d665395e6..0e13d59c9e8 100644
--- a/x11/qt2-examples/Makefile
+++ b/x11/qt2-examples/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2001/11/16 09:09:34 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:38:02 fredb Exp $
#
PKGNAME= qt2-examples-${QTVERSION}
+PKGREVISION= 2
COMMENT= QT2 Tutorial, example code and HTML documentation
.include "../qt2-libs/Makefile.common"
USE_BUILDLINK_ONLY= yes
-BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}
+BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2
CONFIGURE_ENV+= QTDIR=${QTPREFIX}
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 341311c267b..26e206fb083 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:38:02 fredb Exp $
#
#USE_MESA= yes
.include "../qt2-libs/Makefile.common"
PKGNAME= qt2-libs-${QTVERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= C++ X GUI toolkit
USE_BUILDLINK_ONLY= yes
diff --git a/x11/qt2-libs/buildlink.mk b/x11/qt2-libs/buildlink.mk
index a5a335efdcd..2db4c0278ac 100644
--- a/x11/qt2-libs/buildlink.mk
+++ b/x11/qt2-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:38 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/03/13 17:38:02 fredb Exp $
#
# This Makefile fragment is included by packages that use qt2-libs.
#
@@ -17,7 +17,7 @@ QT2_LIBS_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.qt2-libs?= qt2-libs>=2.2.4
+BUILDLINK_DEPENDS.qt2-libs?= qt2-libs>=2.3.1nb2
DEPENDS+= ${BUILDLINK_DEPENDS.qt2-libs}:../../x11/qt2-libs
EVAL_PREFIX+= BUILDLINK_PREFIX.qt2-libs=qt2-libs
diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile
index 06c6fab0e67..e02614aafdf 100644
--- a/x11/qt2/Makefile
+++ b/x11/qt2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/11/16 09:11:38 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:38:00 fredb Exp $
#
-DISTNAME= qt2-${QTVERSION}nb2
+DISTNAME= qt2-${QTVERSION}
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,10 +11,10 @@ COMMENT= "meta-package" for the QT GUI C++ toolkit
.include "Makefile.common"
-DEPENDS+= qt2-libs-${QTVERSION}nb1:../../x11/qt2-libs
-DEPENDS+= {qt2-designer-${QTVERSION}nb1,qt2-designer-kde-${QTVERSION}nb1}:../../x11/qt2-designer
-DEPENDS+= qt2-docs-${QTVERSION}:../../x11/qt2-docs
-DEPENDS+= qt2-examples-${QTVERSION}:../../x11/qt2-examples
+DEPENDS+= qt2-libs-${QTVERSION}nb2:../../x11/qt2-libs
+DEPENDS+= {qt2-designer-${QTVERSION}nb2,qt2-designer-kde-${QTVERSION}nb2}:../../x11/qt2-designer
+DEPENDS+= qt2-docs-${QTVERSION}nb2:../../x11/qt2-docs
+DEPENDS+= qt2-examples-${QTVERSION}nb2:../../x11/qt2-examples
USE_X11BASE= yes
EXTRACT_ONLY= # empty
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index e44ab7a3f26..e36ee87d47e 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/07 08:10:34 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:38:02 fredb Exp $
#
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-docs-${QTVERSION}
+PKGREVISION= 1
COMMENT= Documentation for the QT C++ X GUI toolkit
NO_BUILDLINK_ONLY= yes
-BUILDLINK_DEPENDS.qt3-libs= qt3-libs-${QTVERSION}
+BUILDLINK_DEPENDS.qt3-libs= qt3-libs-${QTVERSION}nb1
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 215f0e15ee8..fa5e31242a2 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/07 08:07:57 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:38:02 fredb Exp $
#
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-libs-${QTVERSION}
+PKGREVISION= 1
COMMENT= C++ X GUI toolkit
USE_BUILDLINK_ONLY= yes
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 8f24a639b18..0641da67ea9 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/01/07 08:07:58 skrll Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/03/13 17:38:03 fredb Exp $
#
DISTNAME= qt-x11-free-${QTVERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= \
ftp://ftp.trolltech.com/qt/source/ \
diff --git a/x11/qt3-libs/buildlink.mk b/x11/qt3-libs/buildlink.mk
index 65c701c6b10..37191b13339 100644
--- a/x11/qt3-libs/buildlink.mk
+++ b/x11/qt3-libs/buildlink.mk
@@ -17,7 +17,7 @@ QT3_LIBS_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.1
+BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.0.1nb1
DEPENDS+= ${BUILDLINK_DEPENDS.qt3-libs}:../../x11/qt3-libs
EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-libs=qt3-libs
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index cc906a56d46..f504c13dfa0 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/07 08:09:16 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:38:03 fredb Exp $
#
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-tools-${QTVERSION}
+PKGREVISION= 1
COMMENT= QT GUI (WYSIWYG) builder and other tools
CONFIGURE_ARGS+= -I${BUILDLINK_QTDIR}/include \
-L${BUILDLINK_QTDIR}/lib
USE_BUILDLINK_ONLY= yes
-BUILDLINK_DEPENDS.qt3-libs= qt3-libs-${QTVERSION}
+BUILDLINK_DEPENDS.qt3-libs= qt3-libs-${QTVERSION}nb1
ALL_TARGET= sub-tools
diff --git a/x11/qt3-tools/buildlink.mk b/x11/qt3-tools/buildlink.mk
index 767c5c9e426..7204934eeb3 100644
--- a/x11/qt3-tools/buildlink.mk
+++ b/x11/qt3-tools/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/01/07 08:09:16 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:38:03 fredb Exp $
#
# This Makefile fragment is included by packages that use qt3-tools.
#
@@ -17,7 +17,7 @@ QT3_TOOLS_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.1
+BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.1nb1
DEPENDS+= ${BUILDLINK_DEPENDS.qt3-tools}:../../x11/qt3-tools
EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-tools=qt3-tools
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 0883d4e71be..a57b61bb613 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -2,6 +2,7 @@
#
DISTNAME= qt3-${QTVERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,9 +11,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_X11BASE= yes
EXTRACT_ONLY= # empty
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index a3dd170ccab..0101051d5c3 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2001/12/20 15:39:46 skrll Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:38:03 fredb Exp $
#
DISTNAME= qtarch-2.1-1
PKGNAME= qtarch-2.1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= x11 devel
MASTER_SITES= ftp://qtarch.sourceforge.net/pub/qtarch/
@@ -11,8 +12,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://qtarch.sourceforge.net/
COMMENT= Graphical dialog editor for the Qt widget set
-DEPENDS+= qt2-libs-[0-9]*:../../x11/qt2-libs
-DEPENDS+= png>=1.0.11:../../graphics/png
+DEPENDS+= qt2-libs-2.3.1nb2:../../x11/qt2-libs
+DEPENDS+= png>=1.2.1:../../graphics/png
USE_X11= yes
USE_GMAKE= yes
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 3870782c9dd..257bbbb1933 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/10/24 22:11:14 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:03 fredb Exp $
DISTNAME= qwt-0.3.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwt/}
@@ -8,7 +9,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://sourceforge.net/projects/qwt
COMMENT= Qt widget library for technical purposes
-BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.0
+BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2
USE_BUILDLINK_ONLY= yes
USE_X11BASE= yes
diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index 4f7e6aece08..360a54bfde1 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/10/22 02:27:38 mycroft Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:38:03 fredb Exp $
#
DISTNAME= rep-gtk-0.15
+PKGREVISION= 1
CATEGORIES= x11 lang
MASTER_SITES= http://prdownloads.sourceforge.net/rep-gtk/
@@ -11,9 +12,9 @@ COMMENT= librep bindings for gtk (used by sawmill)
DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= librep>=0.15:../../lang/librep
-DEPENDS+= libglade-[0-9]*:../../devel/libglade
-DEPENDS+= gnome-libs-[0-9]*:../../x11/gnome-libs
-DEPENDS+= gdk-pixbuf-gnome>=0.9.0:../../graphics/gdk-pixbuf-gnome
+DEPENDS+= libglade-0.17nb1:../../devel/libglade
+DEPENDS+= gnome-libs>=1.4.1.2nb1:../gnome-libs
+DEPENDS+= gdk-pixbuf-gnome>=0.11.0nb4:../../graphics/gdk-pixbuf-gnome
USE_X11= # defined
USE_GMAKE= # defined
diff --git a/x11/ruby-fox/Makefile b/x11/ruby-fox/Makefile
index 52c5766c3dd..2f77217111f 100644
--- a/x11/ruby-fox/Makefile
+++ b/x11/ruby-fox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 23:19:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:38:04 fredb Exp $
DISTNAME= FXRuby-0.99.174
PKGNAME= ${RUBY_PKGNAMEPREFIX}fox-0.99.174
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://prdownloads.sourceforge.net/fxruby/
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 6ce4573ef0e..9eef3c95813 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2001/12/16 08:18:57 jmc Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:04 fredb 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= 1
CATEGORIES= x11
MASTER_SITES= http://www.ruby-lang.org/gtk/download/
@@ -17,7 +18,7 @@ USE_RUBY_EXTCONF= yes
INSTALL_TARGET= site-install
-DEPENDS+= imlib-[0-9]*:../../graphics/imlib
+DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib
DOCS_EN= README README.EXT doc/rbbr.rb
DOCS_JA= README.ja README.EXT.ja
diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index 80f0916cadd..0b1856d566c 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:15 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/03/13 17:38:04 fredb Exp $
DISTNAME= wmessage-0.10
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.ozemail.com.au/~crn/wmessage/
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index f1e4cf60442..9f8cb07ef0d 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2001/11/01 09:48:19 tron Exp $
+# $NetBSD: Makefile,v 1.19 2002/03/13 17:38:04 fredb Exp $
DISTNAME= wterm-6.2.9
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://largo.windowmaker.org/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index e3e545da807..74a351568dc 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2001/12/08 11:36:26 jmc Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:04 fredb Exp $
#
DISTNAME= wxGTK-2.2.7
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk
index 57b8f4cbc26..090608e7a45 100644
--- a/x11/wxGTK/buildlink.mk
+++ b/x11/wxGTK/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/03/13 17:38:05 fredb Exp $
#
# This Makefile fragment is included by packages that use wxGTK.
#
@@ -17,7 +17,7 @@ WXGTK_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.wxGTK?= wxGTK>=2.2.2
+BUILDLINK_DEPENDS.wxGTK?= wxGTK>=2.2.7nb1
DEPENDS+= ${BUILDLINK_DEPENDS.wxGTK}:../../x11/wxGTK
EVAL_PREFIX+= BUILDLINK_PREFIX.wxGTK=wxGTK
diff --git a/x11/xdaemon2/Makefile b/x11/xdaemon2/Makefile
index 53355e6aa5e..1444cf9fe9c 100644
--- a/x11/xdaemon2/Makefile
+++ b/x11/xdaemon2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/05/17 08:32:14 abs Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:38:05 fredb Exp $
DISTNAME= xdaemon-2.0
+PKGREVISION= 1
CATEGORIES= games x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
DISTFILES= ${PIX} Daemon.README
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index a90cc588917..82d854f3b40 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2002/03/05 10:06:15 martti Exp $
+# $NetBSD: Makefile,v 1.24 2002/03/13 17:38:05 fredb Exp $
DISTNAME= xfce-3.8.14
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.xfce.org/archive/
@@ -10,7 +11,7 @@ COMMENT= Lightweight desktop environment with CDE look and feel
BUILD_USES_MSGFMT= yes
DEPENDS+= gtk+-1.2.*:../../x11/gtk
-DEPENDS+= imlib-1.9.*:../../graphics/imlib
+DEPENDS+= imlib>=1.9.11nb1:../../graphics/imlib
GCC_VERSION!= gcc --version
.if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha)
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index f06b49fdd46..c8cdb1e637f 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2002/02/09 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:38:05 fredb Exp $
#
PKGNAME= ${DISTNAME:S/-/-gnome-/}
+PKGREVISION= 1
COMMENT= Screen saver and locker for the X window system (with GNOME support)
-DEPENDS+= control-center>=1.2.0:../../x11/controlcenter
+DEPENDS+= control-center>=1.4.0.1nb1:../../x11/controlcenter
CONFLICTS+= xscreensaver-[0-9]*
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 1696df4333c..f9ed4b86bfc 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.25 2002/03/01 13:27:35 fredb Exp $
+# $NetBSD: Makefile.common,v 1.26 2002/03/13 17:38:05 fredb Exp $
#
DISTNAME= xscreensaver-4.01
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${HOMEPAGE} \
ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/
@@ -11,7 +12,7 @@ HOMEPAGE= http://www.jwz.org/xscreensaver/
DEPENDS+= gtk+-1.2.*:../../x11/gtk
DEPENDS+= gle-[0-9]*:../../graphics/gle
-DEPENDS+= gdk-pixbuf>=0.10.1:../../graphics/gdk-pixbuf
+DEPENDS+= gdk-pixbuf>=0.11.0nb1:../../graphics/gdk-pixbuf
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= libxml-1.8.16:../../textproc/libxml
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index c7527a8b592..112fe88727d 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:17 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:38:06 fredb Exp $
DISTNAME= xteddy-2.0.1
+PKGREVISION= 1
CATEGORIES= x11 games
MASTER_SITES= http://www.ITN.LiU.SE/~stegu/xteddy/