summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/file-roller/Makefile12
-rw-r--r--audio/amarok/Makefile3
-rw-r--r--audio/bmp/Makefile4
-rw-r--r--audio/bmp/Makefile.common6
-rw-r--r--audio/bmpx/Makefile4
-rw-r--r--audio/cdplayer/Makefile4
-rw-r--r--audio/exaile/Makefile3
-rw-r--r--audio/glurp/Makefile6
-rw-r--r--audio/gmpc/Makefile6
-rw-r--r--audio/gst-plugins0.8-artsd/Makefile4
-rw-r--r--audio/gst-plugins0.8-esound/Makefile4
-rw-r--r--audio/gst-plugins0.8-mad/Makefile4
-rw-r--r--audio/gtkpod/Makefile6
-rw-r--r--audio/kid3/Makefile3
-rw-r--r--audio/liteamp/Makefile4
-rw-r--r--audio/py-musique/Makefile4
-rw-r--r--audio/rhythmbox/Makefile10
-rw-r--r--audio/solfege/Makefile4
-rw-r--r--audio/sound-juicer/Makefile8
-rw-r--r--audio/streamtuner/Makefile4
-rw-r--r--audio/tunesbrowser/Makefile6
-rw-r--r--chat/gnomeicu/Makefile10
-rw-r--r--chat/gossip/Makefile10
-rw-r--r--chat/kmess/Makefile4
-rw-r--r--chat/konversation/Makefile4
-rw-r--r--chat/libpurple/Makefile6
-rw-r--r--chat/pidgin-sametime/Makefile4
-rw-r--r--chat/pidgin-silc/Makefile4
-rw-r--r--chat/xchat/Makefile10
-rw-r--r--comms/efax-gtk/Makefile3
-rw-r--r--comms/gnome-pilot/Makefile8
-rw-r--r--comms/gnome-pilot/buildlink3.mk4
-rw-r--r--converters/libwpd/Makefile4
-rw-r--r--converters/wv/Makefile4
-rw-r--r--converters/wv2/Makefile4
-rw-r--r--databases/gourmet/Makefile4
-rw-r--r--databases/gramps/Makefile4
-rw-r--r--databases/gramps2/Makefile8
-rw-r--r--databases/kmysqladmin/Makefile4
-rw-r--r--databases/krecipes/Makefile3
-rw-r--r--databases/libgnomedb/Makefile9
-rw-r--r--databases/libgnomedb/buildlink3.mk4
-rw-r--r--databases/mergeant/Makefile8
-rw-r--r--databases/rrdtool/Makefile5
-rw-r--r--databases/rrdtool/buildlink3.mk4
-rw-r--r--devel/ArX/Makefile4
-rw-r--r--devel/Gorm/Makefile3
-rw-r--r--devel/ProjectCenter/Makefile4
-rw-r--r--devel/Renaissance/Makefile4
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--devel/at-spi/Makefile3
-rw-r--r--devel/devhelp/Makefile9
-rw-r--r--devel/devhelp/buildlink3.mk4
-rw-r--r--devel/distccmon-gnome/Makefile4
-rw-r--r--devel/edcommon/Makefile4
-rw-r--r--devel/eel/Makefile10
-rw-r--r--devel/eel/buildlink3.mk8
-rw-r--r--devel/gail/Makefile3
-rw-r--r--devel/gail/buildlink3.mk4
-rw-r--r--devel/gconfmm/Makefile5
-rw-r--r--devel/gconfmm/buildlink3.mk4
-rw-r--r--devel/gdl/Makefile6
-rw-r--r--devel/glade-gnome/Makefile4
-rw-r--r--devel/glibmm/Makefile5
-rw-r--r--devel/glibmm/buildlink3.mk4
-rw-r--r--devel/gnome-build/Makefile4
-rw-r--r--devel/gnustep-examples/Makefile4
-rw-r--r--devel/guile-gnome/Makefile8
-rw-r--r--devel/kdbg/Makefile3
-rw-r--r--devel/kdesdk3/Makefile4
-rw-r--r--devel/kdevelop-base/Makefile4
-rw-r--r--devel/kdiff3/Makefile3
-rw-r--r--devel/kscope/Makefile3
-rw-r--r--devel/libbonoboui/Makefile10
-rw-r--r--devel/libbonoboui/buildlink3.mk8
-rw-r--r--devel/libextractor/Makefile4
-rw-r--r--devel/libgail-gnome/Makefile4
-rw-r--r--devel/libglademm/Makefile7
-rw-r--r--devel/libglademm/buildlink3.mk4
-rw-r--r--devel/libgnome/Makefile40
-rw-r--r--devel/libgnomemm/Makefile4
-rw-r--r--devel/libgnomeui/Makefile8
-rw-r--r--devel/libgnomeui/buildlink3.mk6
-rw-r--r--devel/libgnomeuimm/Makefile4
-rw-r--r--devel/libgsf/Makefile10
-rw-r--r--devel/libsexymm/Makefile3
-rw-r--r--devel/monotone-viz/Makefile5
-rw-r--r--devel/rox-lib/Makefile4
-rw-r--r--doc/guide/files/fixes.xml18
-rw-r--r--editors/abiword-plugins/Makefile4
-rw-r--r--editors/abiword/Makefile4
-rw-r--r--editors/conglomerate/Makefile10
-rw-r--r--editors/dasher/Makefile12
-rw-r--r--editors/gconf-editor/Makefile14
-rw-r--r--editors/gedit/Makefile12
-rw-r--r--editors/gedit/buildlink3.mk4
-rw-r--r--editors/gtranslator/Makefile4
-rw-r--r--editors/kdissert/Makefile4
-rw-r--r--editors/kile/Makefile4
-rw-r--r--editors/mlview/Makefile10
-rw-r--r--editors/tea/Makefile4
-rw-r--r--editors/vim-kde/Makefile4
-rw-r--r--emulators/kenigma/Makefile4
-rw-r--r--emulators/vice/Makefile4
-rw-r--r--finance/gnucash/Makefile36
-rw-r--r--finance/gnucash/buildlink3.mk4
-rw-r--r--finance/kmymoney2/Makefile3
-rw-r--r--fonts/gucharmap/Makefile4
-rw-r--r--games/asc/Makefile5
-rw-r--r--games/atomix/Makefile4
-rw-r--r--games/boson/Makefile4
-rw-r--r--games/ccgo/Makefile4
-rw-r--r--games/gamazons/Makefile4
-rw-r--r--games/gcompris/Makefile4
-rw-r--r--games/gnome-games/Makefile44
-rw-r--r--games/grhino/Makefile4
-rw-r--r--games/gtetrinet/Makefile8
-rw-r--r--games/gturing/Makefile4
-rw-r--r--games/kdegames3/Makefile3
-rw-r--r--games/kdetoys3/Makefile3
-rw-r--r--games/knights/Makefile4
-rw-r--r--games/kye/Makefile4
-rw-r--r--games/pioneers/Makefile4
-rw-r--r--games/pytraffic/Makefile4
-rw-r--r--games/sirius/Makefile6
-rw-r--r--games/six/Makefile4
-rw-r--r--games/teg/Makefile8
-rw-r--r--games/wormux/Makefile4
-rw-r--r--graphics/3DKit/Makefile4
-rw-r--r--graphics/Cenon/Makefile4
-rw-r--r--graphics/GLXKit/Makefile4
-rw-r--r--graphics/GeometryKit/Makefile4
-rw-r--r--graphics/GlutKit/Makefile4
-rw-r--r--graphics/ImageViewer/Makefile4
-rw-r--r--graphics/Makefile4
-rw-r--r--graphics/RenderKit/Makefile4
-rw-r--r--graphics/SDLKit/Makefile4
-rw-r--r--graphics/camlimages/Makefile6
-rw-r--r--graphics/comix/Makefile5
-rw-r--r--graphics/dia-python/Makefile3
-rw-r--r--graphics/dia/Makefile4
-rw-r--r--graphics/dia/Makefile.common6
-rw-r--r--graphics/digikam-doc/Makefile3
-rw-r--r--graphics/digikam/Makefile3
-rw-r--r--graphics/eog/Makefile14
-rw-r--r--graphics/gimageview/Makefile4
-rw-r--r--graphics/gimp-color-manager/Makefile4
-rw-r--r--graphics/gimp-fix-ca/Makefile4
-rw-r--r--graphics/gimp-rawphoto/Makefile4
-rw-r--r--graphics/gimp-refocus-it/Makefile4
-rw-r--r--graphics/gimp-ufraw/Makefile8
-rw-r--r--graphics/gimp/Makefile6
-rw-r--r--graphics/gimp/buildlink3.mk4
-rw-r--r--graphics/gimp2-wideangle/Makefile4
-rw-r--r--graphics/gimp24/Makefile6
-rw-r--r--graphics/gimp24/buildlink3.mk4
-rw-r--r--graphics/gthumb/Makefile12
-rw-r--r--graphics/gwenview-i18n/Makefile4
-rw-r--r--graphics/gwenview/Makefile4
-rw-r--r--graphics/inkscape/Makefile6
-rw-r--r--graphics/kbarcode/Makefile4
-rw-r--r--graphics/kdegraphics3/Makefile4
-rw-r--r--graphics/kipi-plugins/Makefile3
-rw-r--r--graphics/koverartist/Makefile3
-rw-r--r--graphics/kphotoalbum/Makefile3
-rw-r--r--graphics/kphotobook/Makefile4
-rw-r--r--graphics/kphotools/Makefile4
-rw-r--r--graphics/libgnomecanvas/Makefile8
-rw-r--r--graphics/libgnomecanvas/buildlink3.mk6
-rw-r--r--graphics/libgnomecanvasmm/Makefile3
-rw-r--r--graphics/libkdcraw/Makefile3
-rw-r--r--graphics/libkexif/Makefile4
-rw-r--r--graphics/libkexiv2/Makefile3
-rw-r--r--graphics/libkipi/Makefile4
-rw-r--r--graphics/librsvg/Makefile4
-rw-r--r--graphics/libscigraphica/Makefile5
-rw-r--r--graphics/libscigraphica/buildlink3.mk4
-rw-r--r--graphics/pixieplus/Makefile4
-rw-r--r--graphics/py-gtkglext/Makefile3
-rw-r--r--graphics/py-matplotlib-gtk2/Makefile4
-rw-r--r--graphics/ruby-gnome2-gnomecanvas/Makefile3
-rw-r--r--graphics/ruby-gnome2-libart/Makefile5
-rw-r--r--graphics/ruby-gnome2-rsvg/Makefile4
-rw-r--r--graphics/sane-frontends/Makefile4
-rw-r--r--graphics/scigraphica/Makefile3
-rw-r--r--graphics/showimg/Makefile4
-rw-r--r--graphics/sodipodi/Makefile6
-rw-r--r--graphics/tuxpaint/Makefile4
-rw-r--r--graphics/wxsvg/Makefile5
-rw-r--r--graphics/wxsvg/buildlink3.mk4
-rw-r--r--graphics/xsane/Makefile4
-rw-r--r--ham/gmfsk/Makefile8
-rw-r--r--ham/gpredict/Makefile5
-rw-r--r--ham/xlog/Makefile3
-rw-r--r--inputmethod/imhangul_status_applet/Makefile8
-rw-r--r--inputmethod/uim/Makefile3
-rw-r--r--lang/classpath-gui/Makefile9
-rw-r--r--lang/coq/Makefile5
-rw-r--r--lang/kaffe-x11/Makefile5
-rw-r--r--lang/sablevm-classpath-gui/Makefile6
-rw-r--r--mail/GNUMail/Makefile4
-rw-r--r--mail/balsa/Makefile4
-rw-r--r--mail/claws-mail-gtkhtml/Makefile4
-rw-r--r--mail/evolution-data-server/Makefile8
-rw-r--r--mail/evolution-exchange/Makefile10
-rw-r--r--mail/evolution/Makefile18
-rw-r--r--mail/kbiff/Makefile4
-rw-r--r--mail/mail-notification/Makefile10
-rw-r--r--math/galculator/Makefile6
-rw-r--r--math/gcalctool/Makefile8
-rw-r--r--math/genius/Makefile6
-rw-r--r--math/gnumeric-current/Makefile10
-rw-r--r--math/gnumeric/Makefile10
-rw-r--r--math/qalculate-gtk/Makefile6
-rw-r--r--math/qalculate-kde/Makefile3
-rw-r--r--meta-pkgs/gnome-base/Makefile10
-rw-r--r--meta-pkgs/gnustep/Makefile4
-rw-r--r--meta-pkgs/xfce4-extras/Makefile4
-rw-r--r--meta-pkgs/xfce4/Makefile3
-rw-r--r--misc/Addresses/Makefile4
-rw-r--r--misc/basket/Makefile3
-rw-r--r--misc/celestia/Makefile4
-rw-r--r--misc/deskbar-applet/Makefile8
-rw-r--r--misc/gnome-utils/Makefile20
-rw-r--r--misc/goffice/Makefile12
-rw-r--r--misc/goffice/buildlink3.mk8
-rw-r--r--misc/goffice0.2/Makefile10
-rw-r--r--misc/goffice0.2/buildlink3.mk8
-rw-r--r--misc/goffice0.5/Makefile12
-rw-r--r--misc/goffice0.5/buildlink3.mk8
-rw-r--r--misc/gok/Makefile10
-rw-r--r--misc/kchm/Makefile4
-rw-r--r--misc/kchmviewer/Makefile3
-rw-r--r--misc/kdeaccessibility3/Makefile4
-rw-r--r--misc/kdeaddons3/Makefile3
-rw-r--r--misc/kdeadmin3/Makefile3
-rw-r--r--misc/kdeartwork3/Makefile3
-rw-r--r--misc/kdeedu3/Makefile3
-rw-r--r--misc/kdepim3/Makefile3
-rw-r--r--misc/kdeutils3/Makefile3
-rw-r--r--misc/kmemaid/Makefile4
-rw-r--r--misc/koffice/Makefile6
-rw-r--r--misc/koffice/buildlink3.mk4
-rw-r--r--misc/openoffice2/Makefile4
-rw-r--r--misc/orca/Makefile3
-rw-r--r--misc/taskjuggler/Makefile4
-rw-r--r--misc/yelp/Makefile10
-rw-r--r--mk/defaults/options.description4
-rw-r--r--multimedia/dvdstyler/Makefile4
-rw-r--r--multimedia/gmencoder/Makefile4
-rw-r--r--multimedia/gnash/Makefile4
-rw-r--r--multimedia/gnome-media/Makefile18
-rw-r--r--multimedia/gnome-media/buildlink3.mk6
-rw-r--r--multimedia/gst-plugins0.10-good/Makefile10
-rw-r--r--multimedia/gst-plugins0.8/Makefile8
-rw-r--r--multimedia/gst-plugins0.8/buildlink3.mk4
-rw-r--r--multimedia/gstreamer0.8/Makefile4
-rw-r--r--multimedia/kaffeine/Makefile4
-rw-r--r--multimedia/kdemultimedia3/Makefile3
-rw-r--r--multimedia/kmplayer/Makefile3
-rw-r--r--multimedia/ogle_gui/Makefile6
-rw-r--r--multimedia/subtitleeditor/Makefile3
-rw-r--r--multimedia/swfdec-gtk2/Makefile4
-rw-r--r--multimedia/swfdec/Makefile6
-rw-r--r--multimedia/swfdec/buildlink3.mk4
-rw-r--r--multimedia/totem/Makefile4
-rw-r--r--multimedia/totem/Makefile.common12
-rw-r--r--net/bittorrent-gui/Makefile4
-rw-r--r--net/bug-buddy/Makefile12
-rw-r--r--net/dc_gui2/Makefile4
-rw-r--r--net/etherape/Makefile6
-rw-r--r--net/gnome-netstatus/Makefile10
-rw-r--r--net/hobbitmon/Makefile4
-rw-r--r--net/kdenetwork3/Makefile4
-rw-r--r--net/kftpgrabber/Makefile3
-rw-r--r--net/ktorrent/Makefile4
-rw-r--r--net/libtorrent/Makefile5
-rw-r--r--net/libtorrent/buildlink3.mk4
-rw-r--r--net/logjam/Makefile4
-rw-r--r--net/mldonkey-gui/Makefile4
-rw-r--r--net/mldonkey-gui/options.mk16
-rw-r--r--net/nfdump/Makefile3
-rw-r--r--net/nicotine/Makefile4
-rw-r--r--net/ntop/Makefile3
-rw-r--r--net/rtorrent/Makefile3
-rw-r--r--net/tsclient/Makefile4
-rw-r--r--net/unison/Makefile4
-rw-r--r--net/unison/options.mk8
-rw-r--r--net/vino/Makefile10
-rw-r--r--parallel/ganglia-monitor-core/Makefile4
-rw-r--r--print/advi/Makefile6
-rw-r--r--print/evince-nautilus/Makefile4
-rw-r--r--print/evince/Makefile16
-rw-r--r--print/evince/Makefile.common4
-rw-r--r--print/glabels/Makefile6
-rw-r--r--print/kbibtex/Makefile4
-rw-r--r--print/libgnomeprint/Makefile5
-rw-r--r--print/libgnomeprint/buildlink3.mk4
-rw-r--r--print/libgnomeprintui/Makefile9
-rw-r--r--print/libgnomeprintui/buildlink3.mk8
-rw-r--r--print/ruby-gnome2-gnomeprint/Makefile3
-rw-r--r--print/scribus/Makefile7
-rw-r--r--security/Bastille/Makefile4
-rw-r--r--security/gnome-keyring-manager/Makefile10
-rw-r--r--security/gpass/Makefile6
-rw-r--r--security/honeyd/Makefile4
-rw-r--r--security/kssh/Makefile4
-rw-r--r--security/seahorse-gedit/Makefile10
-rw-r--r--security/seahorse-nautilus/Makefile6
-rw-r--r--security/seahorse/Makefile10
-rw-r--r--security/seahorse/buildlink3.mk4
-rw-r--r--sysutils/bacula-gnome-console/Makefile4
-rw-r--r--sysutils/burn/Makefile4
-rw-r--r--sysutils/filelight/Makefile4
-rw-r--r--sysutils/gcdmaster/Makefile6
-rw-r--r--sysutils/gnome-menus/Makefile4
-rw-r--r--sysutils/gnome-pkgview/Makefile8
-rw-r--r--sysutils/gnome-system-monitor/Makefile8
-rw-r--r--sysutils/gnome-vfs-monikers/Makefile4
-rw-r--r--sysutils/gnome-vfs/Makefile16
-rw-r--r--sysutils/gnome-vfs/Makefile.common4
-rw-r--r--sysutils/gnome-vfs/buildlink3.mk4
-rw-r--r--sysutils/gnome-vfsmm/Makefile4
-rw-r--r--sysutils/gst-plugins0.10-gnomevfs/Makefile4
-rw-r--r--sysutils/gst-plugins0.8-gnomevfs/Makefile4
-rw-r--r--sysutils/gworkspace/Makefile4
-rw-r--r--sysutils/k3b/Makefile3
-rw-r--r--sysutils/kdirstat/Makefile3
-rw-r--r--sysutils/krusader/Makefile3
-rw-r--r--sysutils/libgtop/Makefile4
-rw-r--r--sysutils/nautilus-cd-burner/Makefile12
-rw-r--r--sysutils/nautilus/Makefile10
-rw-r--r--sysutils/nautilus/buildlink3.mk6
-rw-r--r--sysutils/notification-daemon/Makefile6
-rw-r--r--sysutils/py-gnome-menus/Makefile4
-rw-r--r--sysutils/py-notify/Makefile3
-rw-r--r--sysutils/rox/Makefile4
-rw-r--r--sysutils/xfce4-thunar/Makefile5
-rw-r--r--sysutils/xfce4-thunar/buildlink3.mk4
-rw-r--r--textproc/gnome-spell/Makefile6
-rw-r--r--textproc/gnome-spell/buildlink3.mk4
-rw-r--r--textproc/libcroco/Makefile4
-rw-r--r--textproc/libxml++/Makefile3
-rw-r--r--textproc/py-gdick/Makefile4
-rw-r--r--time/cairo-clock/Makefile6
-rw-r--r--time/evolution-webcal/Makefile8
-rw-r--r--time/gdeskcal/Makefile4
-rw-r--r--time/gnotime/Makefile10
-rw-r--r--time/gtodo-applet/Makefile8
-rw-r--r--time/gtodo/Makefile8
-rw-r--r--time/planner/Makefile10
-rw-r--r--time/rsibreak/Makefile3
-rw-r--r--wm/compiz/Makefile10
-rw-r--r--wm/e16menuedit2/Makefile5
-rw-r--r--wm/gnome-compiz-manager/Makefile10
-rw-r--r--wm/metacity/Makefile7
-rw-r--r--wm/metacity/buildlink3.mk4
-rw-r--r--wm/obconf/Makefile5
-rw-r--r--www/bluefish/Makefile4
-rw-r--r--www/browser-bookmarks-menu/Makefile3
-rw-r--r--www/drivel/Makefile10
-rw-r--r--www/epiphany-extensions/Makefile10
-rw-r--r--www/epiphany/Makefile16
-rw-r--r--www/epiphany/buildlink3.mk6
-rw-r--r--www/galeon/Makefile8
-rw-r--r--www/gtkhtml314/Makefile6
-rw-r--r--www/gtkhtml314/buildlink3.mk4
-rw-r--r--www/gtkhtml38/Makefile6
-rw-r--r--www/gtkhtml38/buildlink3.mk4
-rw-r--r--www/kdewebdev3/Makefile3
-rw-r--r--www/libgtkhtml/Makefile4
-rw-r--r--www/liferea/Makefile8
-rw-r--r--x11/Makefile4
-rw-r--r--x11/alacarte/Makefile4
-rw-r--r--x11/antiright/Makefile3
-rw-r--r--x11/control-center/Makefile22
-rw-r--r--x11/control-center/buildlink3.mk6
-rw-r--r--x11/devilspie/Makefile5
-rw-r--r--x11/fast-user-switch-applet/Makefile10
-rw-r--r--x11/gdm/Makefile10
-rw-r--r--x11/gnome-applets/Makefile30
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-mag/Makefile3
-rw-r--r--x11/gnome-panel/Makefile30
-rw-r--r--x11/gnome-panel/buildlink3.mk6
-rw-r--r--x11/gnome-screensaver/Makefile12
-rw-r--r--x11/gnome-session/Makefile10
-rw-r--r--x11/gnome-terminal/Makefile10
-rw-r--r--x11/gnome-themes-extras/Makefile4
-rw-r--r--x11/gnopernicus/Makefile14
-rw-r--r--x11/gnustep-back/Makefile6
-rw-r--r--x11/gnustep-back/buildlink3.mk4
-rw-r--r--x11/gnustep-preferences/Makefile4
-rw-r--r--x11/gtk2-sharp/Makefile8
-rw-r--r--x11/gtkmm/Makefile3
-rw-r--r--x11/gtksourceview/Makefile3
-rw-r--r--x11/gtkterm2/Makefile4
-rw-r--r--x11/kde3-i18n-af/Makefile3
-rw-r--r--x11/kde3-i18n-ar/Makefile3
-rw-r--r--x11/kde3-i18n-az/Makefile3
-rw-r--r--x11/kde3-i18n-bg/Makefile3
-rw-r--r--x11/kde3-i18n-bn/Makefile3
-rw-r--r--x11/kde3-i18n-br/Makefile3
-rw-r--r--x11/kde3-i18n-bs/Makefile3
-rw-r--r--x11/kde3-i18n-ca/Makefile3
-rw-r--r--x11/kde3-i18n-cs/Makefile3
-rw-r--r--x11/kde3-i18n-cy/Makefile3
-rw-r--r--x11/kde3-i18n-da/Makefile3
-rw-r--r--x11/kde3-i18n-de/Makefile3
-rw-r--r--x11/kde3-i18n-el/Makefile3
-rw-r--r--x11/kde3-i18n-en_GB/Makefile3
-rw-r--r--x11/kde3-i18n-eo/Makefile3
-rw-r--r--x11/kde3-i18n-es/Makefile3
-rw-r--r--x11/kde3-i18n-et/Makefile3
-rw-r--r--x11/kde3-i18n-eu/Makefile3
-rw-r--r--x11/kde3-i18n-fa/Makefile3
-rw-r--r--x11/kde3-i18n-fi/Makefile3
-rw-r--r--x11/kde3-i18n-fr/Makefile3
-rw-r--r--x11/kde3-i18n-fy/Makefile3
-rw-r--r--x11/kde3-i18n-ga/Makefile3
-rw-r--r--x11/kde3-i18n-gl/Makefile3
-rw-r--r--x11/kde3-i18n-he/Makefile3
-rw-r--r--x11/kde3-i18n-hi/Makefile3
-rw-r--r--x11/kde3-i18n-hr/Makefile3
-rw-r--r--x11/kde3-i18n-hu/Makefile3
-rw-r--r--x11/kde3-i18n-is/Makefile3
-rw-r--r--x11/kde3-i18n-it/Makefile3
-rw-r--r--x11/kde3-i18n-ja/Makefile3
-rw-r--r--x11/kde3-i18n-kk/Makefile3
-rw-r--r--x11/kde3-i18n-km/Makefile3
-rw-r--r--x11/kde3-i18n-ko/Makefile3
-rw-r--r--x11/kde3-i18n-lt/Makefile3
-rw-r--r--x11/kde3-i18n-lv/Makefile3
-rw-r--r--x11/kde3-i18n-mk/Makefile3
-rw-r--r--x11/kde3-i18n-mn/Makefile3
-rw-r--r--x11/kde3-i18n-ms/Makefile3
-rw-r--r--x11/kde3-i18n-nb/Makefile3
-rw-r--r--x11/kde3-i18n-nds/Makefile3
-rw-r--r--x11/kde3-i18n-nl/Makefile3
-rw-r--r--x11/kde3-i18n-nn/Makefile3
-rw-r--r--x11/kde3-i18n-pa/Makefile3
-rw-r--r--x11/kde3-i18n-pl/Makefile3
-rw-r--r--x11/kde3-i18n-pt/Makefile3
-rw-r--r--x11/kde3-i18n-pt_BR/Makefile3
-rw-r--r--x11/kde3-i18n-ro/Makefile3
-rw-r--r--x11/kde3-i18n-ru/Makefile3
-rw-r--r--x11/kde3-i18n-rw/Makefile3
-rw-r--r--x11/kde3-i18n-se/Makefile3
-rw-r--r--x11/kde3-i18n-sk/Makefile3
-rw-r--r--x11/kde3-i18n-sl/Makefile3
-rw-r--r--x11/kde3-i18n-sr/Makefile3
-rw-r--r--x11/kde3-i18n-sr_Latn/Makefile3
-rw-r--r--x11/kde3-i18n-ss/Makefile3
-rw-r--r--x11/kde3-i18n-sv/Makefile3
-rw-r--r--x11/kde3-i18n-ta/Makefile3
-rw-r--r--x11/kde3-i18n-tg/Makefile3
-rw-r--r--x11/kde3-i18n-tr/Makefile3
-rw-r--r--x11/kde3-i18n-uk/Makefile3
-rw-r--r--x11/kde3-i18n-uz/Makefile3
-rw-r--r--x11/kde3-i18n-vi/Makefile3
-rw-r--r--x11/kde3-i18n-zh_CN/Makefile3
-rw-r--r--x11/kde3-i18n-zh_TW/Makefile3
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/kdebindings-ruby/Makefile3
-rw-r--r--x11/kdelibdocs3/Makefile3
-rw-r--r--x11/kdelibs3/Makefile6
-rw-r--r--x11/kdelibs3/buildlink3.mk4
-rw-r--r--x11/kkbswitch/Makefile4
-rw-r--r--x11/kmessage/Makefile4
-rw-r--r--x11/libgnomekbd/Makefile10
-rw-r--r--x11/libzvt/Makefile6
-rw-r--r--x11/libzvt/buildlink3.mk4
-rw-r--r--x11/py-gnome2-desktop/Makefile4
-rw-r--r--x11/py-gnome2-extras/Makefile4
-rw-r--r--x11/py-gnome2/Makefile8
-rw-r--r--x11/py-gtk2/Makefile5
-rw-r--r--x11/py-gtk2/buildlink3.mk4
-rw-r--r--x11/rep-gtk2/Makefile5
-rw-r--r--x11/rox-session/Makefile4
-rw-r--r--x11/ruby-gnome2-gnome/Makefile4
-rw-r--r--x11/ruby-gnome2-panelapplet/Makefile4
-rw-r--r--x11/vte/Makefile3
-rw-r--r--x11/xfce4-desktop/Makefile3
-rw-r--r--x11/xfce4-terminal/Makefile4
-rw-r--r--x11/xscreensaver-demo/Makefile5
-rw-r--r--x11/zenity/Makefile6
486 files changed, 1420 insertions, 1263 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index ba1e9954a25..4d2bdb0313b 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:25 wiz Exp $
#
DISTNAME= file-roller-2.18.4
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -21,19 +21,19 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_PKGLOCALEDIR= yes
-GCONF2_SCHEMAS= file-roller.schemas
+GCONF_SCHEMAS= file-roller.schemas
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0
BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.10.0
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
-BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.libglade+= libglade>=2.4.0
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 12d35d0e03f..852d5e5b275 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2007/08/30 00:01:35 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/21 13:03:26 wiz Exp $
DISTNAME= amarok-${VERSION}
VERSION= 1.4.7
+PKGREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE:=amarok/${VERSION}/src/}
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index 9c26cb3ea32..b2fe806e851 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:03:26 wiz Exp $
#
BMP_ENABLE_ENCODERS= yes
.include "Makefile.common"
-PKGREVISION= 3
+PKGREVISION= 4
DEPENDS+= unzip-[0-9]*:../../archivers/unzip
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 836b8c08721..65cee46b647 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2007/09/19 23:13:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.24 2007/09/21 13:03:26 wiz Exp $
#
DISTNAME= bmp-0.9.7.1
@@ -52,7 +52,7 @@ PKG_SUPPORTED_OPTIONS= gnome inet6 xmms-eq
.if !empty(PKG_OPTIONS:Mgnome)
CONFIGURE_ARGS+= --enable-gconf
CONFIGURE_ARGS+= --enable-gnome-vfs
-. include "../../devel/GConf2/buildlink3.mk"
+. include "../../devel/GConf/buildlink3.mk"
. include "../../sysutils/gnome-vfs/buildlink3.mk"
.endif
@@ -91,7 +91,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index 00253f163f0..f75eee99f07 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:03:26 wiz Exp $
#
DISTNAME= bmpx-0.40.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://files.beep-media-player.org/releases/0.40/
EXTRACT_SUFX= .tar.bz2
diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile
index b365a535aae..d1ad1e7cb88 100644
--- a/audio/cdplayer/Makefile
+++ b/audio/cdplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:26 wiz Exp $
#
DISTNAME= cdplayer-0.4.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= audio gnustep
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsburn/}
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 9ea70a3761b..78a1252ad6a 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/09/03 10:21:08 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:26 wiz Exp $
#
DISTNAME= exaile_0.2.10
PKGNAME= exaile-0.2.10
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.exaile.org/files/
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index 70020af0721..fe0666c697d 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/07/05 05:37:39 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:26 wiz Exp $
#
DISTNAME= glurp-0.11.6
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=glurp/}
@@ -15,6 +15,6 @@ USE_DIRS+= xdg-1.1
USE_TOOLS+= intltool pkg-config
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index c002bed8a96..b8e49754738 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:13:12 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:03:26 wiz Exp $
#
DISTNAME= gmpc-0.13.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://download.qballcow.nl/programs/gmpc-0.13/
@@ -19,7 +19,7 @@ USE_DIRS+= xdg-1.1
.include "../../audio/libmpd/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/audio/gst-plugins0.8-artsd/Makefile b/audio/gst-plugins0.8-artsd/Makefile
index 07278cdb1f2..a17e3104cf1 100644
--- a/audio/gst-plugins0.8-artsd/Makefile
+++ b/audio/gst-plugins0.8-artsd/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:03:27 wiz Exp $
#
GST_PLUGINS0.8_NAME= artsd
GST_PLUGINS0.8_DIR= ext/artsd
.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
+PKGREVISION= 6
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/arts/buildlink3.mk"
diff --git a/audio/gst-plugins0.8-esound/Makefile b/audio/gst-plugins0.8-esound/Makefile
index 4568ec86115..f8f82111632 100644
--- a/audio/gst-plugins0.8-esound/Makefile
+++ b/audio/gst-plugins0.8-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:03:27 wiz Exp $
#
GST_PLUGINS0.8_NAME= esound
@@ -6,7 +6,7 @@ GST_PLUGINS0.8_DIR= ext/esd
GST_PLUGINS0.8_FLAG= esd
.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
+PKGREVISION= 6
.include "../../audio/esound/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-mad/Makefile b/audio/gst-plugins0.8-mad/Makefile
index 861a502d884..8e52c9cdde7 100644
--- a/audio/gst-plugins0.8-mad/Makefile
+++ b/audio/gst-plugins0.8-mad/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:03:27 wiz Exp $
#
GST_PLUGINS0.8_NAME= mad
GST_PLUGINS0.8_DIR= ext/mad
.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 5
+PKGREVISION= 6
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index c0ce3f30f54..d06ff380ce7 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2007/08/07 00:06:32 smb Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:27 wiz Exp $
#
DISTNAME= gtkpod-0.99.8
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
-PKGREVISION= 1
PATCHFILES= gtkpod-0.99.8_libgpod-0.4.2.diff
PATCH_SITES= http://ftp.osuosl.org/pub/gentoo/distfiles/
@@ -42,7 +42,7 @@ BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.4.2
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 21073fe3697..bc93fed2c33 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:30:03 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:27 wiz Exp $
#
DISTNAME= kid3-0.8.1
+PKGREVISION= 1
CATEGORIES= kde audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kid3/}
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 1c30055be8f..dd1d29fe15a 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/09/19 23:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:03:27 wiz Exp $
DISTNAME= liteamp-0.2.4.2
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= audio
MASTER_SITES= http://kldp.net/frs/download.php/1153/
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index 0f17ba0ac31..59b0b50618b 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:06 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:27 wiz Exp $
#
DISTNAME= pymusique-0.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.pyronecrophilia.com/content/pymusique/
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 499aa54ae04..a7218adf562 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/09/21 13:03:27 wiz Exp $
#
DISTNAME= rhythmbox-0.9.8
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/rhythmbox/0.9/}
EXTRACT_SUFX= .tar.bz2
@@ -23,17 +23,17 @@ CONFIGURE_ARGS+= --without-hal
CONFIGURE_ARGS+= --without-ipod
CONFIGURE_ARGS+= --disable-python
-GCONF2_SCHEMAS= rhythmbox.schemas
+GCONF_SCHEMAS= rhythmbox.schemas
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
BUILDLINK_API_DEPENDS.musicbrainz+= musicbrainz>=2.1.0
BUILDLINK_API_DEPENDS.totem+= {totem,totem-xine}>=1.1.5
.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libsexy/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 2914595d769..bd837b2f8fb 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/08/30 15:46:20 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:28 wiz Exp $
#
DISTNAME= solfege-3.8.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=solfege/}
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 08b493efbb4..b74b86c033d 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:28 wiz Exp $
#
DISTNAME= sound-juicer-2.14.5
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://www.burtonini.com/computing/
@@ -19,11 +19,11 @@ CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
MAKE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
CONFIGURE_ENV+= GST_INSPECT="${LOCALBASE}/bin/gst-inspect-0.10"
-GCONF2_SCHEMAS+= sound-juicer.schemas
+GCONF_SCHEMAS+= sound-juicer.schemas
BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.3
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 33f6a20b926..2a640f9a9ef 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2006/11/19 11:50:23 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:28 wiz Exp $
#
DISTNAME= streamtuner-0.99.99
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= audio www
MASTER_SITES= http://savannah.nongnu.org/download/streamtuner/
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index 430c2572851..638890e62fb 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:13:13 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:03:28 wiz Exp $
#
DISTNAME= tunesbrowser-0.3.0
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= audio
MASTER_SITES= http://craz.net/programs/itunes/files/
EXTRACT_SUFX= .tar.bz2
@@ -23,7 +23,7 @@ BUILDLINK_API_DEPENDS.libopendaap+= libopendaap>=0.4.0
.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
.include "../../audio/libopendaap/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../multimedia/gstreamer0.8/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk"
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 22c124ad62e..2e075d775bd 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2007/09/19 23:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/21 13:03:28 wiz Exp $
DISTNAME= gnomeicu-0.99.12
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
EXTRACT_SUFX= .tar.bz2
@@ -23,13 +23,13 @@ EGDIR= ${PREFIX}/share/examples/gnomeicu
CONF_FILES= ${EGDIR}/sound/events/GnomeICU.soundlist \
${PKG_SYSCONFDIR}/sound/events/GnomeICU.soundlist
-GCONF2_SCHEMAS= gnomeicu.schemas
+GCONF_SCHEMAS= gnomeicu.schemas
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/gdbm/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 0c837b3ad5f..75cf13d2b54 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2007/09/19 23:13:13 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2007/09/21 13:03:28 wiz Exp $
#
DISTNAME= gossip-0.10.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gossip/0.10/}
EXTRACT_SUFX= .tar.bz2
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-GCONF2_SCHEMAS= gossip.schemas
+GCONF_SCHEMAS= gossip.schemas
EGDIR= ${PREFIX}/share/examples/gossip
CONF_FILES= ${EGDIR}/sound/events/gossip.soundlist \
@@ -30,10 +30,10 @@ INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR}
.include "../../chat/loudmouth/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/chat/kmess/Makefile b/chat/kmess/Makefile
index b9ebd27615a..7563f901b34 100644
--- a/chat/kmess/Makefile
+++ b/chat/kmess/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:49:32 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:03:28 wiz Exp $
#
DISTNAME= kmess-1.4.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kmess/}
diff --git a/chat/konversation/Makefile b/chat/konversation/Makefile
index d494c7ce418..2d2044f58c9 100644
--- a/chat/konversation/Makefile
+++ b/chat/konversation/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/07/25 02:44:10 markd Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:28 wiz Exp $
#
DISTNAME= konversation-1.0.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= chat kde
MASTER_SITES= http://download.berlios.de/konversation/
EXTRACT_SUFX= .tar.bz2
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index 9480a06db19..b61430a2d7d 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/09/15 14:55:01 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:29 wiz Exp $
#
PKGNAME= libpurple-${PIDGIN_VERSION}
@@ -14,7 +14,7 @@ MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
USE_TOOLS+= msgfmt intltool
## #USE_DIRS+= xdg-1.2
-GCONF2_SCHEMAS+= purple.schemas
+GCONF_SCHEMAS+= purple.schemas
PKGCONFIG_OVERRIDE+= gaim.pc.in
PKGCONFIG_OVERRIDE+= libpurple/purple.pc.in
@@ -33,6 +33,6 @@ BUILD_DIRS= m4macros libpurple po share
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index 1a51fe2086f..edc9b358313 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/09/04 19:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:29 wiz Exp $
#
PKGNAME= pidgin-sametime-${PIDGIN_VERSION}
@@ -19,7 +19,7 @@ BUILD_DIRS= libpurple/protocols/sametime
.include "../../chat/meanwhile/buildlink3.mk"
.include "../../chat/libpurple/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index 498d731cb85..34625282407 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/09/04 19:09:48 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:29 wiz Exp $
#
PKGNAME= pidgin-silc-${PIDGIN_VERSION}
@@ -48,7 +48,7 @@ SUBST_SED.linkage= -e 's/-lsilcclient -lsilc/-Wl,--whole-archive,libsilcclient.a
.include "../../chat/libpurple/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
#.include "../../devel/silc-toolkit/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 37f98d8561b..ef1b1b2fed4 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2007/08/10 19:14:06 tron Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/21 13:03:29 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -14,7 +14,7 @@ CONFLICTS= xchat-gnome-[0-9]*
USE_TOOLS+= msgfmt
USE_PKGLOCALEDIR= YES
USE_DIRS+= xdg-1.1
-GCONF2_SCHEMAS= apps_xchat_url_handler.schemas
+GCONF_SCHEMAS= apps_xchat_url_handler.schemas
CONFIGURE_ARGS+= --enable-tcl=no
CONFIGURE_ARGS+= --disable-perl
@@ -51,10 +51,10 @@ post-install:
.if !empty(PKG_OPTIONS:Mgnome)
- ${INSTALL_DATA_DIR} ${DESTDIR}${GCONF2_SCHEMAS_DIR}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${GCONF_SCHEMAS_DIR}
# In case there're ever additional schema files, use ODE loop.
- ${GCONF2_SCHEMAS:@.s.@${INSTALL_DATA} ${WRKSRC}/src/common/dbus/${.s.} \
- ${DESTDIR}${GCONF2_SCHEMAS_DIR}/@}
+ ${GCONF_SCHEMAS:@.s.@${INSTALL_DATA} ${WRKSRC}/src/common/dbus/${.s.} \
+ ${DESTDIR}${GCONF_SCHEMAS_DIR}/@}
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 112d742caff..c56c23d5293 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2007/03/21 22:15:11 adam Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:29 wiz Exp $
DISTNAME= efax-gtk-3.0.14.src
PKGNAME= efax-gtk-3.0.14
+PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=efax-gtk/}
EXTRACT_SUFX= .tgz
diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index b7768bf445d..0f441a2b05c 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/09/19 23:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:29 wiz Exp $
#
DISTNAME= gnome-pilot-2.0.15
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-pilot/2.0/}
@@ -22,8 +22,8 @@ CONFIGURE_ARGS+= --with-pisock=${BUILDLINK_PREFIX.pilot-link-libs}
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../comms/pilot-link-libs/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/comms/gnome-pilot/buildlink3.mk b/comms/gnome-pilot/buildlink3.mk
index b8b418f10c8..d39fc2657c1 100644
--- a/comms/gnome-pilot/buildlink3.mk
+++ b/comms/gnome-pilot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/06/05 05:37:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/09/21 13:03:29 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_PILOT_BUILDLINK3_MK:= ${GNOME_PILOT_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.gnome-pilot?= ../../comms/gnome-pilot
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../comms/pilot-link-libs/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/converters/libwpd/Makefile b/converters/libwpd/Makefile
index 0789c4e2203..af69d578778 100644
--- a/converters/libwpd/Makefile
+++ b/converters/libwpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/09/19 23:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:03:29 wiz Exp $
DISTNAME= libwpd-0.8.9
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwpd/}
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 18431d4a2ed..1ee07717bca 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2007/09/19 23:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2007/09/21 13:03:30 wiz Exp $
DISTNAME= wv-1.2.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile
index 40495388184..71a5e52b77e 100644
--- a/converters/wv2/Makefile
+++ b/converters/wv2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2007/09/19 23:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:03:30 wiz Exp $
#
DISTNAME= wv2-0.2.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
EXTRACT_SUFX= .tar.bz2
diff --git a/databases/gourmet/Makefile b/databases/gourmet/Makefile
index ec954cc1516..31a79569eb0 100644
--- a/databases/gourmet/Makefile
+++ b/databases/gourmet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:30 wiz Exp $
#
DISTNAME= gourmet-0.8.5.14
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=grecipe-manager/}
diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index a71a5a8fa52..8ee67dbffd4 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2007/09/19 23:13:13 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:03:30 wiz Exp $
#
DISTNAME= gramps-1.0.11
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/}
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 69df1502253..248c608f5a0 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/09/19 23:13:13 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:03:31 wiz Exp $
#
DISTNAME= gramps-2.2.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/}
@@ -22,7 +22,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_VERSIONS_ACCEPTED= 24
MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
-GCONF2_SCHEMAS+= gramps.schemas
+GCONF_SCHEMAS+= gramps.schemas
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
@@ -33,7 +33,7 @@ GCONF2_SCHEMAS+= gramps.schemas
.include "../../x11/py-gnome2/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 77d7f8a3bca..160c8974d5b 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:18 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/21 13:03:32 wiz Exp $
DISTNAME= kmysqladmin-0.7.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= databases kde
MASTER_SITES= http://www.alwins-world.de/programs/download/kmysqladmin/
diff --git a/databases/krecipes/Makefile b/databases/krecipes/Makefile
index b3396b5a3a6..40882dfa627 100644
--- a/databases/krecipes/Makefile
+++ b/databases/krecipes/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/02/08 20:17:53 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:32 wiz Exp $
#
DISTNAME= krecipes-1.0-beta1
+PKGREVISION= 1
CATEGORIES= databases kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=krecipes/}
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 3dec2897c4c..26de8d00df4 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2007/08/04 11:23:32 obache Exp $
+# $NetBSD: Makefile,v 1.64 2007/09/21 13:03:32 wiz Exp $
#
DISTNAME= libgnomedb-3.0.0
+PKGREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomedb/3.0/}
EXTRACT_SUFX= .tar.bz2
@@ -19,14 +20,14 @@ GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= libgnomedb-3.0.pc.in libgnomedb-extra-3.0.pc.in \
libgnomedb-graph-3.0.pc.in
-GCONF2_SCHEMAS= libgnomedb-3.0.schemas
+GCONF_SCHEMAS= libgnomedb-3.0.schemas
BUILDLINK_API_DEPENDS.libgda+= libgda>=3.0.0
.include "../../databases/libgda/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
index 7a8d8b09cef..85ae9b918a9 100644
--- a/databases/libgnomedb/buildlink3.mk
+++ b/databases/libgnomedb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2007/08/04 11:23:32 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2007/09/21 13:03:32 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEDB_BUILDLINK3_MK:= ${LIBGNOMEDB_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb
.include "../../databases/libgda/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtksourceview/buildlink3.mk"
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index b443dbc51b2..de5000f2a17 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2007/09/19 23:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/09/21 13:03:32 wiz Exp $
#
DISTNAME= mergeant-0.66
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/mergeant/0.66/}
EXTRACT_SUFX= .tar.bz2
@@ -20,9 +20,9 @@ USE_LIBTOOL= YES
.include "../../databases/libgda/buildlink3.mk"
.include "../../databases/libgnomedb/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 4b412831cac..41f882ee130 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2007/05/30 07:32:33 martti Exp $
+# $NetBSD: Makefile,v 1.58 2007/09/21 13:03:33 wiz Exp $
DISTNAME= rrdtool-1.2.23
+PKGREVISION= 1
CATEGORIES= databases graphics net
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
@@ -33,7 +34,7 @@ SUBST_SED.prefix= -e '1s,^\#! \$${prefix},\#! ${PREFIX},'
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index 4e59351c0b6..e79824022fd 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/05/30 07:27:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:03:33 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RRDTOOL_BUILDLINK3_MK:= ${RRDTOOL_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.rrdtool?= ../../databases/rrdtool
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index 19d97c435d3..cf09db2e22c 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/09/20 20:47:01 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:33 wiz Exp $
#
DISTNAME= ArX-2.2.4
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= devel scm
MASTER_SITES= http://savannah.nongnu.org/download/arx/
diff --git a/devel/Gorm/Makefile b/devel/Gorm/Makefile
index 53cf67e15ed..bd113671bc6 100644
--- a/devel/Gorm/Makefile
+++ b/devel/Gorm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2006/09/22 07:08:15 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/21 13:03:33 wiz Exp $
DISTNAME= gorm-1.1.0
PKGNAME= Gorm-1.1.0
+PKGREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=dev-apps/}
diff --git a/devel/ProjectCenter/Makefile b/devel/ProjectCenter/Makefile
index 7ad82d7e826..68fb4329ed9 100644
--- a/devel/ProjectCenter/Makefile
+++ b/devel/ProjectCenter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2006/09/22 07:08:15 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/21 13:03:33 wiz Exp $
DISTNAME= ProjectCenter-0.4.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=dev-apps/}
diff --git a/devel/Renaissance/Makefile b/devel/Renaissance/Makefile
index c5b1afab49b..4bd3663dd19 100644
--- a/devel/Renaissance/Makefile
+++ b/devel/Renaissance/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/09/22 07:08:15 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:33 wiz Exp $
#
DISTNAME= Renaissance-0.8.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= devel gnustep
MASTER_SITES= http://www.gnustep.it/Renaissance/Download/
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 0103f3203cd..dcd052e8b3a 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2007/09/19 23:57:00 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2007/09/21 13:03:33 wiz Exp $
DISTNAME= anjuta-2.0.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=anjuta/}
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index 5b1ab2eb079..b9959f8c17c 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/04/10 18:15:01 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:33 wiz Exp $
#
DISTNAME= at-spi-1.18.1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/at-spi/1.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 20ff6ccabb3..6349fc3a1d0 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2007/09/18 19:23:01 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2007/09/21 13:03:34 wiz Exp $
DISTNAME= devhelp-0.16
+PKGREVISION= 1
CATEGORIES= devel x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/devhelp/0.16/}
EXTRACT_SUFX= .tar.bz2
@@ -18,14 +19,14 @@ USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= libdevhelp-1.0.pc.in
-GCONF2_SCHEMAS= devhelp.schemas
+GCONF_SCHEMAS= devhelp.schemas
.include "options.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/devel/devhelp/buildlink3.mk b/devel/devhelp/buildlink3.mk
index f01088acc8c..c36d569ee2f 100644
--- a/devel/devhelp/buildlink3.mk
+++ b/devel/devhelp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/01/07 12:03:59 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:03:34 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DEVHELP_BUILDLINK3_MK:= ${DEVHELP_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.devhelp?= ../../devel/devhelp
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/devel/distccmon-gnome/Makefile b/devel/distccmon-gnome/Makefile
index bd3fb0d0369..9cf6e44348c 100644
--- a/devel/distccmon-gnome/Makefile
+++ b/devel/distccmon-gnome/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2007/09/19 23:18:45 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:34 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-gnome-/}
COMMENT= Graphical monitor for distcc, the distributed C/C++ compiler
.include "../../devel/distcc/Makefile.common"
-PKGREVISION= 9
+PKGREVISION= 10
USE_TOOLS+= pkg-config
diff --git a/devel/edcommon/Makefile b/devel/edcommon/Makefile
index 3ac227f926f..9cc29ac9a64 100644
--- a/devel/edcommon/Makefile
+++ b/devel/edcommon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/10/04 21:35:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:34 wiz Exp $
#
DISTNAME= edcommon-32-s
PKGNAME= ${DISTNAME:S/-s$//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel gnustep
MASTER_SITES= http://www.mulle-kybernetik.com/software/EDFrameworks/Downloads/
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 10f88caabb0..4ecd058d799 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2007/09/20 21:21:04 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/21 13:03:34 wiz Exp $
DISTNAME= eel-2.18.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eel/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -23,15 +23,15 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.9.1
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.9.4
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gail/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../sysutils/gnome-menus/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/eel/buildlink3.mk b/devel/eel/buildlink3.mk
index 9a77872d5b7..99fb2af47c6 100644
--- a/devel/eel/buildlink3.mk
+++ b/devel/eel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/09/20 21:21:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:03:34 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EEL_BUILDLINK3_MK:= ${EEL_BUILDLINK3_MK}+
@@ -17,14 +17,14 @@ BUILDLINK_ABI_DEPENDS.eel?= eel>=2.18.0.1nb1
BUILDLINK_PKGSRCDIR.eel?= ../../devel/eel
.endif # EEL_BUILDLINK3_MK
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gail/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../sysutils/gnome-menus/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index 0cd075b312c..3c5670df3f3 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2007/09/18 21:16:55 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/21 13:03:34 wiz Exp $
#
DISTNAME= gail-1.20.0
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gail/1.20/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
index 179c8df54ba..ef137ac794e 100644
--- a/devel/gail/buildlink3.mk
+++ b/devel/gail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:03:34 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAIL_BUILDLINK3_MK:= ${GAIL_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.gail?= ../../devel/gail
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 8b930aef299..fa61b5503e0 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/04/10 11:41:01 adam Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:03:34 wiz Exp $
DISTNAME= gconfmm-2.18.0
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gconfmm/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -16,6 +17,6 @@ USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gconf/gconfmm-2.6.pc.in
GNU_CONFIGURE= yes
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk
index 70bcdce4ff4..e30757c6795 100644
--- a/devel/gconfmm/buildlink3.mk
+++ b/devel/gconfmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/29 14:09:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/09/21 13:03:35 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONFMM_BUILDLINK3_MK:= ${GCONFMM_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.gconfmm+= gconfmm>=2.14.0nb1
BUILDLINK_PKGSRCDIR.gconfmm?= ../../devel/gconfmm
.endif # GCONFMM_BUILDLINK3_MK
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gdl/Makefile b/devel/gdl/Makefile
index 5300ee8192d..d75fbd5fd3d 100644
--- a/devel/gdl/Makefile
+++ b/devel/gdl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/09/19 23:18:45 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:03:35 wiz Exp $
#
DISTNAME= gdl-0.6.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdl/0.6/}
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +18,7 @@ USE_TOOLS+= pkg-config perl intltool msgfmt
PKGCONFIG_OVERRIDE+= gdl-1.0.pc.in
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/glade-gnome/Makefile b/devel/glade-gnome/Makefile
index 73f309a47a0..a0ef6116eef 100644
--- a/devel/glade-gnome/Makefile
+++ b/devel/glade-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:35 wiz Exp $
.include "../../devel/glade/Makefile.common"
PKGNAME= ${DISTNAME:S/glade/glade-gnome/}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES+= gnome
COMMENT+= and GNOME2
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 4be31c1b29a..3856f18ad66 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2007/07/05 10:49:43 adam Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:03:35 wiz Exp $
DISTNAME= glibmm-2.12.10
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glibmm/2.12/}
EXTRACT_SUFX= .tar.bz2
@@ -21,5 +22,5 @@ GNU_CONFIGURE= yes
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/glibmm/buildlink3.mk b/devel/glibmm/buildlink3.mk
index 12246bf95ee..092bcd552f2 100644
--- a/devel/glibmm/buildlink3.mk
+++ b/devel/glibmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2007/09/21 13:03:35 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIBMM_BUILDLINK3_MK:= ${GLIBMM_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.glibmm?= ../../devel/glibmm
.endif # GLIBMM_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 31b82bee831..8251fb5889f 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:35 wiz Exp $
#
DISTNAME= gnome-build-0.1.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-build/0.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile
index 0dbe5c54d3d..bf29fcf17b4 100644
--- a/devel/gnustep-examples/Makefile
+++ b/devel/gnustep-examples/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/09/22 07:08:15 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:03:35 wiz Exp $
#
DISTNAME= gnustep-examples-1.0.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
diff --git a/devel/guile-gnome/Makefile b/devel/guile-gnome/Makefile
index c1780ed8f1a..fec287ba276 100644
--- a/devel/guile-gnome/Makefile
+++ b/devel/guile-gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2007/09/19 23:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:35 wiz Exp $
DISTNAME= guile-gnome-platform-2.15.93
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/
@@ -22,10 +22,10 @@ INFO_FILES= YES
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/g-wrap/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 8b5c57d876e..b8529b9675e 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2007/01/26 03:56:50 markd Exp $
+# $NetBSD: Makefile,v 1.66 2007/09/21 13:03:35 wiz Exp $
DISTNAME= kdbg-2.0.5
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kdbg/}
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 1ecfb58f2e2..17faa7571d6 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2007/06/08 12:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2007/09/21 13:03:36 wiz Exp $
DISTNAME= kdesdk-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
COMMENT= Support applications and tools used by KDE developers
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 42912f0e21e..e107a9eab18 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2007/06/08 12:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2007/09/21 13:03:37 wiz Exp $
DISTNAME= kdevelop-3.4.1
PKGNAME= kdevelop-base-3.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel kde
HOMEPAGE= http://www.kdevelop.org/
diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile
index 6e1ac2565e4..d38313174d9 100644
--- a/devel/kdiff3/Makefile
+++ b/devel/kdiff3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/05/18 13:45:58 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:37 wiz Exp $
DISTNAME= kdiff3-0.9.91
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kdiff3/}
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index e0fa161858d..52bfca855fd 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/08/15 03:52:16 markd Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:37 wiz Exp $
#
DISTNAME= kscope-1.5.0
+PKGREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kscope/}
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index a050836a030..b3c4abccc0c 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2007/09/19 23:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2007/09/21 13:03:37 wiz Exp $
#
DISTNAME= libbonoboui-2.18.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libbonoboui/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -27,13 +27,13 @@ BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.16.0
BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.7
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index 4bff5c8b655..f5e0701413c 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/09/19 23:13:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/09/21 13:03:37 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBBONOBOUI_BUILDLINK3_MK:= ${LIBBONOBOUI_BUILDLINK3_MK}+
@@ -17,12 +17,12 @@ BUILDLINK_ABI_DEPENDS.libbonoboui+= libbonoboui>=2.18.0nb1
BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui
.endif # LIBBONOBOUI_BUILDLINK3_MK
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile
index 54836b1a623..4a25d501caf 100644
--- a/devel/libextractor/Makefile
+++ b/devel/libextractor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/21 13:03:37 wiz Exp $
DISTNAME= libextractor-0.5.18
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://gnunet.org/libextractor/download/
diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile
index 80700e84484..8be54334bbd 100644
--- a/devel/libgail-gnome/Makefile
+++ b/devel/libgail-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:03:37 wiz Exp $
#
DISTNAME= libgail-gnome-1.18.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgail-gnome/1.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index ca0feb30a23..4be674d1893 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2007/07/07 17:17:35 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:03:38 wiz Exp $
DISTNAME= libglademm-2.6.4
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libglademm/2.6/}
EXTRACT_SUFX= .tar.bz2
@@ -16,7 +17,7 @@ USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libglade/libglademm-2.4.pc.in
GNU_CONFIGURE= yes
-BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.6.1
-.include "../../devel/libglade2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libglade+= libglade>=2.6.1
+.include "../../devel/libglade/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libglademm/buildlink3.mk b/devel/libglademm/buildlink3.mk
index 883e6ac1a48..8ddef3acba3 100644
--- a/devel/libglademm/buildlink3.mk
+++ b/devel/libglademm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/09/24 16:48:27 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2007/09/21 13:03:38 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGLADEMM_BUILDLINK3_MK:= ${LIBGLADEMM_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.libglademm+= libglademm>=2.6.2nb1
BUILDLINK_PKGSRCDIR.libglademm?= ../../devel/libglademm
.endif # LIBGLADEMM_BUILDLINK3_MK
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index ebf45e073cd..d3cd6dc5a87 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2007/09/19 23:13:15 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2007/09/21 13:03:38 wiz Exp $
#
DISTNAME= libgnome-2.18.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnome/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -36,23 +36,23 @@ CONF_FILES= ${EGDIR}/sound/events/gnome-2.soundlist \
CONF_FILES+= ${EGDIR}/sound/events/gtk-events-2.soundlist \
${PKG_SYSCONFDIR}/sound/events/gtk-events-2.soundlist
-GCONF2_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas
-GCONF2_SCHEMAS+= desktop_gnome_accessibility_startup.schemas
-GCONF2_SCHEMAS+= desktop_gnome_applications_browser.schemas
-GCONF2_SCHEMAS+= desktop_gnome_applications_help_viewer.schemas
-GCONF2_SCHEMAS+= desktop_gnome_applications_terminal.schemas
-GCONF2_SCHEMAS+= desktop_gnome_applications_window_manager.schemas
-GCONF2_SCHEMAS+= desktop_gnome_background.schemas
-GCONF2_SCHEMAS+= desktop_gnome_file_views.schemas
-GCONF2_SCHEMAS+= desktop_gnome_interface.schemas
-GCONF2_SCHEMAS+= desktop_gnome_lockdown.schemas
-GCONF2_SCHEMAS+= desktop_gnome_peripherals_keyboard.schemas
-GCONF2_SCHEMAS+= desktop_gnome_peripherals_mouse.schemas
-GCONF2_SCHEMAS+= desktop_gnome_sound.schemas
-GCONF2_SCHEMAS+= desktop_gnome_thumbnailers.schemas
-GCONF2_SCHEMAS+= desktop_gnome_typing_break.schemas
-GCONF2_SCHEMAS+= desktop_gnome_applications_at_mobility.schemas
-GCONF2_SCHEMAS+= desktop_gnome_applications_at_visual.schemas
+GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas
+GCONF_SCHEMAS+= desktop_gnome_accessibility_startup.schemas
+GCONF_SCHEMAS+= desktop_gnome_applications_browser.schemas
+GCONF_SCHEMAS+= desktop_gnome_applications_help_viewer.schemas
+GCONF_SCHEMAS+= desktop_gnome_applications_terminal.schemas
+GCONF_SCHEMAS+= desktop_gnome_applications_window_manager.schemas
+GCONF_SCHEMAS+= desktop_gnome_background.schemas
+GCONF_SCHEMAS+= desktop_gnome_file_views.schemas
+GCONF_SCHEMAS+= desktop_gnome_interface.schemas
+GCONF_SCHEMAS+= desktop_gnome_lockdown.schemas
+GCONF_SCHEMAS+= desktop_gnome_peripherals_keyboard.schemas
+GCONF_SCHEMAS+= desktop_gnome_peripherals_mouse.schemas
+GCONF_SCHEMAS+= desktop_gnome_sound.schemas
+GCONF_SCHEMAS+= desktop_gnome_thumbnailers.schemas
+GCONF_SCHEMAS+= desktop_gnome_typing_break.schemas
+GCONF_SCHEMAS+= desktop_gnome_applications_at_mobility.schemas
+GCONF_SCHEMAS+= desktop_gnome_applications_at_visual.schemas
BUILDLINK_API_DEPENDS.audiofile+= libaudiofile>=0.2.3
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
@@ -62,7 +62,7 @@ BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.13.0
.include "../../audio/libaudiofile/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/libgnomemm/Makefile b/devel/libgnomemm/Makefile
index b4bc223a08e..9ae1da2ca58 100644
--- a/devel/libgnomemm/Makefile
+++ b/devel/libgnomemm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:03:38 wiz Exp $
DISTNAME= libgnomemm-2.18.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomemm/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 31a7c335c37..a34d86a4dfe 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/09/19 23:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2007/09/21 13:03:38 wiz Exp $
#
DISTNAME= libgnomeui-2.18.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeui/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -41,10 +41,10 @@ post-configure:
.include "../../audio/libaudiofile/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index 602739de0bc..7e57b9b5b0a 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2007/06/05 05:37:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2007/09/21 13:03:38 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEUI_BUILDLINK3_MK:= ${LIBGNOMEUI_BUILDLINK3_MK}+
@@ -18,10 +18,10 @@ BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui
.endif # LIBGNOMEUI_BUILDLINK3_MK
.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/devel/libgnomeuimm/Makefile b/devel/libgnomeuimm/Makefile
index c15e09ab945..5776996d5a9 100644
--- a/devel/libgnomeuimm/Makefile
+++ b/devel/libgnomeuimm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:03:38 wiz Exp $
DISTNAME= libgnomeuimm-2.18.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeuimm/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index eecd556843a..ca9a7eeb972 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2007/09/19 23:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/09/21 13:03:38 wiz Exp $
#
DISTNAME= libgsf-1.14.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgsf/1.14/}
EXTRACT_SUFX= .tar.bz2
@@ -24,9 +24,9 @@ PKGCONFIG_OVERRIDE+= libgsf-gnome-1.pc.in
CONFIGURE_ARGS+= --without-python
# XXX workaround for missing substitution in configure
-MAKE_ENV+= GCONF2_SCHEMAS_DIR=${GCONF2_SCHEMAS_DIR}
+MAKE_ENV+= GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR}
-GCONF2_SCHEMAS= gsf-office-thumbnailer.schemas
+GCONF_SCHEMAS= gsf-office-thumbnailer.schemas
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
@@ -34,5 +34,5 @@ GCONF2_SCHEMAS= gsf-office-thumbnailer.schemas
.include "../../devel/zlib/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libsexymm/Makefile b/devel/libsexymm/Makefile
index a8595ae3bf5..5d9d3860e90 100644
--- a/devel/libsexymm/Makefile
+++ b/devel/libsexymm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/07/28 15:25:02 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:38 wiz Exp $
#
DISTNAME= libsexymm-0.1.9
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://releases.chipx86.com/libsexy/libsexymm/
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index f91286dd033..eb39f7daa46 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/07/17 21:47:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:39 wiz Exp $
#
DISTNAME= monotone-viz-0.15
+PKGREVISION= 1
CATEGORIES= devel scm
MASTER_SITES= http://oandrieu.nerim.net/monotone-viz/
@@ -27,5 +28,5 @@ do-install:
.include "../../lang/ocaml/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/lablgtk2/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile
index fdf541ee554..a4fa9089584 100644
--- a/devel/rox-lib/Makefile
+++ b/devel/rox-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/04/17 13:46:21 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:39 wiz Exp $
#
DISTNAME= rox-lib-2.0.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
EXTRACT_SUFX= .tgz
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index 3d9e99b42b9..981a99d897e 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.89 2007/08/15 06:33:45 rillig Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.90 2007/09/21 13:03:39 wiz Exp $ -->
<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
<title>Making your package work</title>
@@ -1514,21 +1514,21 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist
</sect2>
- <sect2 id="gconf2-data-files">
- <title>Packages installing GConf2 data files</title>
+ <sect2 id="gconf-data-files">
+ <title>Packages installing GConf data files</title>
<para>If a package installs <filename>.schemas</filename> or
- <filename>.entries</filename> files, used by GConf2,
+ <filename>.entries</filename> files, used by GConf,
you need to take some extra steps to make sure they get registered
in the database:</para>
<orderedlist>
<listitem>
- <para>Include <filename>../../devel/GConf2/schemas.mk</filename>
+ <para>Include <filename>../../devel/GConf/schemas.mk</filename>
instead of its <filename>buildlink3.mk</filename> file. This
- takes care of rebuilding the GConf2 database at installation and
+ takes care of rebuilding the GConf database at installation and
deinstallation time, and tells the package where to install
- GConf2 data files using some standard configure arguments. It
+ GConf data files using some standard configure arguments. It
also disallows any access to the database directly from the
package.</para>
</listitem>
@@ -1548,14 +1548,14 @@ PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Pg/.packlist
</listitem>
<listitem>
- <para>Define the <varname>GCONF2_SCHEMAS</varname> variable in
+ <para>Define the <varname>GCONF_SCHEMAS</varname> variable in
your <filename>Makefile</filename> with a list of all
<filename>.schemas</filename> files installed by the package, if
any. Names must not contain any directories in them.</para>
</listitem>
<listitem>
- <para>Define the <varname>GCONF2_ENTRIES</varname> variable in
+ <para>Define the <varname>GCONF_ENTRIES</varname> variable in
your <filename>Makefile</filename> with a
list of all <filename>.entries</filename> files installed by the
package, if any. Names must not contain any directories in
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 037efae5fba..913e6d4b593 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2007/09/19 23:18:47 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:03:39 wiz Exp $
.include "../../editors/abiword/Makefile.common"
PKGNAME= abiword-plugins-${ABIWORD_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Plugins enhancing Abiword's capabilities
WRKSRC= ${WRKDIR}/${DISTNAME}/abiword-plugins
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 2cf7cda1720..f1eafbd735a 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.110 2007/09/19 23:18:47 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2007/09/21 13:03:39 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= Open Source cross-platform word processor
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index de678bf9322..87f6b9710e3 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2007/09/19 23:18:47 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2007/09/21 13:03:39 wiz Exp $
#
DISTNAME= conglomerate-0.9.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=conglomerate/}
@@ -23,13 +23,13 @@ CONFIGURE_ARGS+= --enable-printing
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-GCONF2_SCHEMAS= conglomerate.schemas
+GCONF_SCHEMAS= conglomerate.schemas
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index c12c0209c28..5a35abe19a1 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2007/09/19 23:13:18 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2007/09/21 13:03:39 wiz Exp $
DISTNAME= dasher-4.4.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dasher/4.4/}
EXTRACT_SUFX= .tar.bz2
@@ -24,13 +24,13 @@ GNU_CONFIGURE= yes
LIBS+= -lcompat
.endif
-GCONF2_SCHEMAS+= dasher.schemas
+GCONF_SCHEMAS+= dasher.schemas
post-build:
(cd ${WRKSRC}/Data && ../Src/Gtk2/generate-schema >dasher.schemas)
post-install:
- ${INSTALL_DATA} ${WRKSRC}/Data/dasher.schemas ${GCONF2_SCHEMAS_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/Data/dasher.schemas ${GCONF_SCHEMAS_DIR}
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0
@@ -39,12 +39,12 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/at-spi/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index a49109c66b4..d53378b0e03 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2007/09/19 23:18:48 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2007/09/21 13:03:40 wiz Exp $
#
DISTNAME= gconf-editor-2.18.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gconf-editor/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -17,16 +17,16 @@ USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
-CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE:Q}
-CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g}
+CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF_CONFIG_SOURCE:Q}
+CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g}
-GCONF2_SCHEMAS= gconf-editor.schemas
+GCONF_SCHEMAS= gconf-editor.schemas
-BUILDLINK_API_DEPENDS.GConf2+= GConf2>=2.14.0
+BUILDLINK_API_DEPENDS.GConf+= GConf>=2.14.0
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.14.0
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 9566e2c26f8..aabbcf517b5 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:18 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:40 wiz Exp $
#
DISTNAME= gedit-2.18.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gedit/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -19,7 +19,7 @@ GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE+= data/gedit.pc.in
-GCONF2_SCHEMAS= gedit.schemas
+GCONF_SCHEMAS= gedit.schemas
CONFIGURE_ARGS+= --enable-schemas-install
# XXX option?
@@ -30,16 +30,16 @@ CONFIGURE_ARGS+= --enable-schemas-install
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
BUILDLINK_API_DEPENDS.gtksourceview+= gtksourceview>=1.8.0
-BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.6.0
+BUILDLINK_API_DEPENDS.libglade+= libglade>=2.6.0
BUILDLINK_API_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.12.1
BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.16.0
BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.16.0
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index fa29be46f96..98dae80bc0a 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/06/05 05:37:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/09/21 13:03:40 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GEDIT_BUILDLINK3_MK:= ${GEDIT_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.gedit?= gedit>=2.18.1nb1
BUILDLINK_PKGSRCDIR.gedit?= ../../editors/gedit
.endif # GEDIT_BUILDLINK3_MK
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../x11/gtksourceview/buildlink3.mk"
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 10d2cde0ab2..150384cdb8e 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2007/09/19 23:13:18 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:03:40 wiz Exp $
DISTNAME= gtranslator-1.1.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtranslator/1.1/}
diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile
index 56b9df4bfe9..9e793d78fdc 100644
--- a/editors/kdissert/Makefile
+++ b/editors/kdissert/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/01/26 04:03:19 markd Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:40 wiz Exp $
#
DISTNAME= kdissert-1.0.5
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= editors
MASTER_SITES= http://freehackers.org/~tnagy/kdissert/
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 78379633c98..0d2fe10c99b 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2007/01/26 04:03:19 markd Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/21 13:03:40 wiz Exp $
DISTNAME= kile-1.9.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= editors kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kile/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index af6c144e079..d31a8b6141f 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/09/20 21:21:37 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:03:40 wiz Exp $
#
DISTNAME= mlview-0.7.0
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/mlview/0.7/}
EXTRACT_SUFX= .tar.bz2
@@ -17,13 +17,13 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-GCONF2_SCHEMAS= mlview.schemas
+GCONF_SCHEMAS= mlview.schemas
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/eel/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index 9fb8dcd59ea..a2814f6c959 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:18:48 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:40 wiz Exp $
#
DISTNAME= tea-16.0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tea-editor/}
EXTRACT_SUFX= .tar.bz2
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index 09889e9340e..d0fc973993e 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2007/02/03 01:45:01 markd Exp $
+# $NetBSD: Makefile,v 1.46 2007/09/21 13:03:41 wiz Exp $
DISTNAME= kvim-${KVIM_VERSION}
PKGNAME= vim-kde-${KVIM_VERSION}
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= editors kde
MASTER_SITES= ftp://ftp.rutgers.edu/pub/kde/stable/apps/KDE3.x/utils/ \
ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/utils/ \
diff --git a/emulators/kenigma/Makefile b/emulators/kenigma/Makefile
index ed12c2097ed..c5600ffec7c 100644
--- a/emulators/kenigma/Makefile
+++ b/emulators/kenigma/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:41 wiz Exp $
DISTNAME= 28107-kenigma-1.2.1
PKGNAME= kenigma-1.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= emulators security
MASTER_SITES= http://www.kde-apps.org/content/files/
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index a4be239c6dd..cb207ab60ab 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2007/09/19 23:18:49 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:41 wiz Exp $
#
DISTNAME= vice-1.22
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ \
http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 46f8e950b9f..3bc056a3b94 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.118 2007/09/19 23:18:49 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2007/09/21 13:03:41 wiz Exp $
#
DISTNAME= gnucash-2.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnucash/}
@@ -26,28 +26,28 @@ REPLACE_PERL+= src/optional/xsl/vcard-gnccustomer.pl
CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
MAKE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-GCONF2_SCHEMAS+= apps_gnucash_history.schemas
-GCONF2_SCHEMAS+= apps_gnucash_dialog_commodities.schemas
-GCONF2_SCHEMAS+= apps_gnucash_dialog_common.schemas
-GCONF2_SCHEMAS+= apps_gnucash_dialog_print_checks.schemas
-GCONF2_SCHEMAS+= apps_gnucash_dialog_prices.schemas
-GCONF2_SCHEMAS+= apps_gnucash_warnings.schemas
-GCONF2_SCHEMAS+= apps_gnucash_dialog_reconcile.schemas
-GCONF2_SCHEMAS+= apps_gnucash_dialog_totd.schemas
-GCONF2_SCHEMAS+= apps_gnucash_general.schemas
-GCONF2_SCHEMAS+= apps_gnucash_window_pages_account_tree.schemas
-GCONF2_SCHEMAS+= apps_gnucash_window_pages_register.schemas
-GCONF2_SCHEMAS+= apps_gnucash_import_generic_matcher.schemas
-#GCONF2_SCHEMAS+= apps_gnucash_dialog_hbci.schemas
-GCONF2_SCHEMAS+= apps_gnucash_dialog_business_common.schemas
+GCONF_SCHEMAS+= apps_gnucash_history.schemas
+GCONF_SCHEMAS+= apps_gnucash_dialog_commodities.schemas
+GCONF_SCHEMAS+= apps_gnucash_dialog_common.schemas
+GCONF_SCHEMAS+= apps_gnucash_dialog_print_checks.schemas
+GCONF_SCHEMAS+= apps_gnucash_dialog_prices.schemas
+GCONF_SCHEMAS+= apps_gnucash_warnings.schemas
+GCONF_SCHEMAS+= apps_gnucash_dialog_reconcile.schemas
+GCONF_SCHEMAS+= apps_gnucash_dialog_totd.schemas
+GCONF_SCHEMAS+= apps_gnucash_general.schemas
+GCONF_SCHEMAS+= apps_gnucash_window_pages_account_tree.schemas
+GCONF_SCHEMAS+= apps_gnucash_window_pages_register.schemas
+GCONF_SCHEMAS+= apps_gnucash_import_generic_matcher.schemas
+#GCONF_SCHEMAS+= apps_gnucash_dialog_hbci.schemas
+GCONF_SCHEMAS+= apps_gnucash_dialog_business_common.schemas
.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
#BUILDLINK_API_DEPENDS.swig+= swig>=1.3.28
#.include "../../devel/swig/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
BUILDLINK_API_DEPENDS.pango+= pango>=1.8.0
.include "../../devel/pango/buildlink3.mk"
diff --git a/finance/gnucash/buildlink3.mk b/finance/gnucash/buildlink3.mk
index 90fe93a1c8c..bf57ccb3ba4 100644
--- a/finance/gnucash/buildlink3.mk
+++ b/finance/gnucash/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2007/07/19 19:35:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2007/09/21 13:03:41 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUCASH_BUILDLINK3_MK:= ${GNUCASH_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.gnucash?= ../../finance/gnucash-current
.include "../../devel/glib2/buildlink3.mk"
#.include "../../devel/g-wrap/buildlink3.mk"
#.include "../../devel/libgsf/buildlink3.mk"
-#.include "../../devel/libglade2/buildlink3.mk"
+#.include "../../devel/libglade/buildlink3.mk"
#.include "../../devel/libgnomeui/buildlink3.mk"
#.include "../../devel/pango/buildlink3.mk"
#.include "../../devel/popt/buildlink3.mk"
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 6ef9df1b115..5dac4a5f14c 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2007/05/23 13:38:22 obache Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:41 wiz Exp $
DISTNAME= kmymoney2-0.8.6
+PKGREVISION= 1
CATEGORIES= finance kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kmymoney2/}
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 3ec30c998d3..2f5588623db 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2007/09/19 23:18:49 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2007/09/21 13:03:41 wiz Exp $
#
DISTNAME= gucharmap-1.10.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= fonts gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gucharmap/1.10/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 658782c4f37..188ea1b35b1 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2007/09/09 16:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:41 wiz Exp $
DISTNAME= asc-source-1.16.4.0
PKGNAME= ${DISTNAME:S/-source//}
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asc-hq/}
EXTRACT_SUFX= .tar.bz2
@@ -39,7 +40,7 @@ post-install:
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/SDLmm/buildlink3.mk"
-.include "../../devel/libsigc++/buildlink3.mk"
+.include "../../devel/libsigc++1/buildlink3.mk"
.include "../../graphics/SDL_image/buildlink3.mk"
.include "../../multimedia/smpeg/buildlink3.mk"
.include "../../x11/paragui/buildlink3.mk"
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index c307675d472..1d2843c80fd 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:18:50 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:42 wiz Exp $
#
DISTNAME= atomix-2.14.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/atomix/2.14/}
diff --git a/games/boson/Makefile b/games/boson/Makefile
index 4d88b84a318..7dbc2b419a8 100644
--- a/games/boson/Makefile
+++ b/games/boson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2007/01/26 04:03:20 markd Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:42 wiz Exp $
#
DISTNAME= boson-all-0.8
PKGNAME= ${DISTNAME:S/-all//}
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boson/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index 6c43fa8c1a4..f923b94c4ec 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/05/23 20:25:40 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:03:42 wiz Exp $
DISTNAME= ccgo-0.3.6.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games
MASTER_SITES= http://ccdw.org/~cjj/prog/ccgo/src/
diff --git a/games/gamazons/Makefile b/games/gamazons/Makefile
index fac9c44546e..cabb0d8c6a0 100644
--- a/games/gamazons/Makefile
+++ b/games/gamazons/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:18:50 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:42 wiz Exp $
#
DISTNAME= gamazons-0.83
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.yorgalily.org/gamazons/src/
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index bb6b071c284..55750b7b2c2 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/09/19 23:18:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:42 wiz Exp $
DISTNAME= gcompris-8.3.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gcompris/}
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 536569b3c13..5b77d445205 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:42 wiz Exp $
DISTNAME= gnome-games-2.18.2.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-games/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -36,23 +36,23 @@ CONF_FILES+= ${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile}
FILES_SUBST+= INSTALL=${INSTALL:Q}
-GCONF2_SCHEMAS= aisleriot.schemas
-GCONF2_SCHEMAS+= blackjack.schemas
-GCONF2_SCHEMAS+= glchess.schemas
-GCONF2_SCHEMAS+= glines.schemas
-GCONF2_SCHEMAS+= gnect.schemas
-GCONF2_SCHEMAS+= gnibbles.schemas
-GCONF2_SCHEMAS+= gnobots2.schemas
-GCONF2_SCHEMAS+= gnometris.schemas
-GCONF2_SCHEMAS+= gnomine.schemas
-GCONF2_SCHEMAS+= gnotski.schemas
-GCONF2_SCHEMAS+= gnotravex.schemas
-GCONF2_SCHEMAS+= gnotski.schemas
-GCONF2_SCHEMAS+= gtali.schemas
-GCONF2_SCHEMAS+= iagno.schemas
-GCONF2_SCHEMAS+= libgnomegames.schemas
-GCONF2_SCHEMAS+= mahjongg.schemas
-GCONF2_SCHEMAS+= same-gnome.schemas
+GCONF_SCHEMAS= aisleriot.schemas
+GCONF_SCHEMAS+= blackjack.schemas
+GCONF_SCHEMAS+= glchess.schemas
+GCONF_SCHEMAS+= glines.schemas
+GCONF_SCHEMAS+= gnect.schemas
+GCONF_SCHEMAS+= gnibbles.schemas
+GCONF_SCHEMAS+= gnobots2.schemas
+GCONF_SCHEMAS+= gnometris.schemas
+GCONF_SCHEMAS+= gnomine.schemas
+GCONF_SCHEMAS+= gnotski.schemas
+GCONF_SCHEMAS+= gnotravex.schemas
+GCONF_SCHEMAS+= gnotski.schemas
+GCONF_SCHEMAS+= gtali.schemas
+GCONF_SCHEMAS+= iagno.schemas
+GCONF_SCHEMAS+= libgnomegames.schemas
+GCONF_SCHEMAS+= mahjongg.schemas
+GCONF_SCHEMAS+= same-gnome.schemas
PYTHON_PATCH_SCRIPTS+= libgames-support/games-server.py
PYTHON_PATCH_SCRIPTS+= glchess/src/glchess
@@ -65,11 +65,11 @@ BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.10.0
BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6
.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/GConf2-ui/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/GConf-ui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index f54d031aea1..1ab2abe09a3 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2007/09/19 23:18:51 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/21 13:03:42 wiz Exp $
#
DISTNAME= grhino-0.15.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rhino/}
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 49704a570b2..d8693c64645 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/09/19 23:18:51 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:42 wiz Exp $
#
DISTNAME= gtetrinet-0.7.11
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtetrinet/0.7/}
@@ -27,10 +27,10 @@ PKG_SUPPORTED_OPTIONS= inet6
CONFIGURE_ARGS+= --enable-ipv6
.endif
-GCONF2_SCHEMAS= gtetrinet.schemas
+GCONF_SCHEMAS= gtetrinet.schemas
.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 968d452a408..ed5ee45c6a6 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/09/19 23:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:43 wiz Exp $
#
DISTNAME= gturing-0.1.1
-PKGREVISION= 23
+PKGREVISION= 24
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gturing/0.1/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 495ac8bc05d..ee228a29f38 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2007/01/26 03:23:18 markd Exp $
+# $NetBSD: Makefile,v 1.45 2007/09/21 13:03:43 wiz Exp $
DISTNAME= kdegames-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= games
COMMENT= Games for the KDE integrated X11 desktop
diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile
index 0ad545213ac..4cec7bf0093 100644
--- a/games/kdetoys3/Makefile
+++ b/games/kdetoys3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2007/01/26 03:25:23 markd Exp $
+# $NetBSD: Makefile,v 1.38 2007/09/21 13:03:43 wiz Exp $
DISTNAME= kdetoys-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= games
COMMENT= Toys for the KDE integrated X11 desktop
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 48b1862bdb8..38d1d5fe2bd 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:30 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:03:43 wiz Exp $
DISTNAME= knights-0.6
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=knights/}
diff --git a/games/kye/Makefile b/games/kye/Makefile
index d5f98430b95..4fd0eaafd80 100644
--- a/games/kye/Makefile
+++ b/games/kye/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:03:44 wiz Exp $
#
DISTNAME= kye-0.9.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= games
MASTER_SITES= http://games.moria.org.uk/kye/
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 67105ff1e32..bc5b2b4da4d 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/09/19 23:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:44 wiz Exp $
#
DISTNAME= pioneers-0.9.55
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pio/}
diff --git a/games/pytraffic/Makefile b/games/pytraffic/Makefile
index f4f6512a80a..95f7fde5b1e 100644
--- a/games/pytraffic/Makefile
+++ b/games/pytraffic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/03/31 16:26:55 obache Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:44 wiz Exp $
#
DISTNAME= pytraffic-2.5.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
MASTER_SITES= http://alpha.uhasselt.be/Research/Algebra/Members/pytraffic/
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index cf72fe33f2b..1f893907e7d 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2007/09/19 23:18:53 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:45 wiz Exp $
#
DISTNAME= sirius-0.8.0
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= games gnome
MASTER_SITES= http://sirius.bitvis.nu/files/
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
diff --git a/games/six/Makefile b/games/six/Makefile
index 3613d3ba314..ba50e923745 100644
--- a/games/six/Makefile
+++ b/games/six/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/04 19:36:46 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:45 wiz Exp $
#
DISTNAME= six-0.5.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://six.retes.hu/download/
diff --git a/games/teg/Makefile b/games/teg/Makefile
index aa42b48e724..2f943104688 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2007/09/19 23:18:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:45 wiz Exp $
DISTNAME= teg-0.11.1
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=teg/}
@@ -15,8 +15,8 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= intltool msgfmt pkg-config
-GCONF2_SCHEMAS+= teg.schemas
+GCONF_SCHEMAS+= teg.schemas
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/wormux/Makefile b/games/wormux/Makefile
index 592162c9d11..78a82a6a607 100644
--- a/games/wormux/Makefile
+++ b/games/wormux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/20 21:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:45 wiz Exp $
#
DISTNAME= wormux-0.7.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://download.gna.org/wormux/
diff --git a/graphics/3DKit/Makefile b/graphics/3DKit/Makefile
index 0c08b51d57a..d22cba4e02f 100644
--- a/graphics/3DKit/Makefile
+++ b/graphics/3DKit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:46 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
-PKGREVISION= 11
+PKGREVISION= 12
DISTFILES= DevManual.pdf
diff --git a/graphics/Cenon/Makefile b/graphics/Cenon/Makefile
index e77ec5418e1..0f785dc4021 100644
--- a/graphics/Cenon/Makefile
+++ b/graphics/Cenon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/07/22 05:10:54 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/21 13:03:46 wiz Exp $
#
DISTNAME= Cenon-3.67
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics cad gnustep
MASTER_SITES= http://www.vhf-group.com/vhfInterservice/download/source/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/GLXKit/Makefile b/graphics/GLXKit/Makefile
index ff64b1458e5..bba18fe4aad 100644
--- a/graphics/GLXKit/Makefile
+++ b/graphics/GLXKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:46 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/GLXKit/}
-PKGREVISION= 10
+PKGREVISION= 11
COMMENT= 3DKit GLX backend
diff --git a/graphics/GeometryKit/Makefile b/graphics/GeometryKit/Makefile
index 7a8701516bb..bdcf5bae624 100644
--- a/graphics/GeometryKit/Makefile
+++ b/graphics/GeometryKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2006/07/22 05:10:54 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:46 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/GeometryKit/}
-PKGREVISION= 10
+PKGREVISION= 11
COMMENT= Objective-C class library for calculating 3D geometry
diff --git a/graphics/GlutKit/Makefile b/graphics/GlutKit/Makefile
index 413bffba355..9e2834322ee 100644
--- a/graphics/GlutKit/Makefile
+++ b/graphics/GlutKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 13:03:46 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/GlutKit/}
-PKGREVISION= 12
+PKGREVISION= 13
COMMENT= 3DKit GLUT backend
diff --git a/graphics/ImageViewer/Makefile b/graphics/ImageViewer/Makefile
index dfc9532185e..b48d3258ef0 100644
--- a/graphics/ImageViewer/Makefile
+++ b/graphics/ImageViewer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2006/09/22 07:08:16 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:03:46 wiz Exp $
DISTNAME= ImageViewer-0.6.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics gnustep
MASTER_SITES= http://www.nice.ch/~phip/
diff --git a/graphics/Makefile b/graphics/Makefile
index ac9d918fdc9..420fc4e3366 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.468 2007/09/20 21:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.469 2007/09/21 13:03:45 wiz Exp $
#
COMMENT= Graphics tools and libraries
@@ -167,7 +167,7 @@ SUBDIR+= kphotobook
SUBDIR+= kphotools
SUBDIR+= lcms
SUBDIR+= lib3ds
-SUBDIR+= libart2
+SUBDIR+= libart
SUBDIR+= libcaca
SUBDIR+= libexif
SUBDIR+= libexif-gtk
diff --git a/graphics/RenderKit/Makefile b/graphics/RenderKit/Makefile
index bed0397c27d..452db2a8765 100644
--- a/graphics/RenderKit/Makefile
+++ b/graphics/RenderKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:46 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/RenderKit/}
-PKGREVISION= 10
+PKGREVISION= 11
COMMENT= Objective-C API for core scene rendering
diff --git a/graphics/SDLKit/Makefile b/graphics/SDLKit/Makefile
index fa8417a0808..1976ab6cb28 100644
--- a/graphics/SDLKit/Makefile
+++ b/graphics/SDLKit/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:03:47 wiz Exp $
#
.include "../../graphics/3DKit/Makefile.common"
PKGNAME= ${DISTNAME:S/3DKit/SDLKit/}
-PKGREVISION= 15
+PKGREVISION= 16
COMMENT= 3DKit SDL backend
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 4bafbd310f4..5f53ae36b78 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:34 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:47 wiz Exp $
DISTNAME= camlimages-2.2.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/
EXTRACT_SUFX= .tgz
@@ -40,7 +40,7 @@ PLIST_SUBST+= COND_DLL="@comment "
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/lablgtk1/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/ocaml-graphics/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index b4d35ed43f0..011ae25a5f4 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/06/01 00:45:49 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:03:47 wiz Exp $
#
DISTNAME= comix-3.6.4
+PKGREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=comix/}
@@ -28,7 +29,7 @@ do-install:
cd ${WRKSRC} && ${PYTHONBIN} install.py install --installdir ${PREFIX}
.include "../../databases/shared-mime-info/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/py-imaging/buildlink3.mk"
.include "../../lang/python/application.mk"
diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile
index cd3bc82055c..cd543d4e65a 100644
--- a/graphics/dia-python/Makefile
+++ b/graphics/dia-python/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2006/05/02 16:23:30 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:48 wiz Exp $
#
DIA_SUBPKG= -python
.include "../../graphics/dia/Makefile.common"
+PKGREVISION= 1
COMMENT+= (Python plugin)
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 52fe341dc86..3b1934b118f 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2007/09/19 23:18:53 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/21 13:03:48 wiz Exp $
#
.include "Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
USE_DIRS+= xdg-1.1
.include "options.mk"
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index dbbea6850a1..e6e5bcdb688 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2007/04/19 20:14:58 drochner Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/09/21 13:03:48 wiz Exp $
#
DISTNAME= dia-0.96.1
@@ -37,7 +37,7 @@ BUILDLINK_DEPMETHOD.glib2+= build
BUILDLINK_DEPMETHOD.pango+= build
BUILDLINK_DEPMETHOD.pkgconfig+= build
BUILDLINK_DEPMETHOD.freetype2+= build
-BUILDLINK_DEPMETHOD.libart2+= build
+BUILDLINK_DEPMETHOD.libart+= build
BUILDLINK_DEPMETHOD.libxml2+= build
BUILDLINK_DEPMETHOD.libxslt+= build
BUILDLINK_DEPMETHOD.scrollkeeper+= build
@@ -48,7 +48,7 @@ BUILDLINK_DEPMETHOD.gtk2+= build
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/graphics/digikam-doc/Makefile b/graphics/digikam-doc/Makefile
index 379b159a565..c3df3673f9f 100644
--- a/graphics/digikam-doc/Makefile
+++ b/graphics/digikam-doc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/06/03 00:50:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:48 wiz Exp $
DISTNAME= digikam-doc-0.9.1
+PKGREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index db9c5c3e095..f5d2e1fba7f 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2007/07/08 08:47:26 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/21 13:03:48 wiz Exp $
DISTNAME= digikam-0.9.2
+PKGREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index f6c31a43706..f124f2b0d35 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2007/09/20 22:38:22 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:48 wiz Exp $
#
DISTNAME= eog-2.18.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -16,25 +16,25 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-GCONF2_SCHEMAS= eog.schemas
+GCONF_SCHEMAS= eog.schemas
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0
-BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.16
+BUILDLINK_API_DEPENDS.libart+= libart>=2.3.16
BUILDLINK_API_DEPENDS.libexif+= libexif>=0.6.12
BUILDLINK_DEPMETHOD.libXt?= build
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/eel/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 745c57960b3..275e758fd3c 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2007/09/21 13:03:49 wiz Exp $
DISTNAME= gimageview-0.2.27
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
diff --git a/graphics/gimp-color-manager/Makefile b/graphics/gimp-color-manager/Makefile
index f8c1e466dc5..82308d08b0b 100644
--- a/graphics/gimp-color-manager/Makefile
+++ b/graphics/gimp-color-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:49 wiz Exp $
#
DISTNAME= gimp-color-manager-0.1.0
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= graphics
MASTER_SITES= ftp://www.virtual-sub.org/
diff --git a/graphics/gimp-fix-ca/Makefile b/graphics/gimp-fix-ca/Makefile
index 44003fe40b6..6d5f723d6a8 100644
--- a/graphics/gimp-fix-ca/Makefile
+++ b/graphics/gimp-fix-ca/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:49 wiz Exp $
#
DISTNAME= gimp-fix-ca-2.1.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://registry.gimp.org/file/fix-ca.c?action=download&id=8944&file=
EXTRACT_SUFX= .c
diff --git a/graphics/gimp-rawphoto/Makefile b/graphics/gimp-rawphoto/Makefile
index 115277c3fac..939aa58dbfc 100644
--- a/graphics/gimp-rawphoto/Makefile
+++ b/graphics/gimp-rawphoto/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:49 wiz Exp $
#
DISTNAME= rawphoto-200410220928
PKGNAME= gimp-rawphoto-1.19
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= graphics
MASTER_SITES= #
EXTRACT_SUFX= .tgz
diff --git a/graphics/gimp-refocus-it/Makefile b/graphics/gimp-refocus-it/Makefile
index b27d6e99c99..d32707b3bc1 100644
--- a/graphics/gimp-refocus-it/Makefile
+++ b/graphics/gimp-refocus-it/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:49 wiz Exp $
#
DISTNAME= refocus-it-2.0.0
PKGNAME= gimp-refocus-it-2.0.0
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=refocus-it/}
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index 36103426eb5..e2ef3002a55 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/21 13:03:49 wiz Exp $
DISTNAME= ufraw-0.12.1
PKGNAME= gimp-${DISTNAME}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufraw/}
@@ -19,7 +19,7 @@ USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --enable-mime
-GCONF2_SCHEMAS= ufraw.schemas
+GCONF_SCHEMAS= ufraw.schemas
PTHREAD_AUTO_VARS= yes
@@ -28,7 +28,7 @@ GCC_REQD+= 3.0
BUILDLINK_TRANSFORM+= rm:-std=gnu99
.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../graphics/exiv2/buildlink3.mk"
.include "../../graphics/gimp/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 4aca8773109..62ca77fc869 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.160 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.161 2007/09/21 13:03:49 wiz Exp $
DISTNAME= gimp-2.2.17
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
@@ -60,7 +60,7 @@ PLIST_SUBST+= TWAIN="@comment "
.include "../../graphics/aalib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index 1d57caf72b2..30ee27caba7 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/09/21 13:03:49 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIMP_BUILDLINK3_MK:= ${GIMP_BUILDLINK3_MK}+
@@ -22,7 +22,7 @@ BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp
.include "../../graphics/aalib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile
index 23f6acb3d71..0e61c8787da 100644
--- a/graphics/gimp2-wideangle/Makefile
+++ b/graphics/gimp2-wideangle/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2007/09/20 21:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:03:50 wiz Exp $
#
DISTNAME= wideangle
PKGNAME= gimp2-wideangle-1.0
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= graphics
MASTER_SITES= http://members.ozemail.com.au/~hodsond/
EXTRACT_SUFX= .c
diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index 6542196a788..4b731ba32d0 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/21 13:03:50 wiz Exp $
DISTNAME= gimp-2.3.19
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v2.3/ \
ftp://ftp.cs.umn.edu/pub/gimp/v2.3/ \
@@ -65,7 +65,7 @@ PLIST_SUBST+= TWAIN="@comment "
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/gimp24/buildlink3.mk b/graphics/gimp24/buildlink3.mk
index 775cc83208e..d986a4138ed 100644
--- a/graphics/gimp24/buildlink3.mk
+++ b/graphics/gimp24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/09/21 13:03:50 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIMP_BUILDLINK3_MK:= ${GIMP_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp24
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/aalib/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 9e7c8c04961..20d17916979 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2007/09/19 23:13:19 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/21 13:03:50 wiz Exp $
DISTNAME= gthumb-2.10.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gthumb/2.10/}
@@ -15,15 +15,15 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-GCONF2_SCHEMAS+= gthumb.schemas
-BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
+GCONF_SCHEMAS+= gthumb.schemas
+BUILDLINK_API_DEPENDS.libglade+= libglade>=2.4.0
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgphoto2/buildlink3.mk"
diff --git a/graphics/gwenview-i18n/Makefile b/graphics/gwenview-i18n/Makefile
index 95e9292e636..68c98f0f0c8 100644
--- a/graphics/gwenview-i18n/Makefile
+++ b/graphics/gwenview-i18n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/01/17 23:47:20 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:50 wiz Exp $
#
DISTNAME= gwenview-i18n-1.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= kde graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwenview/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index ea490fadd59..2e02c421177 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/04/01 14:20:16 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:03:50 wiz Exp $
#
DISTNAME= gwenview-1.4.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= kde graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gwenview/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index c6f3bd8941f..b2befdbc89c 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2007/09/19 23:13:20 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/21 13:03:50 wiz Exp $
DISTNAME= inkscape-0.45.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
@@ -36,7 +36,7 @@ UNLIMIT_RESOURCES= datasize
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 6676ab8b247..42ecaa24c0b 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2007/01/26 04:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:03:50 wiz Exp $
DISTNAME= kbarcode-2.0.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kbarcode/}
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 658b6e2dbf8..f31ec21fb79 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2007/08/12 21:06:49 markd Exp $
+# $NetBSD: Makefile,v 1.73 2007/09/21 13:03:50 wiz Exp $
DISTNAME= kdegraphics-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
COMMENT= Graphics programs for the KDE integrated X11 desktop
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index adca7f187ea..4175975638c 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/07/08 10:04:44 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:03:51 wiz Exp $
DISTNAME= kipi-plugins-0.1.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/koverartist/Makefile b/graphics/koverartist/Makefile
index a95dac4ca01..e598ac1bae2 100644
--- a/graphics/koverartist/Makefile
+++ b/graphics/koverartist/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/06/06 11:23:09 markd Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:03:51 wiz Exp $
DISTNAME= koverartist-0.5
+PKGREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= http://www.kde-apps.org/content/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile
index b13078cbb13..8a6a9e22a88 100644
--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/07/17 19:32:42 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:51 wiz Exp $
#
DISTNAME= kphotoalbum-3.0.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://ktown.kde.org/kphotoalbum/download/
diff --git a/graphics/kphotobook/Makefile b/graphics/kphotobook/Makefile
index 8da00a390fe..ece8c0b4f1f 100644
--- a/graphics/kphotobook/Makefile
+++ b/graphics/kphotobook/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/06/16 11:26:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:51 wiz Exp $
#
DISTNAME= kphotobook-0.0.6
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= kde graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kphotobook/}
diff --git a/graphics/kphotools/Makefile b/graphics/kphotools/Makefile
index c62bba537ef..4ed81cc5a08 100644
--- a/graphics/kphotools/Makefile
+++ b/graphics/kphotools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/01/26 04:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:51 wiz Exp $
#
DISTNAME= kphotools-0.2.1
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= kde graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kphotools/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 794074c0c68..7c04f0d3bae 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2006/11/13 21:31:26 drochner Exp $
+# $NetBSD: Makefile,v 1.45 2007/09/21 13:03:51 wiz Exp $
#
DISTNAME= libgnomecanvas-2.14.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.14/}
EXTRACT_SUFX= .tar.bz2
@@ -21,8 +21,8 @@ USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= libgnomecanvas/libgnomecanvas-2.0.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index d9846656f20..76ba80835f4 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:03:51 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMECANVAS_BUILDLINK3_MK:= ${LIBGNOMECANVAS_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas
.endif # LIBGNOMECANVAS_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index d8a5d034741..38feb908657 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/09/24 16:49:19 adam Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:51 wiz Exp $
DISTNAME= libgnomecanvasmm-2.16.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomecanvasmm/2.16/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 131eba3faff..b3550be3542 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/07/08 08:13:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:52 wiz Exp $
#
DISTNAME= libkdcraw-0.1.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index 807569bde6e..d0f51c12f09 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2007/01/27 21:12:16 markd Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:52 wiz Exp $
DISTNAME= libkexif-0.2.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index b618a703a14..afa074150eb 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2007/07/08 06:46:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/21 13:03:52 wiz Exp $
#
DISTNAME= libkexiv2-0.1.5
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 1212832575f..0f8b61d874e 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2007/01/27 21:09:05 markd Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:03:52 wiz Exp $
DISTNAME= libkipi-0.1.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kipi/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 953e103eb0d..73731c77357 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2007/09/20 21:36:56 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:52 wiz Exp $
DISTNAME= librsvg-2.18.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/libscigraphica/Makefile b/graphics/libscigraphica/Makefile
index a13df2f4637..da9e58b3bca 100644
--- a/graphics/libscigraphica/Makefile
+++ b/graphics/libscigraphica/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/07/27 09:03:28 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:03:52 wiz Exp $
#
DISTNAME= libscigraphica-2.1.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/}
@@ -21,7 +22,7 @@ pre-configure:
.include "../../lang/python/extension.mk"
.include "../../math/py-numarray/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk2+extra/buildlink3.mk"
diff --git a/graphics/libscigraphica/buildlink3.mk b/graphics/libscigraphica/buildlink3.mk
index 08caad2eec9..905380ded2d 100644
--- a/graphics/libscigraphica/buildlink3.mk
+++ b/graphics/libscigraphica/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2007/09/21 13:03:52 wiz Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -17,7 +17,7 @@ BUILDLINK_API_DEPENDS.libscigraphica+= libscigraphica>=2.1.1
BUILDLINK_PKGSRCDIR.libscigraphica?= ../../graphics/libscigraphica
.endif # LIBSCIGRAPHICA_BUILDLINK3_MK
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../math/py-numarray/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2+extra/buildlink3.mk"
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 19e02c9a8a5..1b25d9c50bb 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2007/01/26 04:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/21 13:03:52 wiz Exp $
#
DISTNAME= pixieplus-0.5.4
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= graphics
MASTER_SITES= http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/ \
http://www.mosfet.org/pixie/
diff --git a/graphics/py-gtkglext/Makefile b/graphics/py-gtkglext/Makefile
index d27e15c4167..b109e51a3d9 100644
--- a/graphics/py-gtkglext/Makefile
+++ b/graphics/py-gtkglext/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/07/20 11:22:23 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:53 wiz Exp $
#
DISTNAME= pygtkglext-1.1.0
PKGNAME= ${PYPKGPREFIX}-pygtkglext-1.1.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkglext/}
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index 0d94df1fb6e..3a761fe97ba 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2006/06/11 22:58:12 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:54 wiz Exp $
#
DISTNAME= matplotlib-0.87.2
PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.87.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/}
diff --git a/graphics/ruby-gnome2-gnomecanvas/Makefile b/graphics/ruby-gnome2-gnomecanvas/Makefile
index f40ebc182d3..4206e144a6e 100644
--- a/graphics/ruby-gnome2-gnomecanvas/Makefile
+++ b/graphics/ruby-gnome2-gnomecanvas/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/01/29 06:42:34 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:54 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnomecanvas-${VERSION}
COMMENT= Ruby binding of GnomeCanvas-2.x
+PKGREVISION= 1
CATEGORIES= graphics gnome
CONFLICTS+= ruby-gnome2-gnomecanvas-[0-9]*
diff --git a/graphics/ruby-gnome2-libart/Makefile b/graphics/ruby-gnome2-libart/Makefile
index 3fa9fdf173b..bf6a671d232 100644
--- a/graphics/ruby-gnome2-libart/Makefile
+++ b/graphics/ruby-gnome2-libart/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2007/01/29 06:42:34 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/21 13:03:54 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-libart-${VERSION}
COMMENT= Ruby binding of Libart_lgpl
+PKGREVISION= 1
CATEGORIES= graphics
CONFLICTS+= ruby-gnome2-libart-[0-9]*
@@ -14,5 +15,5 @@ USE_TOOLS+= pkg-config
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../meta-pkgs/ruby-gnome2/Makefile.common"
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index c44f841eb5e..347774e5a6e 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/21 13:03:54 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
COMMENT= Ruby binding of librsvg
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
RUBY_EXTCONF_SUBDIRS= rsvg
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index a3f670ff048..574cbcfbb1f 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/21 13:03:54 wiz Exp $
.include "../../graphics/sane-backends/Makefile.common"
DISTNAME= sane-frontends-${SANE_VERSION}
SANE_MICRO= 14
-PGKREVISION= 4
+PGKREVISION= 5
COMMENT= Frontends for access to scanners, digitals camera, frame grabbers etc
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 737082eb655..acb9d1dae51 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2006/09/16 21:52:57 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:55 wiz Exp $
#
DISTNAME= scigraphica-2.1.0
+PKGREVISION= 1
CATEGORIES= graphics math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/}
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 65b70ee2822..8eed4d3832d 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/01/26 04:13:34 markd Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:03:55 wiz Exp $
#
DISTNAME= showimg-0.9.5
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= kde graphics x11
MASTER_SITES= http://www.jalix.org/projects/showimg/download/0.9.5/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index cac48d7fa86..971dc874bed 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2006/07/11 10:21:16 hira Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:55 wiz Exp $
#
DISTNAME= sodipodi-0.34
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sodipodi/}
@@ -28,7 +28,7 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index f820f4d3418..e151ffc615d 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/21 13:03:55 wiz Exp $
#
DISTNAME= tuxpaint-0.9.17
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/} \
ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/source/
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index a1363b4a162..e6c70e7220d 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/07/14 18:32:29 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:55 wiz Exp $
#
DISTNAME= wxsvg-1.0b6
PKGNAME= ${DISTNAME:S/b/beta/}
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxsvg/}
@@ -18,6 +19,6 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/wxGTK/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk
index 00e236e33a1..5ef5bdf2eaf 100644
--- a/graphics/wxsvg/buildlink3.mk
+++ b/graphics/wxsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/09/21 13:03:55 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WXSVG_BUILDLINK3_MK:= ${WXSVG_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.wxsvg?= ../../graphics/wxsvg
.endif # WXSVG_BUILDLINK3_MK
.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/wxGTK/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index a6ef2ce0b36..a1e6da6349e 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2007/09/21 13:03:55 wiz Exp $
DISTNAME= xsane-0.994
PKGNAME= xsane-0.99.4
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://www.xsane.org/download/ \
http://gd.tuwien.ac.at/hci/sane/xsane/ \
diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile
index b49f0b9f0ec..42c95863a90 100644
--- a/ham/gmfsk/Makefile
+++ b/ham/gmfsk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:18:59 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:03:55 wiz Exp $
#
DISTNAME= gmfsk-0.6
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= ham
MASTER_SITES= http://gmfsk.connect.fi/
@@ -13,11 +13,11 @@ COMMENT= Multimode HF terminal program
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
-GCONF2_SCHEMAS+=gmfsk.schemas
+GCONF_SCHEMAS+=gmfsk.schemas
CONFIGURE_ARGS+=--enable-hamlib
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../math/fftw2/buildlink3.mk"
.include "../../ham/hamlib/buildlink3.mk"
diff --git a/ham/gpredict/Makefile b/ham/gpredict/Makefile
index 0c3edea1742..78830a93f13 100644
--- a/ham/gpredict/Makefile
+++ b/ham/gpredict/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2007/07/02 16:34:50 wulf Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:56 wiz Exp $
DISTNAME= gpredict-0.8.0
+PKGREVISION= 1
CATEGORIES= ham
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=groundstation/}
@@ -13,7 +14,7 @@ USE_TOOLS+= gmake msgfmt pkg-config intltool
USE_PKGLOCALEDIR=yes
GNU_CONFIGURE= yes
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
#.include "../../ham/hamlib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index 6450341d2a5..d138c6f9bea 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2007/07/02 16:20:35 wulf Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:56 wiz Exp $
#
DISTNAME= xlog-1.5
+PKGREVISION= 1
CATEGORIES= ham
MASTER_SITES= http://www.qsl.net/pg4i/download/
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 6503b4ba78f..88eae84f5d3 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/09/19 23:18:59 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:03:56 wiz Exp $
#
DISTNAME= imhangul_status_applet-0.3
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= korean inputmethod
MASTER_SITES= http://download.kldp.net/imhangul/imhangul_status_applet/0.3/
@@ -18,8 +18,8 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
-GCONF2_SCHEMAS= imhangul_status.schemas
+GCONF_SCHEMAS= imhangul_status.schemas
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index eea869f3d06..dd39394e10b 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/02/19 20:06:21 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:03:56 wiz Exp $
#
DISTNAME= uim-1.3.1
+PKGREVISION= 1
CATEGORIES= inputmethod
MASTER_SITES= http://uim.freedesktop.org/releases/
EXTRACT_SUFX= .tar.bz2
diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile
index 0da5a304ae6..16ca3169b87 100644
--- a/lang/classpath-gui/Makefile
+++ b/lang/classpath-gui/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2007/01/17 03:11:19 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:03:56 wiz Exp $
.include "../../lang/classpath/Makefile.common"
PKGNAME= ${DISTNAME:S/classpath/classpath-gui/}
+PKGREVISION= 1
COMMENT+= (GUI libraries)
DEPENDS+= classpath>=0.93:../../lang/classpath
@@ -13,13 +14,13 @@ BUILD_DIRS= native/jni/classpath
BUILD_DIRS+= native/jni/gtk-peer
INSTALL_DIRS= native/jni/gtk-peer
-BUILDLINK_FILES.libart2+= bin/libart2-config
-BUILDLINK_FNAME_TRANSFORM.libart2+= -e 's|/libart2-config|/libart-config|g'
+BUILDLINK_FILES.libart+= bin/libart2-config
+BUILDLINK_FNAME_TRANSFORM.libart+= -e 's|/libart2-config|/libart-config|g'
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index 553df998aea..040683823c9 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/02/25 15:03:52 tonio Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 13:03:56 wiz Exp $
#
DISTNAME= coq-8.1
+PKGREVISION= 1
CATEGORIES= lang math
MASTER_SITES= ftp://ftp.inria.fr/INRIA/coq/V8.1/
@@ -37,7 +38,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.coq
PKG_SUPPORTED_OPTIONS= coqide
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mcoqide)
-.include "../../x11/lablgtk2/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
PLIST_SUBST+= WITH_IDE=''
.else
diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile
index 4029b7e153a..a69fc8b0738 100644
--- a/lang/kaffe-x11/Makefile
+++ b/lang/kaffe-x11/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2007/02/07 23:21:36 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:56 wiz Exp $
#
.include "../../lang/kaffe/Makefile.common"
PKGNAME= ${DISTNAME:S/kaffe/kaffe-x11/}
+PKGREVISION= 1
COMMENT+= (AWT support through X11)
@@ -34,7 +35,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../devel/glib2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile
index 38ca07f1b8e..e78abb05734 100644
--- a/lang/sablevm-classpath-gui/Makefile
+++ b/lang/sablevm-classpath-gui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:38 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:56 wiz Exp $
#
.include "../../lang/sablevm-classpath/Makefile.common"
PKGNAME= ${DISTNAME:S/classpath/classpath-gui/}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT+= (GUI libraries)
DEPENDS+= sablevm-classpath>=1.13nb1:../../lang/sablevm-classpath
@@ -22,7 +22,7 @@ PRINT_PLIST_AWK+= \
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXtst/buildlink3.mk"
diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index eafa2d94a39..aed9c3888bd 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2007/05/25 23:56:55 rh Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:57 wiz Exp $
#
DISTNAME= GNUMail-1.1.2
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= mail gnustep
MASTER_SITES= http://debian.uni-essen.de/misc/GNUstep/Apps/GNUMail/
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index fd387b22eb4..aa31352e458 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2007/09/20 20:50:49 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2007/09/21 13:03:57 wiz Exp $
DISTNAME= balsa-2.3.10
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= mail gnome
MASTER_SITES= http://balsa.gnome.org/ \
ftp://ftp.newton.cx/pub/balsa/
diff --git a/mail/claws-mail-gtkhtml/Makefile b/mail/claws-mail-gtkhtml/Makefile
index 72be0623114..abb6415a05c 100644
--- a/mail/claws-mail-gtkhtml/Makefile
+++ b/mail/claws-mail-gtkhtml/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:57 wiz Exp $
#
DISTNAME=gtkhtml2_viewer-0.15.2
PKGNAME=claws-mail-gtkhtml2_viewer-0.15.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES=mail
MASTER_SITES= http://claws-mail.org/downloads/plugins/
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 26e1f566b33..5d676231e55 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2007/09/19 23:13:21 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2007/09/21 13:03:57 wiz Exp $
#
DISTNAME= evolution-data-server-1.10.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-data-server/1.10/}
EXTRACT_SUFX= .tar.bz2
@@ -67,11 +67,11 @@ BUILDLINK_TRANSFORM+= rm:-ldl
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/nss/buildlink3.mk"
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index e6a1da86f6a..bc5ef5fe080 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2007/09/19 23:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:03:57 wiz Exp $
#
DISTNAME= evolution-exchange-2.10.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-exchange/2.10/}
EXTRACT_SUFX= .tar.bz2
@@ -15,14 +15,14 @@ GNU_CONFIGURE= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-GCONF2_SCHEMAS= apps_exchange_addressbook-2.10.schemas
+GCONF_SCHEMAS= apps_exchange_addressbook-2.10.schemas
.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
.include "../../mail/evolution/buildlink3.mk"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 83dd8c6f12e..076f94aa91c 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.122 2007/09/19 23:13:21 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2007/09/21 13:03:57 wiz Exp $
DISTNAME= evolution-2.10.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail time gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.10/}
EXTRACT_SUFX= .tar.bz2
@@ -95,11 +95,11 @@ PLIST_SUBST+= HAVE_SMIME="@comment "
PKGCONFIG_OVERRIDE= evolution-plugin.pc.in
PKGCONFIG_OVERRIDE+= evolution-shell.pc.in
-GCONF2_SCHEMAS= apps-evolution-mail-prompts-checkdefault-2.10.schemas
-GCONF2_SCHEMAS+= apps_evolution_addressbook-2.10.schemas
-GCONF2_SCHEMAS+= apps_evolution_calendar-2.10.schemas
-GCONF2_SCHEMAS+= apps_evolution_shell-2.10.schemas
-GCONF2_SCHEMAS+= evolution-mail-2.10.schemas
+GCONF_SCHEMAS= apps-evolution-mail-prompts-checkdefault-2.10.schemas
+GCONF_SCHEMAS+= apps_evolution_addressbook-2.10.schemas
+GCONF_SCHEMAS+= apps_evolution_calendar-2.10.schemas
+GCONF_SCHEMAS+= apps_evolution_shell-2.10.schemas
+GCONF_SCHEMAS+= evolution-mail-2.10.schemas
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
@@ -113,13 +113,13 @@ LDFLAGS+= -lsemaphore
.include "../../devel/pthread-sem/buildlink3.mk"
.endif
.include "../../databases/openldap-client/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 217d4d43885..7e6a83a1737 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:41 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:03:58 wiz Exp $
DISTNAME= kbiff-3.8
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kbiff/}
EXTRACT_SUFX= .tar.bz2
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 6f2624a0eb0..ce78f71da59 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2007/09/20 21:21:37 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2007/09/21 13:03:58 wiz Exp $
#
DISTNAME= mail-notification-4.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= mail gnome
MASTER_SITES= http://savannah.nongnu.org/download/mailnotify/
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-GCONF2_SCHEMAS= mail-notification.schemas
+GCONF_SCHEMAS= mail-notification.schemas
PKG_OPTIONS_VAR= PKG_OPTIONS.mail-notification
PKG_SUPPORTED_OPTIONS= inet6 sasl ssl
@@ -45,11 +45,11 @@ CONFIGURE_ARGS+= --disable-ssl
.endif
.include "../../devel/eel/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index cebce9eac7b..56e763a716b 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/07/19 10:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:58 wiz Exp $
#
DISTNAME= galculator-1.2.5.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galculator/}
@@ -15,5 +15,5 @@ GNU_CONFIGURE= yes
USE_TOOLS+= gmake msgfmt pkg-config intltool
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 11cfd1471a7..e2cb9a4dcf3 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2007/09/19 23:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2007/09/21 13:03:58 wiz Exp $
#
DISTNAME= gcalctool-5.9.14
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcalctool/5.9/}
EXTRACT_SUFX= .tar.bz2
@@ -19,11 +19,11 @@ USE_LIBTOOL= yes
USE_TOOLS+= bison gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
-GCONF2_SCHEMAS= gcalctool.schemas
+GCONF_SCHEMAS= gcalctool.schemas
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/math/genius/Makefile b/math/genius/Makefile
index 8d54d4e8d51..c6d5e868fe6 100644
--- a/math/genius/Makefile
+++ b/math/genius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/09/19 23:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/21 13:03:58 wiz Exp $
#
DISTNAME= genius-0.7.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= math
MASTER_SITES= http://ftp.5z.com/pub/genius/
@@ -24,7 +24,7 @@ do-test:
.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../math/mpfr/buildlink3.mk"
diff --git a/math/gnumeric-current/Makefile b/math/gnumeric-current/Makefile
index 6507f46b5ea..efd0ec40656 100644
--- a/math/gnumeric-current/Makefile
+++ b/math/gnumeric-current/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/09/19 23:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:03:58 wiz Exp $
#
DISTNAME= gnumeric-1.7.12
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.7/}
EXTRACT_SUFX= .tar.bz2
@@ -17,7 +17,7 @@ USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-GCONF2_SCHEMAS= gnumeric-dialogs.schemas gnumeric-general.schemas \
+GCONF_SCHEMAS= gnumeric-dialogs.schemas gnumeric-general.schemas \
gnumeric-plugins.schemas
PKGCONFIG_OVERRIDE= libspreadsheet-1.7.pc.in
@@ -33,12 +33,12 @@ PYTHON_VERSIONS_ACCEPTED= 24 23
#.include "../../databases/libgnomedb/buildlink3.mk"
BUILDLINK_API_DEPENDS.libgsf+= libgsf>=1.14.2
.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
.include "../../misc/goffice0.5/buildlink3.mk"
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 346faa68ca1..d77704e8e72 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.124 2007/09/19 23:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.125 2007/09/21 13:03:58 wiz Exp $
#
DISTNAME= gnumeric-1.6.3
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.6/}
EXTRACT_SUFX= .tar.bz2
@@ -20,7 +20,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-python
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_VERSIONS_ACCEPTED= 24 23
-GCONF2_SCHEMAS= gnumeric-dialogs.schemas gnumeric-general.schemas \
+GCONF_SCHEMAS= gnumeric-dialogs.schemas gnumeric-general.schemas \
gnumeric-plugins.schemas
# XXX: link test against libDynaLoader_pic.a fails; bug
@@ -31,14 +31,14 @@ PLIST_SUBST+= PERL="@comment "
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/atk/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
# guile is currently not supported in gnumeric
#.include "../../lang/guile/buildlink3.mk"
diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index 3fa5dbe0982..c6c01743134 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2007/09/19 23:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:03:59 wiz Exp $
DISTNAME= qalculate-gtk-0.9.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
@@ -20,7 +20,7 @@ GNU_CONFIGURE= yes
pre-configure:
cd ${WRKSRC}; autoconf
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../math/qalculate/buildlink3.mk"
.include "../../textproc/scrollkeeper/buildlink3.mk"
diff --git a/math/qalculate-kde/Makefile b/math/qalculate-kde/Makefile
index e545af0d32b..1c81b091532 100644
--- a/math/qalculate-kde/Makefile
+++ b/math/qalculate-kde/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/02/20 15:08:48 adam Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:59 wiz Exp $
DISTNAME= qalculate-kde-0.9.5
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index b0aa71f4dc5..a5493d67742 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/09/20 22:51:38 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/21 13:03:59 wiz Exp $
DISTNAME= gnome-base-2.18.1
CATEGORIES= meta-pkgs x11 gnome
@@ -30,8 +30,8 @@ DEPENDS+= libIDL>=0.8.8:../../net/libIDL
DEPENDS+= ORBit2>=2.14.3:../../net/ORBit2
DEPENDS+= libxml2>=2.6.26:../../textproc/libxml2
DEPENDS+= libxslt>=1.1.17:../../textproc/libxslt
-DEPENDS+= GConf2>=2.18.0:../../devel/GConf2
-DEPENDS+= GConf2-ui>=2.18.0:../../devel/GConf2-ui
+DEPENDS+= GConf>=2.18.0:../../devel/GConf
+DEPENDS+= GConf-ui>=2.18.0:../../devel/GConf-ui
DEPENDS+= libbonobo>=2.18.0:../../devel/libbonobo
DEPENDS+= libaudiofile>=0.2.6:../../audio/libaudiofile
DEPENDS+= esound>=0.2.36:../../audio/esound
@@ -39,8 +39,8 @@ DEPENDS+= gnome-vfs>=2.18.1:../../sysutils/gnome-vfs
DEPENDS+= gnome-vfs-cdda>=2.18.1:../../audio/gnome-vfs-cdda
DEPENDS+= gnome-vfs-smb>=2.18.1:../../net/gnome-vfs-smb
DEPENDS+= libgnome>=2.18.0:../../devel/libgnome
-DEPENDS+= libglade2>=2.6.0:../../devel/libglade2
-DEPENDS+= libart2>=2.3.17:../../graphics/libart2
+DEPENDS+= libglade>=2.6.0:../../devel/libglade
+DEPENDS+= libart>=2.3.17:../../graphics/libart
DEPENDS+= libgnomecanvas>=2.14.0:../../graphics/libgnomecanvas
DEPENDS+= libbonoboui>=2.18.0:../../devel/libbonoboui
DEPENDS+= gnome-keyring>=0.8.1:../../security/gnome-keyring
diff --git a/meta-pkgs/gnustep/Makefile b/meta-pkgs/gnustep/Makefile
index bd7fbdc6842..80d7353d9e4 100644
--- a/meta-pkgs/gnustep/Makefile
+++ b/meta-pkgs/gnustep/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2006/04/17 13:46:39 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:03:59 wiz Exp $
DISTNAME= gnustep-1.11.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= meta-pkgs x11 gnustep
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index e24ad34e6b5..b01e249d8fb 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2007/04/27 11:21:47 martti Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:59 wiz Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-extras-${XFCE4_VERSION}
DISTFILES= # empty
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= meta-pkgs
COMMENT= Xfce extras
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 651d70aa73e..94d27f571b8 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2007/04/12 09:55:10 martti Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:03:59 wiz Exp $
.include "Makefile.common"
DISTNAME= xfce4-${XFCE4_VERSION}
DISTFILES= # empty
+PKGREVISION= 1
CATEGORIES= meta-pkgs
COMMENT= Xfce
diff --git a/misc/Addresses/Makefile b/misc/Addresses/Makefile
index b9c020fa4c3..f39b50e79ca 100644
--- a/misc/Addresses/Makefile
+++ b/misc/Addresses/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/09/22 07:08:16 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 13:04:00 wiz Exp $
#
DISTNAME= Addresses-0.4.6
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc gnustep
MASTER_SITES= http://giesler.biz/bjoern/downloads/
diff --git a/misc/basket/Makefile b/misc/basket/Makefile
index f39b6495ab9..961cda69823 100644
--- a/misc/basket/Makefile
+++ b/misc/basket/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/10 21:04:27 seb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:04:00 wiz Exp $
DISTNAME= basket-1.0.2
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://basket.kde.org/downloads/
diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile
index 854e63b01b0..cb7e94fb2a1 100644
--- a/misc/celestia/Makefile
+++ b/misc/celestia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/09/19 23:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:00 wiz Exp $
DISTNAME= celestia-1.4.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= misc x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=celestia/}
diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index aee5b924d62..41525e17201 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2007/09/19 23:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:04:00 wiz Exp $
#
DISTNAME= deskbar-applet-2.18.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/deskbar-applet/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -19,7 +19,7 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config
PKGCONFIG_OVERRIDE= data/deskbar-applet.pc
-GCONF2_SCHEMAS= deskbar-applet.schemas
+GCONF_SCHEMAS= deskbar-applet.schemas
PYTHON_ACCEPTED_VERSIONS= 24
PYTHON_PATCH_SCRIPTS= deskbar/deskbar-applet.py
@@ -27,7 +27,7 @@ PY_PATCHPLIST= yes
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/py-gobject/buildlink3.mk"
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 09164d8208f..5b05b94aa85 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2007/09/20 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2007/09/21 13:04:00 wiz Exp $
#
DISTNAME= gnome-utils-2.18.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-utils/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -22,11 +22,11 @@ PKGCONFIG_OVERRIDE+= gnome-dictionary/libgdict/gdict-1.0-uninstalled.pc.in
CONFIGURE_ARGS+= --enable-gtk-doc=no
-GCONF2_SCHEMAS+= baobab.schemas
-GCONF2_SCHEMAS+= gnome-dictionary.schemas
-GCONF2_SCHEMAS+= gnome-screenshot.schemas
-GCONF2_SCHEMAS+= gnome-search-tool.schemas
-GCONF2_SCHEMAS+= logview.schemas
+GCONF_SCHEMAS+= baobab.schemas
+GCONF_SCHEMAS+= gnome-dictionary.schemas
+GCONF_SCHEMAS+= gnome-screenshot.schemas
+GCONF_SCHEMAS+= gnome-search-tool.schemas
+GCONF_SCHEMAS+= logview.schemas
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.1
BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.13.4
@@ -38,11 +38,11 @@ BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.7
BUILDLINK_DEPMETHOD.libXt?= build
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/GConf2-ui/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/GConf-ui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/misc/goffice/Makefile b/misc/goffice/Makefile
index 744dfbf833e..40fa6d06ab1 100644
--- a/misc/goffice/Makefile
+++ b/misc/goffice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:00 wiz Exp $
#
DISTNAME= goffice-0.4.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goffice/0.4/}
@@ -18,19 +18,19 @@ USE_DIRS+= xdg-1.4
USE_TOOLS+= gmake intltool msgfmt pkg-config
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
BUILDLINK_API_DEPENDS.pango+= pango>=1.8.1
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.11
-.include "../../graphics/libart2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libart+= libart>=2.3.11
+.include "../../graphics/libart/buildlink3.mk"
BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/misc/goffice/buildlink3.mk b/misc/goffice/buildlink3.mk
index fde54115757..2e1a6119a95 100644
--- a/misc/goffice/buildlink3.mk
+++ b/misc/goffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/06/05 05:37:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:04:00 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GOFFICE_BUILDLINK3_MK:= ${GOFFICE_BUILDLINK3_MK}+
@@ -22,16 +22,16 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/goffice\/0.4.0\/plugins$$/ \
next; }
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/goffice0.2/Makefile b/misc/goffice0.2/Makefile
index fb3b63a1b5b..1017a4ebe32 100644
--- a/misc/goffice0.2/Makefile
+++ b/misc/goffice0.2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:01 wiz Exp $
#
DISTNAME= goffice-0.2.2
PKGNAME= goffice0.2-0.2.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goffice/0.2/}
@@ -20,16 +20,16 @@ GNU_CONFIGURE= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.3
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/misc/goffice0.2/buildlink3.mk b/misc/goffice0.2/buildlink3.mk
index 9efa65e5432..42489c6bb7f 100644
--- a/misc/goffice0.2/buildlink3.mk
+++ b/misc/goffice0.2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/06/05 05:37:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/09/21 13:04:01 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GOFFICE02_BUILDLINK3_MK:= ${GOFFICE02_BUILDLINK3_MK}+
@@ -17,15 +17,15 @@ BUILDLINK_ABI_DEPENDS.goffice02?= goffice0.2>=0.2.2nb2
BUILDLINK_PKGSRCDIR.goffice02?= ../../misc/goffice0.2
.endif # GOFFICE02_BUILDLINK3_MK
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/goffice0.5/Makefile b/misc/goffice0.5/Makefile
index 02367657a14..777d3652a36 100644
--- a/misc/goffice0.5/Makefile
+++ b/misc/goffice0.5/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:01 wiz Exp $
#
DISTNAME= goffice-0.5.0
PKGNAME= goffice0.5-0.5.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/goffice/0.5/}
@@ -21,19 +21,19 @@ USE_DIRS+= xdg-1.4
USE_TOOLS+= gmake intltool msgfmt pkg-config
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
BUILDLINK_API_DEPENDS.pango+= pango>=1.8.1
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.11
-.include "../../graphics/libart2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libart+= libart>=2.3.11
+.include "../../graphics/libart/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/goffice0.5/buildlink3.mk b/misc/goffice0.5/buildlink3.mk
index d4070c89fee..cabff6993c4 100644
--- a/misc/goffice0.5/buildlink3.mk
+++ b/misc/goffice0.5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/05 16:06:25 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:04:01 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GOFFICE0.5_BUILDLINK3_MK:= ${GOFFICE0.5_BUILDLINK3_MK}+
@@ -17,16 +17,16 @@ BUILDLINK_PKGSRCDIR.goffice0.5?= ../../misc/goffice0.5
.endif # GOFFICE0.5_BUILDLINK3_MK
#.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
#.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 8fef9f7fd9b..0140061e8ce 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/21 13:04:01 wiz Exp $
#
DISTNAME= gok-1.2.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gok/1.2/}
EXTRACT_SUFX= .tar.bz2
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= gok-1.0.pc.in
-GCONF2_SCHEMAS= gok.schemas
+GCONF_SCHEMAS= gok.schemas
BUILDLINK_DEPMETHOD.libXt?= build
@@ -28,10 +28,10 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../devel/at-spi/buildlink3.mk"
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gail/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/misc/kchm/Makefile b/misc/kchm/Makefile
index 763be69b89c..f9396fa1648 100644
--- a/misc/kchm/Makefile
+++ b/misc/kchm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/01/26 04:25:46 markd Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:01 wiz Exp $
#
DISTNAME= kchm-0.6.5
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= kde misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kchmnew/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile
index a21c728b550..3dd0cf9c1a3 100644
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/16 17:08:39 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:04:01 wiz Exp $
#
DISTNAME= kchmviewer-3.1
+PKGREVISION= 1
CATEGORIES= misc x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kchmviewer/}
diff --git a/misc/kdeaccessibility3/Makefile b/misc/kdeaccessibility3/Makefile
index 4632e4f24b3..843d2e7d747 100644
--- a/misc/kdeaccessibility3/Makefile
+++ b/misc/kdeaccessibility3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:04:01 wiz Exp $
DISTNAME= kdeaccessibility-${_KDE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
COMMENT= Accessibility support for the KDE integrated X11 desktop
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 3c83851bae0..ca21d8bd036 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2007/05/23 13:33:15 markd Exp $
+# $NetBSD: Makefile,v 1.54 2007/09/21 13:04:01 wiz Exp $
DISTNAME= kdeaddons-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Add ons for the KDE integrated X11 desktop
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index dd96e11a341..c37fc20c04a 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2007/02/05 20:14:50 markd Exp $
+# $NetBSD: Makefile,v 1.39 2007/09/21 13:04:02 wiz Exp $
DISTNAME= kdeadmin-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= System administration tools for the KDE integrated X11 desktop
diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile
index 2080d2db953..e1629464a3a 100644
--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2007/01/26 03:10:05 markd Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/21 13:04:02 wiz Exp $
DISTNAME= kdeartwork-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Artwork for the KDE integrated X11 desktop
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 0b04caf0c8f..e92eb5c2c99 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2007/01/26 03:12:58 markd Exp $
+# $NetBSD: Makefile,v 1.45 2007/09/21 13:04:02 wiz Exp $
DISTNAME= kdeedu-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index bd06189bfed..fc6a2fc8195 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2007/06/13 13:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.77 2007/09/21 13:04:02 wiz Exp $
DISTNAME= kdepim-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Personal Information Management tools for the KDE desktop
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index aedc1b0a653..580ddd07a0c 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2007/06/06 11:10:33 markd Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/21 13:04:02 wiz Exp $
DISTNAME= kdeutils-${_KDE_VERSION}
+PKGREVISION= 1
COMMENT= Utilities for the KDE integrated X11 desktop
.include "../../meta-pkgs/kde3/Makefile.kde3"
diff --git a/misc/kmemaid/Makefile b/misc/kmemaid/Makefile
index 76654ddc409..11560ee3284 100644
--- a/misc/kmemaid/Makefile
+++ b/misc/kmemaid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/01/26 04:25:46 markd Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:02 wiz Exp $
#
DISTNAME= kmemaid-0.4.7.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=memaid/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 93370cc2565..210c79284ff 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2007/09/19 23:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2007/09/21 13:04:02 wiz Exp $
DISTNAME= koffice-1.6.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE:=koffice-1.6.3/src/}
EXTRACT_SUFX= .tar.bz2
@@ -61,7 +61,7 @@ post-install:
.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../print/poppler-qt/buildlink3.mk"
diff --git a/misc/koffice/buildlink3.mk b/misc/koffice/buildlink3.mk
index 79665640aa3..12643210691 100644
--- a/misc/koffice/buildlink3.mk
+++ b/misc/koffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/06/05 05:37:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:03 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KOFFICE_BUILDLINK3_MK:= ${KOFFICE_BUILDLINK3_MK}+
@@ -23,7 +23,7 @@ BUILDLINK_PKGSRCDIR.koffice?= ../../misc/koffice
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../x11/kdebase3/buildlink3.mk"
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 6e33cf85a8d..aa5b953d858 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:03 wiz Exp $
#
OO_VER= 2.2.1
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice2-${OO_VER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
DIST_SUBDIR= ${DISTNAME}
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index c585bec40b7..029f1f3de79 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/08/05 19:07:54 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:03 wiz Exp $
#
DISTNAME= orca-2.18.1
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/orca/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/taskjuggler/Makefile b/misc/taskjuggler/Makefile
index 7439dbc5808..0bb6494534b 100644
--- a/misc/taskjuggler/Makefile
+++ b/misc/taskjuggler/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/04/01 09:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:03 wiz Exp $
#
DISTNAME= taskjuggler-2.3.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= http://www.taskjuggler.org/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index c3c02cbb8c3..130cacdf8dd 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/09/19 23:13:24 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2007/09/21 13:04:03 wiz Exp $
#
DISTNAME= yelp-2.18.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -23,7 +23,7 @@ GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
-GCONF2_SCHEMAS= yelp.schemas
+GCONF_SCHEMAS= yelp.schemas
.include "options.mk"
@@ -37,10 +37,10 @@ BUILDLINK_DEPMETHOD.gnome-doc-utils+= full
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index dec477ed363..a204604f69b 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -189,8 +189,8 @@ klash Install Konqueror flash plugin.
kqueue
krb4
krb5
-lablgtk Use lablgtk (GTK1).
-lablgtk2 Use lablgtk2 (GTK2).
+lablgtk1 Use lablgtk1 (GTK1).
+lablgtk Use lablgtk.
lame Use the lame encoder to create MP3 files.
largefile
largescale
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 8782e76a18a..45ef0211304 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:01:23 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:05 wiz Exp $
#
DISTNAME= DVDStyler-1.5b4
PKGNAME= dvdstyler-1.5beta4
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index e2c84ae9b19..29e1948b24a 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2007/09/19 23:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/09/21 13:04:05 wiz Exp $
#
DISTNAME= gmencoder-0.1.0
-PKGREVISION= 22
+PKGREVISION= 23
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gmencoder/}
EXTRACT_SUFX= .tgz
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 1f7b395cc2b..31338f86d32 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/06/17 10:18:13 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/21 13:04:06 wiz Exp $
#
DISTNAME= gnash-0.8.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNU:=gnash/0.8.0/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index b7bf51e3965..c960e793e0e 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:06 wiz Exp $
DISTNAME= gnome-media-2.18.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-media/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -27,10 +27,10 @@ CONFIGURE_ENV+= XGETTEXT=${TOOLS_PATH.xgettext:Q}
CONFIGURE_ENV+= CDROM_HOST="bsd"
.endif
-GCONF2_SCHEMAS= CDDB-Slave2.schemas
-GCONF2_SCHEMAS+= gnome-audio-profiles.schemas
-GCONF2_SCHEMAS+= gnome-sound-recorder.schemas
-GCONF2_SCHEMAS+= gnome-volume-control.schemas
+GCONF_SCHEMAS= CDDB-Slave2.schemas
+GCONF_SCHEMAS+= gnome-audio-profiles.schemas
+GCONF_SCHEMAS+= gnome-sound-recorder.schemas
+GCONF_SCHEMAS+= gnome-volume-control.schemas
BUILDLINK_API_DEPENDS.esound+= esound>=0.2.23
BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.3
@@ -40,12 +40,12 @@ BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.7
BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.2
.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/GConf2-ui/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/GConf-ui/buildlink3.mk"
.include "../../devel/gail/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
diff --git a/multimedia/gnome-media/buildlink3.mk b/multimedia/gnome-media/buildlink3.mk
index 363e17cba9a..b047e3ad896 100644
--- a/multimedia/gnome-media/buildlink3.mk
+++ b/multimedia/gnome-media/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/19 23:41:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:04:06 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_MEDIA_BUILDLINK3_MK:= ${GNOME_MEDIA_BUILDLINK3_MK}+
@@ -17,8 +17,8 @@ BUILDLINK_ABI_DEPENDS.gnome-media?= gnome-media>=2.18.0nb1
BUILDLINK_PKGSRCDIR.gnome-media?= ../../multimedia/gnome-media
.endif # GNOME_MEDIA_BUILDLINK3_MK
-.include "../../devel/GConf2-ui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/GConf-ui/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/multimedia/gst-plugins0.10-good/Makefile b/multimedia/gst-plugins0.10-good/Makefile
index 3cea64393b9..43e5f39ff42 100644
--- a/multimedia/gst-plugins0.10-good/Makefile
+++ b/multimedia/gst-plugins0.10-good/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/07/06 19:13:13 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:06 wiz Exp $
#
.include "Makefile.common"
@@ -12,20 +12,20 @@ CONFIGURE_ARGS+= --enable-gconf
CONFIGURE_ARGS+= --enable-gconftool
CONFIGURE_ARGS+= --enable-zlib
-# We depend on libxml anyway (indirectly through GConf2), so this
+# We depend on libxml anyway (indirectly through GConf), so this
# doesn't hurt. Just make it explicite.
CONFIGURE_ARGS+= --enable-annodex
.include "../../textproc/libxml2/buildlink3.mk"
-GCONF2_SCHEMAS= gstreamer-0.10.schemas
+GCONF_SCHEMAS= gstreamer-0.10.schemas
# only useful if gstreamer was built with the "gstcheck" option
TEST_TARGET= check-torture
post-install:
${INSTALL_DATA} ${WRKSRC}/gconf/gstreamer-0.10.schemas \
- ${GCONF2_SCHEMAS_DIR}
+ ${GCONF_SCHEMAS_DIR}
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins0.8/Makefile b/multimedia/gst-plugins0.8/Makefile
index 9c53cd66c5e..d2c72f6c326 100644
--- a/multimedia/gst-plugins0.8/Makefile
+++ b/multimedia/gst-plugins0.8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/09/19 23:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:04:07 wiz Exp $
#
USE_LANGUAGES= c c++
@@ -6,7 +6,7 @@ USE_LANGUAGES= c c++
.include "Makefile.common"
COMMENT+= base plugins
-PKGREVISION= 8
+PKGREVISION= 9
USE_TOOLS+= perl:run
@@ -24,12 +24,12 @@ CONFIGURE_ARGS+= --enable-xshm
CONFIGURE_ARGS+= --enable-xvideo
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/gst-plugins-0.8
-GCONF2_SCHEMAS= gstreamer-0.8.schemas
+GCONF_SCHEMAS= gstreamer-0.8.schemas
REPLACE_PERL+= tools/gst-launch-ext-m.m
REPLACE_PERL+= tools/gst-visualise-m.m
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXdamage/buildlink3.mk"
diff --git a/multimedia/gst-plugins0.8/buildlink3.mk b/multimedia/gst-plugins0.8/buildlink3.mk
index af15d1a3c95..e75bb12ca51 100644
--- a/multimedia/gst-plugins0.8/buildlink3.mk
+++ b/multimedia/gst-plugins0.8/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/06/05 05:37:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/09/21 13:04:07 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GST_PLUGINS0.8_BUILDLINK3_MK:= ${GST_PLUGINS0.8_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.gst-plugins0.8?= ../../multimedia/gst-plugins0.8
.endif # GST_PLUGINS0.8_BUILDLINK3_MK
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../multimedia/gstreamer0.8/buildlink3.mk"
diff --git a/multimedia/gstreamer0.8/Makefile b/multimedia/gstreamer0.8/Makefile
index 177423fa4f1..bb49d43440d 100644
--- a/multimedia/gstreamer0.8/Makefile
+++ b/multimedia/gstreamer0.8/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:04:07 wiz Exp $
#
DISTNAME= gstreamer-0.8.11
PKGNAME= ${DISTNAME:S/gstreamer/gstreamer0.8/}
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gstreamer/0.8/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 393278a3a7e..8a103934049 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/05/22 10:50:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:04:07 wiz Exp $
#
DISTNAME= kaffeine-0.8.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kaffeine/}
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 465db823ea4..90228f8ebd0 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2007/05/23 13:16:11 markd Exp $
+# $NetBSD: Makefile,v 1.63 2007/09/21 13:04:07 wiz Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= multimedia
COMMENT= Multimedia tools for the KDE integrated X11 desktop
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 129d98bdc49..dbf7ce48cc6 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/05/05 21:43:36 markd Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/21 13:04:08 wiz Exp $
#
DISTNAME= kmplayer-0.9.4a
+PKGREVISION= 1
CATEGORIES= multimedia kde
MASTER_SITES= http://kmplayer.kde.org/pkgs/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index 5f2a0573c29..eb928ed42c6 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/08/19 06:27:10 veego Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:04:08 wiz Exp $
DISTNAME= ogle_gui-0.9.2
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= multimedia
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-gtk2
GCC_REQD+= 2.95.3
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../multimedia/ogle/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index adbd168ae41..812d21a1c6e 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/08 11:33:55 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:04:08 wiz Exp $
#
DISTNAME= subtitleeditor-0.13.6
+PKGREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= http://kitone.free.fr/subtitleeditor/files/
diff --git a/multimedia/swfdec-gtk2/Makefile b/multimedia/swfdec-gtk2/Makefile
index cb5afd00064..eae706ce6c7 100644
--- a/multimedia/swfdec-gtk2/Makefile
+++ b/multimedia/swfdec-gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/09/24 15:25:18 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:04:09 wiz Exp $
#
-PKGREVISION= 9
+PKGREVISION= 10
.include "../../multimedia/swfdec/Makefile.common"
diff --git a/multimedia/swfdec/Makefile b/multimedia/swfdec/Makefile
index 2af63730ff2..0732d3060f3 100644
--- a/multimedia/swfdec/Makefile
+++ b/multimedia/swfdec/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2006/06/12 16:28:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:04:09 wiz Exp $
#
-PKGREVISION= 7
+PKGREVISION= 8
.include "Makefile.common"
CONFIGURE_ARGS+= --disable-pixbuf-loader
.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
index 649b1a1c476..102339cd0ab 100644
--- a/multimedia/swfdec/buildlink3.mk
+++ b/multimedia/swfdec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/09/21 13:04:09 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SWFDEC_BUILDLINK3_MK:= ${SWFDEC_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.swfdec?= ../../multimedia/swfdec
.endif # SWFDEC_BUILDLINK3_MK
.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index b26a22ddb5b..2d7699322dd 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:09 wiz Exp $
#
.include "Makefile.common"
COMMENT+= (using GStreamer)
-PKGREVISION= 1
+PKGREVISION= 2
CONFLICTS+= totem-xine-[0-9]*
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 3d94305fcd5..040b3ddb48d 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile.common,v 1.35 2007/09/21 13:04:09 wiz Exp $
#
DISTNAME= totem-2.18.2
@@ -23,19 +23,19 @@ USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE= totem-plparser.pc.in
-GCONF2_SCHEMAS= totem.schemas
-GCONF2_SCHEMAS+= totem-handlers.schemas
-GCONF2_SCHEMAS+= totem-video-thumbnail.schemas
+GCONF_SCHEMAS= totem.schemas
+GCONF_SCHEMAS+= totem-handlers.schemas
+GCONF_SCHEMAS+= totem-video-thumbnail.schemas
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.10.0
BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.2
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile
index c869349de5e..c3db4391091 100644
--- a/net/bittorrent-gui/Makefile
+++ b/net/bittorrent-gui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2006/04/18 11:53:04 tron Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:04:10 wiz Exp $
.include "../../net/bittorrent/Makefile.common"
PKGNAME= ${DISTNAME:S/BitTorrent/bittorrent-gui/}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT+= (GTK+ GUI)
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index d80c4ce293d..76ed412b505 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2007/09/20 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2007/09/21 13:04:10 wiz Exp $
#
DISTNAME= bug-buddy-2.18.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/bug-buddy/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -17,20 +17,20 @@ USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
-GCONF2_SCHEMAS= bug-buddy.schemas
+GCONF_SCHEMAS= bug-buddy.schemas
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.9.0
BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.96
.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 946a27fecb0..1b1366134f4 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2007/09/21 13:04:11 wiz Exp $
#
DISTNAME= dc_gui2-0.75
-PKGREVISION= 20
+PKGREVISION= 21
CATEGORIES= net
MASTER_SITES= http://www.ac2i.tzo.com/dctc/ \
http://brainz.servebeer.com/dctc/
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 881b819c15b..e821213b0b1 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2007/09/21 13:04:11 wiz Exp $
DISTNAME= etherape-0.9.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= gnome net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/}
@@ -29,7 +29,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/services ${EGDIR}
.include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../textproc/scrollkeeper/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 5fd68559316..e0d114ff03b 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:11 wiz Exp $
#
DISTNAME= gnome-netstatus-2.12.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-netstatus/2.12/}
EXTRACT_SUFX= .tar.bz2
@@ -17,12 +17,12 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-GCONF2_SCHEMAS= netstatus.schemas
+GCONF_SCHEMAS= netstatus.schemas
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index dcbb31f477b..fae3066f43a 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2007/07/04 20:54:49 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:04:11 wiz Exp $
#
DISTNAME= hobbit-4.0-beta6
PKGNAME= hobbit-4.0b6
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 6eacdd783e9..5c024e0cbf1 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2007/06/23 21:41:23 markd Exp $
+# $NetBSD: Makefile,v 1.63 2007/09/21 13:04:11 wiz Exp $
DISTNAME= kdenetwork-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
COMMENT= Network modules for the KDE integrated X11 desktop
diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile
index 1679fb4805c..26df0bbf0f9 100644
--- a/net/kftpgrabber/Makefile
+++ b/net/kftpgrabber/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2007/05/05 21:39:11 markd Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:04:12 wiz Exp $
DISTNAME= kftpgrabber-0.8.1
+PKGREVISION= 1
CATEGORIES= net kde
MASTER_SITES= http://www.kftp.org/uploads/files/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index c1d482df504..a1033f586f6 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/08/23 16:40:29 abs Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:12 wiz Exp $
DISTNAME= ktorrent-${KTORRENT_VER}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net kde
MASTER_SITES= http://ktorrent.org/downloads/${KTORRENT_VER}/
diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 9d3d5ae5e4e..3af3549f48d 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/09/18 12:35:12 tron Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:12 wiz Exp $
DISTNAME= libtorrent-0.11.7
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE:=downloads/}
@@ -35,5 +36,5 @@ CONFIGURE_ENV+= OPENSSL_CFLAGS=${OPENSSL_CFLAGS:Q}
CONFIGURE_ENV+= OPENSSL_LIBS=${OPENSSL_LIBS:Q}
.endif
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk
index 67eea9c22b2..0f3354c6e61 100644
--- a/net/libtorrent/buildlink3.mk
+++ b/net/libtorrent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/01/30 14:04:05 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/09/21 13:04:12 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTORRENT_BUILDLINK3_MK:= ${LIBTORRENT_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.libtorrent+= libtorrent>=0.11.0
BUILDLINK_PKGSRCDIR.libtorrent?= ../../net/libtorrent
.endif # LIBTORRENT_BUILDLINK3_MK
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/logjam/Makefile b/net/logjam/Makefile
index e8dc0d4b897..c755d92c5bb 100644
--- a/net/logjam/Makefile
+++ b/net/logjam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:04:12 wiz Exp $
#
DISTNAME= logjam-4.5.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net
MASTER_SITES= http://logjam.danga.com/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index 2f54f55804f..d73d311fc68 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:12 wiz Exp $
#
.include "../../net/mldonkey/Makefile.common"
PKGNAME= ${DISTNAME:S/mldonkey/mldonkey-gui/}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT+= (GTK interface)
DEPENDS+= mldonkey-[0-9]*:../../net/mldonkey
diff --git a/net/mldonkey-gui/options.mk b/net/mldonkey-gui/options.mk
index 7c2128e5e60..09b6da85fff 100644
--- a/net/mldonkey-gui/options.mk
+++ b/net/mldonkey-gui/options.mk
@@ -1,22 +1,22 @@
-# $NetBSD: options.mk,v 1.7 2007/09/20 21:37:42 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2007/09/21 13:04:13 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mldonkey-gui
PKG_OPTIONS_REQUIRED_GROUPS+= toolkit
-PKG_OPTIONS_GROUP.toolkit= lablgtk lablgtk2
-PKG_SUGGESTED_OPTIONS= lablgtk2
+PKG_OPTIONS_GROUP.toolkit= lablgtk1 lablgtk
+PKG_SUGGESTED_OPTIONS= lablgtk
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mlablgtk)
+.if !empty(PKG_OPTIONS:Mlablgtk1)
CONFIGURE_ARGS+= --enable-gui=newgui1
-.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/lablgtk1/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS:Mlablgtk2)
+.if !empty(PKG_OPTIONS:Mlablgtk)
CONFIGURE_ARGS+= --enable-gui=newgui2
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
# 2.6.0 is the first ~stable version (for mldonkey)
-BUILDLINK_API_DEPENDS.lablgtk2+= lablgtk2>=2.6.0
-.include "../../x11/lablgtk2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.lablgtk+= lablgtk>=2.6.0
+.include "../../x11/lablgtk/buildlink3.mk"
.endif
diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index b13e01cd23b..69d90c2f6f1 100644
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/09/12 07:33:30 seb Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:13 wiz Exp $
#
DISTNAME= nfdump-1.5.5
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nfdump/}
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index 5c9c17e8721..a0403e3eae1 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2007/02/22 19:26:56 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:04:13 wiz Exp $
#
DISTNAME= nicotine-1.0.8
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net audio x11
MASTER_SITES= http://nicotine.thegraveyard.org/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 3dfe9bd38a5..574e2d2746b 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2007/09/15 07:35:37 adam Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/21 13:04:13 wiz Exp $
DISTNAME= ntop-3.3
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ntop/}
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index cac325d67d1..ecfe1ccfe9b 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/09/18 12:35:13 tron Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:13 wiz Exp $
DISTNAME= rtorrent-0.7.7
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE:=downloads/}
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 9b2731cfc19..b1184ed3937 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2007/09/19 23:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/21 13:04:13 wiz Exp $
#
DISTNAME= tsclient-0.132
-PKGREVISION= 19
+PKGREVISION= 20
CATEGORIES= net
MASTER_SITES= http://www.gnomepro.com/tsclient/
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 6aebffec114..2b8efafb014 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2006/12/11 23:00:31 tonio Exp $
+# $NetBSD: Makefile,v 1.34 2007/09/21 13:04:13 wiz Exp $
DISTNAME= unison-2.13.16
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/
diff --git a/net/unison/options.mk b/net/unison/options.mk
index dab19863bf1..b7b08024f49 100644
--- a/net/unison/options.mk
+++ b/net/unison/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2006/12/11 23:00:31 tonio Exp $
+# $NetBSD: options.mk,v 1.2 2007/09/21 13:04:13 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.unison
-PKG_SUPPORTED_OPTIONS= lablgtk2
+PKG_SUPPORTED_OPTIONS= lablgtk
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mlablgtk2)
+.if !empty(PKG_OPTIONS:Mlablgtk)
MAKE_FLAGS+= UISTYLE=gtk2
-.include "../../x11/lablgtk2/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.else
MAKE_FLAGS+= UISTYLE=text
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 61c548b90e2..3400e2058a2 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2007/09/19 23:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/21 13:04:14 wiz Exp $
DISTNAME= vino-2.18.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vino/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -16,16 +16,16 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
GNU_CONFIGURE= yes
-GCONF2_SCHEMAS= vino-server.schemas
+GCONF_SCHEMAS= vino-server.schemas
BUILDLINK_DEPMETHOD.libXt?= build
.include "options.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/parallel/ganglia-monitor-core/Makefile b/parallel/ganglia-monitor-core/Makefile
index a4a4b5e203f..8f50396970f 100644
--- a/parallel/ganglia-monitor-core/Makefile
+++ b/parallel/ganglia-monitor-core/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2007/09/16 10:29:52 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 13:04:14 wiz Exp $
#
DISTNAME= ganglia-3.0.1
PKGNAME= ganglia-monitor-core-3.0.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= net parallel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/}
EXTRACT_SUFX= .tar.bz2
diff --git a/print/advi/Makefile b/print/advi/Makefile
index a7d1e1a516d..8ce2598cdb0 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/12/15 20:33:00 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:04:14 wiz Exp $
DISTNAME= advi-1.6.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= print
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/
EXTRACT_SUFX= .tgz
@@ -60,7 +60,7 @@ post-install:
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/lablgtk1/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/ocaml-graphics/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index 08390db853c..77f61db83f7 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2007/09/20 21:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:04:14 wiz Exp $
#
.include "../../print/evince/Makefile.common"
PKGNAME= ${DISTNAME:S/evince/evince-nautilus/}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= File properties plugin for evince files
PKG_OPTIONS_VAR= PKG_OPTIONS.evince
diff --git a/print/evince/Makefile b/print/evince/Makefile
index 5a77c61b1c6..ecca66bc52f 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.34 2007/09/19 23:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/21 13:04:14 wiz Exp $
#
.include "../../print/evince/Makefile.common"
COMMENT= Document viewer for the GNOME Desktop
-PKGREVISION= 1
+PKGREVISION= 2
-GCONF2_SCHEMAS= evince.schemas
-GCONF2_SCHEMAS+= evince-thumbnailer.schemas
-GCONF2_SCHEMAS+= evince-thumbnailer-ps.schemas
+GCONF_SCHEMAS= evince.schemas
+GCONF_SCHEMAS+= evince-thumbnailer.schemas
+GCONF_SCHEMAS+= evince-thumbnailer-ps.schemas
PKG_OPTIONS_VAR= PKG_OPTIONS.evince
PKG_SUPPORTED_OPTIONS= dvi djvu
@@ -19,7 +19,7 @@ PKG_SUGGESTED_OPTIONS= # none
.if !empty(PKG_OPTIONS:Mdvi)
CONFIGURE_ARGS+= --enable-dvi
PLIST_SUBST+= DVI= # empty
-GCONF2_SCHEMAS+= evince-thumbnailer-dvi.schemas
+GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas
.include "../../mk/tex.buildlink3.mk"
.else
PLIST_SUBST+= DVI="@comment "
@@ -28,7 +28,7 @@ PLIST_SUBST+= DVI="@comment "
.if !empty(PKG_OPTIONS:Mdjvu)
CONFIGURE_ARGS+= --enable-djvu
PLIST_SUBST+= DJVU= #empty
-GCONF2_SCHEMAS+= evince-thumbnailer-djvu.schemas
+GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas
.include "../../graphics/djvulibre-lib/buildlink3.mk"
.else
PLIST_SUBST+= DJVU="@comment "
@@ -36,7 +36,7 @@ PLIST_SUBST+= DJVU="@comment "
BUILDLINK_DEPMETHOD.libXt?= build
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../security/gnome-keyring/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index 68c75320904..a06b2fb4b65 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2007/09/19 23:13:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.17 2007/09/21 13:04:14 wiz Exp $
#
DISTNAME= evince-0.8.3
@@ -32,7 +32,7 @@ BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.3
.include "../../databases/shared-mime-info/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 6e85cae7eb6..cdeadc2f553 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2007/09/19 23:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:04:14 wiz Exp $
#
DISTNAME= glabels-2.0.4
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=glabels/}
@@ -18,7 +18,7 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config
.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/print/kbibtex/Makefile b/print/kbibtex/Makefile
index d20cd01be08..49017ad5e24 100644
--- a/print/kbibtex/Makefile
+++ b/print/kbibtex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:04:14 wiz Exp $
DISTNAME= kbibtex-0.1.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= print kde
MASTER_SITES= http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 1edf9ec7996..de278c9582f 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2007/09/20 17:15:49 rillig Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/21 13:04:14 wiz Exp $
#
DISTNAME= libgnomeprint-2.18.2
+PKGREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprint/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -52,6 +53,6 @@ PRINT_PLIST_AWK+= /cups/ { print "$${USE_CUPS}" $$0; next; }
.include "../../devel/pango/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 1400221b45b..0ed613f8bc7 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/05/30 08:54:31 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:15 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINT_BUILDLINK3_MK:= ${LIBGNOMEPRINT_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@ BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
pkgbase := libgnomeprint
.include "../../mk/pkg-build-options.mk"
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 4d64356ccc9..f2ec29b636f 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2007/09/18 20:01:40 drochner Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/21 13:04:15 wiz Exp $
#
DISTNAME= libgnomeprintui-2.18.1
+PKGREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -22,12 +23,12 @@ PKGCONFIG_OVERRIDE= libgnomeprintui/libgnomeprintui-2.2.pc.in
BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.12.1
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index 19ed22788b5..69cfa3e267a 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:04:15 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEPRINTUI_BUILDLINK3_MK:= ${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
@@ -17,13 +17,13 @@ BUILDLINK_ABI_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.12.1nb3
BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/print/ruby-gnome2-gnomeprint/Makefile b/print/ruby-gnome2-gnomeprint/Makefile
index df5fd233182..991fb4a83b0 100644
--- a/print/ruby-gnome2-gnomeprint/Makefile
+++ b/print/ruby-gnome2-gnomeprint/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/06/09 01:07:13 obache Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:15 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnomeprint-${VERSION}
COMMENT= Ruby binding of libgnomeprint
+PKGREVISION= 1
CATEGORIES= print
RUBY_EXTCONF_SUBDIRS= gnomeprint
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 71bd95181da..f3d59287bb8 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2007/08/08 17:11:33 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2007/09/21 13:04:16 wiz Exp $
DISTNAME= scribus-1.3.3.9
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/}
EXTRACT_SUFX= .tar.bz2
@@ -32,8 +33,8 @@ CONFIGURE_ENV+= ac_cv_prog_hacups=no
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.19nb1
-.include "../../graphics/libart2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1
+.include "../../graphics/libart/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
diff --git a/security/Bastille/Makefile b/security/Bastille/Makefile
index 9bd648f79ce..fb9fe945afd 100644
--- a/security/Bastille/Makefile
+++ b/security/Bastille/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/06/06 22:37:59 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:04:16 wiz Exp $
#
DISTNAME= Bastille-3.0.9
@@ -59,5 +59,5 @@ post-configure:
do-install:
cd ${WRKSRC} && sh ./Install.sh
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 5c912b09db4..b2ff651d166 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/09/19 23:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:04:16 wiz Exp $
#
DISTNAME= gnome-keyring-manager-2.18.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring-manager/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -17,13 +17,13 @@ USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
-GCONF2_SCHEMAS= gnome-keyring-manager.schemas
+GCONF_SCHEMAS= gnome-keyring-manager.schemas
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../security/gnome-keyring/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index 54e96c05b28..22d50e52be3 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/09/19 23:19:07 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:04:16 wiz Exp $
#
DISTNAME= gpass-0.4.4
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= security gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpass/}
@@ -17,7 +17,7 @@ USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/security/honeyd/Makefile b/security/honeyd/Makefile
index a490711595a..d4873d84c4d 100644
--- a/security/honeyd/Makefile
+++ b/security/honeyd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/08/16 09:27:06 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:04:16 wiz Exp $
#
DISTNAME= honeyd-1.5b
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= security net
MASTER_SITES= http://www.citi.umich.edu/u/provos/honeyd/
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index f6330eec575..0892ba31c0c 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:04:16 wiz Exp $
#
DISTNAME= kssh-0.7
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= security kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kssh/}
diff --git a/security/seahorse-gedit/Makefile b/security/seahorse-gedit/Makefile
index 170f26f3b85..caf37aef1f7 100644
--- a/security/seahorse-gedit/Makefile
+++ b/security/seahorse-gedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/09/19 23:13:27 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:17 wiz Exp $
DISTNAME= seahorse-1.0.1
PKGNAME= seahorse-gedit-1.0.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/1.0/}
EXTRACT_SUFX= .tar.bz2
@@ -23,7 +23,7 @@ USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --disable-nautilus
-GCONF2_SCHEMAS= seahorse-gedit.schemas
+GCONF_SCHEMAS= seahorse-gedit.schemas
BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2
@@ -32,10 +32,10 @@ INSTALL_DIRS= plugins/gedit
.include "../../databases/gnome-mime-data/buildlink3.mk"
.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../security/seahorse/buildlink3.mk"
diff --git a/security/seahorse-nautilus/Makefile b/security/seahorse-nautilus/Makefile
index f9a7b02108b..bfb58a98b44 100644
--- a/security/seahorse-nautilus/Makefile
+++ b/security/seahorse-nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/09/20 21:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:04:17 wiz Exp $
DISTNAME= seahorse-1.0.1
PKGNAME= seahorse-nautilus-1.0.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/1.0/}
EXTRACT_SUFX= .tar.bz2
@@ -30,7 +30,7 @@ INSTALL_DIRS= plugins/nautilus-ext
.include "../../databases/gnome-mime-data/buildlink3.mk"
.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 8b43517301c..eeed8216f7f 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2007/09/19 23:13:27 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2007/09/21 13:04:16 wiz Exp $
DISTNAME= seahorse-1.0.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/1.0/}
EXTRACT_SUFX= .tar.bz2
@@ -36,14 +36,14 @@ CONFIGURE_ENV+= SSH_ADD_PATH=${SSH_ADD_PATH:Q}
CONFIGURE_ENV+= SSH_KEYGEN_PATH=${SSH_KEYGEN_PATH:Q}
PKGCONFIG_OVERRIDE+= libcryptui/cryptui.pc.in
-GCONF2_SCHEMAS= seahorse.schemas
+GCONF_SCHEMAS= seahorse.schemas
BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2
.include "../../databases/gnome-mime-data/buildlink3.mk"
.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk
index c18cb46ac97..8e6708d5678 100644
--- a/security/seahorse/buildlink3.mk
+++ b/security/seahorse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2007/09/19 23:13:27 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2007/09/21 13:04:17 wiz Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.10.
# XXX After this file has been verified as correct, the comment lines
@@ -34,7 +34,7 @@ BUILDLINK_PKGSRCDIR.seahorse?= ../../security/seahorse
# XXX buildlink3 lines below to dependencies, remove them.
# XXX
#.include "../../databases/gnome-mime-data/buildlink3.mk"
-#.include "../../devel/libglade2/buildlink3.mk"
+#.include "../../devel/libglade/buildlink3.mk"
#.include "../../devel/libgnomeui/buildlink3.mk"
#.include "../../net/libsoup-devel/buildlink3.mk"
#.include "../../security/gpgme/buildlink3.mk"
diff --git a/sysutils/bacula-gnome-console/Makefile b/sysutils/bacula-gnome-console/Makefile
index a30e8aad29d..3ffef4fa520 100644
--- a/sysutils/bacula-gnome-console/Makefile
+++ b/sysutils/bacula-gnome-console/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/09/19 23:19:07 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:17 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-gnomeconsole-/}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Gnome console for Bacula - The Network Backup Solution
CATEGORIES+= gnome
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index aedf345ae1f..e3a6fcba0fa 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/09/09 02:46:08 obache Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:04:17 wiz Exp $
#
DISTNAME= burn-0.4.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= sysutils gnustep
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsburn/}
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 4b2fea3ba5b..581c87e2b8f 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:04:17 wiz Exp $
#
DISTNAME= filelight-1.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://www.methylblue.com/filelight/packages/
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 52472a5093b..04cbc9c95a9 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2007/09/19 23:19:07 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/21 13:04:17 wiz Exp $
.include "../../sysutils/cdrdao/Makefile.common"
PKGNAME= gcdmaster-${CDRDAO_VER}
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= Gnome UI frontend to cdrdao
DEPENDS+= cdrdao-${CDRDAO_VER}{,nb*}:../../sysutils/cdrdao
@@ -17,7 +17,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/applications share/pixmaps
USE_TOOLS+= pkg-config
INSTALL_DIRS= xdao
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
.include "../../devel/libgnomeuimm/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index eaff6b60bf8..1665fa6cd5a 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2007/09/19 23:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/21 13:04:18 wiz Exp $
#
DISTNAME= gnome-menus-2.18.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-menus/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index b4f86502c33..2545f3a11ad 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2007/09/19 23:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:04:18 wiz Exp $
#
DISTNAME= gnome-pkgview-1.0.6
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/
@@ -15,9 +15,9 @@ GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
-GCONF2_SCHEMAS= gnome-pkgview.schemas
+GCONF_SCHEMAS= gnome-pkgview.schemas
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 35984d1e66b..7a21ee88a08 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/20 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:18 wiz Exp $
#
DISTNAME= gnome-system-monitor-2.15.92
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.15/}
EXTRACT_SUFX= .tar.bz2
@@ -20,7 +20,7 @@ USE_TOOLS+= autoconf gmake intltool msgfmt pkg-config
CONFLICTS+= gnome2-system-monitor-[0-9]*
LIBS+= -lutil
-GCONF2_SCHEMAS+= gnome-system-monitor.schemas
+GCONF_SCHEMAS+= gnome-system-monitor.schemas
pre-configure:
cd ${WRKSRC} && ${PREFIX}/bin/libtoolize
@@ -30,7 +30,7 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.1
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0
# TODO: Add libgksu support.
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
diff --git a/sysutils/gnome-vfs-monikers/Makefile b/sysutils/gnome-vfs-monikers/Makefile
index e66fb15c66a..973f891d568 100644
--- a/sysutils/gnome-vfs-monikers/Makefile
+++ b/sysutils/gnome-vfs-monikers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/09/19 23:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:18 wiz Exp $
#
DISTNAME= gnome-vfs-monikers-2.15.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs-monikers/2.15/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 223bb95fa04..224277d47c6 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2007/09/19 22:22:34 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2007/09/21 13:04:18 wiz Exp $
-PKGREVISION= 2
+PKGREVISION= 3
PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in
PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in
@@ -9,11 +9,11 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/modules
EGFILES+= modules/default-modules.conf
EGFILES+= modules/ssl-modules.conf
-GCONF2_SCHEMAS= desktop_default_applications.schemas
-GCONF2_SCHEMAS+= desktop_gnome_url_handlers.schemas
-GCONF2_SCHEMAS+= system_dns_sd.schemas
-GCONF2_SCHEMAS+= system_http_proxy.schemas
-GCONF2_SCHEMAS+= system_smb.schemas
+GCONF_SCHEMAS= desktop_default_applications.schemas
+GCONF_SCHEMAS+= desktop_gnome_url_handlers.schemas
+GCONF_SCHEMAS+= system_dns_sd.schemas
+GCONF_SCHEMAS+= system_http_proxy.schemas
+GCONF_SCHEMAS+= system_smb.schemas
LDFLAGS.Darwin+= -lresolv
@@ -25,7 +25,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFIGURE_ARGS+= --enable-fam
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common
index 28068ecfa6a..84518b1b7bb 100644
--- a/sysutils/gnome-vfs/Makefile.common
+++ b/sysutils/gnome-vfs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2007/09/20 22:51:00 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/09/21 13:04:18 wiz Exp $
#
GNOME_VFS_VERSION= 2.18.1
@@ -102,7 +102,7 @@ do-install:
${PREFIX}/lib/gnome-vfs-2.0/modules
.endif
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index ae4d1414f89..7763a021e53 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/09/19 22:22:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/09/21 13:04:18 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_VFS_BUILDLINK3_MK:= ${GNOME_VFS_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules/ \
{ print "@comment in gnome-vfs: " $$0; next; }
.endif # GNOME_VFS_BUILDLINK3_MK
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile
index 1d79f3c1915..12fae280400 100644
--- a/sysutils/gnome-vfsmm/Makefile
+++ b/sysutils/gnome-vfsmm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2007/09/19 23:13:30 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:04:18 wiz Exp $
DISTNAME= gnome-vfsmm-2.18.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfsmm/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/gst-plugins0.10-gnomevfs/Makefile b/sysutils/gst-plugins0.10-gnomevfs/Makefile
index 09c8074a135..095cc65758f 100644
--- a/sysutils/gst-plugins0.10-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.10-gnomevfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/09/19 23:13:30 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/21 13:04:18 wiz Exp $
#
GST_PLUGINS0.10_NAME= gnomevfs
@@ -6,7 +6,7 @@ GST_PLUGINS0.10_DIRS= ext/gnomevfs
GST_PLUGINS0.10_FLAGS= gnome_vfs
.include "../../multimedia/gst-plugins0.10-base/Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gst-plugins0.8-gnomevfs/Makefile b/sysutils/gst-plugins0.8-gnomevfs/Makefile
index c0de6beee56..4d202e1477d 100644
--- a/sysutils/gst-plugins0.8-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.8-gnomevfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/19 23:13:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:19 wiz Exp $
#
GST_PLUGINS0.8_NAME= gnomevfs
@@ -6,7 +6,7 @@ GST_PLUGINS0.8_DIR= ext/gnomevfs
GST_PLUGINS0.8_FLAG= gnome_vfs
.include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION= 8
+PKGREVISION= 9
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile
index 6e40512808f..ecb2073a2e5 100644
--- a/sysutils/gworkspace/Makefile
+++ b/sysutils/gworkspace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2006/09/22 07:08:16 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:04:19 wiz Exp $
#
DISTNAME= gworkspace-0.7.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= sysutils gnustep
MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/ \
http://www.imago.ro/gworkspace/
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index ff6cf4820e9..63798d5e24f 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/07/25 02:33:03 markd Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:19 wiz Exp $
#
DISTNAME= k3b-1.0.3
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index f10afc4b0b2..705f2dbeffe 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:11 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:04:19 wiz Exp $
DISTNAME= kdirstat-2.4.4
+PKGREVISION= 1
CATEGORIES= sysutils kde
MASTER_SITES= http://kdirstat.sourceforge.net/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile
index f7db1d3433a..11f244c8971 100644
--- a/sysutils/krusader/Makefile
+++ b/sysutils/krusader/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/08/15 03:20:59 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:19 wiz Exp $
#
DISTNAME= krusader-1.80.0
+PKGREVISION= 1
CATEGORIES= kde sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=krusader/}
diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile
index c81c2cf7a5b..f7416028808 100644
--- a/sysutils/libgtop/Makefile
+++ b/sysutils/libgtop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/09/20 21:12:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:19 wiz Exp $
DISTNAME= libgtop-2.14.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.14/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 5831e23216a..f7ba079830d 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/21 13:04:21 wiz Exp $
#
DISTNAME= nautilus-cd-burner-2.14.3
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.14/}
EXTRACT_SUFX= .tar.bz2
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --disable-hal
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
INSTALL_MAKE_FLAGS+= modulesconfdir=${PREFIX}/share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules
-INSTALL_MAKE_FLAGS+= schemadir=${GCONF2_SCHEMAS_DIR}
+INSTALL_MAKE_FLAGS+= schemadir=${GCONF_SCHEMAS_DIR}
CPPFLAGS+= -D__unix__
@@ -36,16 +36,16 @@ EGDIR= ${PREFIX}/share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules
CONF_FILES= ${EGDIR}/mapping-modules.conf \
${PKG_SYSCONFDIR}/mapping-modules.conf
-GCONF2_SCHEMAS= ncb.schemas
+GCONF_SCHEMAS= ncb.schemas
BUILDLINK_API_DEPENDS.eel+= eel>=2.13.3
BUILDLINK_API_DEPENDS.nautilus+= nautilus>=2.13.4
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/eel/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index eab8e3fa5c3..e616f5ce8b5 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2007/09/21 13:04:20 wiz Exp $
#
DISTNAME= nautilus-2.18.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE= libnautilus-extension/libnautilus-extension.pc.in
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-GCONF2_SCHEMAS= apps_nautilus_preferences.schemas
+GCONF_SCHEMAS= apps_nautilus_preferences.schemas
BUILDLINK_API_DEPENDS.eel+= eel>=2.15.91
BUILDLINK_API_DEPENDS.esound+= esound>=0.2.27
@@ -33,7 +33,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../audio/esound/buildlink3.mk"
.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/eel/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
@@ -43,7 +43,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index af6bc076acb..a5a87ad2216 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2007/09/21 13:04:20 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NAUTILUS_BUILDLINK3_MK:= ${NAUTILUS_BUILDLINK3_MK}+
@@ -23,7 +23,7 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus\/extensions-1.0$$/ \
.endif # NAUTILUS_BUILDLINK3_MK
.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/eel/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
@@ -32,7 +32,7 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus\/extensions-1.0$$/ \
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
diff --git a/sysutils/notification-daemon/Makefile b/sysutils/notification-daemon/Makefile
index daaa2372e23..ded0d1c5656 100644
--- a/sysutils/notification-daemon/Makefile
+++ b/sysutils/notification-daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/03/23 17:07:37 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:04:21 wiz Exp $
#
DISTNAME= notification-daemon-0.3.7
@@ -13,7 +13,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool pkg-config msgfmt
-GCONF2_SCHEMAS= notification-daemon.schemas
+GCONF_SCHEMAS= notification-daemon.schemas
.include "../../mk/bsd.prefs.mk"
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-dbus-sys=${PKG_SYSCONFDIR.dbus}/system.d
CONFIGURE_ARGS+= --with-dbus-sys=${PKG_SYSCONFDIR}/dbus-1/system.d
.endif
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libsexy/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
diff --git a/sysutils/py-gnome-menus/Makefile b/sysutils/py-gnome-menus/Makefile
index 196cd63cc94..eab8b3ee995 100644
--- a/sysutils/py-gnome-menus/Makefile
+++ b/sysutils/py-gnome-menus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/09/19 23:19:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:04:21 wiz Exp $
#
DISTNAME= gnome-menus-2.18.3
PKGNAME= ${PYPKGPREFIX}-gnome-menus-2.18.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-menus/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/sysutils/py-notify/Makefile b/sysutils/py-notify/Makefile
index 5c9f49f9b66..2d6a08da942 100644
--- a/sysutils/py-notify/Makefile
+++ b/sysutils/py-notify/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/01/15 21:16:37 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:21 wiz Exp $
#
DISTNAME= notify-python-0.1.1
PKGNAME= ${PYPKGPREFIX}-notify-0.1.1
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= \
http://www.galago-project.org/files/releases/source/notify-python/
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index 206a800e711..86409faed4a 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/09/19 23:13:31 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/21 13:04:21 wiz Exp $
#
DISTNAME= rox-2.4.1
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
EXTRACT_SUFX= .tgz
diff --git a/sysutils/xfce4-thunar/Makefile b/sysutils/xfce4-thunar/Makefile
index 442ddf3bc06..13d602e1200 100644
--- a/sysutils/xfce4-thunar/Makefile
+++ b/sysutils/xfce4-thunar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/04/17 17:45:07 martti Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:22 wiz Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -6,6 +6,7 @@ XFCE4_VERSION= 0.8.0
DISTNAME= Thunar-${XFCE4_VERSION}
PKGNAME= xfce4-thunar-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= sysutils
COMMENT= Xfce file manager
@@ -16,7 +17,7 @@ USE_DIRS+= xdg-1.2
PKGCONFIG_OVERRIDE+= thunar-vfs/thunar-vfs-1.pc.in
PKGCONFIG_OVERRIDE+= thunarx/thunarx-1.pc.in
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk
index 30adff44174..c2c42853137 100644
--- a/sysutils/xfce4-thunar/buildlink3.mk
+++ b/sysutils/xfce4-thunar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/12 09:46:28 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:04:22 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_THUNAR_BUILDLINK3_MK:= ${XFCE4_THUNAR_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@ BUILDLINK_API_DEPENDS.xfce4-thunar+= xfce4-thunar>=0.8.0
BUILDLINK_PKGSRCDIR.xfce4-thunar?= ../../sysutils/xfce4-thunar
.endif # XFCE4_THUNAR_BUILDLINK3_MK
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 61a2a78ba45..b0e50199cc6 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2007/09/19 23:19:09 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/21 13:04:22 wiz Exp $
DISTNAME= gnome-spell-1.0.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-spell/1.0/}
EXTRACT_SUFX= .tar.bz2
@@ -21,7 +21,7 @@ BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0nb3
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk
index ea523cf7ca0..9c0f5ebcaee 100644
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/06/05 05:37:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/09/21 13:04:23 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_SPELL_BUILDLINK3_MK:= ${GNOME_SPELL_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index e7ce16de3fd..ba99ddb77b3 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2007/09/19 23:19:09 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2007/09/21 13:04:23 wiz Exp $
#
DISTNAME= libcroco-0.6.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libcroco/0.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 7450e295832..40f3c693760 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/09/20 21:03:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:23 wiz Exp $
DISTNAME= libxml++-2.18.1
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml++/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/textproc/py-gdick/Makefile b/textproc/py-gdick/Makefile
index 35c0b8dce03..1898f534f1a 100644
--- a/textproc/py-gdick/Makefile
+++ b/textproc/py-gdick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/09/02 13:00:45 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:23 wiz Exp $
DISTNAME= gdick-0.9.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gdick/}
EXTRACT_SUFX= .tar.bz2
diff --git a/time/cairo-clock/Makefile b/time/cairo-clock/Makefile
index 4220ed8ecde..de467edc192 100644
--- a/time/cairo-clock/Makefile
+++ b/time/cairo-clock/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/09/20 21:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:04:24 wiz Exp $
#
DISTNAME= cairo-clock_0.3.3-1
PKGNAME= cairo-clock-0.3.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= time
MASTER_SITES= http://macslow.thepimp.net/projects/cairo-clock/
@@ -20,5 +20,5 @@ USE_DIRS+= xdg-1.1
.include "../../x11/gtk2/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/evolution-webcal/Makefile b/time/evolution-webcal/Makefile
index 1c4fb4e141c..439051c0ffb 100644
--- a/time/evolution-webcal/Makefile
+++ b/time/evolution-webcal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/09/19 23:19:10 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:24 wiz Exp $
#
DISTNAME= evolution-webcal-2.10.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= time gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-webcal/2.10/}
EXTRACT_SUFX= .tar.bz2
@@ -16,9 +16,9 @@ USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
-GCONF2_SCHEMAS= evolution-webcal.schemas
+GCONF_SCHEMAS= evolution-webcal.schemas
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
diff --git a/time/gdeskcal/Makefile b/time/gdeskcal/Makefile
index b47a91555a4..1d95a3dc6cc 100644
--- a/time/gdeskcal/Makefile
+++ b/time/gdeskcal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2006/10/14 08:23:44 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:04:24 wiz Exp $
#
DISTNAME= gDeskCal-0_57_1
PKGNAME= gdeskcal-0.57.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= time
MASTER_SITES= http://www.pycage.de/download/
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 417061d05b4..14d20f64013 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2007/09/19 23:13:32 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:04:24 wiz Exp $
DISTNAME= gnotime-2.2.1
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= time gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gttr/}
@@ -15,14 +15,14 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-GCONF2_SCHEMAS= gnotime.schemas
+GCONF_SCHEMAS= gnotime.schemas
BUILDLINK_DEPMETHOD.libXt?= build
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
diff --git a/time/gtodo-applet/Makefile b/time/gtodo-applet/Makefile
index bce73943f49..fd1cd3e87de 100644
--- a/time/gtodo-applet/Makefile
+++ b/time/gtodo-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2007/09/19 23:19:10 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/09/21 13:04:25 wiz Exp $
#
DISTNAME= gtodo-applet-0.1
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= time gnome
MASTER_SITES= http://download.qballcow.nl/programs/gtodo/
@@ -17,8 +17,8 @@ GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= YES
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/gtodo/Makefile b/time/gtodo/Makefile
index b38a1cbfd6e..d7fcaeb34c6 100644
--- a/time/gtodo/Makefile
+++ b/time/gtodo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:13:32 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:24 wiz Exp $
#
DISTNAME= gtodo-0.14
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= time gnome
MASTER_SITES= http://download.qballcow.nl/programs/gtodo/
@@ -15,9 +15,9 @@ USE_DIRS+= xdg-1.1
USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
-GCONF2_SCHEMAS= gtodo.schemas
+GCONF_SCHEMAS= gtodo.schemas
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/time/planner/Makefile b/time/planner/Makefile
index 89fd5b2a699..bbf2b21c6f3 100644
--- a/time/planner/Makefile
+++ b/time/planner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/09/19 23:13:32 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:25 wiz Exp $
#
DISTNAME= planner-0.14.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/planner/0.14/}
EXTRACT_SUFX= .tar.bz2
@@ -21,13 +21,13 @@ PKGCONFIG_OVERRIDE= libplanner-1.pc.in
CONFIGURE_ARGS+= --enable-python=no
-GCONF2_SCHEMAS= planner.schemas
+GCONF_SCHEMAS= planner.schemas
.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/time/rsibreak/Makefile b/time/rsibreak/Makefile
index c3de2d6a8e3..92791404943 100644
--- a/time/rsibreak/Makefile
+++ b/time/rsibreak/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/06/19 13:30:04 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:25 wiz Exp $
DISTNAME= Rsibreak-0.8.0
PKGNAME= rsibreak-0.8.0
+PKGREVISION= 1
CATEGORIES= time kde
MASTER_SITES= http://www.rsibreak.org/images/e/e0/
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 403dc4b4070..efded143c5f 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/09/20 21:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:04:25 wiz Exp $
#
DISTNAME= compiz-0.4.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= wm x11
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
EXTRACT_SUFX= .tar.bz2
@@ -17,8 +17,8 @@ USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-GCONF2_SCHEMAS+= gwd.schemas
-GCONF2_SCHEMAS+= compiz.schemas
+GCONF_SCHEMAS+= gwd.schemas
+GCONF_SCHEMAS+= compiz.schemas
PKGCONFIG_OVERRIDE+= compiz.pc.in
PKGCONFIG_OVERRIDE+= libdecoration/libdecoration.pc.in
@@ -56,7 +56,7 @@ PLIST_SUBST+= KDE="@comment "
# some plugins do it.
.include "../../mk/pthread.buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index a5b94483df4..18e4ebb799c 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/10/14 05:02:21 obache Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:04:25 wiz Exp $
#
DISTNAME= e16menuedit2-0.0.3
+PKGREVISION= 1
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
@@ -24,7 +25,7 @@ pre-configure:
aclocal; autoheader; automake -a --foreign -i; autoconf
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/gnome-compiz-manager/Makefile b/wm/gnome-compiz-manager/Makefile
index 87d4c7fd111..beb2bb04a48 100644
--- a/wm/gnome-compiz-manager/Makefile
+++ b/wm/gnome-compiz-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2007/09/20 21:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/21 13:04:25 wiz Exp $
#
DISTNAME= gnome-compiz-manager-0.10.4
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= wm
MASTER_SITES= http://download.gna.org/gcm/gnome-compiz-manager/
@@ -15,12 +15,12 @@ USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool gmake msgfmt
USE_DIRS+= xdg-1.1
-GCONF2_SCHEMAS+= gnome-compiz-preferences.schemas
+GCONF_SCHEMAS+= gnome-compiz-preferences.schemas
PKGCONFIG_OVERRIDE+= gnome-compiz-manager.pc.in
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index bd64a540e40..aedab3bac1b 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/07/13 17:27:07 drochner Exp $
+# $NetBSD: Makefile,v 1.72 2007/09/21 13:04:26 wiz Exp $
#
DISTNAME= metacity-2.18.5
+PKGREVISION= 1
CATEGORIES= wm x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +19,7 @@ USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= src/libmetacity-private.pc.in
-GCONF2_SCHEMAS= metacity.schemas
+GCONF_SCHEMAS= metacity.schemas
.include "../../mk/bsd.prefs.mk"
@@ -34,7 +35,7 @@ BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.7
BUILDLINK_DEPMETHOD.libXt?= build
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index c7785d75f2c..9f23f3ea8fc 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:26 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
METACITY_BUILDLINK3_MK:= ${METACITY_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity
.endif # METACITY_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile
index 362037169bf..24bd3968b40 100644
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2007/06/14 09:33:15 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:26 wiz Exp $
DISTNAME= obconf-2.0.1
+PKGREVISION= 1
CATEGORIES= wm
MASTER_SITES= http://icculus.org/openbox/obconf/
# PR pkg/36489
@@ -16,7 +17,7 @@ GNU_CONFIGURE= YES
.include "../../databases/shared-mime-info/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/buildlink3.mk"
BUILDLINK_API_DEPENDS.openbox+= openbox>=3.4.2
.include "../../wm/openbox/buildlink3.mk"
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 895e0053b17..d6cc044268f 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:32 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:04:26 wiz Exp $
DISTNAME= bluefish-1.0.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= http://bluefish.mrball.net/stable/source/ \
ftp://ftp.ratisbona.com/pub/bluefish/stable/source/ \
diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index 3bb2c7df7ad..e2e3952c14e 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/05/08 13:09:39 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:26 wiz Exp $
#
DISTNAME= browser-bookmarks-menu-0.6
+PKGREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=browserbookapp/}
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 7ca484dff8c..1c934d18d2d 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2007/09/19 23:13:33 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/21 13:04:26 wiz Exp $
#
DISTNAME= drivel-2.0.3
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=drivel/}
EXTRACT_SUFX= .tar.bz2
@@ -18,16 +18,16 @@ USE_PKGLOCALEDIR= YES
CPPFLAGS.NetBSD+= -D_NETBSD_SOURCE
-GCONF2_SCHEMAS= drivel.schemas
+GCONF_SCHEMAS= drivel.schemas
BUILDLINK_API_DEPENDS.curl+= curl>=7.14.0nb1
.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 0f0fb6ffd5d..97d714dd74b 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/09/19 23:19:10 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/21 13:04:27 wiz Exp $
#
DISTNAME= epiphany-extensions-2.18.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -21,16 +21,16 @@ USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --enable-compile-warnings=no
CONFIGURE_ARGS+= --with-extensions=all
-GCONF2_SCHEMAS= smart-bookmarks.schemas
+GCONF_SCHEMAS= smart-bookmarks.schemas
.include "options.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 6d3982a5ef5..4269b59bce5 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:33 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:04:26 wiz Exp $
#
DISTNAME= epiphany-2.18.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -22,10 +22,10 @@ PKGCONFIG_OVERRIDE= data/epiphany-2.16.pc
.include "options.mk"
-GCONF2_SCHEMAS= epiphany.schemas
-GCONF2_SCHEMAS+= epiphany-fonts.schemas
-GCONF2_SCHEMAS+= epiphany-lockdown.schemas
-GCONF2_SCHEMAS+= epiphany-pango.schemas
+GCONF_SCHEMAS= epiphany.schemas
+GCONF_SCHEMAS+= epiphany-fonts.schemas
+GCONF_SCHEMAS+= epiphany-lockdown.schemas
+GCONF_SCHEMAS+= epiphany-pango.schemas
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0
BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.10.0
@@ -34,11 +34,11 @@ BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.14.0
BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.14.0
BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.12
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 14bacafcd89..3e01b23b43e 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2007/09/19 23:13:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2007/09/21 13:04:27 wiz Exp $
#
# This Makefile fragment is included by packages that use epiphany.
#
@@ -21,9 +21,9 @@ BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany
.include "../../mk/bsd.fast.prefs.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index f5d1de5b0f3..e07906f4c58 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.110 2007/09/19 23:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2007/09/21 13:04:27 wiz Exp $
#
DISTNAME= galeon-2.0.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/}
EXTRACT_SUFX= .tar.bz2
@@ -22,13 +22,13 @@ GNU_CONFIGURE= yes
.include "options.mk"
-GCONF2_SCHEMAS= galeon.schemas
+GCONF_SCHEMAS= galeon.schemas
EGDIR= ${PREFIX}/share/examples/galeon
CONF_FILES= ${EGDIR}/sound/events/galeon.soundlist \
${PKG_SYSCONFDIR}/sound/events/galeon.soundlist
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index 8d625f2ac44..e0d5c6b7e73 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:04:27 wiz Exp $
#
DISTNAME= gtkhtml-3.14.3
PKGNAME= ${DISTNAME:S/gtkhtml/gtkhtml314/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkhtml/3.14/}
EXTRACT_SUFX= .tar.bz2
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
diff --git a/www/gtkhtml314/buildlink3.mk b/www/gtkhtml314/buildlink3.mk
index 28e7be7fe6d..11df9e3b5ce 100644
--- a/www/gtkhtml314/buildlink3.mk
+++ b/www/gtkhtml314/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/06/05 05:37:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2007/09/21 13:04:27 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKHTML314_BUILDLINK3_MK:= ${GTKHTML314_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.gtkhtml314?= ../../www/gtkhtml314
# '-lgailutil' in the .la file... I'm not sure about putting the dependency
# here.
.include "../../devel/gail/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index c21f078f9e6..7c4766cabe8 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:27 wiz Exp $
#
DISTNAME= gtkhtml-3.12.3
PKGNAME= ${DISTNAME:S/gtkhtml/gtkhtml38/}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkhtml/3.12/}
EXTRACT_SUFX= .tar.bz2
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
diff --git a/www/gtkhtml38/buildlink3.mk b/www/gtkhtml38/buildlink3.mk
index 7a7467ebb44..384a8cea2b8 100644
--- a/www/gtkhtml38/buildlink3.mk
+++ b/www/gtkhtml38/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/06/05 05:37:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:28 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKHTML38_BUILDLINK3_MK:= ${GTKHTML38_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.gtkhtml38?= ../../www/gtkhtml38
# '-lgailutil' in the .la file... I'm not sure about putting the dependency
# here.
.include "../../devel/gail/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index c20ed543b68..f0c6df99b3c 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:20 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:28 wiz Exp $
DISTNAME= kdewebdev-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= www
COMMENT= HTML editor and tools suitable for experienced web developers
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index b5a9fe54c7b..30e901ba35d 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2007/09/19 23:13:34 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2007/09/21 13:04:28 wiz Exp $
#
DISTNAME= libgtkhtml-2.6.3
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= www devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index f25d4e2751b..5dc50fb2163 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2007/09/19 23:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2007/09/21 13:04:28 wiz Exp $
DISTNAME= liferea-1.2.23
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=liferea/}
@@ -17,9 +17,9 @@ USE_PKGLOCALEDIR= yes
SHLIBTOOL_OVERRIDE= # empty
-GCONF2_SCHEMAS= liferea.schemas
+GCONF_SCHEMAS= liferea.schemas
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/x11/Makefile b/x11/Makefile
index 016199e1e18..4899ee53273 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.525 2007/09/20 20:54:46 wiz Exp $
+# $NetBSD: Makefile,v 1.526 2007/09/21 13:04:28 wiz Exp $
#
COMMENT= Packages to support the X window system
@@ -165,7 +165,7 @@ SUBDIR+= kkbswitch
SUBDIR+= kmessage
SUBDIR+= kterm
SUBDIR+= lablgtk
-SUBDIR+= lablgtk2
+SUBDIR+= lablgtk1
SUBDIR+= labltk
SUBDIR+= lbxproxy
SUBDIR+= lesstif
diff --git a/x11/alacarte/Makefile b/x11/alacarte/Makefile
index aeb4bb83caf..8240185a829 100644
--- a/x11/alacarte/Makefile
+++ b/x11/alacarte/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2007/09/19 23:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/21 13:04:28 wiz Exp $
#
DISTNAME= alacarte-0.11.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/alacarte/0.11/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/antiright/Makefile b/x11/antiright/Makefile
index 4ff1b700ced..bc0c93c4093 100644
--- a/x11/antiright/Makefile
+++ b/x11/antiright/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/07/28 10:23:45 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:28 wiz Exp $
#
DISTNAME= antiright-3.4
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://download.savannah.nongnu.org/releases/antiright/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/control-center/Makefile b/x11/control-center/Makefile
index fe86e387a92..3e3c2301a57 100644
--- a/x11/control-center/Makefile
+++ b/x11/control-center/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 13:04:29 wiz Exp $
#
DISTNAME= control-center-2.18.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -33,13 +33,13 @@ INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
INSTALL_MAKE_FLAGS+= vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
INSTALL_MAKE_FLAGS+= menudir=${PREFIX}/share/examples/${PKGBASE}
-GCONF2_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas
-GCONF2_SCHEMAS+= apps_gnome_settings_daemon_keybindings.schemas
-GCONF2_SCHEMAS+= apps_gnome_settings_daemon_screensaver.schemas
-GCONF2_SCHEMAS+= control-center.schemas
-GCONF2_SCHEMAS+= desktop_gnome_font_rendering.schemas
-GCONF2_SCHEMAS+= themus.schemas
-GCONF2_SCHEMAS+= fontilus.schemas
+GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas
+GCONF_SCHEMAS+= apps_gnome_settings_daemon_keybindings.schemas
+GCONF_SCHEMAS+= apps_gnome_settings_daemon_screensaver.schemas
+GCONF_SCHEMAS+= control-center.schemas
+GCONF_SCHEMAS+= desktop_gnome_font_rendering.schemas
+GCONF_SCHEMAS+= themus.schemas
+GCONF_SCHEMAS+= fontilus.schemas
EGDIR= ${PREFIX}/share/examples/control-center
CONF_FILES= ${EGDIR}/theme-method.conf \
@@ -57,11 +57,11 @@ BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2
.include "../../audio/esound/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/x11/control-center/buildlink3.mk b/x11/control-center/buildlink3.mk
index 8218ced563e..f0f12bfbd91 100644
--- a/x11/control-center/buildlink3.mk
+++ b/x11/control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/09/19 23:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/09/21 13:04:29 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CONTROL_CENTER_BUILDLINK3_MK:= ${CONTROL_CENTER_BUILDLINK3_MK}+
@@ -18,11 +18,11 @@ BUILDLINK_PKGSRCDIR.control-center?= ../../x11/control-center
.endif # CONTROL_CENTER_BUILDLINK3_MK
.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile
index 940252a4a9a..cfea72e5bfa 100644
--- a/x11/devilspie/Makefile
+++ b/x11/devilspie/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2007/02/05 23:14:51 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/09/21 13:04:29 wiz Exp $
DISTNAME= devilspie-0.20.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.burtonini.com/computing/
@@ -21,7 +22,7 @@ post-install:
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.1
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 0a5a8576b75..398f99d38b2 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/09/19 23:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:29 wiz Exp $
#
DISTNAME= fast-user-switch-applet-2.18.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/fast-user-switch-applet/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -32,16 +32,16 @@ CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFDIR.gdm}/custom.conf
CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFBASE}/gdm/custom.conf
.endif
-GCONF2_SCHEMAS= fast-user-switch-applet.schemas
+GCONF_SCHEMAS= fast-user-switch-applet.schemas
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
BUILDLINK_DEPMETHOD.libXt?= build
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 850611fef5f..2679b1284d5 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.131 2007/09/20 21:37:40 wiz Exp $
+# $NetBSD: Makefile,v 1.132 2007/09/21 13:04:29 wiz Exp $
#
DISTNAME= gdm-2.18.4
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -13,7 +13,7 @@ COMMENT= Gnome Display Manager - a re-implementation of the xdm program
DEPENDS+= zenity>=2.16.0:../../x11/zenity
-BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.11
+BUILDLINK_API_DEPENDS.libart+= libart>=2.3.11
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
@@ -145,10 +145,10 @@ PRINT_PLIST_AWK+= /gdmopen/ { print "$${GDMOPEN}" $$0; next }
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 23b450ae650..568c6b55a81 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2007/09/20 21:37:40 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/21 13:04:29 wiz Exp $
#
DISTNAME= gnome-applets-2.18.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -31,14 +31,14 @@ PKGCONFIG_OVERRIDE+= libgweather/gweather.pc.in
EGDIR= ${PREFIX}/share/examples/gnome-applets
-GCONF2_SCHEMAS= charpick.schemas
-GCONF2_SCHEMAS+= drivemount.schemas
-GCONF2_SCHEMAS+= geyes.schemas
-#GCONF2_SCHEMAS+= gswitchit.schemas
-GCONF2_SCHEMAS+= gweather.schemas
-GCONF2_SCHEMAS+= mixer.schemas
-GCONF2_SCHEMAS+= multiload.schemas
-GCONF2_SCHEMAS+= stickynotes.schemas
+GCONF_SCHEMAS= charpick.schemas
+GCONF_SCHEMAS+= drivemount.schemas
+GCONF_SCHEMAS+= geyes.schemas
+#GCONF_SCHEMAS+= gswitchit.schemas
+GCONF_SCHEMAS+= gweather.schemas
+GCONF_SCHEMAS+= mixer.schemas
+GCONF_SCHEMAS+= multiload.schemas
+GCONF_SCHEMAS+= stickynotes.schemas
.include "../../mk/bsd.prefs.mk"
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
(${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h))
-GCONF2_SCHEMAS+= battstat.schemas
+GCONF_SCHEMAS+= battstat.schemas
PLIST_SUBST+= BATTSTAT=
CONF_FILES+= ${EGDIR}/sound/events/battstat_applet.soundlist \
${PKG_SYSCONFDIR}/sound/events/battstat_applet.soundlist
@@ -63,7 +63,7 @@ PRINT_PLIST_AWK+= /[Bb]attstat/ { print "$${BATTSTAT}"$$0; next; }
PRINT_PLIST_AWK+= /examples/ { print "$${BATTSTAT}"$$0; next; }
.if ${OPSYS} == "Linux" && exists(/usr/include/cpufreq.h)
-GCONF2_SCHEMAS+= cpufreq-applet.schemas
+GCONF_SCHEMAS+= cpufreq-applet.schemas
PLIST_SUBST+= CPUFREQ=
.else
PLIST_SUBST+= CPUFREQ="@comment "
@@ -72,10 +72,10 @@ CONFIGURE_ARGS+= --disable-cpufreq
PRINT_PLIST_AWK+= /[Cc][Pp][Uu][Ff]req/ { print "$${CPUFREQ}"$$0; next; }
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.libglade+= libglade>=2.4.0
BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.2
BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.2
BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.16.0
@@ -90,7 +90,7 @@ PYTHON_PATCH_SCRIPTS+= invest-applet/invest/invest-chart
.include "../../devel/gail/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 53c676cba5b..908790b00c9 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/09/19 23:13:34 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2007/09/21 13:04:29 wiz Exp $
#
DISTNAME= gnome-desktop-2.18.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 7a74c7eaab4..af592d0f952 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/07/17 10:48:32 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:04:29 wiz Exp $
#
DISTNAME= gnome-mag-0.14.6
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-mag/0.14/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index d97b20b357b..a26622c30d1 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.89 2007/09/19 23:13:35 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2007/09/21 13:04:30 wiz Exp $
#
DISTNAME= gnome-panel-2.18.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -20,20 +20,20 @@ PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in
#CPPFLAGS+= -DPANEL_GNOME_LOGO_ICON="\"netbsd-logo-icon-transparent\""
-GCONF2_SCHEMAS= clock.schemas
-GCONF2_SCHEMAS+= fish.schemas
-GCONF2_SCHEMAS+= panel-global.schemas
-GCONF2_SCHEMAS+= panel-general.schemas
-GCONF2_SCHEMAS+= panel-toplevel.schemas
-GCONF2_SCHEMAS+= panel-object.schemas
-GCONF2_SCHEMAS+= panel-compatibility.schemas
-GCONF2_SCHEMAS+= workspace-switcher.schemas
-GCONF2_SCHEMAS+= window-list.schemas
-GCONF2_ENTRIES= panel-default-setup.entries
+GCONF_SCHEMAS= clock.schemas
+GCONF_SCHEMAS+= fish.schemas
+GCONF_SCHEMAS+= panel-global.schemas
+GCONF_SCHEMAS+= panel-general.schemas
+GCONF_SCHEMAS+= panel-toplevel.schemas
+GCONF_SCHEMAS+= panel-object.schemas
+GCONF_SCHEMAS+= panel-compatibility.schemas
+GCONF_SCHEMAS+= workspace-switcher.schemas
+GCONF_SCHEMAS+= window-list.schemas
+GCONF_ENTRIES= panel-default-setup.entries
BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.14.2
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
-BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.5.0
+BUILDLINK_API_DEPENDS.libglade+= libglade>=2.5.0
BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.0
BUILDLINK_API_DEPENDS.libwnck+= libwnck>=2.13.5
@@ -44,11 +44,11 @@ PKG_SUGGESTED_OPTIONS= evolution
BUILDLINK_DEPMETHOD.libXt?= build
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index 8eb94560fc3..722b9e576a5 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2007/09/19 23:13:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2007/09/21 13:04:30 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_PANEL_BUILDLINK3_MK:= ${GNOME_PANEL_BUILDLINK3_MK}+
@@ -17,12 +17,12 @@ BUILDLINK_ABI_DEPENDS.gnome-panel?= gnome-panel>=2.18.1nb1
BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel
.endif # GNOME_PANEL_BUILDLINK3_MK
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 57f36fa8333..d6700d7f3a8 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2007/09/19 23:13:36 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:04:30 wiz Exp $
#
DISTNAME= gnome-screensaver-2.18.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.18/}
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --disable-pam
PKGCONFIG_OVERRIDE= data/gnome-screensaver.pc.in
-GCONF2_SCHEMAS= gnome-screensaver.schemas
+GCONF_SCHEMAS= gnome-screensaver.schemas
EGDIR= ${PREFIX}/share/examples/gnome-screensaver
INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
@@ -50,7 +50,7 @@ CONF_FILES= ${EGDIR}/xdg/menus/gnome-screensavers.menu \
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0
BUILDLINK_API_DEPENDS.libexif+= libexif>=0.6.12
-BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.5.0
+BUILDLINK_API_DEPENDS.libglade+= libglade>=2.5.0
post-install:
${INSTALL_DATA_DIR} ${EGDIR}/pam.d
@@ -62,9 +62,9 @@ post-install:
${CHMOD} 04555 ${PREFIX}/libexec/gnome-screensaver-dialog
.endif
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 767b4047630..92d9e46bcf2 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2007/09/20 21:37:40 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2007/09/21 13:04:30 wiz Exp $
#
DISTNAME= gnome-session-2.18.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.18/}
SITES.gnome-splash-2.16.0.png= ${MASTER_SITE_LOCAL:=gnome-splash/}
@@ -27,7 +27,7 @@ MAKE_ENV+= REAL_GCONFTOOL=${GCONFTOOL2:Q}
CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-GCONF2_SCHEMAS= gnome-session.schemas
+GCONF_SCHEMAS= gnome-session.schemas
BUILDLINK_API_DEPENDS.esound+= esound>=0.2.26
BUILDLINK_API_DEPENDS.gnome-keyring+= gnome-keyring>=0.5.1
@@ -40,8 +40,8 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../audio/esound/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/GConf2-ui/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/GConf-ui/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 712b6071f56..275bc8ab82a 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2007/09/19 23:57:04 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:04:30 wiz Exp $
#
DISTNAME= gnome-terminal-2.18.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -19,13 +19,13 @@ USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_LIBTOOL= YES
-GCONF2_SCHEMAS= gnome-terminal.schemas
+GCONF_SCHEMAS= gnome-terminal.schemas
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index 5c995fc3117..0acea8b2c88 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2007/09/20 21:37:41 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/09/21 13:04:30 wiz Exp $
#
DISTNAME= gnome-themes-extras-0.8.1
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-themes-extras/0.8/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 64414bacd0a..c248a69cb44 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2007/09/19 23:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/09/21 13:04:30 wiz Exp $
#
DISTNAME= gnopernicus-1.1.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnopernicus/1.1/}
EXTRACT_SUFX= .tar.bz2
@@ -51,9 +51,9 @@ CONFIGURE_ARGS+= --disable-gtk-doc
PKGCONFIG_OVERRIDE+= gnopernicus-1.0.pc.in
-GCONF2_SCHEMAS+= brlmonitor.schemas
-GCONF2_SCHEMAS+= gnopernicus.schemas
-GCONF2_SCHEMAS+= remote.schemas
+GCONF_SCHEMAS+= brlmonitor.schemas
+GCONF_SCHEMAS+= gnopernicus.schemas
+GCONF_SCHEMAS+= remote.schemas
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.1
BUILDLINK_API_DEPENDS.gnome-speech+= gnome-speech>=0.3.5
@@ -62,9 +62,9 @@ BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.7
.include "../../audio/gnome-speech/buildlink3.mk"
.include "../../devel/at-spi/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index 47edee38f1b..42216640f51 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2007/01/15 19:21:34 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/21 13:04:31 wiz Exp $
DISTNAME= gnustep-back-0.11.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
@@ -21,7 +21,7 @@ pre-install:
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glitz/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/gnustep-gui/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk
index 724e175c34c..9fd0faf8440 100644
--- a/x11/gnustep-back/buildlink3.mk
+++ b/x11/gnustep-back/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/12/15 20:33:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:04:31 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_BACK_BUILDLINK3_MK:= ${GNUSTEP_BACK_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.gnustep-back?= ../../x11/gnustep-back
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glitz/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/gnustep-gui/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index a75962f954c..02990d029d5 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2006/10/12 14:39:23 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:04:31 wiz Exp $
#
DISTNAME= Preferences-1.2.0
PKGNAME= gnustep-${DISTNAME:S/P/p/}
-PKGREVISION= 14
+PKGREVISION= 15
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prefsapp/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtk2-sharp/Makefile b/x11/gtk2-sharp/Makefile
index 7acad554338..053a9d50b2c 100644
--- a/x11/gtk2-sharp/Makefile
+++ b/x11/gtk2-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/09/20 21:37:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:04:31 wiz Exp $
#
DISTNAME= gtk-sharp-2.8.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11
MASTER_SITES= http://go-mono.com/sources/gtk-sharp-2.8/
@@ -41,12 +41,12 @@ substpcprefix:
.include "../../lang/mono/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../www/gtkhtml38/buildlink3.mk"
.include "../../x11/vte/buildlink3.mk"
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index f9dc9028c8c..743c4535224 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2007/08/12 12:24:20 adam Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/21 13:04:31 wiz Exp $
DISTNAME= gtkmm-2.10.11
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkmm/2.10/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index 7c74451cd27..caf50c78cca 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/03/21 22:31:12 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/21 13:04:31 wiz Exp $
#
DISTNAME= gtksourceview-1.8.5
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtksourceview/1.8/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index c041877e138..b6f6df25dc7 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:31 wiz Exp $
DISTNAME= gtkterm2-0.2.3
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkterm/}
diff --git a/x11/kde3-i18n-af/Makefile b/x11/kde3-i18n-af/Makefile
index 63809001fd3..c79c16cc2b4 100644
--- a/x11/kde3-i18n-af/Makefile
+++ b/x11/kde3-i18n-af/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2007/01/26 03:36:14 markd Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:04:31 wiz Exp $
DISTNAME= kde-i18n-af-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ar/Makefile b/x11/kde3-i18n-ar/Makefile
index cd859c43982..d3fa621f2fb 100644
--- a/x11/kde3-i18n-ar/Makefile
+++ b/x11/kde3-i18n-ar/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/01/26 03:36:14 markd Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:04:32 wiz Exp $
DISTNAME= kde-i18n-ar-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-az/Makefile b/x11/kde3-i18n-az/Makefile
index b5a541793f1..25532cd9d27 100644
--- a/x11/kde3-i18n-az/Makefile
+++ b/x11/kde3-i18n-az/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/01/26 03:36:14 markd Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:04:32 wiz Exp $
DISTNAME= kde-i18n-az-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-bg/Makefile b/x11/kde3-i18n-bg/Makefile
index f9075a12f8f..7422cedba2b 100644
--- a/x11/kde3-i18n-bg/Makefile
+++ b/x11/kde3-i18n-bg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:14 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:32 wiz Exp $
DISTNAME= kde-i18n-bg-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-bn/Makefile b/x11/kde3-i18n-bn/Makefile
index 969436a64a8..054d620f00a 100644
--- a/x11/kde3-i18n-bn/Makefile
+++ b/x11/kde3-i18n-bn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 03:36:14 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:32 wiz Exp $
DISTNAME= kde-i18n-bn-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-br/Makefile b/x11/kde3-i18n-br/Makefile
index 9878c672ec1..541e98bf1fd 100644
--- a/x11/kde3-i18n-br/Makefile
+++ b/x11/kde3-i18n-br/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/01/26 03:36:14 markd Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:32 wiz Exp $
DISTNAME= kde-i18n-br-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-bs/Makefile b/x11/kde3-i18n-bs/Makefile
index 2a9673fdb57..fcf6d7a6990 100644
--- a/x11/kde3-i18n-bs/Makefile
+++ b/x11/kde3-i18n-bs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:14 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:32 wiz Exp $
DISTNAME= kde-i18n-bs-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ca/Makefile b/x11/kde3-i18n-ca/Makefile
index 5a71c68e86f..e2ed26de90c 100644
--- a/x11/kde3-i18n-ca/Makefile
+++ b/x11/kde3-i18n-ca/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:04:32 wiz Exp $
DISTNAME= kde-i18n-ca-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-cs/Makefile b/x11/kde3-i18n-cs/Makefile
index 0c4e7bd3096..77deac88ba0 100644
--- a/x11/kde3-i18n-cs/Makefile
+++ b/x11/kde3-i18n-cs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:32 wiz Exp $
DISTNAME= kde-i18n-cs-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-cy/Makefile b/x11/kde3-i18n-cy/Makefile
index 18bae3ca7eb..1fb7d96eca7 100644
--- a/x11/kde3-i18n-cy/Makefile
+++ b/x11/kde3-i18n-cy/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:33 wiz Exp $
DISTNAME= kde-i18n-cy-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-da/Makefile b/x11/kde3-i18n-da/Makefile
index 19fff06319d..5f732b29a30 100644
--- a/x11/kde3-i18n-da/Makefile
+++ b/x11/kde3-i18n-da/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:33 wiz Exp $
DISTNAME= kde-i18n-da-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-de/Makefile b/x11/kde3-i18n-de/Makefile
index 2d9a0c0248b..cb862fd5f52 100644
--- a/x11/kde3-i18n-de/Makefile
+++ b/x11/kde3-i18n-de/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:33 wiz Exp $
DISTNAME= kde-i18n-de-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-el/Makefile b/x11/kde3-i18n-el/Makefile
index 23efa38a5d6..5fd5ee2e6a8 100644
--- a/x11/kde3-i18n-el/Makefile
+++ b/x11/kde3-i18n-el/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:04:33 wiz Exp $
DISTNAME= kde-i18n-el-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-en_GB/Makefile b/x11/kde3-i18n-en_GB/Makefile
index 2669d7c93f5..0c63d5c61fb 100644
--- a/x11/kde3-i18n-en_GB/Makefile
+++ b/x11/kde3-i18n-en_GB/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:33 wiz Exp $
DISTNAME= kde-i18n-en_GB-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-eo/Makefile b/x11/kde3-i18n-eo/Makefile
index 2806c34f3ee..bd1af043e0c 100644
--- a/x11/kde3-i18n-eo/Makefile
+++ b/x11/kde3-i18n-eo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:04:33 wiz Exp $
DISTNAME= kde-i18n-eo-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-es/Makefile b/x11/kde3-i18n-es/Makefile
index 191d430265b..26c277d999d 100644
--- a/x11/kde3-i18n-es/Makefile
+++ b/x11/kde3-i18n-es/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:33 wiz Exp $
DISTNAME= kde-i18n-es-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-et/Makefile b/x11/kde3-i18n-et/Makefile
index 0c541ffebd6..8dff03beb47 100644
--- a/x11/kde3-i18n-et/Makefile
+++ b/x11/kde3-i18n-et/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:33 wiz Exp $
DISTNAME= kde-i18n-et-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-eu/Makefile b/x11/kde3-i18n-eu/Makefile
index 365bbc8e0af..2fa019f4bb9 100644
--- a/x11/kde3-i18n-eu/Makefile
+++ b/x11/kde3-i18n-eu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:34 wiz Exp $
DISTNAME= kde-i18n-eu-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-fa/Makefile b/x11/kde3-i18n-fa/Makefile
index 0959d62a7d5..5ea17be4b50 100644
--- a/x11/kde3-i18n-fa/Makefile
+++ b/x11/kde3-i18n-fa/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:34 wiz Exp $
DISTNAME= kde-i18n-fa-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-fi/Makefile b/x11/kde3-i18n-fi/Makefile
index 802decc9b57..8818ec5287c 100644
--- a/x11/kde3-i18n-fi/Makefile
+++ b/x11/kde3-i18n-fi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:34 wiz Exp $
DISTNAME= kde-i18n-fi-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-fr/Makefile b/x11/kde3-i18n-fr/Makefile
index fb9d859ae41..9ae8229de82 100644
--- a/x11/kde3-i18n-fr/Makefile
+++ b/x11/kde3-i18n-fr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:34 wiz Exp $
DISTNAME= kde-i18n-fr-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-fy/Makefile b/x11/kde3-i18n-fy/Makefile
index 449550e4feb..e5a7303fab2 100644
--- a/x11/kde3-i18n-fy/Makefile
+++ b/x11/kde3-i18n-fy/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:34 wiz Exp $
DISTNAME= kde-i18n-fy-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ga/Makefile b/x11/kde3-i18n-ga/Makefile
index 457883cd19a..bdaf2dcf942 100644
--- a/x11/kde3-i18n-ga/Makefile
+++ b/x11/kde3-i18n-ga/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:34 wiz Exp $
DISTNAME= kde-i18n-ga-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-gl/Makefile b/x11/kde3-i18n-gl/Makefile
index ef694d620da..753e9e793f3 100644
--- a/x11/kde3-i18n-gl/Makefile
+++ b/x11/kde3-i18n-gl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:34 wiz Exp $
DISTNAME= kde-i18n-gl-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-he/Makefile b/x11/kde3-i18n-he/Makefile
index 53494848a97..df0f15d0b5c 100644
--- a/x11/kde3-i18n-he/Makefile
+++ b/x11/kde3-i18n-he/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:34 wiz Exp $
DISTNAME= kde-i18n-he-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-hi/Makefile b/x11/kde3-i18n-hi/Makefile
index c0e90c09f45..11f1d993930 100644
--- a/x11/kde3-i18n-hi/Makefile
+++ b/x11/kde3-i18n-hi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:35 wiz Exp $
DISTNAME= kde-i18n-hi-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-hr/Makefile b/x11/kde3-i18n-hr/Makefile
index d7f52f1181a..e247899d458 100644
--- a/x11/kde3-i18n-hr/Makefile
+++ b/x11/kde3-i18n-hr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:35 wiz Exp $
DISTNAME= kde-i18n-hr-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-hu/Makefile b/x11/kde3-i18n-hu/Makefile
index 99635fa7e0c..693386e32e6 100644
--- a/x11/kde3-i18n-hu/Makefile
+++ b/x11/kde3-i18n-hu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:35 wiz Exp $
DISTNAME= kde-i18n-hu-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-is/Makefile b/x11/kde3-i18n-is/Makefile
index 1c218cd4948..00a4fa4eff3 100644
--- a/x11/kde3-i18n-is/Makefile
+++ b/x11/kde3-i18n-is/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:04:35 wiz Exp $
DISTNAME= kde-i18n-is-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-it/Makefile b/x11/kde3-i18n-it/Makefile
index 21602345213..2c3eadb6a13 100644
--- a/x11/kde3-i18n-it/Makefile
+++ b/x11/kde3-i18n-it/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:35 wiz Exp $
DISTNAME= kde-i18n-it-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ja/Makefile b/x11/kde3-i18n-ja/Makefile
index c80df368482..27381ecb6eb 100644
--- a/x11/kde3-i18n-ja/Makefile
+++ b/x11/kde3-i18n-ja/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:04:35 wiz Exp $
DISTNAME= kde-i18n-ja-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-kk/Makefile b/x11/kde3-i18n-kk/Makefile
index f52f1c07af9..4ee81ecb4f1 100644
--- a/x11/kde3-i18n-kk/Makefile
+++ b/x11/kde3-i18n-kk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:36 wiz Exp $
DISTNAME= kde-i18n-kk-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-km/Makefile b/x11/kde3-i18n-km/Makefile
index b27281118e5..de3e2a8f293 100644
--- a/x11/kde3-i18n-km/Makefile
+++ b/x11/kde3-i18n-km/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:36 wiz Exp $
DISTNAME= kde-i18n-km-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ko/Makefile b/x11/kde3-i18n-ko/Makefile
index 964f0c913f9..a65b15453c0 100644
--- a/x11/kde3-i18n-ko/Makefile
+++ b/x11/kde3-i18n-ko/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:36 wiz Exp $
DISTNAME= kde-i18n-ko-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-lt/Makefile b/x11/kde3-i18n-lt/Makefile
index 8f29fdc3205..18ef474c579 100644
--- a/x11/kde3-i18n-lt/Makefile
+++ b/x11/kde3-i18n-lt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:04:37 wiz Exp $
DISTNAME= kde-i18n-lt-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-lv/Makefile b/x11/kde3-i18n-lv/Makefile
index 024e825c0ce..b83396852d0 100644
--- a/x11/kde3-i18n-lv/Makefile
+++ b/x11/kde3-i18n-lv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:37 wiz Exp $
DISTNAME= kde-i18n-lv-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-mk/Makefile b/x11/kde3-i18n-mk/Makefile
index 760441679df..7ed49f9b9dc 100644
--- a/x11/kde3-i18n-mk/Makefile
+++ b/x11/kde3-i18n-mk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:04:37 wiz Exp $
DISTNAME= kde-i18n-mk-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-mn/Makefile b/x11/kde3-i18n-mn/Makefile
index 82d07048dd7..d72859f1ac0 100644
--- a/x11/kde3-i18n-mn/Makefile
+++ b/x11/kde3-i18n-mn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:37 wiz Exp $
DISTNAME= kde-i18n-mn-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ms/Makefile b/x11/kde3-i18n-ms/Makefile
index c209f82eee2..ebde80f030e 100644
--- a/x11/kde3-i18n-ms/Makefile
+++ b/x11/kde3-i18n-ms/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:37 wiz Exp $
DISTNAME= kde-i18n-ms-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-nb/Makefile b/x11/kde3-i18n-nb/Makefile
index d999b47cfff..ea77b6544f6 100644
--- a/x11/kde3-i18n-nb/Makefile
+++ b/x11/kde3-i18n-nb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:17 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:37 wiz Exp $
DISTNAME= kde-i18n-nb-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-nds/Makefile b/x11/kde3-i18n-nds/Makefile
index 0574c9018e3..9d26d57b94b 100644
--- a/x11/kde3-i18n-nds/Makefile
+++ b/x11/kde3-i18n-nds/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 03:36:18 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:37 wiz Exp $
DISTNAME= kde-i18n-nds-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-nl/Makefile b/x11/kde3-i18n-nl/Makefile
index ba65e86a2a0..89a65394fbc 100644
--- a/x11/kde3-i18n-nl/Makefile
+++ b/x11/kde3-i18n-nl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:18 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:37 wiz Exp $
DISTNAME= kde-i18n-nl-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-nn/Makefile b/x11/kde3-i18n-nn/Makefile
index 6d2bd8ba096..7280d1da4c8 100644
--- a/x11/kde3-i18n-nn/Makefile
+++ b/x11/kde3-i18n-nn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:18 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:39 wiz Exp $
DISTNAME= kde-i18n-nn-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-pa/Makefile b/x11/kde3-i18n-pa/Makefile
index 2a5a4941139..4254cd4bf61 100644
--- a/x11/kde3-i18n-pa/Makefile
+++ b/x11/kde3-i18n-pa/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/01/26 03:36:18 markd Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:04:39 wiz Exp $
DISTNAME= kde-i18n-pa-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-pl/Makefile b/x11/kde3-i18n-pl/Makefile
index 716216b4204..054b5d3ad67 100644
--- a/x11/kde3-i18n-pl/Makefile
+++ b/x11/kde3-i18n-pl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:20 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:39 wiz Exp $
DISTNAME= kde-i18n-pl-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-pt/Makefile b/x11/kde3-i18n-pt/Makefile
index 06571e7c563..c9d1a76d27b 100644
--- a/x11/kde3-i18n-pt/Makefile
+++ b/x11/kde3-i18n-pt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:20 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:39 wiz Exp $
DISTNAME= kde-i18n-pt-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-pt_BR/Makefile b/x11/kde3-i18n-pt_BR/Makefile
index 3f88c136c08..9a2a52db02f 100644
--- a/x11/kde3-i18n-pt_BR/Makefile
+++ b/x11/kde3-i18n-pt_BR/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:39 wiz Exp $
DISTNAME= kde-i18n-pt_BR-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ro/Makefile b/x11/kde3-i18n-ro/Makefile
index f02de5ed1a9..238dba0d68b 100644
--- a/x11/kde3-i18n-ro/Makefile
+++ b/x11/kde3-i18n-ro/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:04:40 wiz Exp $
DISTNAME= kde-i18n-ro-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ru/Makefile b/x11/kde3-i18n-ru/Makefile
index 5012f5f7737..a0f622cafc6 100644
--- a/x11/kde3-i18n-ru/Makefile
+++ b/x11/kde3-i18n-ru/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:40 wiz Exp $
DISTNAME= kde-i18n-ru-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-rw/Makefile b/x11/kde3-i18n-rw/Makefile
index 07ee35154c4..06d262012e9 100644
--- a/x11/kde3-i18n-rw/Makefile
+++ b/x11/kde3-i18n-rw/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:40 wiz Exp $
DISTNAME= kde-i18n-rw-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-se/Makefile b/x11/kde3-i18n-se/Makefile
index cec4cbf1bb8..39d6da0e011 100644
--- a/x11/kde3-i18n-se/Makefile
+++ b/x11/kde3-i18n-se/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:40 wiz Exp $
DISTNAME= kde-i18n-se-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sk/Makefile b/x11/kde3-i18n-sk/Makefile
index bbed91b550c..4228dbf1817 100644
--- a/x11/kde3-i18n-sk/Makefile
+++ b/x11/kde3-i18n-sk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:41 wiz Exp $
DISTNAME= kde-i18n-sk-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sl/Makefile b/x11/kde3-i18n-sl/Makefile
index 1a553558daa..6e928497398 100644
--- a/x11/kde3-i18n-sl/Makefile
+++ b/x11/kde3-i18n-sl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:41 wiz Exp $
DISTNAME= kde-i18n-sl-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sr/Makefile b/x11/kde3-i18n-sr/Makefile
index f03398fb73b..ddadf86b0d2 100644
--- a/x11/kde3-i18n-sr/Makefile
+++ b/x11/kde3-i18n-sr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:41 wiz Exp $
DISTNAME= kde-i18n-sr-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sr_Latn/Makefile b/x11/kde3-i18n-sr_Latn/Makefile
index f03b660581b..a74361354ee 100644
--- a/x11/kde3-i18n-sr_Latn/Makefile
+++ b/x11/kde3-i18n-sr_Latn/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:04:41 wiz Exp $
DISTNAME= kde-i18n-sr@Latn-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/@/_/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ss/Makefile b/x11/kde3-i18n-ss/Makefile
index 30d94e5a4f2..8306c66e950 100644
--- a/x11/kde3-i18n-ss/Makefile
+++ b/x11/kde3-i18n-ss/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:41 wiz Exp $
DISTNAME= kde-i18n-ss-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-sv/Makefile b/x11/kde3-i18n-sv/Makefile
index 2fb503f7ec7..91010491b30 100644
--- a/x11/kde3-i18n-sv/Makefile
+++ b/x11/kde3-i18n-sv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:41 wiz Exp $
DISTNAME= kde-i18n-sv-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-ta/Makefile b/x11/kde3-i18n-ta/Makefile
index 2109eb8bbc8..8c2a3f6e885 100644
--- a/x11/kde3-i18n-ta/Makefile
+++ b/x11/kde3-i18n-ta/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:41 wiz Exp $
DISTNAME= kde-i18n-ta-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-tg/Makefile b/x11/kde3-i18n-tg/Makefile
index bc32eb52448..fc5e72465ab 100644
--- a/x11/kde3-i18n-tg/Makefile
+++ b/x11/kde3-i18n-tg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:41 wiz Exp $
DISTNAME= kde-i18n-tg-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-tr/Makefile b/x11/kde3-i18n-tr/Makefile
index a0ba410c628..1cf0db668ee 100644
--- a/x11/kde3-i18n-tr/Makefile
+++ b/x11/kde3-i18n-tr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:42 wiz Exp $
DISTNAME= kde-i18n-tr-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-uk/Makefile b/x11/kde3-i18n-uk/Makefile
index c19b3519117..431fb4af799 100644
--- a/x11/kde3-i18n-uk/Makefile
+++ b/x11/kde3-i18n-uk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:42 wiz Exp $
DISTNAME= kde-i18n-uk-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-uz/Makefile b/x11/kde3-i18n-uz/Makefile
index bc248ed092d..0aba2594d86 100644
--- a/x11/kde3-i18n-uz/Makefile
+++ b/x11/kde3-i18n-uz/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2007/01/26 03:36:22 markd Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:04:42 wiz Exp $
DISTNAME= kde-i18n-uz-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-vi/Makefile b/x11/kde3-i18n-vi/Makefile
index 44eacce59f6..22ba4b23be7 100644
--- a/x11/kde3-i18n-vi/Makefile
+++ b/x11/kde3-i18n-vi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2007/01/26 03:36:22 markd Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 13:04:42 wiz Exp $
DISTNAME= kde-i18n-vi-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-zh_CN/Makefile b/x11/kde3-i18n-zh_CN/Makefile
index d64425522c4..06f907799dc 100644
--- a/x11/kde3-i18n-zh_CN/Makefile
+++ b/x11/kde3-i18n-zh_CN/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:22 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:42 wiz Exp $
DISTNAME= kde-i18n-zh_CN-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kde3-i18n-zh_TW/Makefile b/x11/kde3-i18n-zh_TW/Makefile
index a7735887486..ee794616d66 100644
--- a/x11/kde3-i18n-zh_TW/Makefile
+++ b/x11/kde3-i18n-zh_TW/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2007/01/26 03:36:22 markd Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:04:42 wiz Exp $
DISTNAME= kde-i18n-zh_TW-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_KDE_I18N}
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 1522afb4c19..d4379b219e3 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.131 2007/09/02 04:33:59 markd Exp $
+# $NetBSD: Makefile,v 1.132 2007/09/21 13:04:42 wiz Exp $
DISTNAME= kdebase-${_KDE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
diff --git a/x11/kdebindings-ruby/Makefile b/x11/kdebindings-ruby/Makefile
index b420468de76..b7cba60cda8 100644
--- a/x11/kdebindings-ruby/Makefile
+++ b/x11/kdebindings-ruby/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/01/26 03:00:43 markd Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:42 wiz Exp $
DISTNAME= kdebindings-${_KDE_VERSION}
PKGNAME= kdebindings-ruby-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Ruby bindings for the KDE integrated X11 desktop
diff --git a/x11/kdelibdocs3/Makefile b/x11/kdelibdocs3/Makefile
index 67fba23efb7..c22e0f3592c 100644
--- a/x11/kdelibdocs3/Makefile
+++ b/x11/kdelibdocs3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2007/01/26 02:50:57 markd Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/21 13:04:43 wiz Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGNAME= kdelibdocs-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11 devel
COMMENT= KDE library documentation
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 6b3e0e2ee9a..ae9aaee1f7a 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.126 2007/09/02 04:33:59 markd Exp $
+# $NetBSD: Makefile,v 1.127 2007/09/21 13:04:43 wiz Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -99,7 +99,7 @@ GCC_REQD+= 2.95
.include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/jasper/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/openexr/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../net/mDNSResponder/buildlink3.mk"
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index 3430433511f..f3aa7417e7e 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2007/05/30 08:54:31 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2007/09/21 13:04:43 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+
@@ -32,7 +32,7 @@ pkgbase := kdelibs
.include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/jasper/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../graphics/openexr/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../net/mDNSResponder/buildlink3.mk"
diff --git a/x11/kkbswitch/Makefile b/x11/kkbswitch/Makefile
index 7348ba76436..1762449d6db 100644
--- a/x11/kkbswitch/Makefile
+++ b/x11/kkbswitch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/01/17 23:47:26 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:04:43 wiz Exp $
#
DISTNAME= kkbswitch-1.4.3
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= kde x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kkbswitch/}
diff --git a/x11/kmessage/Makefile b/x11/kmessage/Makefile
index 1483351895e..a5058c04efb 100644
--- a/x11/kmessage/Makefile
+++ b/x11/kmessage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:27 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/21 13:04:43 wiz Exp $
DISTNAME= kmessage-0.1
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= x11 kde
MASTER_SITES= http://soliton.wins.uva.nl/~wijnhout/kmessage/
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 4c9e99c0ab2..322c7659575 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/09/19 23:19:14 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:04:43 wiz Exp $
#
DISTNAME= libgnomekbd-2.18.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -21,16 +21,16 @@ USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool gmake msgfmt
USE_DIRS+= xdg-1.1
-GCONF2_SCHEMAS+= desktop_gnome_peripherals_keyboard_xkb.schemas
+GCONF_SCHEMAS+= desktop_gnome_peripherals_keyboard_xkb.schemas
PKGCONFIG_OVERRIDE+= libgnomekbd.pc.in
PKGCONFIG_OVERRIDE+= libgnomekbdui.pc.in
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libxklavier/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index 878e33ff9a2..bd10213c76f 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2007/08/06 20:29:36 heinz Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:04:43 wiz Exp $
#
DISTNAME= libzvt-2.0.1
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libzvt/2.0/}
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +18,7 @@ USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libzvt/libzvt-2.0.pc.in
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk
index 7dce8047023..c3092707ea8 100644
--- a/x11/libzvt/buildlink3.mk
+++ b/x11/libzvt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/09/21 13:04:43 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBZVT_BUILDLINK3_MK:= ${LIBZVT_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.libzvt+= libzvt>=2.0.1nb9
BUILDLINK_PKGSRCDIR.libzvt?= ../../x11/libzvt
.endif # LIBZVT_BUILDLINK3_MK
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index ec3d3cb1efc..a7d04143040 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2007/09/20 21:37:41 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:04:44 wiz Exp $
#
DISTNAME= gnome-python-desktop-2.18.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.18/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index 237d33c8115..adb8d093914 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:19:14 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:44 wiz Exp $
#
DISTNAME= gnome-python-extras-2.14.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python-extras/2.14/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 4dda517eacd..dfe7e2215a8 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2007/09/19 23:13:38 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2007/09/21 13:04:44 wiz Exp $
#
DISTNAME= gnome-python-2.18.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -24,8 +24,8 @@ PYTHON_VERSIONS_ACCEPTED= 24
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
-BUILDLINK_API_DEPENDS.GConf2+= GConf2>=2.11.1
-.include "../../devel/GConf2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.GConf+= GConf>=2.11.1
+.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 6d2ed93cb6a..37585f2785e 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2007/08/23 21:17:37 heinz Exp $
+# $NetBSD: Makefile,v 1.44 2007/09/21 13:04:44 wiz Exp $
#
DISTNAME= pygtk-2.10.6
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
+PKGREVISION= 1
CATEGORIES= x11 python
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.10/}
EXTRACT_SUFX= .tar.bz2
@@ -26,7 +27,7 @@ PYTHON_VERSIONS_ACCEPTED= 24 23
BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.12.1
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../graphics/py-cairo/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 3c79808b651..c44632a5c4a 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/07/26 16:56:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2007/09/21 13:04:44 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GTK2_BUILDLINK3_MK:= ${PY_GTK2_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ BUILDLINK_PKGSRCDIR.pygtk2?= ../../x11/py-gtk2
.endif # PY_GTK2_BUILDLINK3_MK
.include "../../devel/py-gobject/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../math/py-Numeric/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/rep-gtk2/Makefile b/x11/rep-gtk2/Makefile
index 46367d314c7..411f5122564 100644
--- a/x11/rep-gtk2/Makefile
+++ b/x11/rep-gtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/05/11 08:32:11 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:44 wiz Exp $
DISTNAME= rep-gtk-0.18
PKGNAME= rep-gtk2-0.18
+PKGREVISION= 1
CATEGORIES= x11 lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rep-gtk/}
@@ -15,7 +16,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../lang/librep/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile
index ac324f318ba..e5504420dea 100644
--- a/x11/rox-session/Makefile
+++ b/x11/rox-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/01/30 23:57:39 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:44 wiz Exp $
#
DISTNAME= rox-session-0.28
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/ruby-gnome2-gnome/Makefile b/x11/ruby-gnome2-gnome/Makefile
index f4877c21676..759298e562d 100644
--- a/x11/ruby-gnome2-gnome/Makefile
+++ b/x11/ruby-gnome2-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/09/19 23:19:14 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:44 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-gnome-${VERSION}
COMMENT= Ruby binding of libgnome/libgnomeui-2.x
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= gnome x11
CONFLICTS+= ruby-gnome2-gnome-[0-9]*
diff --git a/x11/ruby-gnome2-panelapplet/Makefile b/x11/ruby-gnome2-panelapplet/Makefile
index 9b38f2f80ef..8ed1b119d41 100644
--- a/x11/ruby-gnome2-panelapplet/Makefile
+++ b/x11/ruby-gnome2-panelapplet/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/09/19 23:19:15 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:45 wiz Exp $
#
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-panelapplet-${VERSION}
COMMENT= Ruby binding of libpanel-applet-2.6.x
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 gnome
CONFLICTS+= ruby-gnome2-panelapplet-[0-9]*
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 5d56c57084e..0180bd90c57 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2007/09/18 19:11:39 drochner Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/21 13:04:45 wiz Exp $
#
DISTNAME= vte-0.16.9
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.16/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index f54bfb3a324..d28f9f3bc3b 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2007/04/12 09:55:21 martti Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:04:45 wiz Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfdesktop-${XFCE4_VERSION}
PKGNAME= xfce4-desktop-${XFCE4_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Xfce desktop background manager
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 7c7c206b81a..15409e98582 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/08/23 09:24:57 martti Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:45 wiz Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -6,7 +6,7 @@ XFCE4_VERSION= 0.2.6
DISTNAME= Terminal-${XFCE4_VERSION}
PKGNAME= xfce4-terminal-${XFCE4_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Xfce terminal emulator
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 41dafe52ba4..00b0cc7f85b 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/02/22 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:04:45 wiz Exp $
#
PKGNAME= ${DISTNAME:S/-/-demo-/}
+PKGREVISION= 1
COMMENT= Demo viewer and configuration tool for xscreensaver
CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]*
@@ -25,7 +26,7 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/driver/xscreensaver-demo.man \
${PREFIX}/${PKGMANDIR}/man1/xscreensaver-demo.1
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/xscreensaver/buildlink3.mk"
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 59cddf23ca1..37487f4283f 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2007/07/13 15:54:46 drochner Exp $
+# $NetBSD: Makefile,v 1.48 2007/09/21 13:04:45 wiz Exp $
#
DISTNAME= zenity-2.18.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/zenity/2.18/}
EXTRACT_SUFX= .tar.bz2
@@ -21,7 +21,7 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"