summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-08-25 19:21:43 +0000
committerjlam <jlam@pkgsrc.org>2002-08-25 19:21:43 +0000
commitefb93b17bd48d49105d00f52887445a53f7cd60b (patch)
treec69c41be2f3b44bedceeee7e348c2ae58c476c6a
parent653dc760d3901b3c7e67803c589352e8353a5030 (diff)
downloadpkgsrc-efb93b17bd48d49105d00f52887445a53f7cd60b.tar.gz
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.
-rw-r--r--audio/arts/buildlink2.mk18
-rw-r--r--audio/arts/distinfo2
-rw-r--r--audio/arts/patches/patch-aa2
-rw-r--r--audio/arts/patches/patch-ab2
-rw-r--r--audio/arts/patches/patch-ac2
-rw-r--r--audio/arts/patches/patch-ad2
-rw-r--r--audio/arts/patches/patch-ae2
-rw-r--r--audio/arts/patches/patch-af2
-rw-r--r--audio/cdparanoia/buildlink2.mk20
-rw-r--r--audio/flac/buildlink2.mk19
-rw-r--r--audio/gsm/buildlink2.mk20
-rw-r--r--audio/id3lib/Makefile2
-rw-r--r--audio/id3lib/buildlink2.mk20
-rw-r--r--audio/lame/Makefile2
-rw-r--r--audio/lame/buildlink2.mk18
-rw-r--r--audio/lame/distinfo2
-rw-r--r--audio/lame/patches/patch-ac2
-rw-r--r--audio/libcdaudio/Makefile2
-rw-r--r--audio/libcdaudio/buildlink2.mk19
-rw-r--r--audio/libcdaudio/distinfo2
-rw-r--r--audio/libmikmod/Makefile2
-rw-r--r--audio/libmikmod/PLIST2
-rw-r--r--audio/libmikmod/buildlink2.mk21
-rw-r--r--audio/libmikmod/distinfo2
-rw-r--r--audio/libmikmod/patches/patch-ac2
-rw-r--r--audio/libmikmod/patches/patch-ad2
-rw-r--r--audio/libsidplay/buildlink2.mk19
-rw-r--r--audio/mad/PLIST2
-rw-r--r--audio/mad/buildlink.mk2
-rw-r--r--audio/mad/buildlink2.mk25
-rw-r--r--audio/musicbrainz/buildlink2.mk20
-rw-r--r--audio/nas/Makefile2
-rw-r--r--audio/nas/buildlink2.mk19
-rw-r--r--audio/rplay/buildlink2.mk19
-rw-r--r--audio/wsoundserver/buildlink2.mk21
-rw-r--r--audio/xmms/Makefile2
-rw-r--r--audio/xmms/buildlink.mk2
-rw-r--r--audio/xmms/buildlink2.mk24
-rw-r--r--chat/gale/buildlink2.mk32
-rw-r--r--chat/libyahoo/buildlink2.mk21
-rw-r--r--comms/jpilot/buildlink2.mk21
-rw-r--r--comms/pilot-link-libs/buildlink2.mk22
-rw-r--r--converters/psiconv/buildlink2.mk20
-rw-r--r--converters/recode/buildlink2.mk22
-rw-r--r--converters/uulib/buildlink2.mk19
-rw-r--r--converters/wv/buildlink2.mk20
-rw-r--r--converters/xlHtml-mixedcase/buildlink2.mk19
-rw-r--r--databases/db3/Makefile2
-rw-r--r--databases/db3/PLIST2
-rw-r--r--databases/db3/buildlink2.mk21
-rw-r--r--databases/edb/buildlink2.mk19
-rw-r--r--databases/freetds/Makefile2
-rw-r--r--databases/freetds/PLIST2
-rw-r--r--databases/freetds/buildlink2.mk19
-rw-r--r--databases/freetds/distinfo2
-rw-r--r--databases/freetds/patches/patch-aa2
-rw-r--r--databases/gnome-mime-types/Makefile2
-rw-r--r--databases/gnome-mime-types/buildlink.mk2
-rw-r--r--databases/gnome-mime-types/buildlink2.mk22
-rw-r--r--databases/java-db3/buildlink2.mk21
-rw-r--r--databases/openldap1/Makefile2
-rw-r--r--databases/openldap1/buildlink.mk2
-rw-r--r--databases/openldap1/buildlink2.mk30
-rw-r--r--databases/py-mysqldb/buildlink2.mk7
-rw-r--r--databases/sqlite/buildlink2.mk19
-rw-r--r--databases/tcl-postgresql/buildlink2.mk21
-rw-r--r--databases/unixodbc/Makefile2
-rw-r--r--databases/unixodbc/Makefile.common2
-rw-r--r--databases/unixodbc/buildlink.mk2
-rw-r--r--databases/unixodbc/buildlink2.mk34
-rw-r--r--devel/GConf/Makefile2
-rw-r--r--devel/GConf/PLIST2
-rw-r--r--devel/GConf/buildlink.mk2
-rw-r--r--devel/GConf/buildlink2.mk23
-rw-r--r--devel/GConf/distinfo2
-rw-r--r--devel/GConf/patches/patch-ab2
-rw-r--r--devel/GConf2/Makefile2
-rw-r--r--devel/GConf2/PLIST2
-rw-r--r--devel/GConf2/buildlink.mk2
-rw-r--r--devel/GConf2/buildlink2.mk23
-rw-r--r--devel/GConf2/distinfo2
-rw-r--r--devel/SDL/Makefile2
-rw-r--r--devel/SDL/buildlink.mk2
-rw-r--r--devel/SDL/buildlink2.mk30
-rw-r--r--devel/SDL/distinfo2
-rw-r--r--devel/SDL/files/SDL_sysjoystick.c2
-rw-r--r--devel/SDL/patches/patch-aj2
-rw-r--r--devel/SDL/patches/patch-am2
-rw-r--r--devel/SDL/patches/patch-ap2
-rw-r--r--devel/SDL/patches/patch-as2
-rw-r--r--devel/SDL_gfx/buildlink2.mk26
-rw-r--r--devel/SDL_ttf/buildlink2.mk25
-rw-r--r--devel/atk/buildlink.mk2
-rw-r--r--devel/atk/buildlink2.mk22
-rw-r--r--devel/atk/patches/patch-ab2
-rw-r--r--devel/binutils/Makefile2
-rw-r--r--devel/binutils/PLIST2
-rw-r--r--devel/binutils/PLIST.SunOS2
-rw-r--r--devel/binutils/buildlink.mk2
-rw-r--r--devel/binutils/buildlink2.mk55
-rw-r--r--devel/bonobo-activation/Makefile2
-rw-r--r--devel/bonobo-activation/PLIST2
-rw-r--r--devel/bonobo-activation/buildlink.mk2
-rw-r--r--devel/bonobo-activation/buildlink2.mk40
-rw-r--r--devel/bonobo-activation/distinfo2
-rw-r--r--devel/bonobo-conf/Makefile2
-rw-r--r--devel/bonobo-conf/PLIST2
-rw-r--r--devel/bonobo-conf/buildlink2.mk28
-rw-r--r--devel/bonobo-conf/distinfo2
-rw-r--r--devel/bonobo/Makefile2
-rw-r--r--devel/bonobo/PLIST2
-rw-r--r--devel/bonobo/buildlink.mk2
-rw-r--r--devel/bonobo/buildlink2.mk34
-rw-r--r--devel/bonobo/distinfo2
-rw-r--r--devel/bonobo/patches/patch-ac2
-rw-r--r--devel/cdk/buildlink2.mk34
-rw-r--r--devel/dlcompat/Makefile2
-rw-r--r--devel/dlcompat/PLIST2
-rw-r--r--devel/dlcompat/buildlink.mk2
-rw-r--r--devel/dlcompat/buildlink2.mk19
-rw-r--r--devel/dlcompat/distinfo2
-rw-r--r--devel/dlcompat/patches/patch-aa2
-rw-r--r--devel/gal/Makefile2
-rw-r--r--devel/gal/PLIST2
-rw-r--r--devel/gal/buildlink2.mk27
-rw-r--r--devel/gal/distinfo2
-rw-r--r--devel/gal/patches/patch-aa2
-rw-r--r--devel/glib2/buildlink.mk2
-rw-r--r--devel/glib2/buildlink2.mk33
-rw-r--r--devel/glib2/patches/patch-aa2
-rw-r--r--devel/glib2/patches/patch-ab2
-rw-r--r--devel/glib2/patches/patch-ac2
-rw-r--r--devel/glib2/patches/patch-ad2
-rw-r--r--devel/hdf/buildlink2.mk21
-rw-r--r--devel/hdf5/buildlink2.mk50
-rw-r--r--devel/libdockapp/buildlink2.mk21
-rw-r--r--devel/libgetopt/buildlink2.mk36
-rw-r--r--devel/libglade/Makefile2
-rw-r--r--devel/libglade/buildlink2.mk28
-rw-r--r--devel/libole2/buildlink2.mk21
-rw-r--r--devel/libsigc++/buildlink2.mk20
-rw-r--r--devel/libslang/Makefile2
-rw-r--r--devel/libslang/buildlink2.mk20
-rw-r--r--devel/libtar/buildlink2.mk20
-rw-r--r--devel/libtar/distinfo2
-rw-r--r--devel/libusb/Makefile2
-rw-r--r--devel/libusb/PLIST2
-rw-r--r--devel/libusb/buildlink2.mk19
-rw-r--r--devel/libusb/distinfo2
-rw-r--r--devel/libusb/patches/patch-ac2
-rw-r--r--devel/netcdf/buildlink2.mk23
-rw-r--r--devel/oaf/Makefile2
-rw-r--r--devel/oaf/PLIST2
-rw-r--r--devel/oaf/buildlink.mk2
-rw-r--r--devel/oaf/buildlink2.mk24
-rw-r--r--devel/oaf/distinfo2
-rw-r--r--devel/oaf/patches/patch-ac2
-rw-r--r--devel/oaf/patches/patch-ag2
-rw-r--r--devel/pango/PLIST.xf42
-rw-r--r--devel/pango/buildlink.mk2
-rw-r--r--devel/pango/buildlink2.mk22
-rw-r--r--devel/pango/patches/patch-aa2
-rw-r--r--devel/pango/patches/patch-ab2
-rw-r--r--devel/pango/patches/patch-ac2
-rw-r--r--devel/pango/patches/patch-ad2
-rw-r--r--devel/pango/patches/patch-ae2
-rw-r--r--devel/pkgconfig/PLIST2
-rw-r--r--devel/pkgconfig/buildlink2.mk15
-rw-r--r--devel/popt/buildlink2.mk21
-rw-r--r--devel/ptl2/Makefile2
-rw-r--r--devel/ptl2/buildlink.mk2
-rw-r--r--devel/ptl2/buildlink2.mk21
-rw-r--r--devel/ptl2/distinfo2
-rw-r--r--devel/ptl2/patches/patch-ae2
-rw-r--r--devel/ptl2/patches/patch-af2
-rw-r--r--devel/rx/buildlink2.mk19
-rw-r--r--devel/smpeg/buildlink2.mk22
-rw-r--r--devel/stlport/buildlink2.mk20
-rw-r--r--devel/stlport/patches/patch-ag2
-rw-r--r--devel/stlport/patches/patch-ah2
-rw-r--r--devel/unproven-pthreads/Makefile2
-rw-r--r--devel/unproven-pthreads/buildlink2.mk16
-rw-r--r--devel/unproven-pthreads/distinfo2
-rw-r--r--devel/unproven-pthreads/patches/patch-ac2
-rw-r--r--devel/unproven-pthreads/patches/patch-af2
-rw-r--r--devel/unproven-pthreads/patches/patch-bc2
-rw-r--r--graphics/GUIlib/buildlink2.mk22
-rw-r--r--graphics/ImageMagick/Makefile2
-rw-r--r--graphics/ImageMagick/PLIST2
-rw-r--r--graphics/ImageMagick/buildlink2.mk27
-rw-r--r--graphics/ImageMagick/distinfo2
-rw-r--r--graphics/ImageMagick/patches/patch-aa2
-rw-r--r--graphics/aalib-x11/buildlink2.mk19
-rw-r--r--graphics/avifile-devel/buildlink2.mk21
-rw-r--r--graphics/avifile/buildlink2.mk20
-rw-r--r--graphics/clanlib/Makefile2
-rw-r--r--graphics/clanlib/buildlink.mk2
-rw-r--r--graphics/clanlib/buildlink2.mk34
-rw-r--r--graphics/gdk-pixbuf-gnome/Makefile2
-rw-r--r--graphics/gdk-pixbuf-gnome/PLIST2
-rw-r--r--graphics/gdk-pixbuf-gnome/buildlink.mk2
-rw-r--r--graphics/gdk-pixbuf-gnome/buildlink2.mk22
-rw-r--r--graphics/gimp-base/buildlink2.mk24
-rw-r--r--graphics/gle/buildlink2.mk21
-rw-r--r--graphics/gphoto2/Makefile2
-rw-r--r--graphics/gphoto2/PLIST2
-rw-r--r--graphics/gphoto2/buildlink2.mk20
-rw-r--r--graphics/gphoto2/distinfo2
-rw-r--r--graphics/imlib2/buildlink2.mk29
-rw-r--r--graphics/jasper/buildlink2.mk19
-rw-r--r--graphics/libart2/Makefile2
-rw-r--r--graphics/libart2/PLIST2
-rw-r--r--graphics/libart2/buildlink.mk2
-rw-r--r--graphics/libart2/buildlink2.mk20
-rw-r--r--graphics/libart2/distinfo2
-rw-r--r--graphics/libexif/Makefile2
-rw-r--r--graphics/libexif/PLIST2
-rw-r--r--graphics/libexif/buildlink2.mk19
-rw-r--r--graphics/libexif/distinfo2
-rw-r--r--graphics/libwmf/buildlink2.mk26
-rw-r--r--graphics/mpeg-lib/buildlink2.mk19
-rw-r--r--graphics/py-imaging/buildlink2.mk7
-rw-r--r--graphics/sane-backends/Makefile.common2
-rw-r--r--graphics/sane-backends/PLIST2
-rw-r--r--graphics/sane-backends/buildlink2.mk22
-rw-r--r--graphics/sane-backends/distinfo2
-rw-r--r--graphics/sane-backends/patches/patch-aa2
-rw-r--r--inputmethod/canna-lib/Makefile2
-rw-r--r--inputmethod/canna-lib/PLIST2
-rw-r--r--inputmethod/canna-lib/buildlink.mk2
-rw-r--r--inputmethod/canna-lib/buildlink2.mk25
-rw-r--r--inputmethod/canna-lib/distinfo2
-rw-r--r--inputmethod/canna-lib/files/canna2
-rw-r--r--inputmethod/canna-lib/patches/patch-aa2
-rw-r--r--inputmethod/canna-lib/patches/patch-ab2
-rw-r--r--inputmethod/canna-lib/patches/patch-ac2
-rw-r--r--inputmethod/canna-lib/patches/patch-ad2
-rw-r--r--inputmethod/canna-lib/patches/patch-ae2
-rw-r--r--inputmethod/canna-lib/patches/patch-af2
-rw-r--r--inputmethod/ja-freewnn-lib/Makefile2
-rw-r--r--inputmethod/ja-freewnn-lib/Makefile.common2
-rw-r--r--inputmethod/ja-freewnn-lib/PLIST2
-rw-r--r--inputmethod/ja-freewnn-lib/buildlink.mk2
-rw-r--r--inputmethod/ja-freewnn-lib/buildlink2.mk29
-rw-r--r--inputmethod/ja-freewnn-lib/distinfo2
-rw-r--r--inputmethod/ja-freewnn-lib/files/ja_freewnn2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-aa2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ab2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ac2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ad2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ae2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-af2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ag2
-rw-r--r--inputmethod/ja-freewnn-lib/patches/patch-ah2
-rw-r--r--inputmethod/libtabe/Makefile2
-rw-r--r--inputmethod/libtabe/PLIST2
-rw-r--r--inputmethod/libtabe/buildlink.mk2
-rw-r--r--inputmethod/libtabe/buildlink2.mk21
-rw-r--r--inputmethod/libtabe/distinfo2
-rw-r--r--inputmethod/libtabe/patches/patch-aa2
-rw-r--r--inputmethod/sj3-lib/Makefile2
-rw-r--r--inputmethod/sj3-lib/PLIST2
-rw-r--r--inputmethod/sj3-lib/buildlink.mk2
-rw-r--r--inputmethod/sj3-lib/buildlink2.mk19
-rw-r--r--inputmethod/sj3-lib/distinfo2
-rw-r--r--inputmethod/sj3-lib/patches/patch-aa2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ab2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ac2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ad2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ae2
-rw-r--r--inputmethod/sj3-lib/patches/patch-af2
-rw-r--r--inputmethod/sj3-lib/patches/patch-ag2
-rw-r--r--lang/cim/buildlink2.mk20
-rw-r--r--lang/f2c/Makefile2
-rw-r--r--lang/f2c/buildlink2.mk29
-rw-r--r--lang/f2c/distinfo2
-rw-r--r--lang/f2c/patches/patch-aa2
-rw-r--r--lang/gb/buildlink2.mk22
-rw-r--r--lang/guile/Makefile2
-rw-r--r--lang/guile/buildlink2.mk27
-rw-r--r--lang/guile/distinfo2
-rw-r--r--lang/guile/patches/patch-ae2
-rw-r--r--mail/drac/buildlink.mk2
-rw-r--r--mail/drac/buildlink2.mk19
-rw-r--r--mail/faces/Makefile2
-rw-r--r--mail/faces/buildlink2.mk19
-rw-r--r--mail/faces/distinfo2
-rw-r--r--mail/faces/patches/patch-ax2
-rw-r--r--mail/faces/patches/patch-ay2
-rw-r--r--mail/faces/patches/patch-az2
-rw-r--r--mail/imap-uw/Makefile2
-rw-r--r--mail/imap-uw/buildlink2.mk21
-rw-r--r--math/blas/buildlink2.mk19
-rw-r--r--math/gsl/buildlink2.mk20
-rw-r--r--math/lapack/buildlink2.mk19
-rw-r--r--math/py-Numeric/buildlink2.mk7
-rw-r--r--math/udunits/buildlink2.mk21
-rw-r--r--misc/libdvdread/MESSAGE2
-rw-r--r--misc/libdvdread/Makefile2
-rw-r--r--misc/libdvdread/PLIST2
-rw-r--r--misc/libdvdread/buildlink.mk2
-rw-r--r--misc/libdvdread/buildlink2.mk19
-rw-r--r--misc/libdvdread/distinfo2
-rw-r--r--net/ORBit2/Makefile2
-rw-r--r--net/ORBit2/buildlink.mk2
-rw-r--r--net/ORBit2/buildlink2.mk30
-rw-r--r--net/ORBit2/distinfo2
-rw-r--r--net/ORBit2/patches/patch-aa2
-rw-r--r--net/ORBit2/patches/patch-ab2
-rw-r--r--net/SDL_net/buildlink2.mk22
-rw-r--r--net/adns/buildlink2.mk19
-rw-r--r--net/adns/distinfo2
-rw-r--r--net/adns/patches/patch-ac2
-rw-r--r--net/libIDL/buildlink2.mk23
-rw-r--r--net/libpcap/buildlink2.mk32
-rw-r--r--net/linc/Makefile2
-rw-r--r--net/linc/PLIST2
-rw-r--r--net/linc/buildlink.mk2
-rw-r--r--net/linc/buildlink2.mk22
-rw-r--r--net/linc/distinfo2
-rw-r--r--print/gnome-print/buildlink2.mk22
-rw-r--r--security/gpgme/Makefile2
-rw-r--r--security/gpgme/buildlink2.mk19
-rw-r--r--security/kth-krb4/Makefile2
-rw-r--r--security/kth-krb4/PLIST2
-rw-r--r--security/kth-krb4/buildlink.mk2
-rw-r--r--security/kth-krb4/buildlink2.mk30
-rw-r--r--security/libdes/buildlink2.mk20
-rw-r--r--security/openssl/MESSAGE2
-rw-r--r--security/openssl/Makefile2
-rw-r--r--security/openssl/PLIST.common2
-rw-r--r--security/openssl/PLIST.darwin2
-rw-r--r--security/openssl/PLIST.netbsd2
-rw-r--r--security/openssl/buildlink.mk2
-rw-r--r--security/openssl/buildlink2.mk99
-rw-r--r--security/openssl/distinfo2
-rw-r--r--security/openssl/files/patch-netbsd-1.4.22
-rw-r--r--security/openssl/patches/patch-aa2
-rw-r--r--security/openssl/patches/patch-ab2
-rw-r--r--security/openssl/patches/patch-ac2
-rw-r--r--security/openssl/patches/patch-ad2
-rw-r--r--security/openssl/patches/patch-ae2
-rw-r--r--security/openssl/patches/patch-af2
-rw-r--r--sysutils/fam/Makefile2
-rw-r--r--sysutils/fam/PLIST2
-rw-r--r--sysutils/fam/buildlink.mk2
-rw-r--r--sysutils/fam/buildlink2.mk20
-rw-r--r--sysutils/fam/distinfo2
-rw-r--r--sysutils/fam/patches/patch-aa2
-rw-r--r--sysutils/fam/patches/patch-ab2
-rw-r--r--sysutils/fam/patches/patch-ac2
-rw-r--r--sysutils/fam/patches/patch-ad2
-rw-r--r--sysutils/fam/patches/patch-ae2
-rw-r--r--sysutils/fam/patches/patch-af2
-rw-r--r--sysutils/fam/patches/patch-ag2
-rw-r--r--sysutils/fam/patches/patch-ah2
-rw-r--r--sysutils/fam/patches/patch-ai2
-rw-r--r--sysutils/fam/patches/patch-aj2
-rw-r--r--sysutils/fam/patches/patch-ak2
-rw-r--r--sysutils/fam/patches/patch-al2
-rw-r--r--sysutils/fam/patches/patch-am2
-rw-r--r--sysutils/fam/patches/patch-an2
-rw-r--r--sysutils/fam/patches/patch-ao2
-rw-r--r--sysutils/fam/patches/patch-ap2
-rw-r--r--sysutils/fam/patches/patch-aq2
-rw-r--r--sysutils/fam/patches/patch-ar2
-rw-r--r--sysutils/fam/patches/patch-as2
-rw-r--r--sysutils/fam/patches/patch-at2
-rw-r--r--sysutils/fam/patches/patch-au2
-rw-r--r--sysutils/fam/patches/patch-av2
-rw-r--r--sysutils/fam/patches/patch-aw2
-rw-r--r--sysutils/gnome-vfs/PLIST2
-rw-r--r--sysutils/gnome-vfs/buildlink2.mk25
-rw-r--r--textproc/chasen/Makefile2
-rw-r--r--textproc/chasen/Makefile.common2
-rw-r--r--textproc/chasen/PLIST2
-rw-r--r--textproc/chasen/buildlink.mk2
-rw-r--r--textproc/chasen/buildlink2.mk20
-rw-r--r--time/py-mxDateTime/buildlink2.mk7
-rw-r--r--www/glibwww/Makefile2
-rw-r--r--www/glibwww/buildlink2.mk22
-rw-r--r--www/gtkhtml/buildlink2.mk27
-rw-r--r--x11/Xaw-Xpm/buildlink2.mk24
-rw-r--r--x11/Xaw3d/buildlink2.mk22
-rw-r--r--x11/controlcenter/Makefile2
-rw-r--r--x11/controlcenter/PLIST2
-rw-r--r--x11/controlcenter/buildlink2.mk28
-rw-r--r--x11/fox/buildlink2.mk22
-rw-r--r--x11/gnome--/Makefile2
-rw-r--r--x11/gnome--/buildlink2.mk27
-rw-r--r--x11/gnome-core/PLIST2
-rw-r--r--x11/gnome-core/buildlink.mk2
-rw-r--r--x11/gnome-core/buildlink2.mk31
-rw-r--r--x11/gnome-python/buildlink2.mk7
-rw-r--r--x11/gtk+extra/buildlink2.mk21
-rw-r--r--x11/gtk--/Makefile2
-rw-r--r--x11/gtk--/buildlink2.mk28
-rw-r--r--x11/gtk2/buildlink2.mk34
-rw-r--r--x11/gtk2/patches/patch-aa2
-rw-r--r--x11/gtk2/patches/patch-ac2
-rw-r--r--x11/gtk2/patches/patch-ae2
-rw-r--r--x11/gtk2/patches/patch-af2
-rw-r--r--x11/gtk2/patches/patch-aj2
-rw-r--r--x11/gtk2/patches/patch-al2
-rw-r--r--x11/gtk2/patches/patch-an2
-rw-r--r--x11/gtk2/patches/patch-ao2
-rw-r--r--x11/gtk2/patches/patch-ap2
-rw-r--r--x11/kde2/Makefile.kde22
-rw-r--r--x11/kde2/buildlink2.mk84
-rw-r--r--x11/kde3/Makefile2
-rw-r--r--x11/kde3/Makefile.kde32
-rw-r--r--x11/kde3/PLIST2
-rw-r--r--x11/kde3/buildlink.mk2
-rw-r--r--x11/kde3/buildlink2.mk88
-rw-r--r--x11/kdebase3/Makefile2
-rw-r--r--x11/kdebase3/PLIST2
-rw-r--r--x11/kdebase3/PLIST.nsplugins2
-rw-r--r--x11/kdebase3/buildlink.mk2
-rw-r--r--x11/kdebase3/buildlink2.mk22
-rw-r--r--x11/kdebase3/distinfo2
-rw-r--r--x11/kdebase3/patches/patch-aa2
-rw-r--r--x11/kdebase3/patches/patch-ab2
-rw-r--r--x11/kdebase3/patches/patch-ac2
-rw-r--r--x11/kdebase3/patches/patch-ad2
-rw-r--r--x11/kdebase3/patches/patch-ae2
-rw-r--r--x11/kdebase3/patches/patch-af2
-rw-r--r--x11/kdebase3/patches/patch-ag2
-rw-r--r--x11/kdebase3/patches/patch-ah2
-rw-r--r--x11/kdebase3/patches/patch-ai2
-rw-r--r--x11/kdebase3/patches/patch-aj2
-rw-r--r--x11/kdebase3/patches/patch-ak2
-rw-r--r--x11/kdebase3/patches/patch-al2
-rw-r--r--x11/kdebase3/patches/patch-am2
-rw-r--r--x11/kdebase3/patches/patch-an2
-rw-r--r--x11/kdebase3/patches/patch-ao2
-rw-r--r--x11/kdebase3/patches/patch-ap2
-rw-r--r--x11/kdebase3/patches/patch-aq2
-rw-r--r--x11/kdebase3/patches/patch-ar2
-rw-r--r--x11/kdebase3/patches/patch-as2
-rw-r--r--x11/kdebase3/patches/patch-at2
-rw-r--r--x11/kdebase3/patches/patch-au2
-rw-r--r--x11/kdebase3/patches/patch-av2
-rw-r--r--x11/kdebase3/patches/patch-aw2
-rw-r--r--x11/kdebase3/patches/patch-ax2
-rw-r--r--x11/kdebase3/patches/patch-ay2
-rw-r--r--x11/kdebase3/patches/patch-az2
-rw-r--r--x11/kdebase3/patches/patch-ba2
-rw-r--r--x11/kdebase3/patches/patch-bb2
-rw-r--r--x11/kdebase3/patches/patch-bc2
-rw-r--r--x11/kdebase3/patches/patch-bd2
-rw-r--r--x11/kdebase3/patches/patch-be2
-rw-r--r--x11/kdebase3/patches/patch-bf2
-rw-r--r--x11/kdebase3/patches/patch-bg2
-rw-r--r--x11/kdebase3/patches/patch-bh2
-rw-r--r--x11/kdebase3/patches/patch-bi2
-rw-r--r--x11/kdebase3/patches/patch-bj2
-rw-r--r--x11/kdebase3/patches/patch-bk2
-rw-r--r--x11/kdebase3/patches/patch-bl2
-rw-r--r--x11/kdebase3/patches/patch-bm2
-rw-r--r--x11/kdebase3/patches/patch-bn2
-rw-r--r--x11/kdebase3/patches/patch-bo2
-rw-r--r--x11/kdebase3/patches/patch-bp2
-rw-r--r--x11/kdebase3/patches/patch-bq2
-rw-r--r--x11/kdebase3/patches/patch-br2
-rw-r--r--x11/kdebase3/patches/patch-bs2
-rw-r--r--x11/kdebase3/patches/patch-bt2
-rw-r--r--x11/kdebase3/patches/patch-bu2
-rw-r--r--x11/kdebase3/patches/patch-bv2
-rw-r--r--x11/kdebase3/patches/patch-bw2
-rw-r--r--x11/kdebase3/patches/patch-bx2
-rw-r--r--x11/kdebase3/patches/patch-by2
-rw-r--r--x11/kdebase3/patches/patch-bz2
-rw-r--r--x11/kdebase3/patches/patch-ca2
-rw-r--r--x11/kdebase3/patches/patch-cb2
-rw-r--r--x11/kdebase3/patches/patch-cc2
-rw-r--r--x11/kdebase3/patches/patch-cd2
-rw-r--r--x11/kdebase3/patches/patch-ce2
-rw-r--r--x11/kdebase3/patches/patch-cf2
-rw-r--r--x11/kdebase3/patches/patch-cg2
-rw-r--r--x11/kdebase3/patches/patch-ch2
-rw-r--r--x11/kdebase3/patches/patch-ci2
-rw-r--r--x11/kdebase3/patches/patch-cj2
-rw-r--r--x11/kdebase3/patches/patch-ck2
-rw-r--r--x11/kdebase3/patches/patch-cl2
-rw-r--r--x11/kdebase3/patches/patch-cm2
-rw-r--r--x11/kdebase3/patches/patch-cn2
-rw-r--r--x11/kdebase3/patches/patch-co2
-rw-r--r--x11/kdebase3/patches/patch-cp2
-rw-r--r--x11/kdebase3/patches/patch-cq2
-rw-r--r--x11/kdebase3/patches/patch-cr2
-rw-r--r--x11/kdebase3/patches/patch-cs2
-rw-r--r--x11/kdebase3/patches/patch-ct2
-rw-r--r--x11/kdebase3/patches/patch-cu2
-rw-r--r--x11/kdebase3/patches/patch-cv2
-rw-r--r--x11/kdebase3/patches/patch-cw2
-rw-r--r--x11/kdebase3/patches/patch-cx2
-rw-r--r--x11/kdebase3/patches/patch-cy2
-rw-r--r--x11/kdebase3/patches/patch-cz2
-rw-r--r--x11/kdebase3/patches/patch-da2
-rw-r--r--x11/kdebase3/patches/patch-db2
-rw-r--r--x11/kdebase3/patches/patch-dc2
-rw-r--r--x11/kdebase3/patches/patch-dd2
-rw-r--r--x11/kdebase3/patches/patch-de2
-rw-r--r--x11/kdebase3/patches/patch-df2
-rw-r--r--x11/kdebase3/patches/patch-dg2
-rw-r--r--x11/kdebase3/patches/patch-dh2
-rw-r--r--x11/kdebase3/patches/patch-di2
-rw-r--r--x11/kdebase3/patches/patch-dj2
-rw-r--r--x11/kdebase3/patches/patch-dk2
-rw-r--r--x11/kdebase3/patches/patch-dl2
-rw-r--r--x11/kdebase3/patches/patch-dm2
-rw-r--r--x11/kdebase3/patches/patch-dn2
-rw-r--r--x11/kdebase3/patches/patch-do2
-rw-r--r--x11/kdebase3/patches/patch-dp2
-rw-r--r--x11/kdebase3/patches/patch-dq2
-rw-r--r--x11/kdebase3/patches/patch-dr2
-rw-r--r--x11/kdebase3/patches/patch-ds2
-rw-r--r--x11/kdebase3/patches/patch-dt2
-rw-r--r--x11/kdebase3/patches/patch-du2
-rw-r--r--x11/kdebase3/patches/patch-dv2
-rw-r--r--x11/kdebase3/patches/patch-dw2
-rw-r--r--x11/kdebase3/patches/patch-dx2
-rw-r--r--x11/kdebase3/patches/patch-dy2
-rw-r--r--x11/kdebase3/patches/patch-dz2
-rw-r--r--x11/kdebase3/patches/patch-ea2
-rw-r--r--x11/kdebase3/patches/patch-eb2
-rw-r--r--x11/kdebase3/patches/patch-ec2
-rw-r--r--x11/kdebase3/patches/patch-ed2
-rw-r--r--x11/kdebase3/patches/patch-ee2
-rw-r--r--x11/kdebase3/patches/patch-ef2
-rw-r--r--x11/kdebase3/patches/patch-eg2
-rw-r--r--x11/kdebase3/patches/patch-eh2
-rw-r--r--x11/kdebase3/patches/patch-ei2
-rw-r--r--x11/kdebase3/patches/patch-ej2
-rw-r--r--x11/kdebase3/patches/patch-ek2
-rw-r--r--x11/kdebase3/patches/patch-el2
-rw-r--r--x11/kdebase3/patches/patch-em2
-rw-r--r--x11/kdebase3/patches/patch-en2
-rw-r--r--x11/kdebase3/patches/patch-eo2
-rw-r--r--x11/kdebase3/patches/patch-ep2
-rw-r--r--x11/kdebase3/patches/patch-eq2
-rw-r--r--x11/kdebase3/patches/patch-er2
-rw-r--r--x11/kdebase3/patches/patch-es2
-rw-r--r--x11/kdebase3/patches/patch-et2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs3/PLIST2
-rw-r--r--x11/kdelibs3/buildlink.mk2
-rw-r--r--x11/kdelibs3/buildlink2.mk37
-rw-r--r--x11/kdelibs3/distinfo2
-rw-r--r--x11/kdelibs3/patches/patch-aa2
-rw-r--r--x11/kdelibs3/patches/patch-ab2
-rw-r--r--x11/kdelibs3/patches/patch-ac2
-rw-r--r--x11/kdelibs3/patches/patch-ad2
-rw-r--r--x11/kdelibs3/patches/patch-ae2
-rw-r--r--x11/kdelibs3/patches/patch-af2
-rw-r--r--x11/kdelibs3/patches/patch-ag2
-rw-r--r--x11/kdelibs3/patches/patch-ah2
-rw-r--r--x11/kdelibs3/patches/patch-ai2
-rw-r--r--x11/kdelibs3/patches/patch-aj2
-rw-r--r--x11/kdelibs3/patches/patch-ak2
-rw-r--r--x11/kdelibs3/patches/patch-al2
-rw-r--r--x11/kdelibs3/patches/patch-am2
-rw-r--r--x11/kdelibs3/patches/patch-an2
-rw-r--r--x11/kdelibs3/patches/patch-ao2
-rw-r--r--x11/kdelibs3/patches/patch-ap2
-rw-r--r--x11/kdelibs3/patches/patch-aq2
-rw-r--r--x11/kdelibs3/patches/patch-ar2
-rw-r--r--x11/kdelibs3/patches/patch-as2
-rw-r--r--x11/kdelibs3/patches/patch-at2
-rw-r--r--x11/kdelibs3/patches/patch-au2
-rw-r--r--x11/kdelibs3/patches/patch-av2
-rw-r--r--x11/kdelibs3/patches/patch-aw2
-rw-r--r--x11/kdelibs3/patches/patch-ax2
-rw-r--r--x11/kdelibs3/patches/patch-ay2
-rw-r--r--x11/kdelibs3/patches/patch-az2
-rw-r--r--x11/kdelibs3/patches/patch-ba2
-rw-r--r--x11/kdelibs3/patches/patch-bb2
-rw-r--r--x11/kdelibs3/patches/patch-bc2
-rw-r--r--x11/kdelibs3/patches/patch-bd2
-rw-r--r--x11/kdelibs3/patches/patch-be2
-rw-r--r--x11/kdelibs3/patches/patch-bf2
-rw-r--r--x11/kdelibs3/patches/patch-bg2
-rw-r--r--x11/kdelibs3/patches/patch-bh2
-rw-r--r--x11/kdelibs3/patches/patch-bi2
-rw-r--r--x11/kdelibs3/patches/patch-bj2
-rw-r--r--x11/kdelibs3/patches/patch-bk2
-rw-r--r--x11/kdelibs3/patches/patch-bl2
-rw-r--r--x11/kdelibs3/patches/patch-bm2
-rw-r--r--x11/kdelibs3/patches/patch-bn2
-rw-r--r--x11/kdelibs3/patches/patch-bo2
-rw-r--r--x11/kdelibs3/patches/patch-bp2
-rw-r--r--x11/kdelibs3/patches/patch-bq2
-rw-r--r--x11/kdelibs3/patches/patch-br2
-rw-r--r--x11/kdelibs3/patches/patch-bs2
-rw-r--r--x11/kdelibs3/patches/patch-bt2
-rw-r--r--x11/kdelibs3/patches/patch-bu2
-rw-r--r--x11/kdelibs3/patches/patch-bv2
-rw-r--r--x11/kdelibs3/patches/patch-bw2
-rw-r--r--x11/kdelibs3/patches/patch-bx2
-rw-r--r--x11/kdelibs3/patches/patch-by2
-rw-r--r--x11/kdelibs3/patches/patch-bz2
-rw-r--r--x11/kdelibs3/patches/patch-ca2
-rw-r--r--x11/py-Pmw/buildlink2.mk7
-rw-r--r--x11/py-Tk/buildlink2.mk7
-rw-r--r--x11/py-qt2-sip/buildlink2.mk7
-rw-r--r--x11/py-qt2/buildlink2.mk7
-rw-r--r--x11/pygtk/buildlink2.mk7
-rw-r--r--x11/qt3-tools/Makefile2
-rw-r--r--x11/qt3-tools/buildlink.mk2
-rw-r--r--x11/qt3-tools/buildlink2.mk29
-rw-r--r--x11/wx1Motif/Makefile2
-rw-r--r--x11/wx1Motif/PLIST2
-rw-r--r--x11/wx1Motif/buildlink.mk2
-rw-r--r--x11/wx1Motif/buildlink2.mk30
-rw-r--r--x11/wx1Motif/distinfo2
-rw-r--r--x11/wx1Motif/patches/patch-aa2
-rw-r--r--x11/wx1Motif/patches/patch-ab2
-rw-r--r--x11/wx1Motif/patches/patch-ac2
-rw-r--r--x11/wx1Motif/patches/patch-ad2
-rw-r--r--x11/wx1Motif/patches/patch-ae2
-rw-r--r--x11/wx1Motif/patches/patch-af2
-rw-r--r--x11/wx1Motif/patches/patch-ag2
-rw-r--r--x11/wx1Motif/patches/patch-ah2
-rw-r--r--x11/wx1Motif/patches/patch-ai2
-rw-r--r--x11/wx1Motif/patches/patch-aj2
-rw-r--r--x11/xforms/Makefile2
-rw-r--r--x11/xforms/buildlink2.mk22
-rw-r--r--x11/xforms/distinfo2
-rw-r--r--x11/xforms/patches/patch-aa2
-rw-r--r--x11/xview-clients/Makefile6
-rw-r--r--x11/xview/Makefile5
631 files changed, 3880 insertions, 491 deletions
diff --git a/audio/arts/buildlink2.mk b/audio/arts/buildlink2.mk
new file mode 100644
index 00000000000..f9e6e28c8a1
--- /dev/null
+++ b/audio/arts/buildlink2.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:43 jlam Exp $
+
+.if !defined(ARTS_BUILDLINK2_MK)
+ARTS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= arts
+BUILDLINK_DEPENDS.arts?= arts>=1.0.0
+BUILDLINK_PKGSRCDIR.arts?= ../../audio/arts
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.arts=arts
+BUILDLINK_PREFIX.arts_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.arts!= ${GREP} "^\(include\|lib\)" ${.CURDIR}/../../audio/arts/PLIST
+
+BUILDLINK_TARGETS+= arts-buildlink
+
+arts-buildlink: _BUILDLINK_USE
+
+.endif # ARTS_BUILDLINK2_MK
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index e5d47973cd7..edf07f55335 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/07/17 07:54:03 skrll Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:21:44 jlam Exp $
SHA1 (arts-1.0.2.tar.bz2) = ad22ce03239de351f47e317b21050edace810fce
Size (arts-1.0.2.tar.bz2) = 1017488 bytes
diff --git a/audio/arts/patches/patch-aa b/audio/arts/patches/patch-aa
index 7ab9936e95c..87280e83221 100644
--- a/audio/arts/patches/patch-aa
+++ b/audio/arts/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 15:02:58 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:21:44 jlam Exp $
--- Makefile.in.orig Wed May 8 19:59:26 2002
+++ Makefile.in
diff --git a/audio/arts/patches/patch-ab b/audio/arts/patches/patch-ab
index b213df8a127..f017f2c83d6 100644
--- a/audio/arts/patches/patch-ab
+++ b/audio/arts/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/07/17 07:54:04 skrll Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 19:21:45 jlam Exp $
--- artsc/artsdsp.c.orig Mon Jun 24 17:55:50 2002
+++ artsc/artsdsp.c
diff --git a/audio/arts/patches/patch-ac b/audio/arts/patches/patch-ac
index cb944ae37bf..9cadc3a3b94 100644
--- a/audio/arts/patches/patch-ac
+++ b/audio/arts/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/07/17 07:54:04 skrll Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:21:45 jlam Exp $
--- flow/cpuinfo.cc.orig Mon Mar 18 12:39:39 2002
+++ flow/cpuinfo.cc
diff --git a/audio/arts/patches/patch-ad b/audio/arts/patches/patch-ad
index de6e0336b97..42f77c79f25 100644
--- a/audio/arts/patches/patch-ad
+++ b/audio/arts/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 15:02:58 skrll Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 19:21:45 jlam Exp $
--- soundserver/Makefile.am.orig Wed May 8 19:57:54 2002
+++ soundserver/Makefile.am
diff --git a/audio/arts/patches/patch-ae b/audio/arts/patches/patch-ae
index 72bf0475a22..f2263c3a5dc 100644
--- a/audio/arts/patches/patch-ae
+++ b/audio/arts/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 15:02:58 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:21:45 jlam Exp $
--- soundserver/Makefile.in.orig Wed May 8 19:59:27 2002
+++ soundserver/Makefile.in
diff --git a/audio/arts/patches/patch-af b/audio/arts/patches/patch-af
index 1a002600c4e..cba426b41f2 100644
--- a/audio/arts/patches/patch-af
+++ b/audio/arts/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 15:02:58 skrll Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 19:21:45 jlam Exp $
--- flow/gsl/gslcommon.c.orig Thu May 30 13:24:35 2002
+++ flow/gsl/gslcommon.c
diff --git a/audio/cdparanoia/buildlink2.mk b/audio/cdparanoia/buildlink2.mk
new file mode 100644
index 00000000000..2e897d3ac78
--- /dev/null
+++ b/audio/cdparanoia/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:46 jlam Exp $
+
+.if !defined(CDPARANOIA_BUILDLINK2_MK)
+CDPARANOIA_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= cdparanoia
+BUILDLINK_DEPENDS.cdparanoia?= cdparanoia>=3.0
+BUILDLINK_PKGSRCDIR.cdparanoia?= ../../audio/cdparanoia
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.cdparanoia=cdparanoia
+BUILDLINK_PREFIX.cdparanoia_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.cdparanoia= include/cdparanoia/*
+BUILDLINK_FILES.cdparanoia+= lib/libcdda_paranoia.*
+BUILDLINK_FILES.cdparanoia+= lib/libcdda_interface.*
+
+BUILDLINK_TARGETS+= cdparanoia-buildlink
+
+cdparanoia-buildlink: _BUILDLINK_USE
+
+.endif # CDPARANOIA_BUILDLINK2_MK
diff --git a/audio/flac/buildlink2.mk b/audio/flac/buildlink2.mk
new file mode 100644
index 00000000000..739bd289b78
--- /dev/null
+++ b/audio/flac/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:46 jlam Exp $
+
+.if !defined(FLAC_BUILDLINK2_MK)
+FLAC_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= flac
+BUILDLINK_DEPENDS.flac?= flac>=1.0
+BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.flac=flac
+BUILDLINK_PREFIX.flac_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.flac= include/FLAC/*
+BUILDLINK_FILES.flac+= lib/libFLAC.*
+
+BUILDLINK_TARGETS+= flac-buildlink
+
+flac-buildlink: _BUILDLINK_USE
+
+.endif # FLAC_BUILDLINK2_MK
diff --git a/audio/gsm/buildlink2.mk b/audio/gsm/buildlink2.mk
new file mode 100644
index 00000000000..a2b17e2809f
--- /dev/null
+++ b/audio/gsm/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:47 jlam Exp $
+
+.if !defined(GSM_BUILDLINK2_MK)
+GSM_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gsm
+BUILDLINK_DEPENDS.gsm?= gsm>=1.0.10
+BUILDLINK_PKGSRCDIR.gsm?= ../../audio/gsm
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gsm=gsm
+BUILDLINK_PREFIX.gsm_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.gsm= include/gsm.h
+BUILDLINK_FILES.gsm+= include/gsm/*
+BUILDLINK_FILES.gsm+= lib/libgsm.*
+
+BUILDLINK_TARGETS+= gsm-buildlink
+
+gsm-buildlink: _BUILDLINK_USE
+
+.endif # GSM_BUILDLINK2_MK
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index 5e5997e7d04..ef857775b20 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/05/12 10:16:45 abs Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:21:47 jlam Exp $
#
DISTNAME= id3lib-3.8.0pre2
diff --git a/audio/id3lib/buildlink2.mk b/audio/id3lib/buildlink2.mk
new file mode 100644
index 00000000000..c500af05418
--- /dev/null
+++ b/audio/id3lib/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:48 jlam Exp $
+
+.if !defined(ID3LIB_BUILDLINK2_MK)
+ID3LIB_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= id3lib
+BUILDLINK_DEPENDS.id3lib?= id3lib>=3.8.0
+BUILDLINK_PKGSRCDIR.id3lib?= ../../audio/id3lib
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.id3lib=id3lib
+BUILDLINK_PREFIX.id3lib_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.id3lib= include/id3.h
+BUILDLINK_FILES.id3lib+= include/id3/*
+BUILDLINK_FILES.id3lib+= lib/libid3*.*
+
+BUILDLINK_TARGETS+= id3lib-buildlink
+
+id3lib-buildlink: _BUILDLINK_USE
+
+.endif # ID3LIB_BUILDLINK2_MK
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 117ef358284..7bcd5d5db5f 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/05/25 12:47:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 19:21:48 jlam Exp $
#
VERS= 3.92
diff --git a/audio/lame/buildlink2.mk b/audio/lame/buildlink2.mk
new file mode 100644
index 00000000000..35f8a29ee39
--- /dev/null
+++ b/audio/lame/buildlink2.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:49 jlam Exp $
+
+.if !defined(LAME_BUILDLINK2_MK)
+LAME_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= lame
+BUILDLINK_DEPENDS.lame?= lame>=3.89
+BUILDLINK_PKGSRCDIR.lame?= ../../audio/lame
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.lame=lame
+BUILDLINK_PREFIX.lame= ${LOCALBASE}
+BUILDLINK_FILES.lame= include/lame/lame.h
+
+BUILDLINK_TARGETS+= lame-buildlink
+
+lame-buildlink: _BUILDLINK_USE
+
+.endif # LAME_BUILDLINK2_MK
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 467aca42b36..94170817a22 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/05/25 12:47:59 hubertf Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 19:21:49 jlam Exp $
SHA1 (lame-3.92.tar.gz) = 97be7804c7c89b088726124163de94b7432d5ea4
Size (lame-3.92.tar.gz) = 970894 bytes
diff --git a/audio/lame/patches/patch-ac b/audio/lame/patches/patch-ac
index 644fa97cb7a..aa2e31b7a71 100644
--- a/audio/lame/patches/patch-ac
+++ b/audio/lame/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/05/25 12:47:59 hubertf Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:21:49 jlam Exp $
--- frontend/Makefile.in.orig Fri Apr 12 21:38:18 2002
+++ frontend/Makefile.in
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 8995f6960e3..6902f24772f 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/16 02:50:02 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 19:21:50 jlam Exp $
#
DISTNAME= libcdaudio-0.99.6
diff --git a/audio/libcdaudio/buildlink2.mk b/audio/libcdaudio/buildlink2.mk
new file mode 100644
index 00000000000..5ddec4ff5b9
--- /dev/null
+++ b/audio/libcdaudio/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:51 jlam Exp $
+
+.if !defined(LIBCDAUDIO_BUILDLINK2_MK)
+LIBCDAUDIO_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libcdaudio
+BUILDLINK_DEPENDS.libcdaudio?= libcdaudio>=0.99.4nb1
+BUILDLINK_PKGSRCDIR.libcdaudio?= ../../audio/libcdaudio
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libcdaudio=libcdaudio
+BUILDLINK_PREFIX.libcdaudio_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libcdaudio= include/cdaudio.h
+BUILDLINK_FILES.libcdaudio+= lib/libcdaudio.*
+
+BUILDLINK_TARGETS+= libcdaudio-buildlink
+
+libcdaudio-buildlink: _BUILDLINK_USE
+
+.endif # LIBCDAUDIO_BUILDLINK2_MK
diff --git a/audio/libcdaudio/distinfo b/audio/libcdaudio/distinfo
index ec72a541c86..d85a75ff1a5 100644
--- a/audio/libcdaudio/distinfo
+++ b/audio/libcdaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/06 03:19:22 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:21:51 jlam Exp $
SHA1 (libcdaudio-0.99.6.tar.gz) = a75bd8c8204081d05f09e7c1139f26e9ca7cf801
Size (libcdaudio-0.99.6.tar.gz) = 262260 bytes
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 9697c896b6f..ceace402b41 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/07/13 01:03:35 mycroft Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/25 19:21:51 jlam Exp $
DISTNAME= libmikmod-3.1.10
CATEGORIES= audio
diff --git a/audio/libmikmod/PLIST b/audio/libmikmod/PLIST
index 16604d22d4f..6ae063f0359 100644
--- a/audio/libmikmod/PLIST
+++ b/audio/libmikmod/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/13 01:03:35 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:21:51 jlam Exp $
bin/libmikmod-config
include/mikmod.h
@unexec ${INSTALL_INFO} --delete %D/info/mikmod.info %D/info/dir
diff --git a/audio/libmikmod/buildlink2.mk b/audio/libmikmod/buildlink2.mk
new file mode 100644
index 00000000000..6724f4a5af1
--- /dev/null
+++ b/audio/libmikmod/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:52 jlam Exp $
+
+.if !defined(LIBMIKMOD_BUILDLINK2_MK)
+LIBMIKMOD_BUILDLINK2_MK= # defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_PACKAGES+= libmikmod
+BUILDLINK_DEPENDS.libmikmod?= libmikmod>=3.1.9
+BUILDLINK_PKGSRCDIR.libmikmod?= ../../audio/libmikmod
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libmikmod=libmikmod
+BUILDLINK_PREFIX.libmikmod_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libmikmod= include/mikmod.h
+BUILDLINK_FILES.libmikmod+= lib/libmikmod.*
+
+BUILDLINK_TARGETS+= libmikmod-buildlink
+
+libmikmod-buildlink: _BUILDLINK_USE
+
+.endif # LIBMIKMOD_BUILDLINK2_MK
diff --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
index 1abe16f843e..1061d245e6d 100644
--- a/audio/libmikmod/distinfo
+++ b/audio/libmikmod/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/13 01:03:35 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:21:52 jlam Exp $
SHA1 (libmikmod-3.1.10.tar.gz) = 8d4daec66b17e556e8977cb077c4186111808e0d
Size (libmikmod-3.1.10.tar.gz) = 528929 bytes
diff --git a/audio/libmikmod/patches/patch-ac b/audio/libmikmod/patches/patch-ac
index b88db973800..a9285c4962c 100644
--- a/audio/libmikmod/patches/patch-ac
+++ b/audio/libmikmod/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2002/07/13 01:03:35 mycroft Exp $
+$NetBSD: patch-ac,v 1.6 2002/08/25 19:21:52 jlam Exp $
--- configure.orig Tue Jan 22 01:21:19 2002
+++ configure Thu Jul 11 02:05:35 2002
diff --git a/audio/libmikmod/patches/patch-ad b/audio/libmikmod/patches/patch-ad
index a26023f7b11..8c72744d5cc 100644
--- a/audio/libmikmod/patches/patch-ad
+++ b/audio/libmikmod/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2002/07/13 01:03:35 mycroft Exp $
+$NetBSD: patch-ad,v 1.6 2002/08/25 19:21:52 jlam Exp $
--- drivers/drv_sun.c.orig Sun Jan 13 00:58:57 2002
+++ drivers/drv_sun.c Thu Jul 11 02:12:04 2002
diff --git a/audio/libsidplay/buildlink2.mk b/audio/libsidplay/buildlink2.mk
new file mode 100644
index 00000000000..74ad15a0937
--- /dev/null
+++ b/audio/libsidplay/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:53 jlam Exp $
+
+.if !defined(LIBSIDPLAY_BUILDLINK2_MK)
+LIBSIDPLAY_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libsidplay
+BUILDLINK_DEPENDS.libsidplay?= libsidplay>=1.36.38
+BUILDLINK_PKGSRCDIR.libsidplay?= ../../audio/libsidplay
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libsidplay=libsidplay
+BUILDLINK_PREFIX.libsidplay_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libsidplay= include/sidplay/*
+BUILDLINK_FILES.libsidplay+= lib/libsidplay.*
+
+BUILDLINK_TARGETS+= libsidplay-buildlink
+
+libsidplay-buildlink: _BUILDLINK_USE
+
+.endif # LIBSIDPLAY_BUILDLINK2_MK
diff --git a/audio/mad/PLIST b/audio/mad/PLIST
index 4e40350e490..978badedff0 100644
--- a/audio/mad/PLIST
+++ b/audio/mad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/31 10:41:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:21:53 jlam Exp $
bin/abxtest
bin/madplay
include/id3tag.h
diff --git a/audio/mad/buildlink.mk b/audio/mad/buildlink.mk
index 8423d9ad218..839a68c9d7b 100644
--- a/audio/mad/buildlink.mk
+++ b/audio/mad/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/05/28 00:05:08 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:21:53 jlam Exp $
#
# This Makefile fragment is included by packages that use mad.
#
diff --git a/audio/mad/buildlink2.mk b/audio/mad/buildlink2.mk
new file mode 100644
index 00000000000..5a59ad34e5f
--- /dev/null
+++ b/audio/mad/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:54 jlam Exp $
+
+.if !defined(MAD_BUILDLINK2_MK)
+MAD_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= mad
+BUILDLINK_DEPENDS.mad?= mad>=0.14.2b
+BUILDLINK_PKGSRCDIR.mad?= ../../audio/mad
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.mad=mad
+BUILDLINK_PREFIX.mad_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.mad= include/id3tag.h
+BUILDLINK_FILES.mad+= include/mad.h
+BUILDLINK_FILES.mad+= lib/libid3tag.*
+BUILDLINK_FILES.mad+= lib/libmad.*
+
+#.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../audio/esound/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+
+BUILDLINK_TARGETS+= mad-buildlink
+
+mad-buildlink: _BUILDLINK_USE
+
+.endif # MAD_BUILDLINK2_MK
diff --git a/audio/musicbrainz/buildlink2.mk b/audio/musicbrainz/buildlink2.mk
new file mode 100644
index 00000000000..1d851db80ba
--- /dev/null
+++ b/audio/musicbrainz/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:55 jlam Exp $
+
+.if !defined(MUSICBRAINZ_BUILDLINK2_MK)
+MUSICBRAINZ_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= musicbrainz
+BUILDLINK_DEPENDS.musicbrainz?= musicbrainz>=1.1.0
+BUILDLINK_PKGSRCDIR.musicbrainz?= ../../audio/musicbrainz
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.musicbrainz=musicbrainz
+BUILDLINK_PREFIX.musicbrainz_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.musicbrainz= include/musicbrainz/*
+BUILDLINK_FILES.musicbrainz+= include/musicbrainz/*/*
+BUILDLINK_FILES.musicbrainz+= lib/libmusicbrainz.*
+
+BUILDLINK_TARGETS+= musicbrainz-buildlink
+
+musicbrainz-buildlink: _BUILDLINK_USE
+
+.endif # MUSICBRAINZ_BUILDLINK2_MK
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index cc2366f2094..8de58b8c2dd 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/06/09 20:21:08 tron Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/25 19:21:55 jlam Exp $
# FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
#
diff --git a/audio/nas/buildlink2.mk b/audio/nas/buildlink2.mk
new file mode 100644
index 00000000000..cd825f17dc8
--- /dev/null
+++ b/audio/nas/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:55 jlam Exp $
+
+.if !defined(NAS_BUILDLINK2_MK)
+NAS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= nas
+BUILDLINK_DEPENDS.nas?= nas>=1.4.2
+BUILDLINK_PKGSRCDIR.nas?= ../../audio/nas
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.nas=nas
+BUILDLINK_PREFIX.nas_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.nas= include/audio/*
+BUILDLINK_FILES.nas+= lib/libaudio.*
+
+BUILDLINK_TARGETS+= nas-buildlink
+
+nas-buildlink: _BUILDLINK_USE
+
+.endif # NAS_BUILDLINK2_MK
diff --git a/audio/rplay/buildlink2.mk b/audio/rplay/buildlink2.mk
new file mode 100644
index 00000000000..b8937de9bff
--- /dev/null
+++ b/audio/rplay/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:56 jlam Exp $
+
+.if !defined(RPLAY_BUILDLINK2_MK)
+RPLAY_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= rplay
+BUILDLINK_DEPENDS.rplay?= rplay>=3.3.2
+BUILDLINK_PKGSRCDIR.rplay?= ../../audio/rplay
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.rplay=rplay
+BUILDLINK_PREFIX.rplay_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.rplay= include/rplay.h
+BUILDLINK_FILES.rplay+= lib/librplay.*
+
+BUILDLINK_TARGETS+= rplay-buildlink
+
+rplay-buildlink: _BUILDLINK_USE
+
+.endif # RPLAY_BUILDLINK2_MK
diff --git a/audio/wsoundserver/buildlink2.mk b/audio/wsoundserver/buildlink2.mk
new file mode 100644
index 00000000000..85c0fb0d175
--- /dev/null
+++ b/audio/wsoundserver/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:57 jlam Exp $
+
+.if !defined(WSOUND_BUILDLINK2_MK)
+WSOUND_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= wsound
+BUILDLINK_DEPENDS.wsound?= wsoundserver>=0.4.0
+BUILDLINK_PKGSRCDIR.wsound?= wsoundserver
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.wsound=wsoundserver
+BUILDLINK_FILES.wsound= include/wsound.h
+BUILDLINK_FILES.wsound+= lib/libwsound.*
+
+.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../devel/libproplist/buildlink2.mk"
+
+BUILDLINK_TARGETS+= wsound-buildlink
+
+wsound-buildlink: _BUILDLINK_USE
+
+.endif # WSOUND_BUILDLINK2_MK
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index c2ff8ee6250..b51a7d05795 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/08/08 16:17:06 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2002/08/25 19:21:57 jlam Exp $
# FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
DISTNAME= xmms-1.2.7
diff --git a/audio/xmms/buildlink.mk b/audio/xmms/buildlink.mk
index 1f77225f627..9712c2d9a0d 100644
--- a/audio/xmms/buildlink.mk
+++ b/audio/xmms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/08/08 16:17:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 19:21:57 jlam Exp $
#
# This Makefile fragment is included by packages that use xmms.
#
diff --git a/audio/xmms/buildlink2.mk b/audio/xmms/buildlink2.mk
new file mode 100644
index 00000000000..ffd4b872851
--- /dev/null
+++ b/audio/xmms/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:58 jlam Exp $
+
+.if !defined(XMMS_BUILDLINK2_MK)
+XMMS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= xmms
+BUILDLINK_DEPENDS.xmms?= xmms>=1.2.7nb1
+BUILDLINK_PKGSRCDIR.xmms?= ../../audio/xmms
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.xmms=xmms
+BUILDLINK_PREFIX.xmms_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.xmms= include/xmms/*
+BUILDLINK_FILES.xmms+= lib/libxmms.*
+
+PTHREAD_OPTS+= require
+
+.include "../../x11/gtk/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
+
+BUILDLINK_TARGETS+= xmms-buildlink
+
+xmms-buildlink: _BUILDLINK_USE
+
+.endif # XMMS_BUILDLINK2_MK
diff --git a/chat/gale/buildlink2.mk b/chat/gale/buildlink2.mk
new file mode 100644
index 00000000000..eeaa2a6fc64
--- /dev/null
+++ b/chat/gale/buildlink2.mk
@@ -0,0 +1,32 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:58 jlam Exp $
+
+.if !defined(GALE_BUILDLINK2_MK)
+GALE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gale
+BUILDLINK_DEPENDS.gale?= gale>=0.99
+BUILDLINK_PKGSRCDIR.gale?= ../../chat/gale
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gale=gale
+BUILDLINK_PREFIX.gale_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.gale= include/gale/*.h
+BUILDLINK_FILES.gale+= include/oop-adns.h
+BUILDLINK_FILES.gale+= include/oop-glib.h
+BUILDLINK_FILES.gale+= include/oop-www.h
+BUILDLINK_FILES.gale+= include/oop.h
+BUILDLINK_FILES.gale+= lib/libgale.*
+BUILDLINK_FILES.gale+= lib/liboop-adns.*
+BUILDLINK_FILES.gale+= lib/liboop-glib.*
+BUILDLINK_FILES.gale+= lib/liboop-www.*
+BUILDLINK_FILES.gale+= lib/liboop.*
+
+.include "../../devel/glib/buildlink2.mk"
+.include "../../net/adns/buildlink2.mk"
+.include "../../security/rsaref/buildlink2.mk"
+.include "../../www/libwww/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gale-buildlink
+
+gale-buildlink: _BUILDLINK_USE
+
+.endif # GALE_BUILDLINK2_MK
diff --git a/chat/libyahoo/buildlink2.mk b/chat/libyahoo/buildlink2.mk
new file mode 100644
index 00000000000..d13140782c6
--- /dev/null
+++ b/chat/libyahoo/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:59 jlam Exp $
+
+.if !defined(LIBYAHOO_BUILDLINK2_MK)
+LIBYAHOO_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libyahoo
+BUILDLINK_DEPENDS.libyahoo?= libyahoo>=0.18.2
+BUILDLINK_PKGSRCDIR.libyahoo?= ../../chat/libyahoo
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libyahoo=libyahoo
+BUILDLINK_PREFIX.libyahoo_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libyahoo= include/libyahoo/*.h
+BUILDLINK_FILES.libyahoo+= lib/libyahoo.a
+
+BUILDLINK_TRANSFORM.libyahoo= -e "s|include/libyahoo/|include/|g"
+
+BUILDLINK_TARGETS+= libyahoo-buildlink
+
+libyahoo-buildlink: _BUILDLINK_USE
+
+.endif # LIBYAHOO_BUILDLINK2_MK
diff --git a/comms/jpilot/buildlink2.mk b/comms/jpilot/buildlink2.mk
new file mode 100644
index 00000000000..c0f120eb1ab
--- /dev/null
+++ b/comms/jpilot/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:00 jlam Exp $
+
+.if !defined(JPILOT_BUILDLINK2_MK)
+JPILOT_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= jpilot
+BUILDLINK_DEPENDS.jpilot?= jpilot>=0.99
+BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot
+BUILDLINK_DEPMETHOD.jpilot?= build
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.jpilot=jpilot
+BUILDLINK_PREFIX.jpilot_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.jpilot= include/jpilot/*
+
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+= jpilot-buildlink
+
+jpilot-buildlink: _BUILDLINK_USE
+
+.endif # JPILOT_BUILDLINK2_MK
diff --git a/comms/pilot-link-libs/buildlink2.mk b/comms/pilot-link-libs/buildlink2.mk
new file mode 100644
index 00000000000..747200bc94f
--- /dev/null
+++ b/comms/pilot-link-libs/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:00 jlam Exp $
+
+.if !defined(PILOT_LINK_LIBS_BUILDLINK2_MK)
+PILOT_LINK_LIBS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= pilot-link-libs
+BUILDLINK_DEPENDS.pilot-link-libs?= pilot-link-libs>=0.9.5
+BUILDLINK_PKGSRCDIR.pilot-link-libs?= ../../comms/pilot-link-libs
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.pilot-link-libs=pilot-link-libs
+BUILDLINK_PREFIX.pilot-link-libs_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.pilot-link-libs= include/pi-*.*
+BUILDLINK_FILES.pilot-link-libs+= lib/libpicc.*
+BUILDLINK_FILES.pilot-link-libs+= lib/libpisock.*
+
+.include "../../converters/libiconv/buildlink2.mk"
+
+BUILDLINK_TARGETS+= pilot-link-libs-buildlink
+
+pilot-link-libs-buildlink: _BUILDLINK_USE
+
+.endif # PILOT_LINK_LIBS_BUILDLINK2_MK
diff --git a/converters/psiconv/buildlink2.mk b/converters/psiconv/buildlink2.mk
new file mode 100644
index 00000000000..d29dcabf5ea
--- /dev/null
+++ b/converters/psiconv/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:01 jlam Exp $
+
+.if !defined(PSICONV_BUILDLINK2_MK)
+PSICONV_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= psiconv
+BUILDLINK_DEPENDS.psiconv?= psiconv>=0.6.1
+BUILDLINK_PKGSRCDIR.psiconv?= ../../converters/psiconv
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.psiconv=psiconv
+BUILDLINK_PREFIX.psiconv_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.psiconv= include/psiconv/*
+BUILDLINK_FILES.psiconv+= lib/libpsiconv.*
+
+BUILDLINK_TARGETS+= psiconv-buildlink
+
+psiconv-buildlink: _BUILDLINK_USE
+
+.endif # PSICONV_BUILDLINK2_MK
diff --git a/converters/recode/buildlink2.mk b/converters/recode/buildlink2.mk
new file mode 100644
index 00000000000..8afa58cc0f9
--- /dev/null
+++ b/converters/recode/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:02 jlam Exp $
+
+.if !defined(RECODE_BUILDLINK2_MK)
+RECODE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= recode
+BUILDLINK_DEPENDS.recode?= recode>=3.5
+BUILDLINK_PKGSRCDIR.recode?= ../../databases/recode
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.recode=recode
+BUILDLINK_PREFIX.recode_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.recode= include/recode.h
+BUILDLINK_FILES.recode+= include/recodext.h
+BUILDLINK_FILES.recode+= lib/librecode.*
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+
+BUILDLINK_TARGETS+= recode-buildlink
+
+recode-buildlink: _BUILDLINK_USE
+
+.endif # RECODE_BUILDLINK2_MK
diff --git a/converters/uulib/buildlink2.mk b/converters/uulib/buildlink2.mk
new file mode 100644
index 00000000000..b54914aed1d
--- /dev/null
+++ b/converters/uulib/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:02 jlam Exp $
+
+.if !defined(UULIB_BUILDLINK2_MK)
+UULIB_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= uulib
+BUILDLINK_DEPENDS.uulib?= uulib>=0.5.17
+BUILDLINK_PKGSRCDIR.uulib?= ../../converters/uulib
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.uulib=uulib
+BUILDLINK_PREFIX.uulib_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.uulib= include/uu.h
+BUILDLINK_FILES.uulib+= lib/libuu.*
+
+BUILDLINK_TARGETS+= uulib-buildlink
+
+uulib-buildlink: _BUILDLINK_USE
+
+.endif # UULIB_BUILDLINK2_MK
diff --git a/converters/wv/buildlink2.mk b/converters/wv/buildlink2.mk
new file mode 100644
index 00000000000..18e05420cba
--- /dev/null
+++ b/converters/wv/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:03 jlam Exp $
+
+.if !defined(WV_BUILDLINK2_MK)
+WV_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= wv
+BUILDLINK_DEPENDS.wv?= wv>=0.6.5
+BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.wv=wv
+BUILDLINK_PREFIX.wv_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.wv= include/wv.h
+BUILDLINK_FILES.wv+= lib/libwv.*
+
+BUILDLINK_TARGETS+= wv-buildlink
+
+wv-buildlink: _BUILDLINK_USE
+
+.endif # WV_BUILDLINK2_MK
diff --git a/converters/xlHtml-mixedcase/buildlink2.mk b/converters/xlHtml-mixedcase/buildlink2.mk
new file mode 100644
index 00000000000..486ebfa5402
--- /dev/null
+++ b/converters/xlHtml-mixedcase/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:03 jlam Exp $
+
+.if !defined(XLHTML_BUILDLINK2_MK)
+XLHTML_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= xlHtml
+BUILDLINK_DEPENDS.xlHtml?= xlHtml>=0.2.8
+BUILDLINK_PKGSRCDIR.xlHtml?= ../../databases/xlHtml
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.xlHtml=xlHtml
+BUILDLINK_PREFIX.xlHtml_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.xlHtml= include/cole/*
+BUILDLINK_FILES.xlHtml+= lib/libcole.*
+
+BUILDLINK_TARGETS+= xlHtml-buildlink
+
+xlHtml-buildlink: _BUILDLINK_USE
+
+.endif # XLHTML_BUILDLINK2_MK
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 0b2b48dc105..bc14183c079 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/07/22 11:17:03 grant Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 19:22:04 jlam Exp $
DISTNAME= db-3.3.11
PKGNAME= db3-3.11.2
diff --git a/databases/db3/PLIST b/databases/db3/PLIST
index 93bb3b3cd1e..4ddcf205f97 100644
--- a/databases/db3/PLIST
+++ b/databases/db3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/15 18:23:40 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:04 jlam Exp $
bin/db3_archive
bin/db3_checkpoint
bin/db3_deadlock
diff --git a/databases/db3/buildlink2.mk b/databases/db3/buildlink2.mk
new file mode 100644
index 00000000000..490ca281e4f
--- /dev/null
+++ b/databases/db3/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:04 jlam Exp $
+
+.if !defined(DB3_BUILDLINK2_MK)
+DB3_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= db3
+BUILDLINK_DEPENDS.db3?= db3>=2.9.2
+BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.db3=db3
+BUILDLINK_PREFIX.db3_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.db3= include/db3/db_cxx.h
+BUILDLINK_FILES.db3+= include/db3/db.h
+BUILDLINK_FILES.db3+= lib/libdb3.*
+BUILDLINK_FILES.db3+= lib/libdb3_cxx.*
+
+BUILDLINK_TARGETS+= db3-buildlink
+
+db3-buildlink: _BUILDLINK_USE
+
+.endif # DB3_BUILDLINK2_MK
diff --git a/databases/edb/buildlink2.mk b/databases/edb/buildlink2.mk
new file mode 100644
index 00000000000..7d42ea1c034
--- /dev/null
+++ b/databases/edb/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:05 jlam Exp $
+
+.if !defined(EDB_BUILDLINK2_MK)
+EDB_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= edb
+BUILDLINK_DEPENDS.edb?= edb>=1.0.2
+BUILDLINK_PKGSRCDIR.edb?= ../../databases/edb
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.edb=edb
+BUILDLINK_PREFIX.edb_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.edb= include/Edb.h
+BUILDLINK_FILES.edb+= lib/libedb.*
+
+BUILDLINK_TARGETS+= edb-buildlink
+
+edb-buildlink: _BUILDLINK_USE
+
+.endif # EDB_BUILDLINK2_MK
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 9e154e21ac6..09f959764f9 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/06/23 03:38:21 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 19:22:05 jlam Exp $
DISTNAME= freetds-0.53
CATEGORIES= databases
diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST
index 3d9648d2de4..d97fce1c96c 100644
--- a/databases/freetds/PLIST
+++ b/databases/freetds/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/23 03:38:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:05 jlam Exp $
freetds/include/bkpublic.h
freetds/include/common.h
freetds/include/cspublic.h
diff --git a/databases/freetds/buildlink2.mk b/databases/freetds/buildlink2.mk
new file mode 100644
index 00000000000..ab35eff2f81
--- /dev/null
+++ b/databases/freetds/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:06 jlam Exp $
+
+.if !defined(FREETDS_BUILDLINK2_MK)
+FREETDS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= freetds
+BUILDLINK_DEPENDS.freetds?= freetds>=0.53
+BUILDLINK_PKGSRCDIR.freetds?= ../../databases/freetds
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.freetds=freetds
+BUILDLINK_PREFIX.freetds_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.freetds= freetds/include/*
+BUILDLINK_FILES.freetds+= freetds/lib/*
+
+BUILDLINK_TARGETS+= freetds-buildlink
+
+freetds-buildlink: _BUILDLINK_USE
+
+.endif # FREETDS_BUILDLINK2_MK
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index fcd9409c53a..4885fd73fcc 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/23 03:38:21 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:22:06 jlam Exp $
SHA1 (freetds-0.53.tgz) = 7ae8e843ad91c357e9fa91e28176775737584af3
Size (freetds-0.53.tgz) = 312692 bytes
diff --git a/databases/freetds/patches/patch-aa b/databases/freetds/patches/patch-aa
index 46650fc65dd..2cdc96dd329 100644
--- a/databases/freetds/patches/patch-aa
+++ b/databases/freetds/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2002/06/23 03:38:21 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:22:06 jlam Exp $
--- Makefile.in.orig Sun Dec 16 10:40:25 2001
+++ Makefile.in
diff --git a/databases/gnome-mime-types/Makefile b/databases/gnome-mime-types/Makefile
index 9125d2b2c23..c512abfeac3 100644
--- a/databases/gnome-mime-types/Makefile
+++ b/databases/gnome-mime-types/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/07 12:16:30 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:22:07 jlam Exp $
#
DISTNAME= gnome-mime-data-1.0.7
diff --git a/databases/gnome-mime-types/buildlink.mk b/databases/gnome-mime-types/buildlink.mk
index a341d34c5bf..2fac3c286cd 100644
--- a/databases/gnome-mime-types/buildlink.mk
+++ b/databases/gnome-mime-types/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/05/12 01:09:02 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:22:07 jlam Exp $
#
# This Makefile fragment is included by packages that use gnome-mime-data.
#
diff --git a/databases/gnome-mime-types/buildlink2.mk b/databases/gnome-mime-types/buildlink2.mk
new file mode 100644
index 00000000000..b7d17b77f0f
--- /dev/null
+++ b/databases/gnome-mime-types/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:07 jlam Exp $
+
+.if !defined(GNOME_MIME_DATA_BUILDLINK2_MK)
+GNOME_MIME_DATA_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gnome-mime-data
+BUILDLINK_DEPENDS.gnome-mime-data?= gnome-mime-data>=1.0.7
+BUILDLINK_PKGSRCDIR.gnome-mime-data?= ../../databases/gnome-mime-data
+#BUILDLINK_DEPMETHOD.gnome-mime-data?= build
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-mime-data=gnome-mime-data
+BUILDLINK_PREFIX.gnome-mime-data_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.gnome-mime-data+= lib/pkgconfig/gnome-mime-data-2.0.pc
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gnome-mime-data-buildlink
+
+gnome-mime-data-buildlink: _BUILDLINK_USE
+
+.endif # GNOME_MIME_DATA_BUILDLINK2_MK
diff --git a/databases/java-db3/buildlink2.mk b/databases/java-db3/buildlink2.mk
new file mode 100644
index 00000000000..6a1f5cd2c84
--- /dev/null
+++ b/databases/java-db3/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:08 jlam Exp $
+
+.if !defined(JAVA_DB3_BUILDLINK2_MK)
+JAVA_DB3_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= java-db3
+BUILDLINK_DEPENDS.java-db3?= java-db3>=2.9
+BUILDLINK_PKGSRCDIR.java-db3?= ../../databases/java-db3
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.java-db3=java-db3
+BUILDLINK_PREFIX.java-db3_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.java-db3= lib/db3.jar
+BUILDLINK_FILES.java-db3+= lib/libdb3_java.*
+
+.include "../../databases/db3/buildlink2.mk"
+
+BUILDLINK_TARGETS+= java-db3-buildlink
+
+java-db3-buildlink: _BUILDLINK_USE
+
+.endif # JAVA_DB3_BUILDLINK2_MK
diff --git a/databases/openldap1/Makefile b/databases/openldap1/Makefile
index c5493fd4bb5..600f50a20d8 100644
--- a/databases/openldap1/Makefile
+++ b/databases/openldap1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/06/15 21:20:00 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 19:22:08 jlam Exp $
#
DISTNAME= openldap-1.2.13
diff --git a/databases/openldap1/buildlink.mk b/databases/openldap1/buildlink.mk
index 2dde634dbac..6f3e8f2c99a 100644
--- a/databases/openldap1/buildlink.mk
+++ b/databases/openldap1/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/20 08:50:16 kent Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:09 jlam Exp $
#
# This Makefile fragment is included by packages that use openldap.
#
diff --git a/databases/openldap1/buildlink2.mk b/databases/openldap1/buildlink2.mk
new file mode 100644
index 00000000000..cd169b76283
--- /dev/null
+++ b/databases/openldap1/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:09 jlam Exp $
+
+.if !defined(OPENLDAP_BUILDLINK2_MK)
+OPENLDAP_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= openldap
+BUILDLINK_DEPENDS.openldap?= openldap-1.2.*
+BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.openldap=openldap
+BUILDLINK_PREFIX.openldap_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.openldap= include/disptmpl.h
+BUILDLINK_FILES.openldap+= include/lber.h
+BUILDLINK_FILES.openldap+= include/ldap.h
+BUILDLINK_FILES.openldap+= include/ldap_cdefs.h
+BUILDLINK_FILES.openldap+= include/srchpref.h
+BUILDLINK_FILES.openldap+= lib/liblber.*
+BUILDLINK_FILES.openldap+= lib/libldap.*
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == SunOS
+. include "../../databases/db/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+= openldap-buildlink
+
+openldap-buildlink: _BUILDLINK_USE
+
+.endif # OPENLDAP_BUILDLINK2_MK
diff --git a/databases/py-mysqldb/buildlink2.mk b/databases/py-mysqldb/buildlink2.mk
new file mode 100644
index 00000000000..b2a5eed67f1
--- /dev/null
+++ b/databases/py-mysqldb/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:10 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pymysqldb
+BUILDLINK_DEPENDS.pymysqldb?= ${PYPKGPREFIX}-mysqldb-*
+BUILDLINK_PKGSRCDIR.pymysqldb?= ../../databases/py-mysqldb
diff --git a/databases/sqlite/buildlink2.mk b/databases/sqlite/buildlink2.mk
new file mode 100644
index 00000000000..a33bd9094f9
--- /dev/null
+++ b/databases/sqlite/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:11 jlam Exp $
+
+.if !defined(SQLITE_BUILDLINK2_MK)
+SQLITE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= sqlite
+BUILDLINK_DEPENDS.sqlite?= sqlite>=2.0.5
+BUILDLINK_PKGSRCDIR.sqlite?= ../../databases/sqlite
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.sqlite=sqlite
+BUILDLINK_PREFIX.sqlite_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.sqlite= include/sqlite.h
+BUILDLINK_FILES.sqlite+= lib/libsqlite.*
+
+BUILDLINK_TARGETS+= sqlite-buildlink
+
+sqlite-buildlink: _BUILDLINK_USE
+
+.endif # SQLITE_BUILDLINK2_MK
diff --git a/databases/tcl-postgresql/buildlink2.mk b/databases/tcl-postgresql/buildlink2.mk
new file mode 100644
index 00000000000..e93e70613d3
--- /dev/null
+++ b/databases/tcl-postgresql/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:12 jlam Exp $
+
+.if !defined(TCL_POSTGRESQL_BUILDLINK2_MK)
+TCL_POSTGRESQL_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= tcl-postgresql
+BUILDLINK_DEPENDS.tcl-postgresql?= tcl-postgresql>=7.0
+BUILDLINK_PKGSRCDIR.tcl-postgresql?= ../../databases/tcl-postgresql
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.tcl-postgresql=tcl-postgresql
+BUILDLINK_PREFIX.tcl-postgresql_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.tcl-postgresql= include/pgsql/libpgtcl.h
+BUILDLINK_FILES.tcl-postgresql+= lib/libpgtcl.*
+
+.include "../../lang/tcl/buildlink2.mk"
+
+BUILDLINK_TARGETS+= tcl-postgresql-buildlink
+
+tcl-postgresql-buildlink: _BUILDLINK_USE
+
+.endif # TCL_POSTGRESQL_BUILDLINK2_MK
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 24f9b140e92..f6ad5c16ed6 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/08/08 16:17:06 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 19:22:12 jlam Exp $
PKGNAME= unixodbc-${ODBC_BASE_VERS}
PKGREVISION= 1
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common
index bc9992f52c3..98ac647daf4 100644
--- a/databases/unixodbc/Makefile.common
+++ b/databases/unixodbc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2002/08/01 06:40:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2002/08/25 19:22:13 jlam Exp $
DISTNAME= unixODBC-${ODBC_DIST_VERS}
CATEGORIES= databases
diff --git a/databases/unixodbc/buildlink.mk b/databases/unixodbc/buildlink.mk
index 1c383b3fb79..4c66d3d4cab 100644
--- a/databases/unixodbc/buildlink.mk
+++ b/databases/unixodbc/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/08/01 06:40:52 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:13 jlam Exp $
#
# This Makefile fragment is included by packages that use unixodbc.
#
diff --git a/databases/unixodbc/buildlink2.mk b/databases/unixodbc/buildlink2.mk
new file mode 100644
index 00000000000..a1984b92165
--- /dev/null
+++ b/databases/unixodbc/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:13 jlam Exp $
+
+.if !defined(UNIXODBC_BUILDLINK2_MK)
+UNIXODBC_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= unixodbc
+BUILDLINK_DEPENDS.unixodbc?= unixodbc>=2.0.11
+BUILDLINK_PKGSRCDIR.unixodbc?= ../../databases/unixodbc
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.unixodbc=unixodbc
+BUILDLINK_PREFIX.unixodbc_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.unixodbc= include/autotest.h
+BUILDLINK_FILES.unixodbc+= include/odbcinst.h
+BUILDLINK_FILES.unixodbc+= include/odbcinstext.h
+BUILDLINK_FILES.unixodbc+= include/sql.h
+BUILDLINK_FILES.unixodbc+= include/sqlext.h
+BUILDLINK_FILES.unixodbc+= include/sqltypes.h
+BUILDLINK_FILES.unixodbc+= include/sqlucode.h
+BUILDLINK_FILES.unixodbc+= include/uodbc_stats.h
+BUILDLINK_FILES.unixodbc+= lib/libboundparam.*
+BUILDLINK_FILES.unixodbc+= lib/libgtrtst.*
+BUILDLINK_FILES.unixodbc+= lib/libodbc.*
+BUILDLINK_FILES.unixodbc+= lib/libodbccr.*
+BUILDLINK_FILES.unixodbc+= lib/libodbcextras.*
+BUILDLINK_FILES.unixodbc+= lib/libodbcinst.*
+
+.include "../../devel/libtool/buildlink2.mk"
+.include "../../devel/pth/buildlink2.mk"
+
+BUILDLINK_TARGETS+= unixodbc-buildlink
+
+unixodbc-buildlink: _BUILDLINK_USE
+
+.endif # UNIXODBC_BUILDLINK2_MK
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 4c955d3f468..1d702074fa4 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/07/18 02:19:36 rh Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/25 19:22:13 jlam Exp $
#
DISTNAME= GConf-1.0.9
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 2890f3f7985..a9af1c38de7 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2002/07/31 11:38:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2002/08/25 19:22:14 jlam Exp $
bin/gconf-config
bin/gconf-config-1
bin/gconf-sanity-check-1
diff --git a/devel/GConf/buildlink.mk b/devel/GConf/buildlink.mk
index 1630fa5fd03..1739752be14 100644
--- a/devel/GConf/buildlink.mk
+++ b/devel/GConf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/05/22 16:02:25 agc Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 19:22:14 jlam Exp $
#
# This Makefile fragment is included by packages that use gconf.
#
diff --git a/devel/GConf/buildlink2.mk b/devel/GConf/buildlink2.mk
new file mode 100644
index 00000000000..77c91f119fe
--- /dev/null
+++ b/devel/GConf/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:14 jlam Exp $
+
+.if !defined(GCONF_BUILDLINK2_MK)
+GCONF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gconf
+BUILDLINK_DEPENDS.gconf?= GConf>=1.0.7nb1
+BUILDLINK_PKGSRCDIR.gconf?= ../../devel/GConf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gconf=GConf
+BUILDLINK_PREFIX.gconf_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gconf= include/gconf/1/gconf/*
+BUILDLINK_FILES.gconf+= lib/libgconf-*
+
+.include "../../databases/db3/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gconf-buildlink
+
+gconf-buildlink: _BUILDLINK_USE
+
+.endif # GCONF_BUILDLINK2_MK
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index 9a277f8e8c8..0c5e5a354db 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/07/29 01:48:12 rh Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 19:22:15 jlam Exp $
SHA1 (GConf-1.0.9.tar.bz2) = 91a1172c7855a235bf09e2ab925343a2e5250c13
Size (GConf-1.0.9.tar.bz2) = 784363 bytes
diff --git a/devel/GConf/patches/patch-ab b/devel/GConf/patches/patch-ab
index b3332ac4bd7..9e109bfdaf7 100644
--- a/devel/GConf/patches/patch-ab
+++ b/devel/GConf/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2002/07/18 02:19:37 rh Exp $
+$NetBSD: patch-ab,v 1.5 2002/08/25 19:22:15 jlam Exp $
--- gconf.pc.in.orig Sat Mar 24 08:52:30 2001
+++ gconf.pc.in
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index 78c22b35402..b58247994ac 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/22 16:08:42 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:22:16 jlam Exp $
#
DISTNAME= GConf-1.1.10
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index f4fec9e9e1a..5ba0e3ec66a 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/17 17:48:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:16 jlam Exp $
bin/gconf-sanity-check-2
bin/gconfd-2
bin/gconftool-2
diff --git a/devel/GConf2/buildlink.mk b/devel/GConf2/buildlink.mk
index 31ce4fe35fb..e5e622d17f2 100644
--- a/devel/GConf2/buildlink.mk
+++ b/devel/GConf2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/05/22 16:36:12 agc Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:22:16 jlam Exp $
#
# This Makefile fragment is included by packages that use gconf2.
#
diff --git a/devel/GConf2/buildlink2.mk b/devel/GConf2/buildlink2.mk
new file mode 100644
index 00000000000..eb0962dd058
--- /dev/null
+++ b/devel/GConf2/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:16 jlam Exp $
+
+.if !defined(GCONF2_BUILDLINK2_MK)
+GCONF2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gconf2
+BUILDLINK_DEPENDS.gconf2?= GConf2>=1.1.10
+BUILDLINK_PKGSRCDIR.gconf2?= ../../devel/GConf2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gconf2=GConf2
+BUILDLINK_PREFIX.gconf2_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gconf2= include/gconf/2/gconf/*
+BUILDLINK_FILES.gconf2+= lib/libgconf-2*
+
+.include "../../databases/db3/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gconf2-buildlink
+
+gconf2-buildlink: _BUILDLINK_USE
+
+.endif # GCONF2_BUILDLINK2_MK
diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo
index df4a60e30bf..59fa8a2a499 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/22 16:08:42 agc Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 19:22:17 jlam Exp $
SHA1 (GConf-1.1.10.tar.bz2) = 7fa90d0c5f8962fd5307a2f38177daf26b795312
Size (GConf-1.1.10.tar.bz2) = 878638 bytes
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 7cc2d003ad2..7aea9ad0e54 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/08/08 16:17:07 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2002/08/25 19:22:17 jlam Exp $
#
DISTNAME= SDL-1.2.3
diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index cb5df31ce7a..795d35d92c7 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.16 2002/08/01 06:40:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.17 2002/08/25 19:22:17 jlam Exp $
#
# This Makefile fragment is included by packages that use SDL.
#
diff --git a/devel/SDL/buildlink2.mk b/devel/SDL/buildlink2.mk
new file mode 100644
index 00000000000..0fe667c9f09
--- /dev/null
+++ b/devel/SDL/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:17 jlam Exp $
+
+.if !defined(SDL_BUILDLINK2_MK)
+SDL_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= SDL
+BUILDLINK_DEPENDS.SDL?= SDL>=1.2.0
+BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.SDL=SDL
+BUILDLINK_PREFIX.SDL_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.SDL= include/SDL/*
+BUILDLINK_FILES.SDL+= lib/libSDL.*
+BUILDLINK_FILES.SDL+= lib/libSDLmain.*
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(SDL_USE_NAS)
+. include "../../audio/nas/buildlink2.mk"
+.endif
+.include "../../audio/esound/buildlink2.mk"
+.include "../../devel/pth/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/aalib-x11/buildlink2.mk"
+
+BUILDLINK_TARGETS+= SDL-buildlink
+
+SDL-buildlink: _BUILDLINK_USE
+
+.endif # SDL_BUILDLINK2_MK
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index c095695ad4a..794b8832780 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/07/15 23:04:20 kristerw Exp $
+$NetBSD: distinfo,v 1.14 2002/08/25 19:22:17 jlam Exp $
SHA1 (SDL-1.2.3.tar.gz) = f74f5bf47a472083da8700d2354cb90062e2a845
Size (SDL-1.2.3.tar.gz) = 1568671 bytes
diff --git a/devel/SDL/files/SDL_sysjoystick.c b/devel/SDL/files/SDL_sysjoystick.c
index 39a42180c83..bc2d7080090 100644
--- a/devel/SDL/files/SDL_sysjoystick.c
+++ b/devel/SDL/files/SDL_sysjoystick.c
@@ -29,7 +29,7 @@
#ifdef SAVE_RCSID
static char rcsid =
- "@(#) $Id: SDL_sysjoystick.c,v 1.1 2002/07/14 07:28:40 kristerw Exp $";
+ "@(#) $Id: SDL_sysjoystick.c,v 1.2 2002/08/25 19:22:18 jlam Exp $";
#endif
#include <stdio.h>
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj
index 945289ef446..cc64d832002 100644
--- a/devel/SDL/patches/patch-aj
+++ b/devel/SDL/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.12 2002/07/15 23:04:20 kristerw Exp $
+$NetBSD: patch-aj,v 1.13 2002/08/25 19:22:18 jlam Exp $
--- configure.in.orig Thu Nov 8 08:28:00 2001
+++ configure.in Mon Jul 15 23:28:12 2002
@@ -374,10 +374,7 @@
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index 67919b43355..fa336c5b8cb 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2002/07/15 23:04:20 kristerw Exp $
+$NetBSD: patch-am,v 1.6 2002/08/25 19:22:19 jlam Exp $
--- configure.orig Thu Nov 8 08:28:08 2001
+++ configure Mon Jul 15 23:31:06 2002
@@ -3588,10 +3588,7 @@
diff --git a/devel/SDL/patches/patch-ap b/devel/SDL/patches/patch-ap
index adf2b569cc0..37d94bf21c5 100644
--- a/devel/SDL/patches/patch-ap
+++ b/devel/SDL/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.4 2002/07/13 16:17:33 wiz Exp $
+$NetBSD: patch-ap,v 1.5 2002/08/25 19:22:19 jlam Exp $
--- src/hermes/Makefile.in.orig Thu Nov 8 08:28:07 2001
+++ src/hermes/Makefile.in
diff --git a/devel/SDL/patches/patch-as b/devel/SDL/patches/patch-as
index a37f7a4ccfe..0542a38a9c3 100644
--- a/devel/SDL/patches/patch-as
+++ b/devel/SDL/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1 2002/07/13 16:17:33 wiz Exp $
+$NetBSD: patch-as,v 1.2 2002/08/25 19:22:19 jlam Exp $
--- src/Makefile.in.orig Thu Nov 8 08:28:02 2001
+++ src/Makefile.in
diff --git a/devel/SDL_gfx/buildlink2.mk b/devel/SDL_gfx/buildlink2.mk
new file mode 100644
index 00000000000..f2b21926a7e
--- /dev/null
+++ b/devel/SDL_gfx/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:19 jlam Exp $
+
+.if !defined(SDL_GFX_BUILDLINK2_MK)
+SDL_GFX_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= SDL_gfx
+BUILDLINK_DEPENDS.SDL_gfx?= SDL_gfx>=2.0.3
+BUILDLINK_PKGSRCDIR.SDL_gfx?= ../../devel/SDL_gfx
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_gfx=SDL_gfx
+
+BUILDLINK_PREFIX.SDL_gfx_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.SDL_gfx= include/SDL_framerate.h
+BUILDLINK_FILES.SDL_gfx+= include/SDL_gfxPrimitives.h
+BUILDLINK_FILES.SDL_gfx+= include/SDL_gfxPrimitives_font.h
+BUILDLINK_FILES.SDL_gfx+= include/SDL_imageFilter.h
+BUILDLINK_FILES.SDL_gfx+= include/SDL_rotozoom.h
+BUILDLINK_FILES.SDL_gfx+= lib/libSDL_gfx.*
+
+.include "../../devel/SDL/buildlink2.mk"
+
+BUILDLINK_TARGETS+= SDL_gfx-buildlink
+
+SDL_gfx-buildlink: _BUILDLINK_USE
+
+.endif # SDL_GFX_BUILDLINK2_MK
diff --git a/devel/SDL_ttf/buildlink2.mk b/devel/SDL_ttf/buildlink2.mk
new file mode 100644
index 00000000000..20522410787
--- /dev/null
+++ b/devel/SDL_ttf/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:20 jlam Exp $
+
+.if !defined(SDL_TTF_BUILDLINK2_MK)
+SDL_TTF_BUILDLINK2_MK= # defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_PACKAGES+= SDL_ttf
+BUILDLINK_DEPENDS.SDL_ttf?= SDL_ttf>=2.0.3
+BUILDLINK_PKGSRCDIR.SDL_ttf?= ../../devel/SDL_ttf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_ttf=SDL_ttf
+BUILDLINK_PREFIX.SDL_ttf_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.SDL_ttf= include/SDL/SDL_ttf.h
+BUILDLINK_FILES.SDL_ttf+= lib/libSDL_ttf-*
+BUILDLINK_FILES.SDL_ttf+= lib/libSDL_ttf.*
+
+.include "../../devel/SDL/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+
+BUILDLINK_TARGETS+= SDL_ttf-buildlink
+
+SDL_ttf-buildlink: _BUILDLINK_USE
+
+.endif # SDL_TTF_BUILDLINK2_MK
diff --git a/devel/atk/buildlink.mk b/devel/atk/buildlink.mk
index 0d02e9a7f48..038ea0b6468 100644
--- a/devel/atk/buildlink.mk
+++ b/devel/atk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/06/30 14:04:26 jschauma Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:21 jlam Exp $
#
# This Makefile fragment is included by packages that use atk.
#
diff --git a/devel/atk/buildlink2.mk b/devel/atk/buildlink2.mk
new file mode 100644
index 00000000000..edd565b5755
--- /dev/null
+++ b/devel/atk/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:21 jlam Exp $
+
+.if !defined(ATK_BUILDLINK2_MK)
+ATK_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= atk
+BUILDLINK_DEPENDS.atk?= atk>=1.0.2
+BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.atk=atk
+BUILDLINK_PREFIX.atk_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.atk= include/atk-1.0/*/*
+BUILDLINK_FILES.atk+= include/atk-1.0/*
+BUILDLINK_FILES.atk+= lib/libatk-1.0.*
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= atk-buildlink
+
+atk-buildlink: _BUILDLINK_USE
+
+.endif # ATK_BUILDLINK2_MK
diff --git a/devel/atk/patches/patch-ab b/devel/atk/patches/patch-ab
index af19a2679e1..fa01353ae6b 100644
--- a/devel/atk/patches/patch-ab
+++ b/devel/atk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/07/18 02:19:26 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:22:22 jlam Exp $
--- atk.pc.in.orig Wed Mar 6 03:27:29 2002
+++ atk.pc.in
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 08a46d2fba3..6b4383e8374 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/12 02:17:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 19:22:22 jlam Exp $
#
DISTNAME= binutils-2.11.2
diff --git a/devel/binutils/PLIST b/devel/binutils/PLIST
index 28ebeb07a85..c1355b8b440 100644
--- a/devel/binutils/PLIST
+++ b/devel/binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/12 02:17:23 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:22 jlam Exp $
${MACHINE_GNU_PLATFORM}/bin/ar
${MACHINE_GNU_PLATFORM}/bin/as
${MACHINE_GNU_PLATFORM}/bin/ld
diff --git a/devel/binutils/PLIST.SunOS b/devel/binutils/PLIST.SunOS
index 209e752b892..9e36f7cda27 100644
--- a/devel/binutils/PLIST.SunOS
+++ b/devel/binutils/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2002/07/11 16:09:36 agc Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2002/08/25 19:22:22 jlam Exp $
${MACHINE_GNU_PLATFORM}/bin/ar
${MACHINE_GNU_PLATFORM}/bin/as
${MACHINE_GNU_PLATFORM}/bin/ld
diff --git a/devel/binutils/buildlink.mk b/devel/binutils/buildlink.mk
index 729ec66d842..77043a87671 100644
--- a/devel/binutils/buildlink.mk
+++ b/devel/binutils/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/05/21 11:04:12 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:22:22 jlam Exp $
#
# This Makefile fragment is included by packages that use binutils.
#
diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
new file mode 100644
index 00000000000..6d22509ac78
--- /dev/null
+++ b/devel/binutils/buildlink2.mk
@@ -0,0 +1,55 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:22 jlam Exp $
+
+.if !defined(BINUTILS_BUILDLINK2_MK)
+BINUTILS_BUILDLINK2_MK= # defined
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_DEPENDS.binutils?= binutils>=2.11.2
+BUILDLINK_PKGSRCDIR.binutils?= ../../devel/binutils
+BUILDLINK_DEPMETHOD.binutils?= build
+
+_NEED_BINUTILS= NO
+.if ${OPSYS} == "NetBSD"
+_INCOMPAT_BINUTILS= 0.* 1.[01234]* 1.5.* 1.5[A-X]
+. for PATTERN in ${_INCOMPAT_BINUTILS}
+. if ${OS_VERSION:M${PATTERN}} != ""
+_NEED_BINUTILS= YES
+. endif
+. endfor
+.else
+# XXX: logic for other operating systems needed here
+.endif
+
+.if ${_NEED_BINUTILS} == "YES"
+BUILDLINK_PACKAGES+= binutils
+EVAL_PREFIX+= BUILDLINK_PREFIX.binutils=binutils
+BUILDLINK_PREFIX.binutils_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.binutils+= include/ansidecl.h
+BUILDLINK_FILES.binutils+= include/bfd.h
+BUILDLINK_FILES.binutils+= include/bfdlink.h
+BUILDLINK_FILES.binutils+= lib/libbfd.*
+BUILDLINK_FILES.binutils+= lib/libiberty.*
+BUILDLINK_FILES.binutils+= lib/libopcodes.*
+BUILDLINK_FILES.binutils+= bin/addr2line
+BUILDLINK_FILES.binutils+= bin/ar
+BUILDLINK_FILES.binutils+= bin/as
+BUILDLINK_FILES.binutils+= bin/c++filt
+BUILDLINK_FILES.binutils+= bin/gasp
+BUILDLINK_FILES.binutils+= bin/gprof
+BUILDLINK_FILES.binutils+= bin/ld
+BUILDLINK_FILES.binutils+= bin/nm
+BUILDLINK_FILES.binutils+= bin/objcopy
+BUILDLINK_FILES.binutils+= bin/objdump
+BUILDLINK_FILES.binutils+= bin/ranlib
+BUILDLINK_FILES.binutils+= bin/readelf
+BUILDLINK_FILES.binutils+= bin/size
+BUILDLINK_FILES.binutils+= bin/strings
+BUILDLINK_FILES.binutils+= bin/strip
+
+BUILDLINK_TARGETS+= binutils-buildlink
+
+binutils-buildlink: _BUILDLINK_USE
+.endif # _NEED_BINUTILS
+
+.endif # BINUTILS_BUILDLINK2_MK
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index b0dc7525316..a38bb751760 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/12 15:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:22:23 jlam Exp $
#
DISTNAME= bonobo-activation-1.0.2
diff --git a/devel/bonobo-activation/PLIST b/devel/bonobo-activation/PLIST
index 24c98794b35..f6f0bfe630f 100644
--- a/devel/bonobo-activation/PLIST
+++ b/devel/bonobo-activation/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/12 19:34:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:23 jlam Exp $
bin/activation-client
bin/bonobo-activation-empty-server
bin/bonobo-activation-run-query
diff --git a/devel/bonobo-activation/buildlink.mk b/devel/bonobo-activation/buildlink.mk
index 1efc9bf4a02..98798c4728c 100644
--- a/devel/bonobo-activation/buildlink.mk
+++ b/devel/bonobo-activation/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/12 15:59:45 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:23 jlam Exp $
#
# This Makefile fragment is included by packages that use bonobo-activation.
#
diff --git a/devel/bonobo-activation/buildlink2.mk b/devel/bonobo-activation/buildlink2.mk
new file mode 100644
index 00000000000..39a241bc5c7
--- /dev/null
+++ b/devel/bonobo-activation/buildlink2.mk
@@ -0,0 +1,40 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:23 jlam Exp $
+
+.if !defined(BONOBO_ACTIVATION_BUILDLINK2_MK)
+BONOBO_ACTIVATION_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= bonobo-activation
+BUILDLINK_DEPENDS.bonobo-activation?= bonobo-activation>=1.0.2
+BUILDLINK_PKGSRCDIR.bonobo-activation?= ../../devel/bonobo-activation
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo-activation=bonobo-activation
+BUILDLINK_PREFIX.bonobo-activation_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-base-service.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-id.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h
+BUILDLINK_FILES.bonobo-activation+= include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h
+BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/Bonobo_CosNaming_NamingContext.server
+BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/broken.server
+BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/empty.server
+BUILDLINK_FILES.bonobo-activation+= lib/bonobo/servers/plugin.server
+BUILDLINK_FILES.bonobo-activation+= lib/libbonobo-activation.*
+BUILDLINK_FILES.bonobo-activation+= lib/pkgconfig/bonobo-activation-2.0.pc
+
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../net/ORBit2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= bonobo-activation-buildlink
+
+bonobo-activation-buildlink: _BUILDLINK_USE
+
+.endif # BONOBO_ACTIVATION_BUILDLINK2_MK
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 04e70417660..103f0ab9876 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/12 15:59:45 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:22:23 jlam Exp $
SHA1 (bonobo-activation-1.0.2.tar.bz2) = fe5830eb3e6ca5234541bb20c8f19e5096ee0bbc
Size (bonobo-activation-1.0.2.tar.bz2) = 425653 bytes
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index d08cc195601..5414ad444ae 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/05/25 11:31:29 rh Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 19:22:23 jlam Exp $
DISTNAME= bonobo-conf-0.14
PKGREVISION= 2
diff --git a/devel/bonobo-conf/PLIST b/devel/bonobo-conf/PLIST
index 902883ff7b1..e4ecc28b243 100644
--- a/devel/bonobo-conf/PLIST
+++ b/devel/bonobo-conf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/26 10:29:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 19:22:23 jlam Exp $
bin/bonobo-moniker-xmldb
bin/cedit
include/bonobo-conf/Bonobo_Config.h
diff --git a/devel/bonobo-conf/buildlink2.mk b/devel/bonobo-conf/buildlink2.mk
new file mode 100644
index 00000000000..ea1a6dd2867
--- /dev/null
+++ b/devel/bonobo-conf/buildlink2.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:24 jlam Exp $
+
+.if !defined(BONOBO_CONF_BUILDLINK2_MK)
+BONOBO_CONF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= bonobo-conf
+BUILDLINK_DEPENDS.bonobo-conf?= bonobo-conf>0.14nb1
+BUILDLINK_PKGSRCDIR.bonobo-conf?= ../../devel/bonobo-conf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo-conf=bonobo-conf
+BUILDLINK_PREFIX.bonobo-conf_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.bonobo-conf= include/bonobo-conf/*
+BUILDLINK_FILES.bonobo-conf+= lib/bonobo/monikers/libmoniker_config*
+BUILDLINK_FILES.bonobo-conf+= lib/bonobo/monikers/libmoniker_gconf*
+BUILDLINK_FILES.bonobo-conf+= lib/bonobo_conf*
+BUILDLINK_FILES.bonobo-conf+= lib/libbonobo_conf*
+
+.include "../../devel/GConf/buildlink2.mk"
+.include "../../devel/bonobo/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+
+BUILDLINK_TARGETS+= bonobo-conf-buildlink
+
+bonobo-conf-buildlink: _BUILDLINK_USE
+
+.endif # BONOBO_CONF_BUILDLINK2_MK
diff --git a/devel/bonobo-conf/distinfo b/devel/bonobo-conf/distinfo
index 2c328a79d2c..e6558962dd4 100644
--- a/devel/bonobo-conf/distinfo
+++ b/devel/bonobo-conf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/05/25 11:31:29 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:22:24 jlam Exp $
SHA1 (bonobo-conf-0.14.tar.gz) = 9e33ec9eb7553cca90e4e1f9e018e2a7f2740d7a
Size (bonobo-conf-0.14.tar.gz) = 438259 bytes
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 3a776808468..5fb8ce7422e 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/07/18 02:19:39 rh Exp $
+# $NetBSD: Makefile,v 1.27 2002/08/25 19:22:24 jlam Exp $
#
DISTNAME= bonobo-1.0.18
diff --git a/devel/bonobo/PLIST b/devel/bonobo/PLIST
index 7aa1fe02b30..94226d9229b 100644
--- a/devel/bonobo/PLIST
+++ b/devel/bonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/07/12 19:34:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/08/25 19:22:24 jlam Exp $
bin/bonobo-application-x-mines
bin/bonobo-audio-ulaw
bin/bonobo-echo
diff --git a/devel/bonobo/buildlink.mk b/devel/bonobo/buildlink.mk
index 45adcab2c3c..1793a5c9cda 100644
--- a/devel/bonobo/buildlink.mk
+++ b/devel/bonobo/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/07/14 00:58:27 rh Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 19:22:24 jlam Exp $
#
# This Makefile fragment is included by packages that use bonobo.
#
diff --git a/devel/bonobo/buildlink2.mk b/devel/bonobo/buildlink2.mk
new file mode 100644
index 00000000000..7ccda482999
--- /dev/null
+++ b/devel/bonobo/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:25 jlam Exp $
+
+.if !defined(BONOBO_BUILDLINK2_MK)
+BONOBO_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= bonobo
+BUILDLINK_DEPENDS.bonobo?= bonobo>=1.0.18nb1
+BUILDLINK_PKGSRCDIR.bonobo?= ../../devel/bonobo
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.bonobo=bonobo
+BUILDLINK_PREFIX.bonobo_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.bonobo+= include/efs*
+BUILDLINK_FILES.bonobo+= include/gnome-1.0/bonobo.h
+BUILDLINK_FILES.bonobo+= include/gnome-1.0/bonobo/*
+BUILDLINK_FILES.bonobo+= lib/bonobo/*/*
+BUILDLINK_FILES.bonobo+= lib/libbonobo.*
+BUILDLINK_FILES.bonobo+= lib/libbonobox.*
+BUILDLINK_FILES.bonobo+= lib/libbonobo-print.*
+BUILDLINK_FILES.bonobo+= lib/libefs.*
+BUILDLINK_FILES.bonobo+= share/idl/Bonobo*.idl
+
+CPPFLAGS+= -I${BUILDLINK_PREFIX.bonobo}/include/gnome-1.0
+
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+
+BUILDLINK_TARGETS+= bonobo-buildlink
+
+bonobo-buildlink: _BUILDLINK_USE
+
+.endif # BONOBO_BUILDLINK2_MK
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index c45928810c7..87da2f18704 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/07/18 02:19:39 rh Exp $
+$NetBSD: distinfo,v 1.11 2002/08/25 19:22:25 jlam Exp $
SHA1 (bonobo-1.0.18.tar.gz) = e6f6790e0c0eb29a295163f643569e36896d27a0
Size (bonobo-1.0.18.tar.gz) = 1279988 bytes
diff --git a/devel/bonobo/patches/patch-ac b/devel/bonobo/patches/patch-ac
index 4d7b9e7017b..ce7b652a534 100644
--- a/devel/bonobo/patches/patch-ac
+++ b/devel/bonobo/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/07/18 02:19:40 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:25 jlam Exp $
--- libefs/libefs.pc.in.orig Tue Oct 10 18:02:25 2000
+++ libefs/libefs.pc.in
diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
new file mode 100644
index 00000000000..0a0842b5b2e
--- /dev/null
+++ b/devel/cdk/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:25 jlam Exp $
+
+.if !defined(CDK_BUILDLINK2_MK)
+CDK_BUILDLINK2_MK= # defined
+
+BUILDLINK_DEPENDS.cdk?= cdk>=4.9.6
+BUILDLINK_PKGSRCDIR.cdk?= ../../devel/cdk
+
+.if defined(USE_CDK)
+_NEED_CDK= YES
+.elif exists(/usr/include/cdk/cdk.h)
+_NEED_CDK= NO
+.else
+_NEED_CDK= YES
+.endif
+
+.if ${_NEED_CDK} == "YES"
+BUILDLINK_PACKAGES+= cdk
+EVAL_PREFIX+= BUILDLINK_PREFIX.cdk=cdk
+BUILDLINK_PREFIX.cdk_DEFAULT= ${LOCALBASE}
+.else
+BUILDLINK_PREFIX.cdk= /usr
+.endif
+
+BUILDLINK_FILES.cdk= include/cdk/*.h
+BUILDLINK_FILES.cdk+= lib/libcdk.*
+
+.include "../../devel/ncurses/buildlink2.mk"
+
+BUILDLINK_TARGETS+= cdk-buildlink
+
+cdk-buildlink: _BUILDLINK_USE
+
+.endif # CDK_BUILDLINK2_MK
diff --git a/devel/dlcompat/Makefile b/devel/dlcompat/Makefile
index 0d079029c8d..e26a1fb3cd1 100644
--- a/devel/dlcompat/Makefile
+++ b/devel/dlcompat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/22 00:54:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:22:26 jlam Exp $
#
DISTNAME= dlcompat-20020606
diff --git a/devel/dlcompat/PLIST b/devel/dlcompat/PLIST
index b757d7e53ec..86f36b1f29f 100644
--- a/devel/dlcompat/PLIST
+++ b/devel/dlcompat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/17 16:56:02 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:22:26 jlam Exp $
include/dlfcn.h
lib/libdl.0.dylib
lib/libdl.a
diff --git a/devel/dlcompat/buildlink.mk b/devel/dlcompat/buildlink.mk
index 534322462da..b7a96f22c77 100644
--- a/devel/dlcompat/buildlink.mk
+++ b/devel/dlcompat/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/22 00:54:36 schmonz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:26 jlam Exp $
#
# This Makefile fragment is included by packages that use dlcompat (libdl).
#
diff --git a/devel/dlcompat/buildlink2.mk b/devel/dlcompat/buildlink2.mk
new file mode 100644
index 00000000000..1d79308ed2f
--- /dev/null
+++ b/devel/dlcompat/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:26 jlam Exp $
+
+.if !defined(DLCOMPAT_BUILDLINK2_MK)
+DLCOMPAT_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= dlcompat
+BUILDLINK_DEPENDS.dlcompat?= dlcompat>=20020606
+BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.dlcompat=dlcompat
+BUILDLINK_PREFIX.dlcompat_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.dlcompat= include/dlfcn.h
+BUILDLINK_FILES.dlcompat+= lib/libdl.*
+
+BUILDLINK_TARGETS+= dlcompat-buildlink
+
+dlcompat-buildlink: _BUILDLINK_USE
+
+.endif # DLCOMPAT_BUILDLINK2_MK
diff --git a/devel/dlcompat/distinfo b/devel/dlcompat/distinfo
index 16dfa056770..36d17ed82a5 100644
--- a/devel/dlcompat/distinfo
+++ b/devel/dlcompat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/22 00:54:36 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:22:26 jlam Exp $
SHA1 (dlcompat-20020606.tar.gz) = 4ac0bb67d1693bb6af7d4ebf095f7ccc4feb59e2
Size (dlcompat-20020606.tar.gz) = 8131 bytes
diff --git a/devel/dlcompat/patches/patch-aa b/devel/dlcompat/patches/patch-aa
index 8576ea9e889..f394b7252ce 100644
--- a/devel/dlcompat/patches/patch-aa
+++ b/devel/dlcompat/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/07/22 00:54:37 schmonz Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:27 jlam Exp $
--- Makefile.orig Sun May 12 22:36:53 2002
+++ Makefile
diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 964f099b3d3..8305b9a920b 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/07/12 23:38:44 mycroft Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 19:22:27 jlam Exp $
DISTNAME= gal-0.19.3
CATEGORIES= gnome devel
diff --git a/devel/gal/PLIST b/devel/gal/PLIST
index c531b0b3167..a6250b98c27 100644
--- a/devel/gal/PLIST
+++ b/devel/gal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/07/12 23:38:44 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 19:22:27 jlam Exp $
include/gal/util/e-util.h
include/gal/util/e-xml-utils.h
include/gal/util/e-cache.h
diff --git a/devel/gal/buildlink2.mk b/devel/gal/buildlink2.mk
new file mode 100644
index 00000000000..7f06d3b3a8b
--- /dev/null
+++ b/devel/gal/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:27 jlam Exp $
+
+.if !defined(GAL_BUILDLINK2_MK)
+GAL_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gal
+BUILDLINK_DEPENDS.gal?= gal>=0.19nb1
+BUILDLINK_PKGSRCDIR.gal?= ../../devel/gal
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gal=gal
+BUILDLINK_PREFIX.gal_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gal+= include/gal/*
+BUILDLINK_FILES.gal+= include/gal/*/*
+BUILDLINK_FILES.gal+= lib/libgal.*
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/bonobo/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libglade/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
+.include "../../sysutils/gnome-vfs/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gal-buildlink
+
+gal-buildlink: _BUILDLINK_USE
+
+.endif # GAL_BUILDLINK2_MK
diff --git a/devel/gal/distinfo b/devel/gal/distinfo
index 19727bc47c3..3738d1b911e 100644
--- a/devel/gal/distinfo
+++ b/devel/gal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/07/12 23:38:44 mycroft Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 19:22:27 jlam Exp $
SHA1 (gal-0.19.3.tar.bz2) = db4a09f01f5d2d1f3c2c3466988f3c42cc0d2073
Size (gal-0.19.3.tar.bz2) = 903527 bytes
diff --git a/devel/gal/patches/patch-aa b/devel/gal/patches/patch-aa
index 7b6ffc6c922..5a310e89220 100644
--- a/devel/gal/patches/patch-aa
+++ b/devel/gal/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2002/07/12 23:38:45 mycroft Exp $
+$NetBSD: patch-aa,v 1.9 2002/08/25 19:22:28 jlam Exp $
--- configure.orig Thu Jun 20 04:40:53 2002
+++ configure Wed Jul 10 22:54:42 2002
diff --git a/devel/glib2/buildlink.mk b/devel/glib2/buildlink.mk
index 00daedfb02b..0cdf2f91c0e 100644
--- a/devel/glib2/buildlink.mk
+++ b/devel/glib2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/08/01 05:48:08 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:22:28 jlam Exp $
#
# This Makefile fragment is included by packages that use glib2.
#
diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk
new file mode 100644
index 00000000000..7c38a68ad69
--- /dev/null
+++ b/devel/glib2/buildlink2.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:28 jlam Exp $
+
+.if !defined(GLIB2_BUILDLINK2_MK)
+GLIB2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= glib2
+BUILDLINK_DEPENDS.glib2?= glib2>=2.0.1nb1
+BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.glib2=glib2
+BUILDLINK_PREFIX.glib2_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.glib2= include/glib/glib-2.0/*/*
+BUILDLINK_FILES.glib2+= include/glib/glib-2.0/*
+BUILDLINK_FILES.glib2+= lib/glib-2.0/*/*
+BUILDLINK_FILES.glib2+= lib/libglib-2.0.*
+BUILDLINK_FILES.glib2+= lib/libgmodule-2.0.*
+BUILDLINK_FILES.glib2+= lib/libgobject-2.0.*
+BUILDLINK_FILES.glib2+= lib/libgthread-2.0.*
+
+USE_PTHREAD= native ptl2
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/pthread.buildlink2.mk"
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= glib2-buildlink
+
+glib2-buildlink: _BUILDLINK_USE
+
+.endif # GLIB2_BUILDLINK2_MK
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index d30f2708194..a7f0a3fb863 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/05/10 01:17:29 rh Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:29 jlam Exp $
--- glib-2.0.pc.in.orig Wed Mar 6 01:37:24 2002
+++ glib-2.0.pc.in
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
index b3a94992acd..0a573dc1a4a 100644
--- a/devel/glib2/patches/patch-ab
+++ b/devel/glib2/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/05/10 01:17:29 rh Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:29 jlam Exp $
--- gmodule-2.0.pc.in.orig Wed Mar 6 01:37:24 2002
+++ gmodule-2.0.pc.in
diff --git a/devel/glib2/patches/patch-ac b/devel/glib2/patches/patch-ac
index 2cca15a7de4..e8d8654643c 100644
--- a/devel/glib2/patches/patch-ac
+++ b/devel/glib2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/05/10 01:17:29 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:29 jlam Exp $
--- gobject-2.0.pc.in.orig Wed Mar 6 01:37:24 2002
+++ gobject-2.0.pc.in
diff --git a/devel/glib2/patches/patch-ad b/devel/glib2/patches/patch-ad
index ea777af1f06..30b94c05563 100644
--- a/devel/glib2/patches/patch-ad
+++ b/devel/glib2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2002/05/10 01:17:30 rh Exp $
+$NetBSD: patch-ad,v 1.4 2002/08/25 19:22:29 jlam Exp $
--- gthread-2.0.pc.in.orig Wed Mar 6 01:37:24 2002
+++ gthread-2.0.pc.in
diff --git a/devel/hdf/buildlink2.mk b/devel/hdf/buildlink2.mk
new file mode 100644
index 00000000000..5cc1fe9f8e5
--- /dev/null
+++ b/devel/hdf/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:29 jlam Exp $
+
+.if !defined(HDF_BUILDLINK2_MK)
+HDF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= hdf
+BUILDLINK_DEPENDS.hdf?= hdf>=4.1r5
+BUILDLINK_PKGSRCDIR.hdf?= ../../devel/hdf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.hdf=hdf
+BUILDLINK_PREFIX.hdf_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.hdf= include/hdf/*
+BUILDLINK_FILES.hdf+= lib/libdf.*
+BUILDLINK_FILES.hdf+= lib/libmfhdf.*
+
+BUILDLINK_TARGETS+= hdf-buildlink
+
+hdf-buildlink: _BUILDLINK_USE
+
+.endif # HDF_BUILDLINK2_MK
diff --git a/devel/hdf5/buildlink2.mk b/devel/hdf5/buildlink2.mk
new file mode 100644
index 00000000000..d16f69e3d9f
--- /dev/null
+++ b/devel/hdf5/buildlink2.mk
@@ -0,0 +1,50 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:30 jlam Exp $
+
+.if !defined(HDF5_BUILDLINK2_MK)
+HDF5_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= hdf5
+BUILDLINK_DEPENDS.hdf5?= hdf5>=1.4.3
+BUILDLINK_PKGSRCDIR.hdf5?= ../../devel/hdf5
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.hdf5=hdf5
+BUILDLINK_PREFIX.hdf5_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.hdf5= include/H5ACpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Apublic.h
+BUILDLINK_FILES.hdf5+= include/H5Bpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Dpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Epublic.h
+BUILDLINK_FILES.hdf5+= include/H5FDcore.h
+BUILDLINK_FILES.hdf5+= include/H5FDfamily.h
+BUILDLINK_FILES.hdf5+= include/H5FDgass.h
+BUILDLINK_FILES.hdf5+= include/H5FDlog.h
+BUILDLINK_FILES.hdf5+= include/H5FDmpio.h
+BUILDLINK_FILES.hdf5+= include/H5FDmulti.h
+BUILDLINK_FILES.hdf5+= include/H5FDpublic.h
+BUILDLINK_FILES.hdf5+= include/H5FDsec2.h
+BUILDLINK_FILES.hdf5+= include/H5FDsrb.h
+BUILDLINK_FILES.hdf5+= include/H5FDstdio.h
+BUILDLINK_FILES.hdf5+= include/H5FDstream.h
+BUILDLINK_FILES.hdf5+= include/H5Fpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Gpublic.h
+BUILDLINK_FILES.hdf5+= include/H5HGpublic.h
+BUILDLINK_FILES.hdf5+= include/H5HLpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Ipublic.h
+BUILDLINK_FILES.hdf5+= include/H5MMpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Opublic.h
+BUILDLINK_FILES.hdf5+= include/H5Ppublic.h
+BUILDLINK_FILES.hdf5+= include/H5Rpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Spublic.h
+BUILDLINK_FILES.hdf5+= include/H5Tpublic.h
+BUILDLINK_FILES.hdf5+= include/H5Zpublic.h
+BUILDLINK_FILES.hdf5+= include/H5api_adpt.h
+BUILDLINK_FILES.hdf5+= include/H5pubconf.h
+BUILDLINK_FILES.hdf5+= include/H5public.h
+BUILDLINK_FILES.hdf5+= lib/libhdf5.*
+
+BUILDLINK_TARGETS+= hdf5-buildlink
+
+hdf5-buildlink: _BUILDLINK_USE
+
+.endif # HDF5_BUILDLINK2_MK
diff --git a/devel/libdockapp/buildlink2.mk b/devel/libdockapp/buildlink2.mk
new file mode 100644
index 00000000000..ec7a27467c1
--- /dev/null
+++ b/devel/libdockapp/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:30 jlam Exp $
+
+.if !defined(LIBDOCKAPP_BUILDLINK2_MK)
+LIBDOCKAPP_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libdockapp
+BUILDLINK_DEPENDS.libdockapp?= libdockapp>=0.4.0
+BUILDLINK_PKGSRCDIR.libdockapp?= ../../devel/libdockapp
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libdockapp=libdockapp
+BUILDLINK_PREFIX.libdockapp_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libdockapp= include/dockapp.h
+BUILDLINK_FILES.libdockapp+= lib/libdockapp.*
+
+.include "../../graphics/xpm/buildlink2.mk"
+
+BUILDLINK_TARGETS+= libdockapp-buildlink
+
+libdockapp-buildlink: _BUILDLINK_USE
+
+.endif # LIBDOCKAPP_BUILDLINK2_MK
diff --git a/devel/libgetopt/buildlink2.mk b/devel/libgetopt/buildlink2.mk
new file mode 100644
index 00000000000..c7e19d5c9f3
--- /dev/null
+++ b/devel/libgetopt/buildlink2.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:30 jlam Exp $
+
+.if !defined(GETOPT_BUILDLINK2_MK)
+GETOPT_BUILDLINK2_MK= # defined
+
+BUILDLINK_DEPENDS.getopt?= libgetopt>=1.3
+BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt
+
+.if exists(/usr/include/getopt.h)
+_NEED_GETOPT= NO
+.else
+_NEED_GETOPT= YES
+.endif
+
+.if ${_NEED_GETOPT} == "NO"
+BUILDLINK_PREFIX.getopt= /usr
+BUILDLINK_FILES.getopt= include/getopt.h
+LIBGETOPT= # empty
+.else
+BUILDLINK_PACKAGES+= getopt
+EVAL_PREFIX+= BUILDLINK_PREFIX.getopt=libgetopt
+BUILDLINK_PREFIX.getopt_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.getopt= include/getopt.h
+BUILDLINK_FILES.getopt+= lib/libgetopt.*
+BUILDLINK_FILES.getopt+= lib/libgetopt_pic.a
+LIBGETOPT= -lgetopt
+.endif
+
+CONFIGURE_ENV+= LIBGETOPT="${LIBGETOPT}"
+MAKE_ENV+= LIBGETOPT="${LIBGETOPT}"
+
+BUILDLINK_TARGETS+= getopt-buildlink
+
+getopt-buildlink: _BUILDLINK_USE
+
+.endif # GETOPT_BUILDLINK2_MK
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index c0523a7e43b..2322f4ea58b 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/07/31 16:16:48 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2002/08/25 19:22:31 jlam Exp $
#
DISTNAME= libglade-0.17
diff --git a/devel/libglade/buildlink2.mk b/devel/libglade/buildlink2.mk
new file mode 100644
index 00000000000..e0ad1ba69e5
--- /dev/null
+++ b/devel/libglade/buildlink2.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:31 jlam Exp $
+
+.if !defined(LIBGLADE_BUILDLINK2_MK)
+LIBGLADE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libglade
+BUILDLINK_DEPENDS.libglade?= libglade>=0.17nb1
+BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libglade=libglade
+BUILDLINK_PREFIX.libglade_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.libglade= include/libglade-1.0/glade/*
+BUILDLINK_FILES.libglade+= lib/libglade.*
+BUILDLINK_FILES.libglade+= lib/libglade-gnome.*
+BUILDLINK_FILES.libglade+= lib/libgladeConf.sh
+
+CPPFLAGS+= -I${BUILDLINK_PREFIX.libglade}/include/libglade-1.0
+
+.include "../../audio/esound/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+= libglade-buildlink
+
+pre-configure: ${BUILDLINK_TARGETS.libglade}
+
+.endif # LIBGLADE_BUILDLINK2_MK
diff --git a/devel/libole2/buildlink2.mk b/devel/libole2/buildlink2.mk
new file mode 100644
index 00000000000..40f0abdcd77
--- /dev/null
+++ b/devel/libole2/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:31 jlam Exp $
+
+.if !defined(LIBOLE2_BUILDLINK2_MK)
+LIBOLE2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libole2
+BUILDLINK_DEPENDS.libole2?= libole2>=0.2.4
+BUILDLINK_PKGSRCDIR.libole2?= ../../devel/libole2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libole2=libole2
+BUILDLINK_PREFIX.libole2_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libole2+= include/libole2/*
+BUILDLINK_FILES.libole2+= lib/libgnomeole2.*
+
+.include "../../devel/glib/buildlink2.mk"
+
+BUILDLINK_TARGETS+= libole2-buildlink
+
+libole2-buildlink: _BUILDLINK_USE
+
+.endif # LIBOLE2_BUILDLINK2_MK
diff --git a/devel/libsigc++/buildlink2.mk b/devel/libsigc++/buildlink2.mk
new file mode 100644
index 00000000000..abbb73b0523
--- /dev/null
+++ b/devel/libsigc++/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:32 jlam Exp $
+
+.if !defined(LIBSIGCXX_BUILDLINK2_MK)
+LIBSIGCXX_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libsigcxx
+BUILDLINK_DEPENDS.libsigcxx?= libsigc++>=0.4
+BUILDLINK_PKGSRCDIR.libsigcxx?= ../../devel/libsigc++
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libsigcxx=libsigc++
+BUILDLINK_PREFIX.libsigcxx_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libsigcxx= include/sigc++/*
+BUILDLINK_FILES.libsigcxx+= lib/sigc++/include/sigc++config.h
+BUILDLINK_FILES.libsigcxx+= lib/libsigc.*
+
+BUILDLINK_TARGETS+= libsigcxx-buildlink
+
+libsigcxx-buildlink: _BUILDLINK_USE
+
+.endif # LIBSIGCXX_BUILDLINK2_MK
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index ac60d850fe0..6cf4c213755 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/07/27 09:38:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.36 2002/08/25 19:22:32 jlam Exp $
#
DISTNAME= slang-1.4.5
diff --git a/devel/libslang/buildlink2.mk b/devel/libslang/buildlink2.mk
new file mode 100644
index 00000000000..4ea3d04a6a6
--- /dev/null
+++ b/devel/libslang/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:32 jlam Exp $
+
+.if !defined(LIBSLANG_BUILDLINK2_MK)
+LIBSLANG_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libslang
+BUILDLINK_DEPENDS.libslang?= libslang>=1.4.4
+BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libslang=libslang
+BUILDLINK_PREFIX.libslang_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libslang= include/slcurses.h
+BUILDLINK_FILES.libslang+= include/slang.h
+BUILDLINK_FILES.libslang+= lib/libslang.*
+
+BUILDLINK_TARGETS+= libslang-buildlink
+
+libslang-buildlink: _BUILDLINK_USE
+
+.endif # LIBSLANG_BUILDLINK2_MK
diff --git a/devel/libtar/buildlink2.mk b/devel/libtar/buildlink2.mk
new file mode 100644
index 00000000000..2a7f626ed2b
--- /dev/null
+++ b/devel/libtar/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:33 jlam Exp $
+
+.if !defined(LIBTAR_BUILDLINK2_MK)
+LIBTAR_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libtar
+BUILDLINK_DEPENDS.libtar?= libtar>=1.2.5
+BUILDLINK_PKGSRCDIR.libtar?= ../../devel/libtar
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libtar=libtar
+BUILDLINK_PREFIX.libtar_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.libtar= include/libtar*
+BUILDLINK_FILES.libtar+= lib/libtar.*
+
+BUILDLINK_TARGETS+= libtar-buildlink
+
+libtar-buildlink: _BUILDLINK_USE
+
+.endif # LIBTAR_BUILDLINK2_MK
diff --git a/devel/libtar/distinfo b/devel/libtar/distinfo
index 74899af9da2..059f86bca21 100644
--- a/devel/libtar/distinfo
+++ b/devel/libtar/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/07/02 12:43:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:22:33 jlam Exp $
SHA1 (libtar-1.2.5.tar.gz) = 35e84315a071d0a0e36471716b64489eb97a8797
Size (libtar-1.2.5.tar.gz) = 88243 bytes
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 1cfae2c897a..4348c516cf4 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/21 11:05:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 19:22:33 jlam Exp $
#
DISTNAME= libusb-0.1.6a
diff --git a/devel/libusb/PLIST b/devel/libusb/PLIST
index 542fa5fec8d..cddca2429b4 100644
--- a/devel/libusb/PLIST
+++ b/devel/libusb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/19 19:07:19 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:33 jlam Exp $
bin/libusb-config
include/usb.h
lib/libusb-0.1.so
diff --git a/devel/libusb/buildlink2.mk b/devel/libusb/buildlink2.mk
new file mode 100644
index 00000000000..1e3f62dcde8
--- /dev/null
+++ b/devel/libusb/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:33 jlam Exp $
+
+.if !defined(LIBUSB_BUILDLINK2_MK)
+LIBUSB_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libusb
+BUILDLINK_DEPENDS.libusb?= libusb>=0.1.5
+BUILDLINK_PKGSRCDIR.libusb?= ../../devel/libusb
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libusb=libusb
+BUILDLINK_FILES.libusb= include/usb.h
+BUILDLINK_FILES.libusb+= lib/libusb-*.*
+BUILDLINK_FILES.libusb+= lib/libusb.*
+
+BUILDLINK_TARGETS+= libusb-buildlink
+
+libusb-buildlink: _BUILDLINK_USE
+
+.endif # LIBUSB_BUILDLINK2_MK
diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo
index 52aa46b039a..fedd7df3a99 100644
--- a/devel/libusb/distinfo
+++ b/devel/libusb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/19 19:07:19 mycroft Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:22:33 jlam Exp $
SHA1 (libusb-0.1.6a.tar.gz) = 79ef093d70b5f4597a4227178ad00b6aa5ed49b0
Size (libusb-0.1.6a.tar.gz) = 180291 bytes
diff --git a/devel/libusb/patches/patch-ac b/devel/libusb/patches/patch-ac
index 77c9f483124..fd3c943d48d 100644
--- a/devel/libusb/patches/patch-ac
+++ b/devel/libusb/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/08/19 19:07:21 mycroft Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:22:34 jlam Exp $
--- libusb-config.in.orig Mon May 13 22:29:07 2002
+++ libusb-config.in Thu Jul 11 01:57:07 2002
diff --git a/devel/netcdf/buildlink2.mk b/devel/netcdf/buildlink2.mk
new file mode 100644
index 00000000000..1ab2e2c4f43
--- /dev/null
+++ b/devel/netcdf/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:34 jlam Exp $
+
+.if !defined(NETCDF_BUILDLINK2_MK)
+NETCDF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= netcdf
+BUILDLINK_DEPENDS.netcdf?= netcdf>=3.4
+BUILDLINK_PKGSRCDIR.netcdf?= ../../devel/netcdf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.netcdf=netcdf
+BUILDLINK_PREFIX.netcdf_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.netcdf= include/netcdf.h
+BUILDLINK_FILES.netcdf+= include/netcdf.inc
+BUILDLINK_FILES.netcdf+= include/netcdf.hh
+BUILDLINK_FILES.netcdf+= include/ncvalues.hh
+BUILDLINK_FILES.netcdf+= lib/libnetcdf.*
+BUILDLINK_FILES.netcdf+= lib/libnetcdf_c++.*
+
+BUILDLINK_TARGETS+= netcdf-buildlink
+
+netcdf-buildlink: _BUILDLINK_USE
+
+.endif # NETCDF_BUILDLINK2_MK
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 81ab9f9d404..9ecad8cf98b 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/07/31 17:48:07 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 19:22:35 jlam Exp $
#
DISTNAME= oaf-0.6.10
diff --git a/devel/oaf/PLIST b/devel/oaf/PLIST
index befc113be80..bc56cb1a643 100644
--- a/devel/oaf/PLIST
+++ b/devel/oaf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/05/18 10:54:16 mjl Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:35 jlam Exp $
bin/oaf-client
bin/oaf-config
bin/oaf-empty-server
diff --git a/devel/oaf/buildlink.mk b/devel/oaf/buildlink.mk
index 4210c916d84..d12382a5dbc 100644
--- a/devel/oaf/buildlink.mk
+++ b/devel/oaf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2002/07/14 01:11:42 rh Exp $
+# $NetBSD: buildlink.mk,v 1.8 2002/08/25 19:22:35 jlam Exp $
#
# This Makefile fragment is included by packages that use oaf.
#
diff --git a/devel/oaf/buildlink2.mk b/devel/oaf/buildlink2.mk
new file mode 100644
index 00000000000..ff301afc31b
--- /dev/null
+++ b/devel/oaf/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:35 jlam Exp $
+
+.if !defined(OAF_BUILDLINK2_MK)
+OAF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= oaf
+BUILDLINK_DEPENDS.oaf?= oaf>=0.6.7nb1
+BUILDLINK_PKGSRCDIR.oaf?= ../../devel/oaf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.oaf=oaf
+BUILDLINK_PREFIX.oaf_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.oaf= include/liboaf/*
+BUILDLINK_FILES.oaf+= lib/liboaf.*
+BUILDLINK_FILES.oaf+= lib/oafConf.sh
+
+.include "../../devel/popt/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+= oaf-buildlink
+
+oaf-buildlink: _BUILDLINK_USE
+
+.endif # OAF_BUILDLINK2_MK
diff --git a/devel/oaf/distinfo b/devel/oaf/distinfo
index c3f824ca716..eedc4163ec5 100644
--- a/devel/oaf/distinfo
+++ b/devel/oaf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/05/18 10:54:16 mjl Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 19:22:35 jlam Exp $
SHA1 (oaf-0.6.10.tar.bz2) = d8eaff6b3bc953fc4158f55b03ba92cb197518c5
Size (oaf-0.6.10.tar.bz2) = 435621 bytes
diff --git a/devel/oaf/patches/patch-ac b/devel/oaf/patches/patch-ac
index e2db5f3cbcb..f865a087213 100644
--- a/devel/oaf/patches/patch-ac
+++ b/devel/oaf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2002/05/18 10:54:17 mjl Exp $
+$NetBSD: patch-ac,v 1.5 2002/08/25 19:22:35 jlam Exp $
--- liboaf/Makefile.in.orig Sat May 18 12:22:48 2002
+++ liboaf/Makefile.in Sat May 18 12:23:02 2002
diff --git a/devel/oaf/patches/patch-ag b/devel/oaf/patches/patch-ag
index 49401b8dd58..e5930d9ab5d 100644
--- a/devel/oaf/patches/patch-ag
+++ b/devel/oaf/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.6 2002/05/18 10:54:18 mjl Exp $
+$NetBSD: patch-ag,v 1.7 2002/08/25 19:22:35 jlam Exp $
--- configure.orig Sat May 18 12:24:35 2002
+++ configure Sat May 18 12:25:54 2002
diff --git a/devel/pango/PLIST.xf4 b/devel/pango/PLIST.xf4
index 9cab0b8b9d2..26e9b7e55ac 100644
--- a/devel/pango/PLIST.xf4
+++ b/devel/pango/PLIST.xf4
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.xf4,v 1.1 2002/07/03 01:29:39 dmcmahill Exp $
+@comment $NetBSD: PLIST.xf4,v 1.2 2002/08/25 19:22:36 jlam Exp $
include/pango-1.0/pango/pangoxft.h
lib/libpangoxft-1.0.a
lib/libpangoxft-1.0.la
diff --git a/devel/pango/buildlink.mk b/devel/pango/buildlink.mk
index 8c9526f32b5..bf7d48415b5 100644
--- a/devel/pango/buildlink.mk
+++ b/devel/pango/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/06/30 01:51:30 jschauma Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:22:36 jlam Exp $
#
# This Makefile fragment is included by packages that use pango.
#
diff --git a/devel/pango/buildlink2.mk b/devel/pango/buildlink2.mk
new file mode 100644
index 00000000000..3650d548edc
--- /dev/null
+++ b/devel/pango/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:36 jlam Exp $
+
+.if !defined(PANGO_BUILDLINK2_MK)
+PANGO_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= pango
+BUILDLINK_DEPENDS.pango?= pango>=1.0.3
+BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.pango=pango
+BUILDLINK_PREFIX.pango_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.pango= include/pango-1.0/*/*
+BUILDLINK_FILES.pango+= include/pango-1.0/*
+BUILDLINK_FILES.pango+= lib/libpango*-1.0.*
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= pango-buildlink
+
+pango-buildlink: _BUILDLINK_USE
+
+.endif # PANGO_BUILDLINK2_MK
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
index 2e6da162716..4c9a0caedda 100644
--- a/devel/pango/patches/patch-aa
+++ b/devel/pango/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/05/10 00:45:51 rh Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:36 jlam Exp $
--- pango.pc.in.orig Thu Mar 7 03:04:39 2002
+++ pango.pc.in
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
index 732b4fd2edd..19c337a82b5 100644
--- a/devel/pango/patches/patch-ab
+++ b/devel/pango/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/05/10 00:45:51 rh Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:37 jlam Exp $
--- pangoft2.pc.in.orig Wed Mar 6 03:20:57 2002
+++ pangoft2.pc.in
diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac
index 37da3087795..4150323b76b 100644
--- a/devel/pango/patches/patch-ac
+++ b/devel/pango/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/05/10 00:45:51 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:37 jlam Exp $
--- pangox.pc.in.orig Wed Mar 6 03:20:57 2002
+++ pangox.pc.in
diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad
index 6e39d53a732..2f19b3c5749 100644
--- a/devel/pango/patches/patch-ad
+++ b/devel/pango/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/07/18 02:19:36 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 19:22:37 jlam Exp $
--- pangowin32.pc.in.orig Wed Mar 6 03:20:57 2002
+++ pangowin32.pc.in
diff --git a/devel/pango/patches/patch-ae b/devel/pango/patches/patch-ae
index 34b48cecb36..58ea5954f98 100644
--- a/devel/pango/patches/patch-ae
+++ b/devel/pango/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2002/07/18 02:19:36 rh Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:22:37 jlam Exp $
--- pangoxft.pc.in.orig Wed Mar 6 03:20:57 2002
+++ pangoxft.pc.in
diff --git a/devel/pkgconfig/PLIST b/devel/pkgconfig/PLIST
index d61d0763bd6..ff3e57c2c0e 100644
--- a/devel/pkgconfig/PLIST
+++ b/devel/pkgconfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:29:39 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:37 jlam Exp $
bin/pkg-config
man/man1/pkg-config.1
share/aclocal/pkg.m4
diff --git a/devel/pkgconfig/buildlink2.mk b/devel/pkgconfig/buildlink2.mk
new file mode 100644
index 00000000000..945a25da049
--- /dev/null
+++ b/devel/pkgconfig/buildlink2.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:37 jlam Exp $
+
+.if !defined(PKGCONFIG_BUILDLINK2_MK)
+PKGCONFIG_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= pkgconfig
+BUILDLINK_DEPENDS.pkgconfig?= pkgconfig-[0-9]*
+BUILDLINK_PKGSRCDIR.pkgconfig?= ../../devel/pkgconfig
+BUILDLINK_DEPMETHOD.pkgconfig?= build
+
+PKG_CONFIG_PATH?= ${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig
+CONFIGURE_ENV+= PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
+MAKE_ENV+= PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
+
+.endif # PKGCONFIG_BUILDLINK2_MK
diff --git a/devel/popt/buildlink2.mk b/devel/popt/buildlink2.mk
new file mode 100644
index 00000000000..972def1a8f6
--- /dev/null
+++ b/devel/popt/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:37 jlam Exp $
+
+.if !defined(POPT_BUILDLINK2_MK)
+POPT_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= popt
+BUILDLINK_DEPENDS.popt?= popt>=1.6.2
+BUILDLINK_PKGSRCDIR.popt?= ../../devel/popt
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.popt=popt
+BUILDLINK_PREFIX.popt_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.popt= include/popt.h
+BUILDLINK_FILES.popt+= lib/libpopt.*
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+
+BUILDLINK_TARGETS+= popt-buildlink
+
+popt-buildlink: _BUILDLINK_USE
+
+.endif # POPT_BUILDLINK2_MK
diff --git a/devel/ptl2/Makefile b/devel/ptl2/Makefile
index b257b9a74dd..c287e92d00c 100644
--- a/devel/ptl2/Makefile
+++ b/devel/ptl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/07/24 19:45:23 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2002/08/25 19:22:38 jlam Exp $
DISTNAME= PTL-2.1.8
PKGNAME= ptl-2.1.8
diff --git a/devel/ptl2/buildlink.mk b/devel/ptl2/buildlink.mk
index 3511c95101f..bf11c3abc34 100644
--- a/devel/ptl2/buildlink.mk
+++ b/devel/ptl2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/12 09:57:43 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:38 jlam Exp $
#
# This Makefile fragment is included by packages that use ptl2.
#
diff --git a/devel/ptl2/buildlink2.mk b/devel/ptl2/buildlink2.mk
new file mode 100644
index 00000000000..7d9b67d610f
--- /dev/null
+++ b/devel/ptl2/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:38 jlam Exp $
+
+.if !defined(PTL2_BUILDLINK2_MK)
+PTL2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= ptl2
+BUILDLINK_DEPENDS.ptl2?= ptl>=2.1.7
+BUILDLINK_PKGSRCDIR.ptl2?= ../../devel/ptl2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.ptl2=ptl
+BUILDLINK_PREFIX.ptl2_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.ptl2= PTL/include/*/*/*.h
+BUILDLINK_FILES.ptl2+= PTL/include/*/*.h
+BUILDLINK_FILES.ptl2+= PTL/include/*.h
+BUILDLINK_FILES.ptl2+= lib/libPTL.*
+
+BUILDLINK_TARGETS+= ptl2-buildlink
+
+ptl2-buildlink: _BUILDLINK_USE
+
+.endif # PTL2_BUILDLINK2_MK
diff --git a/devel/ptl2/distinfo b/devel/ptl2/distinfo
index f94340a7be1..1536cfa3b79 100644
--- a/devel/ptl2/distinfo
+++ b/devel/ptl2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/06/24 12:09:43 skrll Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:22:38 jlam Exp $
SHA1 (PTL-2.1.8.tar.gz) = b62ba82f12dd99e2ff8a20b15c2b02c809c07d16
Size (PTL-2.1.8.tar.gz) = 678474 bytes
diff --git a/devel/ptl2/patches/patch-ae b/devel/ptl2/patches/patch-ae
index dd3d17145a0..346878f14c6 100644
--- a/devel/ptl2/patches/patch-ae
+++ b/devel/ptl2/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2002/06/24 12:09:44 skrll Exp $
+$NetBSD: patch-ae,v 1.4 2002/08/25 19:22:39 jlam Exp $
--- Util/config.guess.orig Mon Jun 24 07:57:31 2002
+++ Util/config.guess
diff --git a/devel/ptl2/patches/patch-af b/devel/ptl2/patches/patch-af
index 3e5a17b19b2..31a830821b0 100644
--- a/devel/ptl2/patches/patch-af
+++ b/devel/ptl2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2002/06/24 12:09:44 skrll Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 19:22:39 jlam Exp $
--- libaltsys/utils/config.guess.orig Mon Jun 24 07:57:31 2002
+++ libaltsys/utils/config.guess
diff --git a/devel/rx/buildlink2.mk b/devel/rx/buildlink2.mk
new file mode 100644
index 00000000000..e66c790155c
--- /dev/null
+++ b/devel/rx/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:39 jlam Exp $
+
+.if !defined(RX_BUILDLINK2_MK)
+RX_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= rx
+BUILDLINK_DEPENDS.rx?= rx>=1.5
+BUILDLINK_PKGSRCDIR.rx?= ../../devel/rx
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.rx=rx
+BUILDLINK_PREFIX.rx_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.rx= include/rxposix.h
+BUILDLINK_FILES.rx+= lib/librx.*
+
+BUILDLINK_TARGETS+= rx-buildlink
+
+rx-buildlink: _BUILDLINK_USE
+
+.endif # RX_BUILDLINK2_MK
diff --git a/devel/smpeg/buildlink2.mk b/devel/smpeg/buildlink2.mk
new file mode 100644
index 00000000000..7bf3e8a1153
--- /dev/null
+++ b/devel/smpeg/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:40 jlam Exp $
+
+.if !defined(SMPEG_BUILDLINK2_MK)
+SMPEG_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= smpeg
+BUILDLINK_DEPENDS.smpeg?= smpeg>=0.4.3
+BUILDLINK_PKGSRCDIR.smpeg?= ../../devel/smpeg
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.smpeg=smpeg
+BUILDLINK_PREFIX.smpeg_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.smpeg= include/smpeg/*
+BUILDLINK_FILES.smpeg+= lib/libsmpeg-*
+BUILDLINK_FILES.smpeg+= lib/libsmpeg.*
+
+.include "../../devel/SDL/buildlink2.mk"
+
+BUILDLINK_TARGETS+= smpeg-buildlink
+
+smpeg-buildlink: _BUILDLINK_USE
+
+.endif # SMPEG_BUILDLINK2_MK
diff --git a/devel/stlport/buildlink2.mk b/devel/stlport/buildlink2.mk
new file mode 100644
index 00000000000..5300254c385
--- /dev/null
+++ b/devel/stlport/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:41 jlam Exp $
+
+.if !defined(STLPORT_BUILDLINK2_MK)
+STLPORT_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= stlport
+BUILDLINK_DEPENDS.stlport?= stlport>=4.0
+BUILDLINK_PKGSRCDIR.stlport?= ../../devel/stlport
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.stlport=stlport
+BUILDLINK_PREFIX.stlport_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.stlport= include/stlport/*
+BUILDLINK_FILES.stlport+= include/stlport/*/*
+BUILDLINK_FILES.stlport+= lib/libstlport*
+
+BUILDLINK_TARGETS+= stlport-buildlink
+
+stlport-buildlink: _BUILDLINK_USE
+
+.endif # STLPORT_BUILDLINK2_MK
diff --git a/devel/stlport/patches/patch-ag b/devel/stlport/patches/patch-ag
index fd11c579587..63da87ea3d1 100644
--- a/devel/stlport/patches/patch-ag
+++ b/devel/stlport/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2002/05/20 17:43:05 cjep Exp $
+$NetBSD: patch-ag,v 1.3 2002/08/25 19:22:41 jlam Exp $
--- stlport/typeinfo.orig Sat Nov 10 19:38:11 2001
+++ stlport/typeinfo Sat Nov 10 19:39:12 2001
@@ -23,7 +23,9 @@
diff --git a/devel/stlport/patches/patch-ah b/devel/stlport/patches/patch-ah
index 7d4d079aba3..57814c5546c 100644
--- a/devel/stlport/patches/patch-ah
+++ b/devel/stlport/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2002/05/20 17:43:05 cjep Exp $
+$NetBSD: patch-ah,v 1.3 2002/08/25 19:22:41 jlam Exp $
--- stlport/stl/_config.h.orig Sat Nov 10 19:51:04 2001
+++ stlport/stl/_config.h Sat Nov 10 19:51:28 2001
@@ -174,7 +174,7 @@
diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile
index 7abdf0d11ac..57c293cee55 100644
--- a/devel/unproven-pthreads/Makefile
+++ b/devel/unproven-pthreads/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/08/16 20:15:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.33 2002/08/25 19:22:41 jlam Exp $
#
DISTNAME= unproven-pthreads-0.17
diff --git a/devel/unproven-pthreads/buildlink2.mk b/devel/unproven-pthreads/buildlink2.mk
new file mode 100644
index 00000000000..3ef49bb707a
--- /dev/null
+++ b/devel/unproven-pthreads/buildlink2.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:42 jlam Exp $
+
+.if !defined(UNPROVEN_PTHREADS_BUILDLINK2_MK)
+UNPROVEN_PTHREADS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= unproven-pthreads
+BUILDLINK_DEPENDS.unproven-pthreads?= unproven-pthreads>=0.17
+BUILDLINK_PKGSRCDIR.unproven-pthreads?= ../../devel/unproven-pthreads
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.unproven-pthreads=unproven-pthreads
+BUILDLINK_PREFIX.unproven-pthreads_DEFAULT= ${LOCALBASE}
+
+CC= ${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/bin/pgcc
+CXX= ${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/bin/pg++
+
+.endif # UNPROVEN_PTHREADS_BUILDLINK2_MK
diff --git a/devel/unproven-pthreads/distinfo b/devel/unproven-pthreads/distinfo
index 349c2ca3368..e1fb7d48584 100644
--- a/devel/unproven-pthreads/distinfo
+++ b/devel/unproven-pthreads/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/07/18 09:17:27 agc Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:22:42 jlam Exp $
SHA1 (unproven-pthreads-0.17.tar.gz) = 9f50e31da916b341e0c1ce21012bbd95b1a08a7d
Size (unproven-pthreads-0.17.tar.gz) = 234180 bytes
diff --git a/devel/unproven-pthreads/patches/patch-ac b/devel/unproven-pthreads/patches/patch-ac
index 2c080c2805d..f6d8baa6c1e 100644
--- a/devel/unproven-pthreads/patches/patch-ac
+++ b/devel/unproven-pthreads/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/07/18 09:17:27 agc Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:43 jlam Exp $
--- config/configure.in.orig Mon Jul 10 14:03:06 2000
+++ config/configure.in
diff --git a/devel/unproven-pthreads/patches/patch-af b/devel/unproven-pthreads/patches/patch-af
index 56bf101ebf3..084843145b0 100644
--- a/devel/unproven-pthreads/patches/patch-af
+++ b/devel/unproven-pthreads/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2002/07/18 09:17:27 agc Exp $
+$NetBSD: patch-af,v 1.4 2002/08/25 19:22:43 jlam Exp $
--- config/configure.orig Mon Jul 10 14:03:06 2000
+++ config/configure
diff --git a/devel/unproven-pthreads/patches/patch-bc b/devel/unproven-pthreads/patches/patch-bc
index 901102d8300..a346a029cda 100644
--- a/devel/unproven-pthreads/patches/patch-bc
+++ b/devel/unproven-pthreads/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.1 2002/07/10 21:40:11 skrll Exp $
+$NetBSD: patch-bc,v 1.2 2002/08/25 19:22:43 jlam Exp $
--- include/pthread.h.orig Mon Jul 10 19:23:14 2000
+++ include/pthread.h
diff --git a/graphics/GUIlib/buildlink2.mk b/graphics/GUIlib/buildlink2.mk
new file mode 100644
index 00000000000..017f9ce1cbd
--- /dev/null
+++ b/graphics/GUIlib/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:43 jlam Exp $
+
+.if !defined(GUILIB_BUILDLINK2_MK)
+GUILIB_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= GUIlib
+BUILDLINK_DEPENDS.GUIlib?= GUIlib>=1.1.0
+BUILDLINK_PKGSRCDIR.GUIlib?= ../../graphics/GUIlib
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.GUIlib=GUIlib
+BUILDLINK_PREFIX.GUIlib_DEFAULT=${LOCALBASE}
+BUILDLINK_FILES.GUIlib= include/GUI/*.h
+BUILDLINK_FILES.GUIlib+= lib/libGUI-*
+BUILDLINK_FILES.GUIlib+= lib/libGUI.*
+
+.include "../../devel/SDL/buildlink2.mk"
+
+BUILDLINK_TARGETS+= GUIlib-buildlink
+
+GUIlib-buildlink: _BUILDLINK_USE
+
+.endif # GUILIB_BUILDLINK2_MK
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index f603f1d7f88..021e583436c 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2002/08/22 08:06:11 tron Exp $
+# $NetBSD: Makefile,v 1.84 2002/08/25 19:22:44 jlam Exp $
DISTNAME= ImageMagick-5.4.8-2
PKGNAME= ${DISTNAME:S/-2/.2/}
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 3ca2bd7ae1d..bfc10883585 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/22 08:06:11 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:44 jlam Exp $
bin/Magick++-config
bin/Magick-config
bin/animate
diff --git a/graphics/ImageMagick/buildlink2.mk b/graphics/ImageMagick/buildlink2.mk
new file mode 100644
index 00000000000..5a7039062e4
--- /dev/null
+++ b/graphics/ImageMagick/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:44 jlam Exp $
+
+.if !defined(IMAGEMAGICK_BUILDLINK2_MK)
+IMAGEMAGICK_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= ImageMagick
+BUILDLINK_DEPENDS.ImageMagick?= ImageMagick>=5.3.9nb1
+BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.ImageMagick=ImageMagick
+BUILDLINK_PREFIX.ImageMagick_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.ImageMagick= include/Magick++.h
+BUILDLINK_FILES.ImageMagick+= include/Magick++/*
+BUILDLINK_FILES.ImageMagick+= include/magick/*
+BUILDLINK_FILES.ImageMagick+= lib/libMagick.*
+BUILDLINK_FILES.ImageMagick+= lib/libMagick++.*
+
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+
+BUILDLINK_TARGETS+= ImageMagick-buildlink
+
+ImageMagick-buildlink: _BUILDLINK_USE
+
+.endif # IMAGEMAGICK_BUILDLINK2_MK
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 4b9a5df6b14..aeac4d03018 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/08/22 08:06:11 tron Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 19:22:44 jlam Exp $
SHA1 (ImageMagick-5.4.8-2.tar.bz2) = 5f8149c6235ba74581c19871367c73bbb7a799b9
Size (ImageMagick-5.4.8-2.tar.bz2) = 2979552 bytes
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index dca68308b74..910b712a2e6 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.18 2002/08/22 08:06:12 tron Exp $
+$NetBSD: patch-aa,v 1.19 2002/08/25 19:22:45 jlam Exp $
--- coders/fits.c.orig Sun Aug 18 03:20:46 2002
+++ coders/fits.c Tue Aug 20 08:35:05 2002
diff --git a/graphics/aalib-x11/buildlink2.mk b/graphics/aalib-x11/buildlink2.mk
new file mode 100644
index 00000000000..223f28b3c79
--- /dev/null
+++ b/graphics/aalib-x11/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:45 jlam Exp $
+
+.if !defined(AALIB_X11_BUILDLINK2_MK)
+AALIB_X11_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= aalib-x11
+BUILDLINK_DEPENDS.aalib-x11?= aalib-x11>=1.4.0.4
+BUILDLINK_PKGSRCDIR.aalib-x11?= ../../graphics/aalib-x11
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.aalib-x11=aalib-x11
+BUILDLINK_PREFIX.aalib-x11_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.aalib-x11= include/aalib.h
+BUILDLINK_FILES.aalib-x11+= lib/libaa.*
+
+BUILDLINK_TARGETS+= aalib-x11-buildlink
+
+aalib-x11-buildlink: _BUILDLINK_USE
+
+.endif # AALIB_X11_BUILDLINK2_MK
diff --git a/graphics/avifile-devel/buildlink2.mk b/graphics/avifile-devel/buildlink2.mk
new file mode 100644
index 00000000000..658b2b778cd
--- /dev/null
+++ b/graphics/avifile-devel/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:46 jlam Exp $
+
+.if !defined(AVIFILE_BUILDLINK2_MK)
+AVIFILE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= avifile
+BUILDLINK_DEPENDS.avifile?= avifile>=0.6
+BUILDLINK_PKGSRCDIR.avifile?= ../../graphics/avifile-devel
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.avifile=avifile
+BUILDLINK_PREFIX.avifile_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.avifile= lib/libaviplay.*
+BUILDLINK_FILES.avifile+= lib/avifile-0.6/*
+BUILDLINK_FILES.avifile+= include/avifile/*
+BUILDLINK_FILES.avifile+= include/avifile/wine/*
+
+BUILDLINK_TARGETS.avifile= avifile-buildlink
+
+avifile-buildlink: _BUILDLINK_USE
+
+.endif # AVIFILE_BUILDLINK2_MK
diff --git a/graphics/avifile/buildlink2.mk b/graphics/avifile/buildlink2.mk
new file mode 100644
index 00000000000..e2b2d078618
--- /dev/null
+++ b/graphics/avifile/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:46 jlam Exp $
+
+.if !defined(AVIFILE_BUILDLINK2_MK)
+AVIFILE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= avifile
+BUILDLINK_DEPENDS.avifile?= avifile>=0.53.5
+BUILDLINK_PKGSRCDIR.avifile?= ../../graphics/avifile
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.avifile=avifile
+BUILDLINK_PREFIX.avifile_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.avifile= lib/libaviplay.*
+BUILDLINK_FILES.avifile+= include/avifile/*
+BUILDLINK_FILES.avifile+= include/avifile/wine/*
+
+BUILDLINK_TARGETS+= avifile-buildlink
+
+avifile-buildlink: _BUILDLINK_USE
+
+.endif # AVIFILE_BUILDLINK2_MK
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 998afa313b6..693328b293b 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/08/08 16:17:07 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2002/08/25 19:22:46 jlam Exp $
DISTNAME= ClanLib-0.4.4
PKGREVISION= 2
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index 62245d275b4..be49fddb9d0 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2002/08/01 06:40:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2002/08/25 19:22:47 jlam Exp $
#
# This Makefile fragment is included by packages that use ClanLib.
#
diff --git a/graphics/clanlib/buildlink2.mk b/graphics/clanlib/buildlink2.mk
new file mode 100644
index 00000000000..57ce6f24a3a
--- /dev/null
+++ b/graphics/clanlib/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:47 jlam Exp $
+
+.if !defined(CLANLIB_BUILDLINK2_MK)
+CLANLIB_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= ClanLib
+BUILDLINK_DEPENDS.ClanLib?= ClanLib>=0.4.4nb1
+BUILDLINK_PKGSRCDIR.ClanLib?= ../../graphics/ClanLib
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.ClanLib=ClanLib
+BUILDLINK_PREFIX.ClanLib_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.ClanLib= lib/libclanCore.*
+BUILDLINK_FILES.ClanLib+= lib/ClanLib/*
+BUILDLINK_FILES.ClanLib+= include/ClanLib/*.h
+BUILDLINK_FILES.ClanLib+= include/ClanLib/Core/*/*
+BUILDLINK_FILES.ClanLib+= include/ClanLib/GL/*
+BUILDLINK_FILES.ClanLib+= include/ClanLib/GUI/*
+BUILDLINK_FILES.ClanLib+= include/ClanLib/Lua/*
+BUILDLINK_FILES.ClanLib+= include/ClanLib/MIDI/*
+BUILDLINK_FILES.ClanLib+= include/ClanLib/MPEG/*
+BUILDLINK_FILES.ClanLib+= include/ClanLib/Magick/*
+BUILDLINK_FILES.ClanLib+= include/ClanLib/MikMod/*
+BUILDLINK_FILES.ClanLib+= include/ClanLib/png/*
+
+.include "../../devel/pth/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/hermes/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+
+BUILDLINK_TARGETS+= ClanLib-buildlink
+
+ClanLib-buildlink: _BUILDLINK_USE
+
+.endif # CLANLIB_BUILDLINK2_MK
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 7ab250edbb4..ec37562875d 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/05/11 11:56:58 rh Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 19:22:47 jlam Exp $
PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
COMMENT= the GNOME image loading library GNOME canvas support add-on
diff --git a/graphics/gdk-pixbuf-gnome/PLIST b/graphics/gdk-pixbuf-gnome/PLIST
index 3d39e623539..2aed178c0cf 100644
--- a/graphics/gdk-pixbuf-gnome/PLIST
+++ b/graphics/gdk-pixbuf-gnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/11 11:56:59 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:22:47 jlam Exp $
include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
lib/gnomecanvaspixbufConf.sh
lib/libgnomecanvaspixbuf.so.1.0
diff --git a/graphics/gdk-pixbuf-gnome/buildlink.mk b/graphics/gdk-pixbuf-gnome/buildlink.mk
index 0c9755f1490..a8180716d05 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/05/11 11:56:59 rh Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:22:47 jlam Exp $
#
# This Makefile fragment is included by packages that use gdk-pixbuf-gnome.
#
diff --git a/graphics/gdk-pixbuf-gnome/buildlink2.mk b/graphics/gdk-pixbuf-gnome/buildlink2.mk
new file mode 100644
index 00000000000..ca5223c665d
--- /dev/null
+++ b/graphics/gdk-pixbuf-gnome/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:47 jlam Exp $
+
+.if !defined(GDK_PIXBUF_GNOME_BUILDLINK2_MK)
+GDK_PIXBUF_GNOME_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gdk-pixbuf-gnome
+BUILDLINK_DEPENDS.gdk-pixbuf-gnome?= gdk-pixbuf-gnome>=0.11.0nb1
+BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?= ../../graphics/gdk-pixbuf-gnome
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf-gnome=gdk-pixbuf-gnome
+BUILDLINK_PREFIX.gdk-pixbuf-gnome_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gdk-pixbuf-gnome= include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
+BUILDLINK_FILES.gdk-pixbuf-gnome+= lib/libgnomecanvaspixbuf.*
+
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gdk-pixbuf-gnome-buildlink
+
+gdk-pixbuf-gnome-buildlink: _BUILDLINK_USE
+
+.endif # GDK_PIXBUF_GNOME_BUILDLINK2_MK
diff --git a/graphics/gimp-base/buildlink2.mk b/graphics/gimp-base/buildlink2.mk
new file mode 100644
index 00000000000..0f3ae41e140
--- /dev/null
+++ b/graphics/gimp-base/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:48 jlam Exp $
+
+.if !defined(GIMP_BASE_BUILDLINK2_MK)
+GIMP_BASE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gimp-base
+BUILDLINK_DEPENDS.gimp-base?= gimp-base>=1.2.3nb1
+BUILDLINK_PKGSRCDIR.gimp-base?= ../../graphics/gimp-base
+DEPENDS+= ${BUILDLINK_DEPENDS.gimpbase}:../../graphics/gimp-base
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gimp-base=gimp-base
+BUILDLINK_PREFIX.gimp-base_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gimp-base= include/libgimp/*
+BUILDLINK_FILES.gimp-base+= lib/libgimp.*
+BUILDLINK_FILES.gimp-base+= lib/libgimpui.*
+
+.include "../../devel/glib/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gimp-base-buildlink
+
+gimp-base-buildlink: _BUILDLINK_USE
+
+.endif # GIMP_BASE_BUILDLINK2_MK
diff --git a/graphics/gle/buildlink2.mk b/graphics/gle/buildlink2.mk
new file mode 100644
index 00000000000..5e96f99f617
--- /dev/null
+++ b/graphics/gle/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:48 jlam Exp $
+
+.if !defined(GLE_BUILDLINK2_MK)
+GLE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gle
+BUILDLINK_DEPENDS.gle?= gle>=3.0.3
+BUILDLINK_PKGSRCDIR.gle?= ../../graphics/gle
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gle=gle
+BUILDLINK_PREFIX.gle_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.gle= include/GL/gle.h
+BUILDLINK_FILES.gle+= lib/libgle.*
+
+.include "../../graphics/Mesa/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gle-buildlink
+
+gle-buildlink: _BUILDLINK_USE
+
+.endif # GLE_BUILDLINK2_MK
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 03f5d65b5da..b2bcc0d658b 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/07/12 21:22:21 mycroft Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 19:22:49 jlam Exp $
DISTNAME= gphoto2-2.1.0
PKGNAME= gphoto-2.1.0
diff --git a/graphics/gphoto2/PLIST b/graphics/gphoto2/PLIST
index 2f4c81c6f6a..0cf4b728316 100644
--- a/graphics/gphoto2/PLIST
+++ b/graphics/gphoto2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/12 21:22:21 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:49 jlam Exp $
bin/gphoto2
bin/gphoto2-config
bin/gphoto2-port-config
diff --git a/graphics/gphoto2/buildlink2.mk b/graphics/gphoto2/buildlink2.mk
new file mode 100644
index 00000000000..cbe5f141e8d
--- /dev/null
+++ b/graphics/gphoto2/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:49 jlam Exp $
+
+.if !defined(GPHOTO2_BUILDLINK2_MK)
+GPHOTO2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gphoto2
+BUILDLINK_DEPENDS.gphoto2?= gphoto>=2.0
+BUILDLINK_PKGSRCDIR.gphoto2?= ../../graphics/gphoto2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gphoto2=gphoto2
+BUILDLINK_PREFIX.gphoto2= ${LOCALBASE}
+BUILDLINK_FILES.gphoto2= include/gphoto2/*.h
+BUILDLINK_FILES.gphoto2+= lib/libgphoto2.*
+BUILDLINK_FILES.gphoto2+= lib/libgphoto2_port.*
+
+BUILDLINK_TARGETS+= gphoto2-buildlink
+
+gphoto2-buildlink: _BUILDLINK_USE
+
+.endif # GPHOTO2_BUILDLINK2_MK
diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo
index 2b339ebc26b..481d1b065b3 100644
--- a/graphics/gphoto2/distinfo
+++ b/graphics/gphoto2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/12 21:22:21 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:22:49 jlam Exp $
SHA1 (gphoto2-2.1.0.tar.gz) = 3ce3280dd90912d8a72b4d7586cff402e5157450
Size (gphoto2-2.1.0.tar.gz) = 2137982 bytes
diff --git a/graphics/imlib2/buildlink2.mk b/graphics/imlib2/buildlink2.mk
new file mode 100644
index 00000000000..172d7c03fd3
--- /dev/null
+++ b/graphics/imlib2/buildlink2.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:49 jlam Exp $
+
+.if !defined(IMLIB2_BUILDLINK2_MK)
+IMLIB2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= imlib2
+BUILDLINK_DEPENDS.imlib2?= imlib2>=1.0.3nb1
+BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.imlib2=imlib2
+BUILDLINK_PREFIX.imlib2_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.imlib2= include/Imlib2.h
+BUILDLINK_FILES.imlib2+= lib/libImlib2.*
+BUILDLINK_FILES.imlib2+= lib/loaders/image/*
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../databases/edb/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+= imlib2-buildlink
+
+imlib2-buildlink: _BUILDLINK_USE
+
+.endif # IMLIB2_BUILDLINK2_MK
diff --git a/graphics/jasper/buildlink2.mk b/graphics/jasper/buildlink2.mk
new file mode 100644
index 00000000000..8490a2c2d26
--- /dev/null
+++ b/graphics/jasper/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:50 jlam Exp $
+
+.if !defined(JASPER_BUILDLINK2_MK)
+JASPER_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= jasper
+BUILDLINK_DEPENDS.jasper?= jasper-1.500.0
+BUILDLINK_PKGSRCDIR.jasper?= ../../graphics/jasper
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.jasper=jasper
+BUILDLINK_PREFIX.jasper_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.jasper= include/jasper/*
+BUILDLINK_FILES.jasper+= lib/libjasper.*
+
+BUILDLINK_TARGETS+= jasper-buildlink
+
+jasper-buildlink: _BUILDLINK_USE
+
+.endif # JASPER_BUILDLINK2_MK
diff --git a/graphics/libart2/Makefile b/graphics/libart2/Makefile
index 1f5fc933649..23a2e90d5dc 100644
--- a/graphics/libart2/Makefile
+++ b/graphics/libart2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/22 21:30:31 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:22:50 jlam Exp $
DISTNAME= libart_lgpl-2.3.8
PKGNAME= libart2-2.3.8
diff --git a/graphics/libart2/PLIST b/graphics/libart2/PLIST
index f692ff5cdba..d6ebe4e22cf 100644
--- a/graphics/libart2/PLIST
+++ b/graphics/libart2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/22 21:30:31 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:22:50 jlam Exp $
bin/libart2-config
include/libart-2.0/libart_lgpl/art_affine.h
include/libart-2.0/libart_lgpl/art_alphagamma.h
diff --git a/graphics/libart2/buildlink.mk b/graphics/libart2/buildlink.mk
index e6356e78163..70dd255ee9e 100644
--- a/graphics/libart2/buildlink.mk
+++ b/graphics/libart2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/08 02:14:41 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:50 jlam Exp $
#
# This Makefile fragment is included by packages that use the library
# provided by libart2.
diff --git a/graphics/libart2/buildlink2.mk b/graphics/libart2/buildlink2.mk
new file mode 100644
index 00000000000..17f4e81c15f
--- /dev/null
+++ b/graphics/libart2/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:50 jlam Exp $
+
+.if !defined(LIBART2_BUILDLINK2_MK)
+LIBART2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libart2
+BUILDLINK_DEPENDS.libart2?= libart2>=2.3.8
+BUILDLINK_PKGSRCDIR.libart2?= ../../graphics/libart2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libart2=libart2
+BUILDLINK_PREFIX.libart2_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libart2= bin/libart22-config
+BUILDLINK_FILES.libart2+= include/libart2-2.0/libart2_lgpl/*
+BUILDLINK_FILES.libart2+= lib/libart2_lgpl_2.*
+
+BUILDLINK_TARGETS+= libart2-buildlink
+
+libart2-buildlink: _BUILDLINK_USE
+
+.endif # LIBART2_BUILDLINK2_MK
diff --git a/graphics/libart2/distinfo b/graphics/libart2/distinfo
index 21e08ee0fbe..c080b22ac97 100644
--- a/graphics/libart2/distinfo
+++ b/graphics/libart2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/22 21:30:31 agc Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 19:22:51 jlam Exp $
SHA1 (libart_lgpl-2.3.8.tar.bz2) = f87fe20d8135a5778112aea28698f6022a779a06
Size (libart_lgpl-2.3.8.tar.bz2) = 205615 bytes
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index f3ba9a1ccb5..7d2de2b227c 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/01 23:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:22:51 jlam Exp $
DISTNAME= libexif-0.5.3
CATEGORIES= graphics
diff --git a/graphics/libexif/PLIST b/graphics/libexif/PLIST
index 2cdef1b3eae..a1f0e732d3d 100644
--- a/graphics/libexif/PLIST
+++ b/graphics/libexif/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/01 23:19:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:51 jlam Exp $
include/libexif/exif-byte-order.h
include/libexif/exif-content.h
include/libexif/exif-data.h
diff --git a/graphics/libexif/buildlink2.mk b/graphics/libexif/buildlink2.mk
new file mode 100644
index 00000000000..5acfacae10b
--- /dev/null
+++ b/graphics/libexif/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:52 jlam Exp $
+
+.if !defined(LIBEXIF_BUILDLINK2_MK)
+LIBEXIF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libexif
+BUILDLINK_DEPENDS.libexif?= libexif>=0.5
+BUILDLINK_PKGSRCDIR.libexif?= ../../graphics/libexif
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libexif=libexif
+BUILDLINK_PREFIX.libexif_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libexif= include/libexif/*.h
+BUILDLINK_FILES.libexif+= lib/libexif.*
+
+BUILDLINK_TARGETS+= libexif-buildlink
+
+libexif-buildlink: _BUILDLINK_USE
+
+.endif # LIBEXIF_BUILDLINK2_MK
diff --git a/graphics/libexif/distinfo b/graphics/libexif/distinfo
index 51bcdad53c8..f537981d24c 100644
--- a/graphics/libexif/distinfo
+++ b/graphics/libexif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/01 23:19:06 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:22:52 jlam Exp $
SHA1 (libexif-0.5.3.tar.bz2) = 13ad8d8e5b478ba822b7f6b738f23985cd3ee261
Size (libexif-0.5.3.tar.bz2) = 236917 bytes
diff --git a/graphics/libwmf/buildlink2.mk b/graphics/libwmf/buildlink2.mk
new file mode 100644
index 00000000000..62f6464260f
--- /dev/null
+++ b/graphics/libwmf/buildlink2.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:52 jlam Exp $
+
+.if !defined(LIBWMF_BUILDLINK2_MK)
+LIBWMF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libwmf
+BUILDLINK_DEPENDS.libwmf?= libwmf>=0.2.2nb1
+BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libwmf=libwmf
+BUILDLINK_PREFIX.libwmf_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libwmf= include/libwmf/libwmf/*.h
+BUILDLINK_FILES.libwmf+= include/libwmf/libwmf/gd/*.h
+BUILDLINK_FILES.libwmf+= lib/libwmf-0.2.so*
+BUILDLINK_FILES.libwmf+= lib/libwmf.*
+
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+
+BUILDLINK_TARGETS+= libwmf-buildlink
+
+libwmf-buildlink: _BUILDLINK_USE
+
+.endif # LIBWMF_BUILDLINK2_MK
diff --git a/graphics/mpeg-lib/buildlink2.mk b/graphics/mpeg-lib/buildlink2.mk
new file mode 100644
index 00000000000..00e1208ad3b
--- /dev/null
+++ b/graphics/mpeg-lib/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:53 jlam Exp $
+
+.if !defined(MPEG_BUILDLINK2_MK)
+MPEG_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= mpeg
+BUILDLINK_DEPENDS.mpeg?= mpeg>=1.3.1
+BUILDLINK_PKGSRCDIR.mpeg?= ../../graphics/mpeg-lib
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.mpeg=mpeg
+BUILDLINK_PREFIX.mpeg_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.mpeg= include/mpeg.h
+BUILDLINK_FILES.mpeg+= lib/libmpeg_lib.*
+
+BUILDLINK_TARGETS+= mpeg-buildlink
+
+mpeg-buildlink: _BUILDLINK_USE
+
+.endif # MPEG_BUILDLINK2_MK
diff --git a/graphics/py-imaging/buildlink2.mk b/graphics/py-imaging/buildlink2.mk
new file mode 100644
index 00000000000..01612a8431b
--- /dev/null
+++ b/graphics/py-imaging/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:53 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pyimaging
+BUILDLINK_DEPENDS.pyimaging?= ${PYPKGPREFIX}-imaging-*
+BUILDLINK_PKGSRCDIR.pyimaging?= ../../graphics/py-imaging
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 4378c4c3ccf..298d4d00d86 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2002/08/19 19:17:03 mycroft Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/08/25 19:22:53 jlam Exp $
CATEGORIES?= graphics
MASTER_SITES?= ftp://ftp.mostang.com/pub/sane/sane-${SANE_VERSION}/ \
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 29ecfa3fb20..0736e318a5e 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/19 19:17:04 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:53 jlam Exp $
bin/sane-config
bin/sane-find-scanner
bin/scanimage
diff --git a/graphics/sane-backends/buildlink2.mk b/graphics/sane-backends/buildlink2.mk
new file mode 100644
index 00000000000..876390b35b2
--- /dev/null
+++ b/graphics/sane-backends/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:54 jlam Exp $
+
+.if !defined(SANE_BUILDLINK2_MK)
+SANE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= sane
+BUILDLINK_DEPENDS.sane?= sane-backends>=1.0.3
+BUILDLINK_PKGSRCDIR.sane?= ../../graphics/sane-backends
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.sane=sane-backends
+BUILDLINK_PREFIX.sane_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.sane= include/sane/*.h
+BUILDLINK_FILES.sane+= lib/libsane.*
+
+.include "../../devel/libusb/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+
+BUILDLINK_TARGETS+= sane-buildlink
+
+sane-buildlink: _BUILDLINK_USE
+
+.endif # SANE_BUILDLINK2_MK
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index f86fa80337c..af47a12a3db 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/08/19 19:17:04 mycroft Exp $
+$NetBSD: distinfo,v 1.10 2002/08/25 19:22:54 jlam Exp $
SHA1 (sane-backends-1.0.8.tar.gz) = b442f500e6aa21184abeb74dc6b83246e01b383a
Size (sane-backends-1.0.8.tar.gz) = 2169657 bytes
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index 015b78b3531..a96762d63eb 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2002/08/19 19:17:05 mycroft Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/25 19:22:54 jlam Exp $
--- doc/Makefile.in.orig Sun May 5 16:59:45 2002
+++ doc/Makefile.in Sat Jul 13 03:15:58 2002
diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile
index 6034561fd95..0914c84c1e0 100644
--- a/inputmethod/canna-lib/Makefile
+++ b/inputmethod/canna-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/21 02:43:45 grant Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 19:22:55 jlam Exp $
#
DISTNAME= Canna35b2
diff --git a/inputmethod/canna-lib/PLIST b/inputmethod/canna-lib/PLIST
index f0cc1a8f36e..7ca1aada58d 100644
--- a/inputmethod/canna-lib/PLIST
+++ b/inputmethod/canna-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/19 14:50:06 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:55 jlam Exp $
include/canna/RK.h
include/canna/jrkanji.h
include/canna/keydef.h
diff --git a/inputmethod/canna-lib/buildlink.mk b/inputmethod/canna-lib/buildlink.mk
index af39a4ddfb2..3e4d6c67eb9 100644
--- a/inputmethod/canna-lib/buildlink.mk
+++ b/inputmethod/canna-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/06/10 09:47:26 sakamoto Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:22:55 jlam Exp $
#
# This Makefile fragment is included by packages that use Canna.
#
diff --git a/inputmethod/canna-lib/buildlink2.mk b/inputmethod/canna-lib/buildlink2.mk
new file mode 100644
index 00000000000..e2c72bc3bc7
--- /dev/null
+++ b/inputmethod/canna-lib/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:55 jlam Exp $
+
+.if !defined(CANNA_BUILDLINK2_MK)
+CANNA_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= canna
+BUILDLINK_DEPENDS.canna?= Canna-lib>=3.5.2
+BUILDLINK_PKGSRCDIR.canna?= ../../inputmethod/canna-lib
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.canna=canna-lib
+BUILDLINK_PREFIX.canna_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.canna= include/canna/RK.h
+BUILDLINK_FILES.canna+= include/canna/jrkanji.h
+BUILDLINK_FILES.canna+= include/canna/keydef.h
+BUILDLINK_FILES.canna+= include/canna/mfdef.h
+BUILDLINK_FILES.canna+= lib/libRKC.*
+BUILDLINK_FILES.canna+= lib/libRKC16.*
+BUILDLINK_FILES.canna+= lib/libcanna.*
+BUILDLINK_FILES.canna+= lib/libcanna16.*
+
+BUILDLINK_TARGETS+= canna-buildlink
+
+canna-buildlink: _BUILDLINK_USE
+
+.endif # CANNA_BUILDLINK2_MK
diff --git a/inputmethod/canna-lib/distinfo b/inputmethod/canna-lib/distinfo
index 5ca3994463d..10f618fe040 100644
--- a/inputmethod/canna-lib/distinfo
+++ b/inputmethod/canna-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/06/10 09:47:26 sakamoto Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:22:55 jlam Exp $
SHA1 (Uum4.109.tar.gz) = 9d57fa67fc321c0b1101970b02154b5d6e42e88e
Size (Uum4.109.tar.gz) = 43738 bytes
diff --git a/inputmethod/canna-lib/files/canna b/inputmethod/canna-lib/files/canna
index 85805426efa..217450b09bf 100644
--- a/inputmethod/canna-lib/files/canna
+++ b/inputmethod/canna-lib/files/canna
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: canna,v 1.3 2002/08/07 07:43:32 jlam Exp $
+# $NetBSD: canna,v 1.4 2002/08/25 19:22:55 jlam Exp $
#
# PROVIDE: canna
# REQUIRE: DAEMON
diff --git a/inputmethod/canna-lib/patches/patch-aa b/inputmethod/canna-lib/patches/patch-aa
index dfa2a82db89..0bac4477838 100644
--- a/inputmethod/canna-lib/patches/patch-aa
+++ b/inputmethod/canna-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 19:22:55 jlam Exp $
--- Canna.conf- Fri Dec 1 00:31:14 2000
+++ Canna.conf Fri Dec 1 00:31:36 2000
diff --git a/inputmethod/canna-lib/patches/patch-ab b/inputmethod/canna-lib/patches/patch-ab
index c1d037928cd..db67743b3e6 100644
--- a/inputmethod/canna-lib/patches/patch-ab
+++ b/inputmethod/canna-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 19:22:56 jlam Exp $
--- ./Imakefile.orig Wed Nov 27 16:01:34 1996
+++ ./Imakefile Fri Jul 30 19:17:44 1999
diff --git a/inputmethod/canna-lib/patches/patch-ac b/inputmethod/canna-lib/patches/patch-ac
index b2f546f1675..80fab924b54 100644
--- a/inputmethod/canna-lib/patches/patch-ac
+++ b/inputmethod/canna-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:22:56 jlam Exp $
--- dic/phono/Imakefile.orig Wed Nov 27 16:15:14 1996
+++ dic/phono/Imakefile Fri Jul 30 19:57:02 1999
diff --git a/inputmethod/canna-lib/patches/patch-ad b/inputmethod/canna-lib/patches/patch-ad
index bff1761c507..d626848cd63 100644
--- a/inputmethod/canna-lib/patches/patch-ad
+++ b/inputmethod/canna-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/25 19:22:56 jlam Exp $
--- server/misc.c~ Fri Jul 29 12:03:54 1994
+++ server/misc.c Fri Jun 30 10:16:39 2000
@@ -788,12 +788,19 @@
diff --git a/inputmethod/canna-lib/patches/patch-ae b/inputmethod/canna-lib/patches/patch-ae
index edb2e80708e..5763ca872b0 100644
--- a/inputmethod/canna-lib/patches/patch-ae
+++ b/inputmethod/canna-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 19:22:56 jlam Exp $
PATCH_SITES+= http://apps.v6.linux.or.jp/pub/Linux/IPv6-2/canna/
PATCHFILES+= Canna35b2-v6-20000602.diff.gz
diff --git a/inputmethod/canna-lib/patches/patch-af b/inputmethod/canna-lib/patches/patch-af
index e2aa18a8be7..2318a3f6d58 100644
--- a/inputmethod/canna-lib/patches/patch-af
+++ b/inputmethod/canna-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
+$NetBSD: patch-af,v 1.3 2002/08/25 19:22:56 jlam Exp $
--- lib/RKC/convert.c.orig Wed May 22 22:02:57 1996
+++ lib/RKC/convert.c
diff --git a/inputmethod/ja-freewnn-lib/Makefile b/inputmethod/ja-freewnn-lib/Makefile
index a5cda3ab4bc..c726e208651 100644
--- a/inputmethod/ja-freewnn-lib/Makefile
+++ b/inputmethod/ja-freewnn-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/10 10:03:33 sakamoto Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:22:56 jlam Exp $
#
PKGNAME= ja-FreeWnn-lib-1.10
diff --git a/inputmethod/ja-freewnn-lib/Makefile.common b/inputmethod/ja-freewnn-lib/Makefile.common
index 289633f9c37..e544ee6896b 100644
--- a/inputmethod/ja-freewnn-lib/Makefile.common
+++ b/inputmethod/ja-freewnn-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2002/06/10 10:03:33 sakamoto Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/08/25 19:22:56 jlam Exp $
#
DISTNAME= FreeWnn-1.10
diff --git a/inputmethod/ja-freewnn-lib/PLIST b/inputmethod/ja-freewnn-lib/PLIST
index d7bfe5d3256..493056815bc 100644
--- a/inputmethod/ja-freewnn-lib/PLIST
+++ b/inputmethod/ja-freewnn-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/20 08:55:50 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:56 jlam Exp $
include/wnn/commonhd.h
include/wnn/config.h
include/wnn/cplib.h
diff --git a/inputmethod/ja-freewnn-lib/buildlink.mk b/inputmethod/ja-freewnn-lib/buildlink.mk
index 2c1dcef53ac..3a9eb3f178e 100644
--- a/inputmethod/ja-freewnn-lib/buildlink.mk
+++ b/inputmethod/ja-freewnn-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/06/10 10:03:33 sakamoto Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:22:57 jlam Exp $
#
# This Makefile fragment is included by packages that use FreeWnn.
#
diff --git a/inputmethod/ja-freewnn-lib/buildlink2.mk b/inputmethod/ja-freewnn-lib/buildlink2.mk
new file mode 100644
index 00000000000..a40f98ca680
--- /dev/null
+++ b/inputmethod/ja-freewnn-lib/buildlink2.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:57 jlam Exp $
+
+.if !defined(JA_FREEWNN_BUILDLINK2_MK)
+JA_FREEWNN_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= ja-freewnn
+BUILDLINK_DEPENDS.ja-freewnn?= ja-FreeWnn-lib>=1.10
+BUILDLINK_PKGSRCDIR.ja-freewnn?= ../../inputmethod/ja-freewnn-lib
+BUILDLINK_DEPMETHOD.ja-freewnn?= build
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.ja-freewnn=ja-FreeWnn-lib
+BUILDLINK_PREFIX.ja-freewnn_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.ja-freewnn= include/wnn/commonhd.h
+BUILDLINK_FILES.ja-freewnn+= include/wnn/config.h
+BUILDLINK_FILES.ja-freewnn+= include/wnn/cplib.h
+BUILDLINK_FILES.ja-freewnn+= include/wnn/jlib.h
+BUILDLINK_FILES.ja-freewnn+= include/wnn/jllib.h
+BUILDLINK_FILES.ja-freewnn+= include/wnn/jslib.h
+BUILDLINK_FILES.ja-freewnn+= include/wnn/msg.h
+BUILDLINK_FILES.ja-freewnn+= include/wnn/rk_spclval.h
+BUILDLINK_FILES.ja-freewnn+= include/wnn/wnnerror.h
+BUILDLINK_FILES.ja-freewnn+= lib/libjd.a
+BUILDLINK_FILES.ja-freewnn+= lib/libwnn.a
+
+BUILDLINK_TARGETS+= ja-freewnn-buildlink
+
+ja-freewnn-buildlink: _BUILDLINK_USE
+
+.endif # JA_FREEWNN_BUILDLINK2_MK
diff --git a/inputmethod/ja-freewnn-lib/distinfo b/inputmethod/ja-freewnn-lib/distinfo
index 75572f269cf..1e6cd0349ea 100644
--- a/inputmethod/ja-freewnn-lib/distinfo
+++ b/inputmethod/ja-freewnn-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/06/20 08:55:50 sakamoto Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:22:57 jlam Exp $
SHA1 (freewnn/FreeWnn-1.10.tar.gz) = 66a0640d4632d82b7012c4aa2239bc1d69d45034
Size (freewnn/FreeWnn-1.10.tar.gz) = 3468613 bytes
diff --git a/inputmethod/ja-freewnn-lib/files/ja_freewnn b/inputmethod/ja-freewnn-lib/files/ja_freewnn
index 5a18d42b898..f366934f0bf 100644
--- a/inputmethod/ja-freewnn-lib/files/ja_freewnn
+++ b/inputmethod/ja-freewnn-lib/files/ja_freewnn
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ja_freewnn,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+# $NetBSD: ja_freewnn,v 1.3 2002/08/25 19:22:57 jlam Exp $
#
# PROVIDE: freewnn
# REQUIRE: DAEMON
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-aa b/inputmethod/ja-freewnn-lib/patches/patch-aa
index 9532a4477c7..7112da6d6f4 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-aa
+++ b/inputmethod/ja-freewnn-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/06/20 08:55:51 sakamoto Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:57 jlam Exp $
--- Wnn/Makefile.in.orig Tue Mar 23 21:10:52 1999
+++ Wnn/Makefile.in Mon May 20 03:04:12 2002
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ab b/inputmethod/ja-freewnn-lib/patches/patch-ab
index 4e6e14ef891..1195996f40a 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ab
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 19:22:57 jlam Exp $
--- cWnn/Makefile.in.orig Tue Mar 23 21:13:41 1999
+++ cWnn/Makefile.in Mon May 20 03:07:33 2002
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ac b/inputmethod/ja-freewnn-lib/patches/patch-ac
index d57db9e35bf..9bd6e88f9db 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ac
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:22:58 jlam Exp $
--- kWnn/Makefile.in.orig Tue Mar 23 21:14:47 1999
+++ kWnn/Makefile.in Mon May 20 03:07:57 2002
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ad b/inputmethod/ja-freewnn-lib/patches/patch-ad
index e273844e30e..350c48a86b8 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ad
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/25 19:22:58 jlam Exp $
--- configure.in.orig Tue Apr 6 12:12:19 1999
+++ configure.in
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ae b/inputmethod/ja-freewnn-lib/patches/patch-ae
index 22ab7ab95db..56736b5f9f0 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ae
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 19:22:58 jlam Exp $
--- configure.orig Tue Apr 6 12:12:18 1999
+++ configure
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-af b/inputmethod/ja-freewnn-lib/patches/patch-af
index e15da02256b..7e64c973036 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-af
+++ b/inputmethod/ja-freewnn-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-af,v 1.3 2002/08/25 19:22:58 jlam Exp $
--- ./Makefile.in.orig Tue Mar 23 21:10:39 1999
+++ ./Makefile.in Thu Sep 2 14:57:48 1999
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ag b/inputmethod/ja-freewnn-lib/patches/patch-ag
index 69702a67fc3..269ea7d2ae1 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ag
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2002/06/10 10:03:34 sakamoto Exp $
+$NetBSD: patch-ag,v 1.3 2002/08/25 19:22:58 jlam Exp $
--- Wnn/jlib/js.c.orig Mon May 17 12:04:45 1999
+++ Wnn/jlib/js.c Wed Sep 22 18:37:26 1999
diff --git a/inputmethod/ja-freewnn-lib/patches/patch-ah b/inputmethod/ja-freewnn-lib/patches/patch-ah
index db230295e0a..fe66e5d936f 100644
--- a/inputmethod/ja-freewnn-lib/patches/patch-ah
+++ b/inputmethod/ja-freewnn-lib/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2002/06/20 08:55:51 sakamoto Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 19:22:58 jlam Exp $
--- Wnn/jd/Makefile.in.orig Tue Mar 23 21:11:01 1999
+++ Wnn/jd/Makefile.in
diff --git a/inputmethod/libtabe/Makefile b/inputmethod/libtabe/Makefile
index ca51ca55d9b..8b753a503a0 100644
--- a/inputmethod/libtabe/Makefile
+++ b/inputmethod/libtabe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/04 08:31:10 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:22:59 jlam Exp $
#
DISTNAME= libtabe-0.2.5
diff --git a/inputmethod/libtabe/PLIST b/inputmethod/libtabe/PLIST
index b120a0c1046..98ffcb37bee 100644
--- a/inputmethod/libtabe/PLIST
+++ b/inputmethod/libtabe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/04 08:31:10 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:22:59 jlam Exp $
bin/tsiadd
bin/tsidel
bin/tsidump
diff --git a/inputmethod/libtabe/buildlink.mk b/inputmethod/libtabe/buildlink.mk
index 47d4f93e5bc..4c43c4c5aac 100644
--- a/inputmethod/libtabe/buildlink.mk
+++ b/inputmethod/libtabe/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/06/04 16:12:04 cjep Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:59 jlam Exp $
#
# This Makefile fragment is included by packages that use libtabe.
#
diff --git a/inputmethod/libtabe/buildlink2.mk b/inputmethod/libtabe/buildlink2.mk
new file mode 100644
index 00000000000..75532c90075
--- /dev/null
+++ b/inputmethod/libtabe/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:59 jlam Exp $
+
+.if !defined(LIBTABE_BUILDLINK2_MK)
+LIBTABE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libtabe
+BUILDLINK_DEPENDS.libtabe?= libtabe>=0.2.5
+BUILDLINK_PKGSRCDIR.libtabe?= ../../inputmethod/libtabe
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libtabe=libtabe
+BUILDLINK_PREFIX.libtabe_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.libtabe= include/bims.h
+BUILDLINK_FILES.libtabe+= include/tabe.h
+BUILDLINK_FILES.libtabe+= lib/libbims.*
+BUILDLINK_FILES.libtabe+= lib/libtabe.*
+
+BUILDLINK_TARGETS+= libtabe-buildlink
+
+libtabe-buildlink: _BUILDLINK_USE
+
+.endif # LIBTABE_BUILDLINK2_MK
diff --git a/inputmethod/libtabe/distinfo b/inputmethod/libtabe/distinfo
index e101c3f74fd..dd636fd0c7b 100644
--- a/inputmethod/libtabe/distinfo
+++ b/inputmethod/libtabe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/04 08:31:10 uebayasi Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 19:22:59 jlam Exp $
SHA1 (libtabe-0.2.5.tar.gz) = 487f3b34fa6e560c4baad5ac37af509f2850bc82
Size (libtabe-0.2.5.tar.gz) = 1615825 bytes
diff --git a/inputmethod/libtabe/patches/patch-aa b/inputmethod/libtabe/patches/patch-aa
index 929701f77bc..a2167627fc4 100644
--- a/inputmethod/libtabe/patches/patch-aa
+++ b/inputmethod/libtabe/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/04 08:31:11 uebayasi Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:22:59 jlam Exp $
--- configure.orig Tue Dec 4 23:05:00 2001
+++ configure Fri Dec 7 23:17:32 2001
diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile
index d7d782eee35..41440d6e483 100644
--- a/inputmethod/sj3-lib/Makefile
+++ b/inputmethod/sj3-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/10 10:21:25 sakamoto Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:23:00 jlam Exp $
# FreeBSD Id: Makefile,v 1.9 1998/11/28 05:08:27 asami Exp $
DISTNAME= sj3-2.0.1.20
diff --git a/inputmethod/sj3-lib/PLIST b/inputmethod/sj3-lib/PLIST
index ccf66d2a1cf..7eba911f0b8 100644
--- a/inputmethod/sj3-lib/PLIST
+++ b/inputmethod/sj3-lib/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/10 10:21:25 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:23:00 jlam Exp $
include/sj3lib.h
lib/libsj3lib.a
diff --git a/inputmethod/sj3-lib/buildlink.mk b/inputmethod/sj3-lib/buildlink.mk
index f7724f79aff..e85d7896202 100644
--- a/inputmethod/sj3-lib/buildlink.mk
+++ b/inputmethod/sj3-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/06/10 10:21:25 sakamoto Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:00 jlam Exp $
#
# This Makefile fragment is included by packages that use sj3.
#
diff --git a/inputmethod/sj3-lib/buildlink2.mk b/inputmethod/sj3-lib/buildlink2.mk
new file mode 100644
index 00000000000..5585a1e630f
--- /dev/null
+++ b/inputmethod/sj3-lib/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:00 jlam Exp $
+
+.if !defined(SJ3_BUILDLINK2_MK)
+SJ3_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= sj3-lib
+BUILDLINK_DEPENDS.sj3?= sj3-lib>=2.0.1.20nb1
+BUILDLINK_PKGSRCDIR.sj3?= ../../inputmethod/sj3-lib
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.sj3=sj3-lib
+BUILDLINK_PREFIX.sj3_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.sj3= include/sj3lib.h
+BUILDLINK_FILES.sj3+= lib/libsj3lib.a
+
+BUILDLINK_TARGETS+= sj3-buildlink
+
+sj3-buildlink: _BUILDLINK_USE
+
+.endif # SJ3_BUILDLINK2_MK
diff --git a/inputmethod/sj3-lib/distinfo b/inputmethod/sj3-lib/distinfo
index 236f55c3819..fc2a6878755 100644
--- a/inputmethod/sj3-lib/distinfo
+++ b/inputmethod/sj3-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/06/10 10:21:25 sakamoto Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:23:00 jlam Exp $
SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259
Size (sj3-2.0.1.20.tar.gz) = 584065 bytes
diff --git a/inputmethod/sj3-lib/patches/patch-aa b/inputmethod/sj3-lib/patches/patch-aa
index 2aa679cf098..0df186640be 100644
--- a/inputmethod/sj3-lib/patches/patch-aa
+++ b/inputmethod/sj3-lib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 19:23:01 jlam Exp $
diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms ./doc/doc/sj3lib.ms
*** ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms Fri Jun 3 17:00:49 1994
diff --git a/inputmethod/sj3-lib/patches/patch-ab b/inputmethod/sj3-lib/patches/patch-ab
index 12bf413f114..6c976890d62 100644
--- a/inputmethod/sj3-lib/patches/patch-ab
+++ b/inputmethod/sj3-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- include/Const.h.orig Thu Jan 23 12:20:52 1997
+++ include/Const.h Wed Dec 8 10:33:54 1999
diff --git a/inputmethod/sj3-lib/patches/patch-ac b/inputmethod/sj3-lib/patches/patch-ac
index 0e18e8002d9..3357d7d607c 100644
--- a/inputmethod/sj3-lib/patches/patch-ac
+++ b/inputmethod/sj3-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- dict/dict/Imakefile.~1~ Thu Jan 23 20:20:51 1997
+++ dict/dict/Imakefile Tue Aug 18 10:51:14 1998
diff --git a/inputmethod/sj3-lib/patches/patch-ad b/inputmethod/sj3-lib/patches/patch-ad
index 80ab4563265..4f0bef831da 100644
--- a/inputmethod/sj3-lib/patches/patch-ad
+++ b/inputmethod/sj3-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- sj3.tmpl.orig Thu Jan 23 20:20:58 1997
+++ sj3.tmpl Fri Jul 30 20:27:08 1999
diff --git a/inputmethod/sj3-lib/patches/patch-ae b/inputmethod/sj3-lib/patches/patch-ae
index 1e6ece5eebb..4ab7f251130 100644
--- a/inputmethod/sj3-lib/patches/patch-ae
+++ b/inputmethod/sj3-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- include/Paths.h.in.orig Thu Jan 23 20:20:57 1997
+++ include/Paths.h.in Tue Aug 18 11:29:00 1998
diff --git a/inputmethod/sj3-lib/patches/patch-af b/inputmethod/sj3-lib/patches/patch-af
index 63be34b9ba5..d7fa53c12da 100644
--- a/inputmethod/sj3-lib/patches/patch-af
+++ b/inputmethod/sj3-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-af,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- server/main.c.orig Mon Mar 23 19:48:03 1998
+++ server/main.c Mon Aug 2 19:26:45 1999
diff --git a/inputmethod/sj3-lib/patches/patch-ag b/inputmethod/sj3-lib/patches/patch-ag
index f91171ba3b0..eeb7cfb89ce 100644
--- a/inputmethod/sj3-lib/patches/patch-ag
+++ b/inputmethod/sj3-lib/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2002/06/10 10:21:26 sakamoto Exp $
+$NetBSD: patch-ag,v 1.3 2002/08/25 19:23:01 jlam Exp $
--- server/setup.c.orig Mon May 7 12:15:08 2001
+++ server/setup.c Mon May 7 12:50:19 2001
diff --git a/lang/cim/buildlink2.mk b/lang/cim/buildlink2.mk
new file mode 100644
index 00000000000..3679b9f3ea7
--- /dev/null
+++ b/lang/cim/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:01 jlam Exp $
+
+.if !defined(CIM_BUILDLINK2_MK)
+CIM_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= cim
+BUILDLINK_DEPENDS.cim?= cim>=3.30
+BUILDLINK_PKGSRCDIR.cim?= ../../lang/cim
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.cim=cim
+BUILDLINK_PREFIX.cim_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.cim= include/cim.h
+BUILDLINK_FILES.cim+= lib/libcim-atr.*
+BUILDLINK_FILES.cim+= lib/libcim.*
+
+BUILDLINK_TARGETS+= cim-buildlink
+
+cim-buildlink: _BUILDLINK_USE
+
+.endif # CIM_BUILDLINK2_MK
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 0ef5902047d..a410bc1f01d 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/07/02 14:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2002/08/25 19:23:02 jlam Exp $
DISTNAME= f2c-20001205
PKGREVISION= 5
diff --git a/lang/f2c/buildlink2.mk b/lang/f2c/buildlink2.mk
new file mode 100644
index 00000000000..37bdc912d28
--- /dev/null
+++ b/lang/f2c/buildlink2.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:02 jlam Exp $
+
+.if !defined(F2C_BUILDLINK2_MK)
+F2C_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= f2c
+BUILDLINK_DEPENDS.f2c?= f2c>=20001205nb3
+BUILDLINK_PKGSRCDIR.f2c?= ../../lang/f2c
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.f2c=f2c
+BUILDLINK_PREFIX.f2c_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.f2c= include/f2c.h
+BUILDLINK_FILES.f2c+= lib/libf2c.*
+BUILDLINK_FILES.f2c+= lib/libf2c_p.a
+BUILDLINK_FILES.f2c+= lib/libf2c_pic.a
+BUILDLINK_FILES.f2c+= lib/libF77.*
+BUILDLINK_FILES.f2c+= lib/libF77_p.a
+BUILDLINK_FILES.f2c+= lib/libF77_pic.a
+BUILDLINK_FILES.f2c+= lib/libI77.*
+BUILDLINK_FILES.f2c+= lib/libI77_p.a
+BUILDLINK_FILES.f2c+= lib/libI77_pic.a
+
+PKG_FC= ${BUILDLINK_PREFIX.f2c}/bin/f2c-f77
+
+BUILDLINK_TARGETS+= f2c-buildlink
+
+f2c-buildlink: _BUILDLINK_USE
+
+.endif # F2C_BUILDLINK2_MK
diff --git a/lang/f2c/distinfo b/lang/f2c/distinfo
index fe5d1d80aac..9481451f85b 100644
--- a/lang/f2c/distinfo
+++ b/lang/f2c/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/06/17 04:21:08 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:23:02 jlam Exp $
SHA1 (f2c-20001205.tar.gz) = f3cc1653eb962fee45d850df50890fc53448a17f
Size (f2c-20001205.tar.gz) = 988607 bytes
diff --git a/lang/f2c/patches/patch-aa b/lang/f2c/patches/patch-aa
index 7ac8c5bab94..126af6db8da 100644
--- a/lang/f2c/patches/patch-aa
+++ b/lang/f2c/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2002/06/17 04:21:09 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.12 2002/08/25 19:23:02 jlam Exp $
Add a top level Makefile
diff --git a/lang/gb/buildlink2.mk b/lang/gb/buildlink2.mk
new file mode 100644
index 00000000000..f5861fd7a7c
--- /dev/null
+++ b/lang/gb/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:03 jlam Exp $
+
+.if !defined(GB_BUILDLINK2_MK)
+GB_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gb
+BUILDLINK_DEPENDS.gb?= gb>=0.0.20nb1
+BUILDLINK_PKGSRCDIR.gb?= ../../lang/gb
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gb=gb
+BUILDLINK_PREFIX.gb_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gb= include/gb/*
+BUILDLINK_FILES.gb+= include/gbrun/*
+BUILDLINK_FILES.gb+= lib/libgbrun.*
+
+.include "../../print/gnome-print/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gb-buildlink
+
+gb-buildlink: _BUILDLINK_USE
+
+.endif # GB_BUILDLINK2_MK
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index d4dcb2583cf..f6161566378 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/07/12 07:55:50 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2002/08/25 19:23:03 jlam Exp $
# FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
#
diff --git a/lang/guile/buildlink2.mk b/lang/guile/buildlink2.mk
new file mode 100644
index 00000000000..4339ca38e89
--- /dev/null
+++ b/lang/guile/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:03 jlam Exp $
+
+.if !defined(GUILE_BUILDLINK2_MK)
+GUILE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= guile
+BUILDLINK_DEPENDS.guile?= guile>=1.4
+BUILDLINK_PKGSRCDIR.guile?= ../../lang/guile
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.guile=guile
+BUILDLINK_PREFIX.guile_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.guile+= include/guile/*
+BUILDLINK_FILES.guile+= include/guile-readline/*
+BUILDLINK_FILES.guile+= include/libguile.h
+BUILDLINK_FILES.guile+= include/libguile/*
+BUILDLINK_FILES.guile+= lib/libguile.*
+BUILDLINK_FILES.guile+= lib/libguilereadline.*
+
+USE_GNU_READLINE= # defined
+
+.include "../../devel/readline/buildlink2.mk"
+
+BUILDLINK_TARGETS+= guile-buildlink
+
+guile-buildlink: _BUILDLINK_USE
+
+.endif # GUILE_BUILDLINK2_MK
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 2c98ff85e2e..4496c12c90a 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/23 21:29:28 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:23:03 jlam Exp $
SHA1 (guile-1.4.tar.gz) = b143efaff0820f7c701eea0b25aa87af2693c4ac
Size (guile-1.4.tar.gz) = 1132852 bytes
diff --git a/lang/guile/patches/patch-ae b/lang/guile/patches/patch-ae
index b9be47ad655..35e9499e148 100644
--- a/lang/guile/patches/patch-ae
+++ b/lang/guile/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2002/07/23 21:29:29 agc Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:04 jlam Exp $
--- guile-readline/configure 2002/07/23 21:24:40 1.1
+++ guile-readline/configure 2002/07/23 21:25:00
diff --git a/mail/drac/buildlink.mk b/mail/drac/buildlink.mk
index 3f57b9ef336..e454b3ff3bb 100644
--- a/mail/drac/buildlink.mk
+++ b/mail/drac/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/05/20 12:49:32 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:04 jlam Exp $
#
# This Makefile fragment is included by packages that use drac.
#
diff --git a/mail/drac/buildlink2.mk b/mail/drac/buildlink2.mk
new file mode 100644
index 00000000000..a5611659aea
--- /dev/null
+++ b/mail/drac/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:04 jlam Exp $
+
+.if !defined(DRAC_BUILDLINK2_MK)
+DRAC_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= drac
+BUILDLINK_DEPENDS.drac?= drac>=1.10
+BUILDLINK_PKGSRCDIR.drac?= ../../mail/drac
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.drac=drac
+BUILDLINK_PREFIX.drac_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.drac+= include/drac.h
+BUILDLINK_FILES.drac+= lib/libdrac.*
+
+BUILDLINK_TARGETS+= drac-buildlink
+
+drac-buildlink: _BUILDLINK_USE
+
+.endif # DRAC_BUILDLINK2_MK
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index c8f7c185934..aa4d9f544fe 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/07/07 14:39:16 tron Exp $
+# $NetBSD: Makefile,v 1.28 2002/08/25 19:23:05 jlam Exp $
DISTNAME= faces-1.6.1
PKGREVISION= 2
diff --git a/mail/faces/buildlink2.mk b/mail/faces/buildlink2.mk
new file mode 100644
index 00000000000..28e1ce6449e
--- /dev/null
+++ b/mail/faces/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:05 jlam Exp $
+
+.if !defined(FACES_BUILDLINK2_MK)
+FACES_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= faces
+BUILDLINK_DEPENDS.faces?= faces>=1.6.1nb1
+BUILDLINK_PKGSRCDIR.faces?= ../../mail/faces
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.faces=faces
+BUILDLINK_PREFIX.faces_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.faces= include/compface.h
+BUILDLINK_FILES.faces+= lib/libcompface.*
+
+BUILDLINK_TARGETS+= faces-buildlink
+
+faces-buildlink: _BUILDLINK_USE
+
+.endif # FACES_BUILDLINK2_MK
diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index 7a21f5c9102..2cf62ea21eb 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/07/07 14:25:52 tron Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 19:23:05 jlam Exp $
SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
Size (faces-1.6.1.tar.Z) = 249469 bytes
diff --git a/mail/faces/patches/patch-ax b/mail/faces/patches/patch-ax
index 8108a858db8..c7018de8c71 100644
--- a/mail/faces/patches/patch-ax
+++ b/mail/faces/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.1 2002/07/07 14:25:53 tron Exp $
+$NetBSD: patch-ax,v 1.2 2002/08/25 19:23:05 jlam Exp $
--- filters/fs2ikon.orig Thu Oct 24 03:26:14 1991
+++ filters/fs2ikon Sun Jul 7 16:18:17 2002
diff --git a/mail/faces/patches/patch-ay b/mail/faces/patches/patch-ay
index d46d955b459..d232ac59057 100644
--- a/mail/faces/patches/patch-ay
+++ b/mail/faces/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1 2002/07/07 14:25:53 tron Exp $
+$NetBSD: patch-ay,v 1.2 2002/08/25 19:23:05 jlam Exp $
--- filters/fs2xbm.orig Tue Nov 19 05:02:32 1991
+++ filters/fs2xbm Sun Jul 7 16:19:16 2002
diff --git a/mail/faces/patches/patch-az b/mail/faces/patches/patch-az
index 4cd065b27b1..5480f3cc13e 100644
--- a/mail/faces/patches/patch-az
+++ b/mail/faces/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.1 2002/07/07 14:25:53 tron Exp $
+$NetBSD: patch-az,v 1.2 2002/08/25 19:23:05 jlam Exp $
--- filters/xbmsize48.orig Tue Nov 19 05:02:32 1991
+++ filters/xbmsize48 Sun Jul 7 16:19:23 2002
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 9aa03e1805e..b7e57af9d60 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2002/08/15 00:32:58 fredb Exp $
+# $NetBSD: Makefile,v 1.44 2002/08/25 19:23:06 jlam Exp $
DISTNAME= imap-2001a
PKGNAME= imap-uw-2001.1
diff --git a/mail/imap-uw/buildlink2.mk b/mail/imap-uw/buildlink2.mk
new file mode 100644
index 00000000000..5874c33f8af
--- /dev/null
+++ b/mail/imap-uw/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:06 jlam Exp $
+
+.if !defined(IMAP_UW_BUILDLINK2_MK)
+IMAP_UW_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= imap-uw
+BUILDLINK_DEPENDS.imap-uw?= imap-uw>=2001.1
+BUILDLINK_PKGSRCDIR.imap-uw?= ../../mail/imap-uw
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.imap-uw=imap-uw
+BUILDLINK_PREFIX.imap-uw_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.imap-uw= include/c-client/*
+BUILDLINK_FILES.imap-uw+= lib/libc-client.*
+BUILDLINK_FILES.imap-uw+= lib/libc-client_pic.*
+BUILDLINK_FILES.imap-uw+= lib/libimapuw.*
+
+BUILDLINK_TARGETS+= imap-uw-buildlink
+
+imap-uw-buildlink: _BUILDLINK_USE
+
+.endif # IMAP_UW_BUILDLINK2_MK
diff --git a/math/blas/buildlink2.mk b/math/blas/buildlink2.mk
new file mode 100644
index 00000000000..0c86afe06cf
--- /dev/null
+++ b/math/blas/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:06 jlam Exp $
+
+.if !defined(BLAS_BUILDLINK2_MK)
+BLAS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= blas
+BUILDLINK_DEPENDS.blas?= blas>=1.0
+BUILDLINK_PKGSRCDIR.blas?= ../../math/blas
+BUILDLINK_DEPMETHOD.blas?= build
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.blas=blas
+BUILDLINK_PREFIX.blas_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.blas= lib/libblas.*
+
+BUILDLINK_TARGETS+= blas-buildlink
+
+blas-buildlink: _BUILDLINK_USE
+
+.endif # BLAS_BUILDLINK2_MK
diff --git a/math/gsl/buildlink2.mk b/math/gsl/buildlink2.mk
new file mode 100644
index 00000000000..689fb0e1029
--- /dev/null
+++ b/math/gsl/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:07 jlam Exp $
+
+.if !defined(GSL_BUILDLINK2_MK)
+GSL_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gsl
+BUILDLINK_DEPENDS.gsl?= gsl>=1.1.1
+BUILDLINK_PKGSRCDIR.gsl?= ../../math/gsl
+BUILDLINK_DEPMETHOD.gsl?= build
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gsl=gsl
+BUILDLINK_PREFIX.gsl_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.gsl= include/gsl/*
+BUILDLINK_FILES.gsl+= lib/libgsl.*
+
+BUILDLINK_TARGETS+= gsl-buildlink
+
+gsl-buildlink: _BUILDLINK_USE
+
+.endif # GSL_BUILDLINK2_MK
diff --git a/math/lapack/buildlink2.mk b/math/lapack/buildlink2.mk
new file mode 100644
index 00000000000..7fc959ea3a0
--- /dev/null
+++ b/math/lapack/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:07 jlam Exp $
+
+.if !defined(LAPACK_BUILDLINK2_MK)
+LAPACK_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= lapack
+BUILDLINK_DEPENDS.lapack?= lapack>=20010201
+BUILDLINK_PKGSRCDIR.lapack?= ../../math/lapack
+BUILDLINK_DEPMETHOD.lapack?= build
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.lapack=lapack
+BUILDLINK_PREFIX.lapack_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.lapack= lib/liblapack.*
+
+BUILDLINK_TARGETS== lapack-buildlink
+
+lapack-buildlink: _BUILDLINK_USE
+
+.endif # LAPACK_BUILDLINK2_MK
diff --git a/math/py-Numeric/buildlink2.mk b/math/py-Numeric/buildlink2.mk
new file mode 100644
index 00000000000..da60e44f469
--- /dev/null
+++ b/math/py-Numeric/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:08 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pynumeric
+BUILDLINK_DEPENDS.pynumeric?= ${PYPKGPREFIX}-Numeric-*
+BUILDLINK_PKGSRCDIR.pynumeric?= ../../math/py-Numeric
diff --git a/math/udunits/buildlink2.mk b/math/udunits/buildlink2.mk
new file mode 100644
index 00000000000..41ce89f97e4
--- /dev/null
+++ b/math/udunits/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:08 jlam Exp $
+
+.if !defined(UDUNITS_BUILDLINK2_MK)
+UDUNITS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= udunits
+BUILDLINK_DEPENDS.udunits?= udunits>=1.11.7
+BUILDLINK_PKGSRCDIR.udunits?= ../../math/udunits
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.udunits=udunits
+BUILDLINK_PREFIX.udunits_DEFAULT=${LOCALBASE}
+BUILDLINK_FILES.udunits= lib/libudunits.*
+BUILDLINK_FILES.udunits+= lib/libudport.*
+BUILDLINK_FILES.udunits+= include/udunits.h
+BUILDLINK_FILES.udunits+= include/udunits.inc
+
+BUILDLINK_TARGETS+= udunits-buildlink
+
+udunits-buildlink: _BUILDLINK_USE
+
+.endif # UDUNITS_BUILDLINK2_MK
diff --git a/misc/libdvdread/MESSAGE b/misc/libdvdread/MESSAGE
index 107cb2df3cd..4a4c8ffedd0 100644
--- a/misc/libdvdread/MESSAGE
+++ b/misc/libdvdread/MESSAGE
@@ -1,5 +1,5 @@
======================================================================
-$NetBSD: MESSAGE,v 1.1 2002/05/27 15:08:15 veego Exp $
+$NetBSD: MESSAGE,v 1.2 2002/08/25 19:23:08 jlam Exp $
Because of the unclear legal status of libdvdcss, we do not provide a
package for it. It is however needed to play encrypted DVDs.
diff --git a/misc/libdvdread/Makefile b/misc/libdvdread/Makefile
index 648dd19098a..68657df7562 100644
--- a/misc/libdvdread/Makefile
+++ b/misc/libdvdread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/05/27 15:08:15 veego Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 19:23:09 jlam Exp $
DISTNAME= libdvdread-0.9.3
CATEGORIES= misc
diff --git a/misc/libdvdread/PLIST b/misc/libdvdread/PLIST
index 90d12bfb075..c96b3cea7cc 100644
--- a/misc/libdvdread/PLIST
+++ b/misc/libdvdread/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/27 15:08:15 veego Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:23:09 jlam Exp $
include/dvdread/dvd_reader.h
include/dvdread/ifo_print.h
include/dvdread/ifo_read.h
diff --git a/misc/libdvdread/buildlink.mk b/misc/libdvdread/buildlink.mk
index 5c5ea7bc6e6..4902d7dce41 100644
--- a/misc/libdvdread/buildlink.mk
+++ b/misc/libdvdread/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/05/27 15:08:15 veego Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:23:09 jlam Exp $
#
# This Makefile fragment is included by packages that use libdvdread.
#
diff --git a/misc/libdvdread/buildlink2.mk b/misc/libdvdread/buildlink2.mk
new file mode 100644
index 00000000000..6bf3e98165b
--- /dev/null
+++ b/misc/libdvdread/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:09 jlam Exp $
+
+.if !defined(LIBDVDREAD_BUILDLINK2_MK)
+LIBDVDREAD_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libdvdread
+BUILDLINK_DEPENDS.libdvdread?= libdvdread>=0.9.3
+BUILDLINK_PKGSRCDIR.libdvdread?= ../../misc/libdvdread
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libdvdread=libdvdread
+BUILDLINK_PREFIX.libdvdread= ${LOCALBASE}
+BUILDLINK_FILES.libdvdread= include/dvdread/*
+BUILDLINK_FILES.libdvdread+= lib/libdvdread.*
+
+BUILDLINK_TARGETS+= libdvdread-buildlink
+
+libdvdread-buildlink: _BUILDLINK_USE
+
+.endif # LIBDVDREAD_BUILDLINK2_MK
diff --git a/misc/libdvdread/distinfo b/misc/libdvdread/distinfo
index e1a4e76cebb..42a2747a62b 100644
--- a/misc/libdvdread/distinfo
+++ b/misc/libdvdread/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/05/27 15:08:15 veego Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:23:09 jlam Exp $
SHA1 (libdvdread-0.9.3.tar.gz) = 8098fd5f03e3b521b58ac1a5eb838b2e5ceb0426
Size (libdvdread-0.9.3.tar.gz) = 196597 bytes
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 52d0042f73e..7c37c5d0423 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/07/18 02:19:40 rh Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 19:23:09 jlam Exp $
#
DISTNAME= ORBit2-2.4.0
diff --git a/net/ORBit2/buildlink.mk b/net/ORBit2/buildlink.mk
index 26642c880bb..307772af67c 100644
--- a/net/ORBit2/buildlink.mk
+++ b/net/ORBit2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/07/12 15:33:13 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:23:09 jlam Exp $
#
# This Makefile fragment is included by packages that use orbit2.
#
diff --git a/net/ORBit2/buildlink2.mk b/net/ORBit2/buildlink2.mk
new file mode 100644
index 00000000000..615b6f2cf6e
--- /dev/null
+++ b/net/ORBit2/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:10 jlam Exp $
+
+.if !defined(ORBIT2_BUILDLINK2_MK)
+ORBIT2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= ORBit2
+BUILDLINK_DEPENDS.orbit2?= ORBit2>=2.4.0
+BUILDLINK_PKGSRCDIR.orbit2?= ../../net/ORBit2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.orbit2=orbit2
+BUILDLINK_PREFIX.orbit2_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.orbit2= include/orbit-2.0/orbit/*/*
+BUILDLINK_FILES.orbit2+= include/orbit-2.0/orbit/*
+BUILDLINK_FILES.orbit2+= include/orbit-2.0/ORBitservices/*
+BUILDLINK_FILES.orbit2+= lib/libORBit-2.*
+BUILDLINK_FILES.orbit2+= lib/libORBitCosNaming-2.*
+BUILDLINK_FILES.orbit2+= lib/libname-server-2.*
+BUILDLINK_FILES.orbit2+= lib/orbit-2.0/*
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../net/libIDL/buildlink2.mk"
+.include "../../net/linc/buildlink2.mk"
+
+BUILDLINK_TARGETS+= orbit2-buildlink
+
+orbit2-buildlink: _BUILDLINK_USE
+
+.endif # ORBIT2_BUILDLINK2_MK
diff --git a/net/ORBit2/distinfo b/net/ORBit2/distinfo
index b8a3357ed51..0f4ec0f8567 100644
--- a/net/ORBit2/distinfo
+++ b/net/ORBit2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/07/18 02:19:40 rh Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 19:23:10 jlam Exp $
SHA1 (ORBit2-2.4.0.tar.bz2) = 234b4b8f66744637386ad7f2caf0aeca88afe484
Size (ORBit2-2.4.0.tar.bz2) = 431841 bytes
diff --git a/net/ORBit2/patches/patch-aa b/net/ORBit2/patches/patch-aa
index 335c1c59a7c..a9b665445bb 100644
--- a/net/ORBit2/patches/patch-aa
+++ b/net/ORBit2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2002/05/21 12:06:08 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:10 jlam Exp $
--- ORBit-2.0.pc.in.orig Sat Apr 27 18:24:08 2002
+++ ORBit-2.0.pc.in
diff --git a/net/ORBit2/patches/patch-ab b/net/ORBit2/patches/patch-ab
index 2095b23870d..e7f70c1e6b5 100644
--- a/net/ORBit2/patches/patch-ab
+++ b/net/ORBit2/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/07/18 02:19:40 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:10 jlam Exp $
--- ORBit-CosNaming-2.0.pc.in.orig Thu Nov 1 11:50:44 2001
+++ ORBit-CosNaming-2.0.pc.in
diff --git a/net/SDL_net/buildlink2.mk b/net/SDL_net/buildlink2.mk
new file mode 100644
index 00000000000..6f0e80abf1b
--- /dev/null
+++ b/net/SDL_net/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:10 jlam Exp $
+
+.if !defined(SDL_NET_BUILDLINK2_MK)
+SDL_NET_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= SDL_net
+BUILDLINK_DEPENDS.SDL_net?= SDL_net>=1.2.0
+BUILDLINK_PKGSRCDIR.SDL_net?= ../../net/SDL_net
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_net=SDL_net
+BUILDLINK_PREFIX.SDL_net_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.SDL_net= include/SDL/SDL_net.h
+BUILDLINK_FILES.SDL_net+= lib/libSDL_net-*
+BUILDLINK_FILES.SDL_net+= lib/libSDL_net.*
+
+.include "../../devel/SDL/buildlink2.mk"
+
+BUILDLINK_TARGETS+= SDL_net-buildlink
+
+SDL_net-buildlink: _BUILDLINK_USE
+
+.endif # SDL_NET_BUILDLINK2_MK
diff --git a/net/adns/buildlink2.mk b/net/adns/buildlink2.mk
new file mode 100644
index 00000000000..0ba22737784
--- /dev/null
+++ b/net/adns/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:11 jlam Exp $
+
+.if !defined(ADNS_BUILDLINK2_MK)
+ADNS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= adns
+BUILDLINK_DEPENDS.adns?= adns>=1.0
+BUILDLINK_PKGSRCDIR.adns?= ../../net/adns
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.adns=adns
+BUILDLINK_PREFIX.adns_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.adns= include/adns.h
+BUILDLINK_FILES.adns+= lib/libadns.*
+
+BUILDLINK_TARGETS+= adns-buildlink
+
+adns-buildlink: _BUILDLINK_USE
+
+.endif # ADNS_BUILDLINK2_MK
diff --git a/net/adns/distinfo b/net/adns/distinfo
index 0141c4beec3..e33a52a946e 100644
--- a/net/adns/distinfo
+++ b/net/adns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/07 17:48:38 atatat Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:23:11 jlam Exp $
SHA1 (adns-1.0.tar.gz) = 7675da67c7829f2db9a6fafd64f1f90c7bce412a
Size (adns-1.0.tar.gz) = 208741 bytes
diff --git a/net/adns/patches/patch-ac b/net/adns/patches/patch-ac
index 4de31a9a7c2..5acd8b6418c 100644
--- a/net/adns/patches/patch-ac
+++ b/net/adns/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2002/06/07 17:48:39 atatat Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 19:23:12 jlam Exp $
Need to include sys/types.h so that pid_t is a defined type for
sys/select.h.
diff --git a/net/libIDL/buildlink2.mk b/net/libIDL/buildlink2.mk
new file mode 100644
index 00000000000..2a54cc28945
--- /dev/null
+++ b/net/libIDL/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:12 jlam Exp $
+
+.if !defined(LIBIDL2_BUILDLINK2_MK)
+LIBIDL2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= idl
+BUILDLINK_DEPENDS.idl?= libIDL>=0.7.4nb1
+BUILDLINK_PKGSRCDIR.idl?= ../../net/libIDL
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.idl=idl
+BUILDLINK_PREFIX.idl_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.idl= include/libIDL-2.0/libIDL/*
+BUILDLINK_FILES.idl+= lib/libIDL-2.*
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= idl-buildlink
+
+idl-buildlink: _BUILDLINK_USE
+
+.endif # LIBIDL2_BUILDLINK2_MK
diff --git a/net/libpcap/buildlink2.mk b/net/libpcap/buildlink2.mk
new file mode 100644
index 00000000000..78d063ce5d7
--- /dev/null
+++ b/net/libpcap/buildlink2.mk
@@ -0,0 +1,32 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:12 jlam Exp $
+
+.if !defined(LIBPCAP_BUILDLINK2_MK)
+LIBPCAP_BUILDLINK2_MK= # defined
+
+BUILDLINK_DEPENDS.libpcap?= libpcap>=0.7.1
+BUILDLINK_PKGSRCDIR.libpcap?= ../../net/libpcap
+
+.if exists(/usr/include/pcap.h)
+_NEED_LIBPCAP= NO
+.else
+_NEED_LIBPCAP= YES
+.endif
+
+.if ${_NEED_LIBPCAP} == "YES"
+BUILDLINK_PACKAGES+= libpcap
+EVAL_PREFIX+= BUILDLINK_PREFIX.libpcap=libpcap
+BUILDLINK_PREFIX.libpcap_DEFAULT= ${LOCALBASE}
+.else
+BUILDLINK_PREFIX.libpcap= /usr
+.endif
+
+BUILDLINK_FILES.libpcap= include/pcap.h
+BUILDLINK_FILES.libpcap+= include/pcap-namedb.h
+BUILDLINK_FILES.libpcap+= include/net/bpf.h
+BUILDLINK_FILES.libpcap+= lib/libpcap.*
+
+BUILDLINK_TARGETS+= libpcap-buildlink
+
+libpcap-buildlink: _BUILDLINK_USE
+
+.endif # LIBPCAP_BUILDLINK2_MK
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 1390d759bdc..211ebb7fc91 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/12 15:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:23:13 jlam Exp $
#
DISTNAME= linc-0.5.0
diff --git a/net/linc/PLIST b/net/linc/PLIST
index 973ee1f054a..f90db6a9190 100644
--- a/net/linc/PLIST
+++ b/net/linc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/12 15:19:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:23:14 jlam Exp $
bin/linc-cleanup-sockets
bin/linc-config
include/linc-1.0/linc/linc-config.h
diff --git a/net/linc/buildlink.mk b/net/linc/buildlink.mk
index 2d0ee958b0b..c126f25f520 100644
--- a/net/linc/buildlink.mk
+++ b/net/linc/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/07/12 15:19:07 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:23:14 jlam Exp $
#
# This Makefile fragment is included by packages that use linc.
#
diff --git a/net/linc/buildlink2.mk b/net/linc/buildlink2.mk
new file mode 100644
index 00000000000..48191a23306
--- /dev/null
+++ b/net/linc/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:14 jlam Exp $
+
+.if !defined(LINC_BUILDLINK2_MK)
+LINC_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= linc
+BUILDLINK_DEPENDS.linc?= linc>=0.5.0
+BUILDLINK_PKGSRCDIR.linc?= ../../net/linc
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.linc=linc
+BUILDLINK_PREFIX.linc_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.linc= include/linc-1.0/linc/*
+BUILDLINK_FILES.linc+= lib/liblinc.*
+
+.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+= linc-buildlink
+
+linc-buildlink: _BUILDLINK_USE
+
+.endif # LINC_BUILDLINK2_MK
diff --git a/net/linc/distinfo b/net/linc/distinfo
index ab61135d678..f81b9ebcf21 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/12 15:19:07 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:23:14 jlam Exp $
SHA1 (linc-0.5.0.tar.bz2) = c404b77735bc6e1f7b4f835e5e03931ca2c8765b
Size (linc-0.5.0.tar.bz2) = 177900 bytes
diff --git a/print/gnome-print/buildlink2.mk b/print/gnome-print/buildlink2.mk
new file mode 100644
index 00000000000..66c216b8c09
--- /dev/null
+++ b/print/gnome-print/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:14 jlam Exp $
+
+.if !defined(GNOME_PRINT_BUILDLINK2_MK)
+GNOME_PRINT_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gnome-print
+BUILDLINK_DEPENDS.gnome-print?= gnome-print>=0.29nb1
+BUILDLINK_PKGSRCDIR.gnome-print?= ../../print/gnome-print
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-print=gnome-print
+BUILDLINK_PREFIX.gnome-print_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gnome-print+= include/gnome-1.0/libgnomeprint/*
+BUILDLINK_FILES.gnome-print+= lib/libgnomeprint.*
+
+.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gnome-print-buildlink
+
+gnome-print-buildlink: _BUILDLINK_USE
+
+.endif # GNOME_PRINT_BUILDLINK2_MK
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 4e6bc068bd7..9fe5cbaa280 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/05/11 20:10:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:23:15 jlam Exp $
DISTNAME= gpgme-0.3.0
CATEGORIES= security
diff --git a/security/gpgme/buildlink2.mk b/security/gpgme/buildlink2.mk
new file mode 100644
index 00000000000..5a7e79906d0
--- /dev/null
+++ b/security/gpgme/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:15 jlam Exp $
+
+.if !defined(GPGME_BUILDLINK2_MK)
+GPGME_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gpgme
+BUILDLINK_DEPENDS.gpgme?= gpgme>=0.3.0
+BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gpgme=gpgme
+BUILDLINK_PREFIX.gpgme_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.gpgme+= include/gpgme.h
+BUILDLINK_FILES.gpgme+= lib/libgpgme.*
+
+BUILDLINK_TARGETS+= gpgme-buildlink
+
+gpgme-buildlink: _BUILDLINK_USE
+
+.endif # GPGME_BUILDLINK2_MK
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 36c598401a9..5dcc5fede8c 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/07/02 11:41:15 agc Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 19:23:15 jlam Exp $
#
DISTNAME= krb4-1.1.1
diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST
index d7fb7f6256e..58cfb3645a6 100644
--- a/security/kth-krb4/PLIST
+++ b/security/kth-krb4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/17 11:02:05 martti Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:23:15 jlam Exp $
bin/afslog
bin/compile_et
bin/ftp
diff --git a/security/kth-krb4/buildlink.mk b/security/kth-krb4/buildlink.mk
index 6270e04e105..bebee1d5bf5 100644
--- a/security/kth-krb4/buildlink.mk
+++ b/security/kth-krb4/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/12 20:41:16 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:23:16 jlam Exp $
#
# This Makefile fragment is included by packages that use kth-krb4.
#
diff --git a/security/kth-krb4/buildlink2.mk b/security/kth-krb4/buildlink2.mk
new file mode 100644
index 00000000000..c840c623526
--- /dev/null
+++ b/security/kth-krb4/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:16 jlam Exp $
+
+.if !defined(KTHKRB4_BUILDLINK2_MK)
+KTHKRB4_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= kth-krb4
+BUILDLINK_DEPENDS.kth-krb4?= kth-krb4>=1.1.1
+BUILDLINK_PKGSRCDIR.kth-krb4?= ../../security/kth-krb4
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.kth-krb4=kth-krb4
+BUILDLINK_PREFIX.kth-krb4_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.kth-krb4= include/kerberosIV/*
+BUILDLINK_FILES.kth-krb4+= lib/libacl.*
+BUILDLINK_FILES.kth-krb4+= lib/libcom_err.*
+BUILDLINK_FILES.kth-krb4+= lib/libdes.*
+BUILDLINK_FILES.kth-krb4+= lib/libkadm.*
+BUILDLINK_FILES.kth-krb4+= lib/libkafs.*
+BUILDLINK_FILES.kth-krb4+= lib/lib/libkdb.*
+BUILDLINK_FILES.kth-krb4+= lib/libkrb.*
+BUILDLINK_FILES.kth-krb4+= lib/libotp.*
+BUILDLINK_FILES.kth-krb4+= lib/libroken.*
+BUILDLINK_FILES.kth-krb4+= lib/libsl.*
+BUILDLINK_FILES.kth-krb4+= lib/libss.*
+
+BUILDLINK_TARGETS+= kth-krb4-buildlink
+
+kth-krb4-buildlink: _BUILDLINK_USE
+
+.endif # KTHKRB4_BUILDLINK2_MK
diff --git a/security/libdes/buildlink2.mk b/security/libdes/buildlink2.mk
new file mode 100644
index 00000000000..8e2e757e685
--- /dev/null
+++ b/security/libdes/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:16 jlam Exp $
+
+.if !defined(LIBDES_BUILDLINK2_MK)
+LIBDES_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libdes
+BUILDLINK_DEPENDS.libdes?= libdes-4.04b
+BUILDLINK_PKGSRCDIR.libdes?= ../../security/libdes
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libdes=libdes
+BUILDLINK_PREFIX.libdes_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.libdes= include/libdes.h
+BUILDLINK_FILES.libdes+= lib/libdes.a
+
+BUILDLINK_TARGETS+= libdes-buildlink
+
+libdes-buildlink: _BUILDLINK_USE
+
+.endif # LIBDES_BUILDLINK2_MK
diff --git a/security/openssl/MESSAGE b/security/openssl/MESSAGE
index 0de241e9aa0..ed18f5fec81 100644
--- a/security/openssl/MESSAGE
+++ b/security/openssl/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/08/09 14:35:55 jlam Exp $
+$NetBSD: MESSAGE,v 1.4 2002/08/25 19:23:16 jlam Exp $
If upgrading from SSLeay, you will need to copy your ssleay.cnf (used for
creating certificate requests with "ca") into "${PKG_SYSCONFDIR}/openssl.cnf".
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 6edef48bcd3..96452ea35a8 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2002/08/19 16:00:06 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2002/08/25 19:23:17 jlam Exp $
DISTNAME= openssl-0.9.6g
SVR4_PKGNAME= ossl
diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index 4ea81ae87f5..700e3eb91cf 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2002/08/09 14:45:05 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2002/08/25 19:23:17 jlam Exp $
bin/openssl
bin/c_hash
bin/c_info
diff --git a/security/openssl/PLIST.darwin b/security/openssl/PLIST.darwin
index 94899b82d2e..c0dbfa6d7c5 100644
--- a/security/openssl/PLIST.darwin
+++ b/security/openssl/PLIST.darwin
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.darwin,v 1.2 2002/08/04 15:47:44 fredb Exp $
+@comment $NetBSD: PLIST.darwin,v 1.3 2002/08/25 19:23:17 jlam Exp $
lib/libcrypto.300.0.dylib
lib/libcrypto.300.dylib
lib/libcrypto.dylib
diff --git a/security/openssl/PLIST.netbsd b/security/openssl/PLIST.netbsd
index 6080dbb4d21..a74cf5af8ba 100644
--- a/security/openssl/PLIST.netbsd
+++ b/security/openssl/PLIST.netbsd
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.netbsd,v 1.2 2002/08/04 15:47:44 fredb Exp $
+@comment $NetBSD: PLIST.netbsd,v 1.3 2002/08/25 19:23:17 jlam Exp $
lib/libcrypto.so
lib/libcrypto.so.300
lib/libcrypto.so.300.0
diff --git a/security/openssl/buildlink.mk b/security/openssl/buildlink.mk
index eb93bfa1ec3..18ecbf6db6d 100644
--- a/security/openssl/buildlink.mk
+++ b/security/openssl/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.19 2002/08/16 19:41:14 agc Exp $
+# $NetBSD: buildlink.mk,v 1.20 2002/08/25 19:23:17 jlam Exp $
#
# This Makefile fragment is included by packages that use OpenSSL.
#
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk
new file mode 100644
index 00000000000..03b0d6bfa55
--- /dev/null
+++ b/security/openssl/buildlink2.mk
@@ -0,0 +1,99 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:17 jlam Exp $
+#
+# Optionally define USE_OPENSSL_VERSION to the mininum OpenSSL version
+# number in <openssl/opensslv.h>, i.e. 0x0090600fL, etc.
+
+.if !defined(OPENSSL_BUILDLINK2_MK)
+OPENSSL_BUILDLINK2_MK= # defined
+
+.include "../../mk/bsd.prefs.mk"
+
+# OpenSSL version numbers from <openssl/opensslv.h>
+OPENSSL_VERSION_095A= 0x0090581fL
+OPENSSL_VERSION_096= 0x0090600fL
+OPENSSL_VERSION_096A= 0x0090601fL
+OPENSSL_VERSION_096B= 0x0090602fL
+OPENSSL_VERSION_096D= 0x0090604fL
+OPENSSL_VERSION_096E= 0x0090605fL
+OPENSSL_VERSION_096F= 0x0090606fL
+OPENSSL_VERSION_096G= 0x0090607fL
+
+# Check for a usable installed version of OpenSSL. Version must be greater
+# than 0.9.6f, or else contain a fix for the 2002-07-30 security advisory.
+# If a usable version isn't present, then use the pkgsrc OpenSSL package.
+#
+_NEED_OPENSSL= YES
+
+_OPENSSLV_H= /usr/include/openssl/opensslv.h
+_SSL_H= /usr/include/openssl/ssl.h
+
+.if exists(${_OPENSSLV_H}) && exists(${_SSL_H})
+_IN_TREE_OPENSSL_HAS_FIX!= \
+ ${AWK} 'BEGIN { ans = "NO" } \
+ /SSL_R_SSL2_CONNECTION_ID_TOO_LONG/ { ans = "YES" } \
+ END { print ans; exit 0 }' ${_SSL_H}
+
+. if ${_IN_TREE_OPENSSL_HAS_FIX} == "YES"
+USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_096F}
+. else
+USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_096G}
+. endif
+
+_OPENSSL_VERSION!= ${AWK} '/.*OPENSSL_VERSION_NUMBER.*/ { print $$3 }' \
+ ${_OPENSSLV_H}
+
+# There never was a package for this; only the in-tree openssl had it.
+#_VALID_SSL_VERSIONS= ${OPENSSL_VERSION_096F} # OpenSSL 0.9.6f
+#BUILDLINK_DEPENDS.openssl= openssl>=0.9.6f
+
+. if ${USE_OPENSSL_VERSION} == ${OPENSSL_VERSION_096G} # OpenSSL 0.9.6g
+_VALID_SSL_VERSIONS= ${OPENSSL_VERSION_096G}
+BUILDLINK_DEPENDS.openssl= openssl>=0.9.6g
+. else
+_VALID_SSL_VERSIONS+= ${OPENSSL_VERSION_096G}
+. endif
+
+. for PATTERN in ${_VALID_SSL_VERSIONS}
+. if ${_OPENSSL_VERSION:M${PATTERN}} != ""
+_NEED_OPENSSL= NO
+. endif
+. endfor
+.endif # exists(${_OPENSSLV_H}) && exists(${_SSL_H})
+
+BUILDLINK_DEPENDS.openssl?= openssl>=0.9.6g
+BUILDLINK_PKGSRCDIR.openssl?= ../../security/openssl
+
+.if ${_NEED_OPENSSL} == "YES"
+BUILDLINK_PACKAGES+= openssl
+EVAL_PREFIX+= BUILDLINK_PREFIX.openssl=openssl
+BUILDLINK_PREFIX.openssl_DEFAULT= ${LOCALBASE}
+SSLBASE= ${BUILDLINK_PREFIX.openssl}
+.else
+BUILDLINK_PREFIX.openssl= /usr
+SSLBASE= /usr
+.endif
+
+.if defined(PKG_SYSCONFDIR.openssl)
+SSLCERTS= ${PKG_SYSCONFDIR.openssl}/certs
+.elif ${OPSYS} == "NetBSD"
+SSLCERTS= /etc/openssl/certs
+.else
+SSLCERTS= ${PKG_SYSCONFBASE}/openssl/certs
+.endif
+BUILD_DEFS+= SSLBASE SSLCERTS
+
+BUILDLINK_FILES.openssl= bin/openssl
+BUILDLINK_FILES.openssl+= include/openssl/*
+BUILDLINK_FILES.openssl+= lib/libRSAglue.*
+BUILDLINK_FILES.openssl+= lib/libcrypto.*
+BUILDLINK_FILES.openssl+= lib/libssl.*
+
+.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
+. include "../../security/rsaref/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+= openssl-buildlink
+
+openssl-buildlink: _BUILDLINK_USE
+
+.endif # OPENSSL_BUILDLINK2_MK
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index c01b87045da..99c00c7d20d 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/08/19 18:34:54 fredb Exp $
+$NetBSD: distinfo,v 1.14 2002/08/25 19:23:18 jlam Exp $
SHA1 (openssl-0.9.6g.tar.gz) = 5b3cdad1d33134c97f659a8ad5dbf4ca4cf3d9c8
Size (openssl-0.9.6g.tar.gz) = 2170570 bytes
diff --git a/security/openssl/files/patch-netbsd-1.4.2 b/security/openssl/files/patch-netbsd-1.4.2
index 50980767ad3..ef99a2edf87 100644
--- a/security/openssl/files/patch-netbsd-1.4.2
+++ b/security/openssl/files/patch-netbsd-1.4.2
@@ -1,4 +1,4 @@
-$NetBSD: patch-netbsd-1.4.2,v 1.1 2002/08/15 19:22:11 fredb Exp $
+$NetBSD: patch-netbsd-1.4.2,v 1.2 2002/08/25 19:23:18 jlam Exp $
Revert the addition of strlcpy() and strlcat(), for NetBSD-1.4.2.
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index 668ecb5ed79..a0e88f13417 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2002/08/10 04:50:32 fredb Exp $
+$NetBSD: patch-aa,v 1.11 2002/08/25 19:23:18 jlam Exp $
--- config.orig Sun Jun 16 05:32:14 2002
+++ config
diff --git a/security/openssl/patches/patch-ab b/security/openssl/patches/patch-ab
index 832c6b4da1c..fb832f12047 100644
--- a/security/openssl/patches/patch-ab
+++ b/security/openssl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2002/08/04 15:47:46 fredb Exp $
+$NetBSD: patch-ab,v 1.9 2002/08/25 19:23:18 jlam Exp $
--- crypto/opensslv.h.orig Tue Jul 30 05:34:28 2002
+++ crypto/opensslv.h
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 7d4791a7270..2b5dddb5daf 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2002/08/19 18:34:56 fredb Exp $
+$NetBSD: patch-ac,v 1.8 2002/08/25 19:23:18 jlam Exp $
--- Configure.orig Thu Aug 8 16:12:40 2002
+++ Configure
diff --git a/security/openssl/patches/patch-ad b/security/openssl/patches/patch-ad
index c1d46b8488c..6ab9b9ae7b9 100644
--- a/security/openssl/patches/patch-ad
+++ b/security/openssl/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2002/08/04 15:47:46 fredb Exp $
+$NetBSD: patch-ad,v 1.7 2002/08/25 19:23:19 jlam Exp $
--- apps/Makefile.ssl.orig Tue Jul 30 04:29:57 2002
+++ apps/Makefile.ssl
diff --git a/security/openssl/patches/patch-ae b/security/openssl/patches/patch-ae
index 99febec539e..808d4a29d36 100644
--- a/security/openssl/patches/patch-ae
+++ b/security/openssl/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2002/08/04 15:47:46 fredb Exp $
+$NetBSD: patch-ae,v 1.6 2002/08/25 19:23:19 jlam Exp $
--- tools/Makefile.ssl.orig Thu Apr 29 16:52:08 1999
+++ tools/Makefile.ssl
diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af
index 0e7569c24b0..5d84ef8a886 100644
--- a/security/openssl/patches/patch-af
+++ b/security/openssl/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2002/08/10 04:50:33 fredb Exp $
+$NetBSD: patch-af,v 1.6 2002/08/25 19:23:19 jlam Exp $
--- Makefile.org.orig Fri Aug 9 06:43:56 2002
+++ Makefile.org
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index 51bf4f9dbfd..2c53e6fa1d9 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/12 10:25:47 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:23:19 jlam Exp $
#
DISTNAME= fam-2.6.7
diff --git a/sysutils/fam/PLIST b/sysutils/fam/PLIST
index 5758147f293..bac0efcad7a 100644
--- a/sysutils/fam/PLIST
+++ b/sysutils/fam/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/12 10:25:47 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:23:19 jlam Exp $
bin/fam
etc/fam.conf.sample
include/fam.h
diff --git a/sysutils/fam/buildlink.mk b/sysutils/fam/buildlink.mk
index 737ad8a2991..0fb34d63a67 100644
--- a/sysutils/fam/buildlink.mk
+++ b/sysutils/fam/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/05/12 10:43:10 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:19 jlam Exp $
#
# This Makefile fragment is included by packages that use fam.
#
diff --git a/sysutils/fam/buildlink2.mk b/sysutils/fam/buildlink2.mk
new file mode 100644
index 00000000000..9382dbc6d0d
--- /dev/null
+++ b/sysutils/fam/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:20 jlam Exp $
+
+.if !defined(FAM_BUILDLINK2_MK)
+FAM_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= fam
+BUILDLINK_DEPENDS.fam?= fam>=2.6.7
+BUILDLINK_PKGSRCDIR.fam?= ../../sysutils/fam
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.fam=fam
+BUILDLINK_PREFIX.fam_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.fam+= include/fam.h
+BUILDLINK_FILES.fam+= lib/fam/editconf.perl
+BUILDLINK_FILES.fam+= lib/libfam.*
+
+BUILDLINK_TARGETS+= fam-buildlink
+
+fam-buildlink: _BUILDLINK_USE
+
+.endif # FAM_BUILDLINK2_MK
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
index 36a71c9407d..6b9781a2fab 100644
--- a/sysutils/fam/distinfo
+++ b/sysutils/fam/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/07/02 13:02:28 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:23:20 jlam Exp $
SHA1 (fam-2.6.7.tar.gz) = ca03cb4120e3cc7f6bb08c8183b358e240bd5d36
Size (fam-2.6.7.tar.gz) = 241203 bytes
diff --git a/sysutils/fam/patches/patch-aa b/sysutils/fam/patches/patch-aa
index 98b5ffa1121..894a9271d86 100644
--- a/sysutils/fam/patches/patch-aa
+++ b/sysutils/fam/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/12 10:25:47 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:20 jlam Exp $
--- acconfig.h.orig Tue Dec 18 11:03:36 2001
+++ acconfig.h
diff --git a/sysutils/fam/patches/patch-ab b/sysutils/fam/patches/patch-ab
index 9cbdd501358..8c3c15b6137 100644
--- a/sysutils/fam/patches/patch-ab
+++ b/sysutils/fam/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:20 jlam Exp $
--- config.h.in.orig Fri Dec 21 10:00:06 2001
+++ config.h.in
diff --git a/sysutils/fam/patches/patch-ac b/sysutils/fam/patches/patch-ac
index 6c81b67b825..cada84d7a08 100644
--- a/sysutils/fam/patches/patch-ac
+++ b/sysutils/fam/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 19:23:20 jlam Exp $
--- configure.in.orig Fri Dec 21 08:18:48 2001
+++ configure.in
diff --git a/sysutils/fam/patches/patch-ad b/sysutils/fam/patches/patch-ad
index 4b79be34485..e2090688034 100644
--- a/sysutils/fam/patches/patch-ad
+++ b/sysutils/fam/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 19:23:20 jlam Exp $
--- fam/Client.h.orig Tue Dec 18 11:03:36 2001
+++ fam/Client.h
diff --git a/sysutils/fam/patches/patch-ae b/sysutils/fam/patches/patch-ae
index 1f6d56e7fe5..7114ccbb021 100644
--- a/sysutils/fam/patches/patch-ae
+++ b/sysutils/fam/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/FileSystem.c++.orig Tue Dec 18 11:03:37 2001
+++ fam/FileSystem.c++
diff --git a/sysutils/fam/patches/patch-af b/sysutils/fam/patches/patch-af
index 0697d150ec8..31f15d1fd40 100644
--- a/sysutils/fam/patches/patch-af
+++ b/sysutils/fam/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/FileSystemTable.c++.orig Tue Dec 18 11:03:37 2001
+++ fam/FileSystemTable.c++
diff --git a/sysutils/fam/patches/patch-ag b/sysutils/fam/patches/patch-ag
index fcce18cb060..6bacc0e0e8e 100644
--- a/sysutils/fam/patches/patch-ag
+++ b/sysutils/fam/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/IMon.c++.orig Tue Dec 18 11:03:37 2001
+++ fam/IMon.c++
diff --git a/sysutils/fam/patches/patch-ah b/sysutils/fam/patches/patch-ah
index 297d98d8368..4c874090dbe 100644
--- a/sysutils/fam/patches/patch-ah
+++ b/sysutils/fam/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/Interest.c++.orig Thu Dec 20 08:59:20 2001
+++ fam/Interest.c++
diff --git a/sysutils/fam/patches/patch-ai b/sysutils/fam/patches/patch-ai
index e5e528aab1e..17c73de7666 100644
--- a/sysutils/fam/patches/patch-ai
+++ b/sysutils/fam/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ai,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/InternalClient.c++.orig Tue Dec 18 11:03:37 2001
+++ fam/InternalClient.c++
diff --git a/sysutils/fam/patches/patch-aj b/sysutils/fam/patches/patch-aj
index 5d8d02c029e..9f925926436 100644
--- a/sysutils/fam/patches/patch-aj
+++ b/sysutils/fam/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/Listener.c++.orig Tue Dec 18 11:03:37 2001
+++ fam/Listener.c++
diff --git a/sysutils/fam/patches/patch-ak b/sysutils/fam/patches/patch-ak
index 3e4e92ca708..dd778965f01 100644
--- a/sysutils/fam/patches/patch-ak
+++ b/sysutils/fam/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ak,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/Log.c++.orig Tue Dec 18 11:03:37 2001
+++ fam/Log.c++
diff --git a/sysutils/fam/patches/patch-al b/sysutils/fam/patches/patch-al
index c7b5ed3e98c..d1c30c51abb 100644
--- a/sysutils/fam/patches/patch-al
+++ b/sysutils/fam/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-al,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/Makefile.am.orig Tue Dec 18 11:03:37 2001
+++ fam/Makefile.am
diff --git a/sysutils/fam/patches/patch-am b/sysutils/fam/patches/patch-am
index dad15743a6b..154c9d2e315 100644
--- a/sysutils/fam/patches/patch-am
+++ b/sysutils/fam/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-am,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/Scheduler.h.orig Tue Dec 18 11:03:37 2001
+++ fam/Scheduler.h
diff --git a/sysutils/fam/patches/patch-an b/sysutils/fam/patches/patch-an
index da9632a5abb..3333283de63 100644
--- a/sysutils/fam/patches/patch-an
+++ b/sysutils/fam/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-an,v 1.2 2002/08/25 19:23:21 jlam Exp $
--- fam/StringTable.h.orig Tue Dec 18 11:03:37 2001
+++ fam/StringTable.h
diff --git a/sysutils/fam/patches/patch-ao b/sysutils/fam/patches/patch-ao
index be547485627..57b32eed875 100644
--- a/sysutils/fam/patches/patch-ao
+++ b/sysutils/fam/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ao,v 1.2 2002/08/25 19:23:22 jlam Exp $
--- fam/mntent.h.orig Sun May 12 19:15:01 2002
+++ fam/mntent.h
diff --git a/sysutils/fam/patches/patch-ap b/sysutils/fam/patches/patch-ap
index ba929575674..f38ba19a80f 100644
--- a/sysutils/fam/patches/patch-ap
+++ b/sysutils/fam/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:22 jlam Exp $
--- fam/mntent_compat.c++.orig Sun May 12 19:37:49 2002
+++ fam/mntent_compat.c++
diff --git a/sysutils/fam/patches/patch-aq b/sysutils/fam/patches/patch-aq
index 50ef8b1d543..6a828ecd474 100644
--- a/sysutils/fam/patches/patch-aq
+++ b/sysutils/fam/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-aq,v 1.2 2002/08/25 19:23:22 jlam Exp $
--- libfam/Client.c++.orig Tue Dec 18 11:03:38 2001
+++ libfam/Client.c++
diff --git a/sysutils/fam/patches/patch-ar b/sysutils/fam/patches/patch-ar
index e418270de31..e0131471cc3 100644
--- a/sysutils/fam/patches/patch-ar
+++ b/sysutils/fam/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-ar,v 1.2 2002/08/25 19:23:22 jlam Exp $
--- libfam/fam.c++.orig Tue Dec 18 11:03:38 2001
+++ libfam/fam.c++
diff --git a/sysutils/fam/patches/patch-as b/sysutils/fam/patches/patch-as
index ccff09833e4..9fdb7904894 100644
--- a/sysutils/fam/patches/patch-as
+++ b/sysutils/fam/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-as,v 1.2 2002/08/25 19:23:22 jlam Exp $
--- test/test.c++.orig Wed Dec 19 19:08:48 2001
+++ test/test.c++
diff --git a/sysutils/fam/patches/patch-at b/sysutils/fam/patches/patch-at
index b84eb52f205..c57d78bdd67 100644
--- a/sysutils/fam/patches/patch-at
+++ b/sysutils/fam/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-at,v 1.2 2002/08/25 19:23:22 jlam Exp $
--- Makefile.am.orig Tue Dec 18 11:03:36 2001
+++ Makefile.am
diff --git a/sysutils/fam/patches/patch-au b/sysutils/fam/patches/patch-au
index b512fa47678..3233423fe3d 100644
--- a/sysutils/fam/patches/patch-au
+++ b/sysutils/fam/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-au,v 1.2 2002/08/25 19:23:23 jlam Exp $
--- fam/Makefile.in.orig Fri Dec 21 10:00:16 2001
+++ fam/Makefile.in
diff --git a/sysutils/fam/patches/patch-av b/sysutils/fam/patches/patch-av
index 6acade39b54..0e35593d322 100644
--- a/sysutils/fam/patches/patch-av
+++ b/sysutils/fam/patches/patch-av
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-av,v 1.2 2002/08/25 19:23:23 jlam Exp $
--- Makefile.in.orig Sun May 12 19:27:47 2002
+++ Makefile.in
diff --git a/sysutils/fam/patches/patch-aw b/sysutils/fam/patches/patch-aw
index 33b84686939..1e1749c0617 100644
--- a/sysutils/fam/patches/patch-aw
+++ b/sysutils/fam/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.1.1.1 2002/05/12 10:25:48 rh Exp $
+$NetBSD: patch-aw,v 1.2 2002/08/25 19:23:23 jlam Exp $
--- man/Makefile.in.orig Sun May 12 20:01:26 2002
+++ man/Makefile.in
diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST
index 6fcb11952c2..8153ee8112b 100644
--- a/sysutils/gnome-vfs/PLIST
+++ b/sysutils/gnome-vfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/06/26 10:30:03 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/08/25 19:23:23 jlam Exp $
bin/gnome-vfs-config
etc/gnome-vfs-mime-magic
etc/vfs/modules/default-modules.conf
diff --git a/sysutils/gnome-vfs/buildlink2.mk b/sysutils/gnome-vfs/buildlink2.mk
new file mode 100644
index 00000000000..14233a15c27
--- /dev/null
+++ b/sysutils/gnome-vfs/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:23 jlam Exp $
+
+.if !defined(GNOME_VFS_BUILDLINK2_MK)
+GNOME_VFS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gnome-vfs
+BUILDLINK_DEPENDS.gnome-vfs?= gnome-vfs>=1.0.2nb1
+BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-vfs=gnome-vfs
+BUILDLINK_PREFIX.gnome-vfs_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gnome-vfs= include/gnome-vfs-1.0/*/*
+BUILDLINK_FILES.gnome-vfs+= lib/gnome-vfs-1.0/include/*
+BUILDLINK_FILES.gnome-vfs+= lib/libgnomevfs-pthread.*
+BUILDLINK_FILES.gnome-vfs+= lib/libgnomevfs.*
+BUILDLINK_FILES.gnome-vfs+= lib/vfsConf.sh
+
+.include "../../devel/GConf/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gnome-vfs-buildlink
+
+gnome-vfs-buildlink: _BUILDLINK_USE
+
+.endif # GNOME_VFS_BUILDLINK2_MK
diff --git a/textproc/chasen/Makefile b/textproc/chasen/Makefile
index ef05f308f29..7e663e2dfa6 100644
--- a/textproc/chasen/Makefile
+++ b/textproc/chasen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:56 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:23:24 jlam Exp $
#
DISTNAME= chasen-${CHASEN_VERSION}
diff --git a/textproc/chasen/Makefile.common b/textproc/chasen/Makefile.common
index b87c0b67e37..ae6f05e8d2c 100644
--- a/textproc/chasen/Makefile.common
+++ b/textproc/chasen/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/05/31 13:00:56 seb Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/08/25 19:23:24 jlam Exp $
#
CHASEN_VERSION= 2.2.9
diff --git a/textproc/chasen/PLIST b/textproc/chasen/PLIST
index ec293dea6dd..6d11dbd177b 100644
--- a/textproc/chasen/PLIST
+++ b/textproc/chasen/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:56 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:23:24 jlam Exp $
@comment this plist intentionally left empty
diff --git a/textproc/chasen/buildlink.mk b/textproc/chasen/buildlink.mk
index 52e6f928e15..8c9d27baabc 100644
--- a/textproc/chasen/buildlink.mk
+++ b/textproc/chasen/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/05/31 13:00:56 seb Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:24 jlam Exp $
#
# This Makefile fragment is included by packages that use chasen.
#
diff --git a/textproc/chasen/buildlink2.mk b/textproc/chasen/buildlink2.mk
new file mode 100644
index 00000000000..d1eb463224e
--- /dev/null
+++ b/textproc/chasen/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:24 jlam Exp $
+
+.if !defined(CHASEN_BUILDLINK2_MK)
+CHASEN_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= chasen
+BUILDLINK_DEPENDS.chasen?= chasen>=2.0
+BUILDLINK_PKGSRCDIR.chasen?= ../../textproc/chasen
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.chasen=chasen
+BUILDLINK_PREFIX.chasen_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.chasen= include/chasen.h
+BUILDLINK_FILES.chasen+= lib/libchasen.*
+
+BUILDLINK_TARGETS+= chasen-buildlink
+
+chasen-buildlink: _BUILDLINK_USE
+
+.endif # CHASEN_BUILDLINK2_MK
diff --git a/time/py-mxDateTime/buildlink2.mk b/time/py-mxDateTime/buildlink2.mk
new file mode 100644
index 00000000000..a7a96626f15
--- /dev/null
+++ b/time/py-mxDateTime/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:24 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pymxdatetime
+BUILDLINK_DEPENDS.pymxdatetime?= ${PYPKGPREFIX}-mxDateTime-*
+BUILDLINK_PKGSRCDIR.pymxdatetime?= ../../time/py-mxDateTime
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 521fb0b556e..00ee29c5813 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/07/15 14:46:15 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 19:23:25 jlam Exp $
#
DISTNAME= glibwww-0.2
diff --git a/www/glibwww/buildlink2.mk b/www/glibwww/buildlink2.mk
new file mode 100644
index 00000000000..48f896af394
--- /dev/null
+++ b/www/glibwww/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:25 jlam Exp $
+
+.if !defined(GLIBWWW_BUILDLINK2_MK)
+GLIBWWW_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= glibwww
+BUILDLINK_DEPENDS.glibwww?= glibwww>=0.2nb1
+BUILDLINK_PKGSRCDIR.glibwww?= ../../www/glibwww
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.glibwww=glibwww
+BUILDLINK_PREFIX.glibwww_DEFAULTS= ${X11PREFIX}
+BUILDLINK_FILES.glibwww= include/glibwww/glibwww.h
+BUILDLINK_FILES.glibwww+= lib/libglibwww.*
+
+.include "../../www/libwww/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+= glibwww-buildlink
+
+glibwww-buildlink: _BUILDLINK_USE
+
+.endif # GLIBWWW_BUILDLINK2_MK
diff --git a/www/gtkhtml/buildlink2.mk b/www/gtkhtml/buildlink2.mk
new file mode 100644
index 00000000000..05eae57a9ae
--- /dev/null
+++ b/www/gtkhtml/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:25 jlam Exp $
+
+.if !defined(GTKHTML_BUILDLINK2_MK)
+GTKHTML_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gtkhtml
+BUILDLINK_DEPENDS.gtkhtml?= gtkhtml>=1.0.1nb1
+BUILDLINK_PKGSRCDIR.gtkhtml?= ../../www/gtkhtml
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gtkhtml=gtkhtml
+BUILDLINK_PREFIX.gtkhtml_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gtkhtml+= include/gtkhtml/*
+BUILDLINK_FILES.gtkhtml+= lib/bonobo/libstorage_http.*
+BUILDLINK_FILES.gtkhtml+= lib/libgtkhtml.*
+
+.include "../../devel/bonobo/buildlink2.mk"
+.include "../../devel/gal/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
+.include "../../www/glibwww/buildlink2.mk"
+.include "../../www/libghttp/buildlink2.mk"
+.include "../../x11/controlcenter/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gtkhtml-buildlink
+
+gtkhtml-buildlink: _BUILDLINK_USE
+
+.endif # GTKHTML_BUILDLINK2_MK
diff --git a/x11/Xaw-Xpm/buildlink2.mk b/x11/Xaw-Xpm/buildlink2.mk
new file mode 100644
index 00000000000..8aaaac7e5c9
--- /dev/null
+++ b/x11/Xaw-Xpm/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:26 jlam Exp $
+
+.if !defined(XAWXPM_BUILDLINK2_MK)
+XAWXPM_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= Xaw-Xpm
+BUILDLINK_DEPENDS.Xaw-Xpm?= Xaw-Xpm-1.1
+BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.Xaw-Xpm=Xaw-Xpm
+BUILDLINK_PREFIX.Xaw-Xpm_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.Xaw-Xpm= include/X11/Xaw3d/*
+BUILDLINK_FILES.Xaw-Xpm+= lib/libXaw3d.*
+
+.include "../../graphics/xpm/buildlink2.mk"
+
+BUILDLINK_TARGETS+= Xaw-Xpm-buildlink
+
+LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \
+ -L${BUILDLINK_PREFIX.xpm}/lib -lXaw3d -lXpm
+
+Xaw-Xpm-buildlink: _BUILDLINK_USE
+
+.endif # XAWXPM_BUILDLINK2_MK
diff --git a/x11/Xaw3d/buildlink2.mk b/x11/Xaw3d/buildlink2.mk
new file mode 100644
index 00000000000..94d4e7178c6
--- /dev/null
+++ b/x11/Xaw3d/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:26 jlam Exp $
+
+.if !defined(XAW3D_BUILDLINK2_MK)
+XAW3D_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= Xaw3d
+BUILDLINK_DEPENDS.Xaw3d?= Xaw3d-1.5
+BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.Xaw3d=Xaw3d
+BUILDLINK_PREFIX.Xaw3d_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.Xaw3d= include/X11/X11/Xaw3d/* # for OpenWindows
+BUILDLINK_FILES.Xaw3d+= include/X11/Xaw3d/*
+BUILDLINK_FILES.Xaw3d+= lib/libXaw3d.*
+
+BUILDLINK_TARGETS+= Xaw3d-buildlink
+
+LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib -lXaw3d
+
+Xaw3d-buildlink: _BUILDLINK_USE
+
+.endif # XAW3D_BUILDLINK2_MK
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 58f9a3ee675..865b57ceed3 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/08/19 02:48:07 kei Exp $
+# $NetBSD: Makefile,v 1.41 2002/08/25 19:23:27 jlam Exp $
DISTNAME= control-center-1.4.0.4
CATEGORIES= x11 gnome
diff --git a/x11/controlcenter/PLIST b/x11/controlcenter/PLIST
index e6d1d7924b3..f3a617cadb9 100644
--- a/x11/controlcenter/PLIST
+++ b/x11/controlcenter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/08/19 02:48:07 kei Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/08/25 19:23:27 jlam Exp $
bin/background-properties-capplet
bin/file-types-capplet
bin/gnome-edit-properties-capplet
diff --git a/x11/controlcenter/buildlink2.mk b/x11/controlcenter/buildlink2.mk
new file mode 100644
index 00000000000..899f30291f0
--- /dev/null
+++ b/x11/controlcenter/buildlink2.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:27 jlam Exp $
+
+.if !defined(CONTROLCENTER_BUILDLINK2_MK)
+CONTROLCENTER_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= controlcenter
+BUILDLINK_DEPENDS.controlcenter?= control-center>=1.4.0.4
+BUILDLINK_PKGSRCDIR.controlcenter?= ../../x11/controlcenter
+DEPENDS+= ${BUILDLINK_DEPENDS.controlcenter}:../../x11/controlcenter
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.controlcenter=controlcenter
+BUILDLINK_PREFIX.controlcenter_DEFAULTS= ${X11PREFIX}
+BUILDLINK_FILES.controlcenter= include/libcapplet1/*
+BUILDLINK_FILES.controlcenter+= lib/libcapplet.*
+
+BUILDLINK_TRANSFORM.controlcenter= \
+ -e "s|/include/libcapplet1/|/include/|g
+
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../sysutils/gnome-vfs/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+= controlcenter-buildlink
+
+controlcenter-buildlink: _BUILDLINK_USE
+
+.endif # CONTROLCENTER_BUILDLINK2_MK
diff --git a/x11/fox/buildlink2.mk b/x11/fox/buildlink2.mk
new file mode 100644
index 00000000000..cf12732e8a1
--- /dev/null
+++ b/x11/fox/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:27 jlam Exp $
+
+.if !defined(FOX_BUILDLINK2_MK)
+FOX_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= fox
+BUILDLINK_DEPENDS.fox?= fox>=0.99.174nb1
+BUILDLINK_PKGSRCDIR.fox?= ../../x11/fox
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.fox=fox
+BUILDLINK_PREFIX.fox_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.fox= include/fox/*
+BUILDLINK_FILES.fox+= lib/libFOX-*
+BUILDLINK_FILES.fox+= lib/libFOX.*
+
+CPPFLAGS+= -I${BUILDLINK_PREFIX.fox}/include/fox
+
+BUILDLINK_TARGETS+= fox-buildlink
+
+fox-buildlink: _BUILDLINK_USE
+
+.endif # FOX_BUILDLINK2_MK
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index 202a486905c..ec17565c70f 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/07/24 19:45:32 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 19:23:28 jlam Exp $
#
DISTNAME= gnomemm-1.1.19
diff --git a/x11/gnome--/buildlink2.mk b/x11/gnome--/buildlink2.mk
new file mode 100644
index 00000000000..56cad656b2b
--- /dev/null
+++ b/x11/gnome--/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:28 jlam Exp $
+
+.if !defined(GNOMEMM_BUILDLINK2_MK)
+GNOMEMM_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gnomemm
+BUILDLINK_DEPENDS.gnomemm?= gnome-->=1.1.19
+BUILDLINK_PKGSRCDIR.gnomemm?= ../../x11/gnome--
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gnomemm=gnome--
+BUILDLINK_PREFIX.gnomemm_DEFAULT= ${X11PREFIX}
+
+BUILDLINK_FILES.gnomemm= include/gnome--/private/*
+BUILDLINK_FILES.gnomemm+= include/gnome--/*
+BUILDLINK_FILES.gnomemm+= include/gnome--.h
+BUILDLINK_FILES.gnomemm+= lib/libgnomemm-1.1.*
+BUILDLINK_FILES.gnomemm+= lib/libgnomemm.*
+
+.include "../../devel/libsigc++/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../x11/gtk--/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gnomemm-buildlink
+
+gnomemm-buildlink: _BUILDLINK_USE
+
+.endif # GNOMEMM_BUILDLINK2_MK
diff --git a/x11/gnome-core/PLIST b/x11/gnome-core/PLIST
index 0f3430f1ae9..2517a26dacb 100644
--- a/x11/gnome-core/PLIST
+++ b/x11/gnome-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/07/19 04:54:24 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/08/25 19:23:28 jlam Exp $
bin/deskguide_applet
bin/gmenu
bin/gnome-about
diff --git a/x11/gnome-core/buildlink.mk b/x11/gnome-core/buildlink.mk
index b34d0516db0..f1cfc51a983 100644
--- a/x11/gnome-core/buildlink.mk
+++ b/x11/gnome-core/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2002/07/14 01:21:18 rh Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/08/25 19:23:29 jlam Exp $
#
# This Makefile fragment is included by packages that use gnome-core.
#
diff --git a/x11/gnome-core/buildlink2.mk b/x11/gnome-core/buildlink2.mk
new file mode 100644
index 00000000000..be7d8056926
--- /dev/null
+++ b/x11/gnome-core/buildlink2.mk
@@ -0,0 +1,31 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:29 jlam Exp $
+
+.if !defined(GNOME_CORE_BUILDLINK2_MK)
+GNOME_CORE_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gnome-core
+BUILDLINK_DEPENDS.gnome-core?= gnome-core>=1.4.0.4nb1
+BUILDLINK_PKGSRCDIR.gnome-core?= ../../x11/gnome-core
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-core=gnome-core
+BUILDLINK_PREFIX.gnome-core_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gnome-core= include/applet-widget.h
+BUILDLINK_FILES.gnome-core+= include/gnome-panel.h
+BUILDLINK_FILES.gnome-core+= include/status-docklet.h
+BUILDLINK_FILES.gnome-core+= lib/libfish_applet.*
+BUILDLINK_FILES.gnome-core+= lib/libgen_util_applet.*
+BUILDLINK_FILES.gnome-core+= lib/libpanel_applet.*
+BUILDLINK_FILES.gnome-core+= lib/libpanel_status.*
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libglade/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../www/gtkhtml/buildlink2.mk"
+.include "../../www/libghttp/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gnome-core-buildlink
+
+gnome-core-buildlink: _BUILDLINK_USE
+
+.endif # GNOME_CORE_BUILDLINK2_MK
diff --git a/x11/gnome-python/buildlink2.mk b/x11/gnome-python/buildlink2.mk
new file mode 100644
index 00000000000..fcdf0a96c39
--- /dev/null
+++ b/x11/gnome-python/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:29 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pygnome
+BUILDLINK_DEPENDS.pygnome?= ${PYPKGPREFIX}-gnome-*
+BUILDLINK_PKGSRCDIR.pygnome?= ../../x11/gnome-python
diff --git a/x11/gtk+extra/buildlink2.mk b/x11/gtk+extra/buildlink2.mk
new file mode 100644
index 00000000000..cd28f8f2169
--- /dev/null
+++ b/x11/gtk+extra/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:30 jlam Exp $
+
+.if !defined(GTKEXTRA_BUILDLINK2_MK)
+GTKEXTRA_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gtkextra
+BUILDLINK_DEPENDS.gtkextra?= gtk+extra>=0.99.17
+BUILDLINK_PKGSRCDIR.gtkextra?= ../../x11/gtk+extra
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gtkextra=gtk+extra
+BUILDLINK_PREFIX.gtkextra_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gtkextra= include/gtkextra/*
+BUILDLINK_FILES.gtkextra+= lib/libgtkextra.*
+
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gtkextra-buildlink
+
+gtkextra-buildlink: _BUILDLINK_USE
+
+.endif # GTKEXTRA_BUILDLINK2_MK
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index 307009d7688..8fb549d1e78 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/07/24 19:45:32 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 19:23:30 jlam Exp $
# FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp
#
diff --git a/x11/gtk--/buildlink2.mk b/x11/gtk--/buildlink2.mk
new file mode 100644
index 00000000000..6e506056c73
--- /dev/null
+++ b/x11/gtk--/buildlink2.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:30 jlam Exp $
+
+.if !defined(GTKMM_BUILDLINK2_MK)
+GTKMM_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gtkmm
+BUILDLINK_DEPENDS.gtkmm?= gtk-->=1.2.5
+BUILDLINK_PKGSRCDIR.gtkmm?= ../../x11/gtk--
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gtkmm=gtkmm
+BUILDLINK_PREFIX.gtkmm_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gtkmm= include/gdk--.h
+BUILDLINK_FILES.gtkmm+= include/gdk--/*
+BUILDLINK_FILES.gtkmm+= include/glib--.h
+BUILDLINK_FILES.gtkmm+= include/gtk--.h
+BUILDLINK_FILES.gtkmm+= include/gtk--/*
+BUILDLINK_FILES.gtkmm+= lib/gtkmm/include/*
+BUILDLINK_FILES.gtkmm+= lib/libgdkmm.*
+BUILDLINK_FILES.gtkmm+= lib/libgtkmm.*
+
+.include "../../devel/libsigc++/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gtkmm-buildlink
+
+gtkmm-buildlink: _BUILDLINK_USE
+
+.endif # GTKMM_BUILDLINK2_MK
diff --git a/x11/gtk2/buildlink2.mk b/x11/gtk2/buildlink2.mk
new file mode 100644
index 00000000000..98ff46c5faa
--- /dev/null
+++ b/x11/gtk2/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:31 jlam Exp $
+
+.if !defined(GTK2_BUILDLINK2_MK)
+GTK2_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gtk2
+BUILDLINK_DEPENDS.gtk2?= gtk2+>=2.0.0
+BUILDLINK_PKGSRCDIR.gtk2?= ../../x11/gtk2
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gtk2=gtk2
+BUILDLINK_PREFIX.gtk2_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.gtk2= include/gtk-2.0/*/*
+BUILDLINK_FILES.gtk2+= include/gtk-2.0/*
+BUILDLINK_FILES.gtk2+= lib/gtk-2.0/*/*/*
+BUILDLINK_FILES.gtk2+= lib/gtk-2.0/*/*
+BUILDLINK_FILES.gtk2+= lib/gtk-2.0/*
+BUILDLINK_FILES.gtk2+= lib/libgdk*-2.0.*
+BUILDLINK_FILES.gtk2+= lib/libgtk*-2.0.*
+
+.include "../../devel/atk/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/pango/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+
+BUILDLINK_TARGETS+= gtk2-buildlink
+
+gtk2-buildlink: _BUILDLINK_USE
+
+.endif # GTK2_BUILDLINK2_MK
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 5a06fa4fd7c..cbc60799ae5 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2002/08/25 19:23:32 jlam Exp $
--- configure.orig Sun Jun 16 00:58:22 2002
+++ configure
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
index 871cdda7afa..fa08e477d84 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.6 2002/08/25 19:23:32 jlam Exp $
--- demos/Makefile.in.orig Sun Jun 16 01:16:31 2002
+++ demos/Makefile.in
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index c1bd3f61a10..afa7a0b00fa 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.5 2002/08/25 19:23:32 jlam Exp $
--- demos/gtk-demo/Makefile.in.orig Sun Jun 16 01:16:32 2002
+++ demos/gtk-demo/Makefile.in
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index f73aa37b639..b4a60b29403 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2002/07/18 02:19:28 rh Exp $
+$NetBSD: patch-af,v 1.6 2002/08/25 19:23:32 jlam Exp $
--- contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in.orig Wed Mar 6 07:03:50 2002
+++ contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
diff --git a/x11/gtk2/patches/patch-aj b/x11/gtk2/patches/patch-aj
index 21d5ee2d580..1df28b950a9 100644
--- a/x11/gtk2/patches/patch-aj
+++ b/x11/gtk2/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.5 2002/08/25 19:23:32 jlam Exp $
--- gdk/Makefile.in.orig Sun Jun 16 01:16:19 2002
+++ gdk/Makefile.in
diff --git a/x11/gtk2/patches/patch-al b/x11/gtk2/patches/patch-al
index 6eb51eebe71..f4bb3d56c26 100644
--- a/x11/gtk2/patches/patch-al
+++ b/x11/gtk2/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-al,v 1.5 2002/08/25 19:23:32 jlam Exp $
--- gtk/Makefile.in.orig Sun Jun 16 01:16:26 2002
+++ gtk/Makefile.in
diff --git a/x11/gtk2/patches/patch-an b/x11/gtk2/patches/patch-an
index 373a1e3aa80..f5b56170f69 100644
--- a/x11/gtk2/patches/patch-an
+++ b/x11/gtk2/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2002/07/18 02:19:29 rh Exp $
+$NetBSD: patch-an,v 1.4 2002/08/25 19:23:32 jlam Exp $
--- gdk-2.0.pc.in.orig Wed Mar 6 07:03:49 2002
+++ gdk-2.0.pc.in
diff --git a/x11/gtk2/patches/patch-ao b/x11/gtk2/patches/patch-ao
index c5a9f1819ef..43fac144c6a 100644
--- a/x11/gtk2/patches/patch-ao
+++ b/x11/gtk2/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.3 2002/07/18 02:19:29 rh Exp $
+$NetBSD: patch-ao,v 1.4 2002/08/25 19:23:32 jlam Exp $
--- gdk-pixbuf-2.0.pc.in.orig Wed Mar 6 07:03:49 2002
+++ gdk-pixbuf-2.0.pc.in
diff --git a/x11/gtk2/patches/patch-ap b/x11/gtk2/patches/patch-ap
index ff49b7e0fe2..6c72c729336 100644
--- a/x11/gtk2/patches/patch-ap
+++ b/x11/gtk2/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1 2002/07/18 02:19:29 rh Exp $
+$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:32 jlam Exp $
--- gtk+-2.0.pc.in.orig Wed Mar 6 07:03:49 2002
+++ gtk+-2.0.pc.in
diff --git a/x11/kde2/Makefile.kde2 b/x11/kde2/Makefile.kde2
index d710705522b..88569128471 100644
--- a/x11/kde2/Makefile.kde2
+++ b/x11/kde2/Makefile.kde2
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kde2,v 1.4 2002/06/07 09:04:44 cjep Exp $
+# $NetBSD: Makefile.kde2,v 1.5 2002/08/25 19:23:33 jlam Exp $
#
# This Makefile fragment is included at the top of package Makefiles for
# KDE2-distributed packages (they all share common configure and build
diff --git a/x11/kde2/buildlink2.mk b/x11/kde2/buildlink2.mk
new file mode 100644
index 00000000000..42db746ae2b
--- /dev/null
+++ b/x11/kde2/buildlink2.mk
@@ -0,0 +1,84 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:33 jlam Exp $
+#
+# This Makefile fragment is included by packages that use the KDE2
+# configure-and-build process.
+#
+# To use this Makefile fragment, simply include this Makefile fragment in
+# the package Makefile.
+#
+# The buildlink strategy with KDE2 packages is:
+#
+# * pass UIC to the configure script, as most of the KDE2 packages need
+# the path to the QT2 uic to build.
+#
+# * pass USER_LDFLAGS to the configure script, containing the value of
+# LDFLAGS as set by bsd.pkg.mk; this should pass all of the necessary
+# library directory and rpath settings to the compiler/linker to find
+# the X11, Qt-2.x, and KDE-2.x libraries.
+#
+# We pass the following values via options to the configure script:
+#
+# * datadir is where all of the KDE2 data files go
+# * qt-dir is the location of QT2 for build purposes
+# * extra-includes is where headers for dependencies may be found
+#
+# We _don't_ pass the following values via options to the configure script:
+#
+# * extra-libs contains library directories that are added to both the
+# rpath via -R and to the linker flags via -L; we don't need this
+# since we pass them in directly via ${USER_LDFLAGS}
+#
+# We also disable the rpath setting by the configure script since it often
+# guesses wrong on odd setups, and since we already pass all of the required
+# flags through USER_LDFLAGS.
+
+.if !defined(KDE2_BUILDLINK2_MK)
+KDE2_BUILDLINK2_MK= # defined
+
+# All KDE2 packages satisfy the requirements for USE_X11BASE. This also
+# forces all KDE2 packages to have a common installation prefix.
+#
+USE_X11BASE= YES
+
+.include "../../mk/bsd.prefs.mk"
+
+KDEDIR?= ${X11PREFIX}
+QTDIR?= ${X11PREFIX}/qt2
+
+CONFIGURE_ARGS+= --datadir="${KDEDIR}/share/kde"
+CONFIGURE_ARGS+= --with-qt-dir="${QTDIR}"
+CONFIGURE_ARGS+= --with-extra-includes="${_KDE2_EXTRA_INCLUDES}"
+CONFIGURE_ARGS+= --disable-rpath
+.if exists(${X11BASE}/lib/libXinerama.so)
+CONFIGURE_ARGS+= --with-xinerama
+.endif
+
+CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic"
+CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}"
+LDFLAGS+= -L${QTDIR}/lib
+
+_KDE2_EXTRA_INCLUDES?= ${LOCALBASE}/include:${X11BASE}/include
+
+KDE_CONFIG_SITE?= ${KDEDIR}/share/kde/config.site \
+ ${KDEDIR}/etc/config.site
+
+CONFIGURE_ENV+= KDEDIR="${KDEDIR}"
+CONFIGURE_ENV+= CONFIG_SITE="${KDE_CONFIG_SITE}"
+CONFIGURE_ENV+= kde_appsdir="${KDEDIR}/share/kde/applnk"
+#CONFIGURE_ENV+= kde_bindir="${KDEDIR}/bin"
+CONFIGURE_ENV+= kde_cgidir="${KDEDIR}/kde-cgi-bin"
+CONFIGURE_ENV+= kde_confdir="${KDEDIR}/share/kde/config"
+CONFIGURE_ENV+= kde_datadir="${KDEDIR}/share/kde/apps"
+CONFIGURE_ENV+= kde_htmldir="${KDEDIR}/share/doc/kde/HTML"
+CONFIGURE_ENV+= kde_icondir="${KDEDIR}/share/kde/icons"
+CONFIGURE_ENV+= kde_locale="${KDEDIR}/share/kde/locale"
+CONFIGURE_ENV+= kde_mimedir="${KDEDIR}/share/kde/mimelnk"
+#CONFIGURE_ENV+= kde_moduledir="${KDEDIR}/lib/kde2"
+CONFIGURE_ENV+= kde_servicesdir="${KDEDIR}/share/kde/services"
+CONFIGURE_ENV+= kde_servicetypesdir="${KDEDIR}/share/kde/servicetypes"
+CONFIGURE_ENV+= kde_sounddir="${KDEDIR}/share/kde/sounds"
+CONFIGURE_ENV+= kde_templatesdir="${KDEDIR}/share/kde/templates"
+CONFIGURE_ENV+= kde_toolbardir="${KDEDIR}/share/kde/toolbar"
+CONFIGURE_ENV+= kde_wallpaperdir="${KDEDIR}/share/kde/wallpapers"
+
+.endif # KDE2_BUILDLINK2_MK
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index f8c9405e2f9..f696763ee2d 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/17 07:54:11 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:23:33 jlam Exp $
DISTNAME= kde-3.0.2
CATEGORIES= x11 kde
diff --git a/x11/kde3/Makefile.kde3 b/x11/kde3/Makefile.kde3
index a8b7933fe52..e76256a0592 100644
--- a/x11/kde3/Makefile.kde3
+++ b/x11/kde3/Makefile.kde3
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kde3,v 1.2 2002/07/17 07:54:11 skrll Exp $
+# $NetBSD: Makefile.kde3,v 1.3 2002/08/25 19:23:33 jlam Exp $
#
# This Makefile fragment is included at the top of package Makefiles for
# KDE3-distributed packages (they all share common configure and build
diff --git a/x11/kde3/PLIST b/x11/kde3/PLIST
index c33451d272c..e4d41ebe39d 100644
--- a/x11/kde3/PLIST
+++ b/x11/kde3/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:15:50 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:23:34 jlam Exp $
@comment this plist intentionally left empty
diff --git a/x11/kde3/buildlink.mk b/x11/kde3/buildlink.mk
index 79cf5e522ce..c2630de53fd 100644
--- a/x11/kde3/buildlink.mk
+++ b/x11/kde3/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/05/31 13:15:51 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:34 jlam Exp $
#
# This Makefile fragment is included by packages that use the KDE3
# configure-and-build process.
diff --git a/x11/kde3/buildlink2.mk b/x11/kde3/buildlink2.mk
new file mode 100644
index 00000000000..9c6576b6ca5
--- /dev/null
+++ b/x11/kde3/buildlink2.mk
@@ -0,0 +1,88 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:34 jlam Exp $
+#
+# This Makefile fragment is included by packages that use the KDE3
+# configure-and-build process.
+#
+# To use this Makefile fragment, simply include this Makefile fragment in
+# the package Makefile.
+#
+# The buildlink strategy with KDE3 packages is:
+#
+# * pass UIC to the configure script, as the KDE3 configure scripts now
+# check for its existance and fail if its not found.
+#
+# * pass USER_LDFLAGS to the configure script, containing the value of
+# LDFLAGS as set by bsd.pkg.mk; this should pass all of the necessary
+# library directory and rpath settings to the compiler/linker to find
+# the X11, Qt-3.x, and KDE-3.x libraries.
+#
+# We pass the following values via options to the configure script:
+#
+# * datadir is where all of the KDE3 data files go
+# * qt-dir is the location of QT3 for build purposes
+# * extra-includes is where headers for dependencies may be found
+#
+# We _don't_ pass the following values via options to the configure script:
+#
+# * extra-libs contains library directories that are added to both the
+# rpath via -R and to the linker flags via -L; we don't need this
+# since we pass them in directly via ${USER_LDFLAGS}
+#
+# We also disable the rpath setting by the configure script since it often
+# guesses wrong on odd setups, and since we already pass all of the required
+# flags through USER_LDFLAGS.
+#
+# The qt3-tools and qt3-libs buildlink2.mk files are also pulled in as all
+# KDE3 pkgs need them.
+
+.if !defined(KDE3_BUILDLINK2_MK)
+KDE3_BUILDLINK2_MK= # defined
+
+# All KDE3 packages satisfy the requirements for USE_X11BASE. This also
+# forces all KDE3 packages to have a common installation prefix.
+#
+USE_X11BASE= YES
+
+.include "../../mk/bsd.prefs.mk"
+
+KDEDIR?= ${X11PREFIX}
+QTDIR?= ${X11PREFIX}/qt3
+
+CONFIGURE_ARGS+= --datadir="${KDEDIR}/share/kde"
+CONFIGURE_ARGS+= --with-qt-dir="${QTDIR}"
+CONFIGURE_ARGS+= --with-extra-includes="${_KDE3_EXTRA_INCLUDES}"
+CONFIGURE_ARGS+= --disable-rpath
+.if exists(${X11BASE}/lib/libXinerama.so)
+CONFIGURE_ARGS+= --with-xinerama
+.endif
+
+CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}"
+LDFLAGS+= -L${QTDIR}/lib
+
+_KDE3_EXTRA_INCLUDES?= ${LOCALBASE}/include:${X11BASE}/include
+
+KDE_CONFIG_SITE?= ${KDEDIR}/share/kde/config.site \
+ ${KDEDIR}/etc/config.site
+
+CONFIGURE_ENV+= KDEDIR="${KDEDIR}"
+CONFIGURE_ENV+= CONFIG_SITE="${KDE_CONFIG_SITE}"
+CONFIGURE_ENV+= kde_appsdir="${KDEDIR}/share/kde/applnk"
+CONFIGURE_ENV+= kde_cgidir="${KDEDIR}/kde-cgi-bin"
+CONFIGURE_ENV+= kde_confdir="${KDEDIR}/share/kde/config"
+CONFIGURE_ENV+= kde_datadir="${KDEDIR}/share/kde/apps"
+CONFIGURE_ENV+= kde_htmldir="${KDEDIR}/share/doc/kde/HTML"
+CONFIGURE_ENV+= kde_icondir="${KDEDIR}/share/kde/icons"
+CONFIGURE_ENV+= kde_locale="${KDEDIR}/share/kde/locale"
+CONFIGURE_ENV+= kde_mimedir="${KDEDIR}/share/kde/mimelnk"
+CONFIGURE_ENV+= kde_servicesdir="${KDEDIR}/share/kde/services"
+CONFIGURE_ENV+= kde_servicetypesdir="${KDEDIR}/share/kde/servicetypes"
+CONFIGURE_ENV+= kde_sounddir="${KDEDIR}/share/kde/sounds"
+CONFIGURE_ENV+= kde_templatesdir="${KDEDIR}/share/kde/templates"
+CONFIGURE_ENV+= kde_toolbardir="${KDEDIR}/share/kde/toolbar"
+CONFIGURE_ENV+= kde_wallpaperdir="${KDEDIR}/share/kde/wallpapers"
+
+BUILDLINK_DEPMETHOD.qt3-tools= build
+
+.include "../../x11/qt3-tools/buildlink2.mk"
+
+.endif # KDE3_BUILDLINK2_MK
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 36dccf6331a..12dc59b48af 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/21 15:33:05 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 19:23:34 jlam Exp $
DISTNAME= kdebase-3.0.2
PKGREVISION= 2
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index 40cbe46db9e..df57bc874be 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/17 07:54:07 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:23:34 jlam Exp $
bin/appletproxy
bin/chooser
bin/conttest
diff --git a/x11/kdebase3/PLIST.nsplugins b/x11/kdebase3/PLIST.nsplugins
index d8c524749ca..c55130b446d 100644
--- a/x11/kdebase3/PLIST.nsplugins
+++ b/x11/kdebase3/PLIST.nsplugins
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.nsplugins,v 1.1.1.1 2002/05/31 13:18:37 skrll Exp $
+@comment $NetBSD: PLIST.nsplugins,v 1.2 2002/08/25 19:23:35 jlam Exp $
bin/nspluginscan
bin/nspluginviewer
lib/libkcm_nsplugin.a
diff --git a/x11/kdebase3/buildlink.mk b/x11/kdebase3/buildlink.mk
index 7f8fbaa6408..f4b7b7de2a4 100644
--- a/x11/kdebase3/buildlink.mk
+++ b/x11/kdebase3/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/05/31 13:18:37 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:35 jlam Exp $
#
# This Makefile fragment is included by packages that use kdebase3.
#
diff --git a/x11/kdebase3/buildlink2.mk b/x11/kdebase3/buildlink2.mk
new file mode 100644
index 00000000000..e4af8ec3700
--- /dev/null
+++ b/x11/kdebase3/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:35 jlam Exp $
+
+.if !defined(KDEBASE3_BUILDLINK2_MK)
+KDEBASE3_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= kdebase3
+BUILDLINK_DEPENDS.kdebase3?= kdebase>=3.0
+BUILDLINK_PKGSRCDIR.kdebase3?= ../../x11/kdebase3
+
+.include "../../mk/bsd.prefs.mk"
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.kdebase3=kdebase
+BUILDLINK_PREFIX.kdebase3_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.kdebase3!= ${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdebase3/PLIST
+
+.include "../../x11/kdelibs3/buildlink2.mk"
+
+BUILDLINK_TARGETS+= kdebase3-buildlink
+
+kdebase3-buildlink: _BUILDLINK_USE
+
+.endif # KDEBASE3_BUILDLINK2_MK
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 2711959b4cc..0a6cc699475 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/21 16:00:11 skrll Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 19:23:35 jlam Exp $
SHA1 (kdebase-3.0.2.tar.bz2) = 763af0ddce718789fae3dfe2b67036dbc2d01a02
Size (kdebase-3.0.2.tar.bz2) = 13115043 bytes
diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa
index fa232174f45..8e86aace86e 100644
--- a/x11/kdebase3/patches/patch-aa
+++ b/x11/kdebase3/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:18:39 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- configure.orig Mon May 13 23:58:21 2002
+++ configure
diff --git a/x11/kdebase3/patches/patch-ab b/x11/kdebase3/patches/patch-ab
index c6e72026595..c28d194e96f 100644
--- a/x11/kdebase3/patches/patch-ab
+++ b/x11/kdebase3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:18:40 skrll Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kate/app/Makefile.am.orig Thu Jan 10 17:03:37 2002
+++ kate/app/Makefile.am
diff --git a/x11/kdebase3/patches/patch-ac b/x11/kdebase3/patches/patch-ac
index e6e4ead25a3..8727dff256e 100644
--- a/x11/kdebase3/patches/patch-ac
+++ b/x11/kdebase3/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:18:40 skrll Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kate/app/Makefile.in.orig Mon May 13 23:57:35 2002
+++ kate/app/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ad b/x11/kdebase3/patches/patch-ad
index 91af47b3c0d..042f7038123 100644
--- a/x11/kdebase3/patches/patch-ad
+++ b/x11/kdebase3/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:18:40 skrll Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kate/app/dummy_main.cpp.orig Thu May 30 09:59:32 2002
+++ kate/app/dummy_main.cpp
diff --git a/x11/kdebase3/patches/patch-ae b/x11/kdebase3/patches/patch-ae
index 0624a646591..012036ef44e 100644
--- a/x11/kdebase3/patches/patch-ae
+++ b/x11/kdebase3/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:18:40 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kate/app/katemain.cpp.orig Sun Feb 24 23:16:06 2002
+++ kate/app/katemain.cpp
diff --git a/x11/kdebase3/patches/patch-af b/x11/kdebase3/patches/patch-af
index 9a2deb29d01..56bd895b413 100644
--- a/x11/kdebase3/patches/patch-af
+++ b/x11/kdebase3/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kate/app/kwritemain.cpp.orig Wed May 8 19:20:50 2002
+++ kate/app/kwritemain.cpp
diff --git a/x11/kdebase3/patches/patch-ag b/x11/kdebase3/patches/patch-ag
index 30f66ed8ae0..ae23d0291ab 100644
--- a/x11/kdebase3/patches/patch-ag
+++ b/x11/kdebase3/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kate_main.cpp.orig Thu May 30 09:59:34 2002
+++ kate_main.cpp
diff --git a/x11/kdebase3/patches/patch-ah b/x11/kdebase3/patches/patch-ah
index c882d2be643..239f613b2ed 100644
--- a/x11/kdebase3/patches/patch-ah
+++ b/x11/kdebase3/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kcontrol/access/Makefile.am.orig Wed May 8 19:20:50 2002
+++ kcontrol/access/Makefile.am
diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai
index 84e9864c037..09b12d90c55 100644
--- a/x11/kdebase3/patches/patch-ai
+++ b/x11/kdebase3/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2002/06/25 22:14:12 skrll Exp $
+$NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam Exp $
--- kcontrol/access/Makefile.in.orig Tue Jun 25 19:31:44 2002
+++ kcontrol/access/Makefile.in
diff --git a/x11/kdebase3/patches/patch-aj b/x11/kdebase3/patches/patch-aj
index 807ff2da77a..476ac94dcb9 100644
--- a/x11/kdebase3/patches/patch-aj
+++ b/x11/kdebase3/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kcontrol/access/kaccess_main.cpp.orig Thu May 30 09:59:35 2002
+++ kcontrol/access/kaccess_main.cpp
diff --git a/x11/kdebase3/patches/patch-ak b/x11/kdebase3/patches/patch-ak
index 3beaa509c19..3ac4b1f5631 100644
--- a/x11/kdebase3/patches/patch-ak
+++ b/x11/kdebase3/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
+$NetBSD: patch-ak,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kcontrol/access/main.cpp.orig Mon Jan 7 10:39:46 2002
+++ kcontrol/access/main.cpp
diff --git a/x11/kdebase3/patches/patch-al b/x11/kdebase3/patches/patch-al
index 52754536bc4..3f134455190 100644
--- a/x11/kdebase3/patches/patch-al
+++ b/x11/kdebase3/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
+$NetBSD: patch-al,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/ebrowsing/Makefile.am.orig Tue Feb 19 13:43:23 2002
+++ kcontrol/ebrowsing/Makefile.am
diff --git a/x11/kdebase3/patches/patch-am b/x11/kdebase3/patches/patch-am
index 5898fb159ae..a31de5809d4 100644
--- a/x11/kdebase3/patches/patch-am
+++ b/x11/kdebase3/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
+$NetBSD: patch-am,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/ebrowsing/Makefile.in.orig Mon May 13 23:57:37 2002
+++ kcontrol/ebrowsing/Makefile.in
diff --git a/x11/kdebase3/patches/patch-an b/x11/kdebase3/patches/patch-an
index 2aeaf497ef4..7c263a3bcd1 100644
--- a/x11/kdebase3/patches/patch-an
+++ b/x11/kdebase3/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $
+$NetBSD: patch-an,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/Makefile.am.orig Wed May 8 19:21:01 2002
+++ kcontrol/kcontrol/Makefile.am
diff --git a/x11/kdebase3/patches/patch-ao b/x11/kdebase3/patches/patch-ao
index e2331adc5d7..fcebbe3d92e 100644
--- a/x11/kdebase3/patches/patch-ao
+++ b/x11/kdebase3/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/Makefile.in.orig Mon May 13 23:57:39 2002
+++ kcontrol/kcontrol/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ap b/x11/kdebase3/patches/patch-ap
index 7d22a3926d2..013633bc346 100644
--- a/x11/kdebase3/patches/patch-ap
+++ b/x11/kdebase3/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/kcminit.cpp.orig Tue Feb 19 13:43:03 2002
+++ kcontrol/kcontrol/kcminit.cpp
diff --git a/x11/kdebase3/patches/patch-aq b/x11/kdebase3/patches/patch-aq
index 340fe44aa34..205b14c8d8c 100644
--- a/x11/kdebase3/patches/patch-aq
+++ b/x11/kdebase3/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-aq,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/kcminit_main.cpp.orig Thu May 30 09:59:38 2002
+++ kcontrol/kcontrol/kcminit_main.cpp
diff --git a/x11/kdebase3/patches/patch-ar b/x11/kdebase3/patches/patch-ar
index 939c248512e..be615558d09 100644
--- a/x11/kdebase3/patches/patch-ar
+++ b/x11/kdebase3/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-ar,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/kcmshell.cpp.orig Sun Mar 3 00:23:50 2002
+++ kcontrol/kcontrol/kcmshell.cpp
diff --git a/x11/kdebase3/patches/patch-as b/x11/kdebase3/patches/patch-as
index 5557d7a9a50..3fffb756061 100644
--- a/x11/kdebase3/patches/patch-as
+++ b/x11/kdebase3/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-as,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/kcmshell_main.cpp.orig Thu May 30 09:59:39 2002
+++ kcontrol/kcontrol/kcmshell_main.cpp
diff --git a/x11/kdebase3/patches/patch-at b/x11/kdebase3/patches/patch-at
index 1e2b2464f06..91e65f7d97f 100644
--- a/x11/kdebase3/patches/patch-at
+++ b/x11/kdebase3/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-at,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/kcontrol_main.cpp.orig Thu May 30 09:59:39 2002
+++ kcontrol/kcontrol/kcontrol_main.cpp
diff --git a/x11/kdebase3/patches/patch-au b/x11/kdebase3/patches/patch-au
index 0a3cf89be92..fc8a1ff8108 100644
--- a/x11/kdebase3/patches/patch-au
+++ b/x11/kdebase3/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-au,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/main.cpp.orig Wed May 8 19:21:01 2002
+++ kcontrol/kcontrol/main.cpp
diff --git a/x11/kdebase3/patches/patch-av b/x11/kdebase3/patches/patch-av
index 74ee8014abf..88ffc568432 100644
--- a/x11/kdebase3/patches/patch-av
+++ b/x11/kdebase3/patches/patch-av
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-av,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kdeprint/kjobviewer/Makefile.am.orig Sun Jul 8 10:31:24 2001
+++ kdeprint/kjobviewer/Makefile.am
diff --git a/x11/kdebase3/patches/patch-aw b/x11/kdebase3/patches/patch-aw
index 7f1daec47c6..d86623396bb 100644
--- a/x11/kdebase3/patches/patch-aw
+++ b/x11/kdebase3/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdeprint/kjobviewer/Makefile.in.orig Mon May 13 23:57:42 2002
+++ kdeprint/kjobviewer/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ax b/x11/kdebase3/patches/patch-ax
index e9b643274c6..b9162320abc 100644
--- a/x11/kdebase3/patches/patch-ax
+++ b/x11/kdebase3/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-ax,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdeprint/kjobviewer/kjobviewer_main.cpp.orig Thu May 30 09:59:42 2002
+++ kdeprint/kjobviewer/kjobviewer_main.cpp
diff --git a/x11/kdebase3/patches/patch-ay b/x11/kdebase3/patches/patch-ay
index 6df370e9d34..03da7202b58 100644
--- a/x11/kdebase3/patches/patch-ay
+++ b/x11/kdebase3/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-ay,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdeprint/kjobviewer/main.cpp.orig Sat Dec 29 17:10:49 2001
+++ kdeprint/kjobviewer/main.cpp
diff --git a/x11/kdebase3/patches/patch-az b/x11/kdebase3/patches/patch-az
index 1a42bf4e69d..91e6dfba407 100644
--- a/x11/kdebase3/patches/patch-az
+++ b/x11/kdebase3/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-az,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdesktop/Makefile.am.orig Wed May 8 19:21:24 2002
+++ kdesktop/Makefile.am
diff --git a/x11/kdebase3/patches/patch-ba b/x11/kdebase3/patches/patch-ba
index 396f03a040f..19344a887b3 100644
--- a/x11/kdebase3/patches/patch-ba
+++ b/x11/kdebase3/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdesktop/Makefile.in.orig Mon May 13 23:57:43 2002
+++ kdesktop/Makefile.in
diff --git a/x11/kdebase3/patches/patch-bb b/x11/kdebase3/patches/patch-bb
index 144fbd0804d..afc39cd894f 100644
--- a/x11/kdebase3/patches/patch-bb
+++ b/x11/kdebase3/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $
+$NetBSD: patch-bb,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdesktop/init.cc.orig Thu Oct 11 12:19:53 2001
+++ kdesktop/init.cc
diff --git a/x11/kdebase3/patches/patch-bc b/x11/kdebase3/patches/patch-bc
index 17d9675356f..877fe161bcc 100644
--- a/x11/kdebase3/patches/patch-bc
+++ b/x11/kdebase3/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bc,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdesktop/kdeeject.orig Sat May 5 21:05:58 2001
+++ kdesktop/kdeeject
diff --git a/x11/kdebase3/patches/patch-bd b/x11/kdebase3/patches/patch-bd
index 9c1299ae238..7eb61275ed2 100644
--- a/x11/kdebase3/patches/patch-bd
+++ b/x11/kdebase3/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bd,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdesktop/kdesktop_main.cc.orig Thu May 30 09:59:45 2002
+++ kdesktop/kdesktop_main.cc
diff --git a/x11/kdebase3/patches/patch-be b/x11/kdebase3/patches/patch-be
index 70717a32da9..f8b13b417d2 100644
--- a/x11/kdebase3/patches/patch-be
+++ b/x11/kdebase3/patches/patch-be
@@ -1,4 +1,4 @@
-$NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-be,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdesktop/main.cc.orig Wed May 8 19:21:24 2002
+++ kdesktop/main.cc
diff --git a/x11/kdebase3/patches/patch-bf b/x11/kdebase3/patches/patch-bf
index 4f911b329b0..081d1295686 100644
--- a/x11/kdebase3/patches/patch-bf
+++ b/x11/kdebase3/patches/patch-bf
@@ -1,4 +1,4 @@
-$NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bf,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- khotkeys/khotkeys/Makefile.am.orig Tue Feb 12 14:32:08 2002
+++ khotkeys/khotkeys/Makefile.am
diff --git a/x11/kdebase3/patches/patch-bg b/x11/kdebase3/patches/patch-bg
index 593450bf5c3..b9f3c1aa689 100644
--- a/x11/kdebase3/patches/patch-bg
+++ b/x11/kdebase3/patches/patch-bg
@@ -1,4 +1,4 @@
-$NetBSD: patch-bg,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- khotkeys/khotkeys/Makefile.in.orig Mon May 13 23:57:45 2002
+++ khotkeys/khotkeys/Makefile.in
diff --git a/x11/kdebase3/patches/patch-bh b/x11/kdebase3/patches/patch-bh
index 16bb95af869..b339f1c4109 100644
--- a/x11/kdebase3/patches/patch-bh
+++ b/x11/kdebase3/patches/patch-bh
@@ -1,4 +1,4 @@
-$NetBSD: patch-bh,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bh,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- khotkeys/khotkeys/khotkeys_main.cpp.orig Thu May 30 09:59:46 2002
+++ khotkeys/khotkeys/khotkeys_main.cpp
diff --git a/x11/kdebase3/patches/patch-bi b/x11/kdebase3/patches/patch-bi
index 2b6bdfc1fdd..71c47b4c106 100644
--- a/x11/kdebase3/patches/patch-bi
+++ b/x11/kdebase3/patches/patch-bi
@@ -1,4 +1,4 @@
-$NetBSD: patch-bi,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bi,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- khotkeys/khotkeys/main.cpp.orig Tue Feb 12 14:32:08 2002
+++ khotkeys/khotkeys/main.cpp
diff --git a/x11/kdebase3/patches/patch-bj b/x11/kdebase3/patches/patch-bj
index 9ae4361c532..08a19a331da 100644
--- a/x11/kdebase3/patches/patch-bj
+++ b/x11/kdebase3/patches/patch-bj
@@ -1,4 +1,4 @@
-$NetBSD: patch-bj,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bj,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/Makefile.am.orig Wed May 8 19:21:48 2002
+++ kicker/Makefile.am
diff --git a/x11/kdebase3/patches/patch-bk b/x11/kdebase3/patches/patch-bk
index 42b7f80ee4b..eb7703941db 100644
--- a/x11/kdebase3/patches/patch-bk
+++ b/x11/kdebase3/patches/patch-bk
@@ -1,4 +1,4 @@
-$NetBSD: patch-bk,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bk,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/Makefile.in.orig Mon May 13 23:57:45 2002
+++ kicker/Makefile.in
diff --git a/x11/kdebase3/patches/patch-bl b/x11/kdebase3/patches/patch-bl
index 0dc1fddc509..ae8afba2fbb 100644
--- a/x11/kdebase3/patches/patch-bl
+++ b/x11/kdebase3/patches/patch-bl
@@ -1,4 +1,4 @@
-$NetBSD: patch-bl,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bl,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/applets/launcher/Makefile.am.orig Tue Feb 26 16:58:10 2002
+++ kicker/applets/launcher/Makefile.am
diff --git a/x11/kdebase3/patches/patch-bm b/x11/kdebase3/patches/patch-bm
index a5472dd64de..c2ceeb41081 100644
--- a/x11/kdebase3/patches/patch-bm
+++ b/x11/kdebase3/patches/patch-bm
@@ -1,4 +1,4 @@
-$NetBSD: patch-bm,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bm,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/applets/launcher/Makefile.in.orig Mon May 13 23:57:45 2002
+++ kicker/applets/launcher/Makefile.in
diff --git a/x11/kdebase3/patches/patch-bn b/x11/kdebase3/patches/patch-bn
index f36d1533fdd..351ef2f9932 100644
--- a/x11/kdebase3/patches/patch-bn
+++ b/x11/kdebase3/patches/patch-bn
@@ -1,4 +1,4 @@
-$NetBSD: patch-bn,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bn,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/core/main.cpp.orig Wed Feb 27 16:10:06 2002
+++ kicker/core/main.cpp
diff --git a/x11/kdebase3/patches/patch-bo b/x11/kdebase3/patches/patch-bo
index b4e48418030..3bc7f7b5def 100644
--- a/x11/kdebase3/patches/patch-bo
+++ b/x11/kdebase3/patches/patch-bo
@@ -1,4 +1,4 @@
-$NetBSD: patch-bo,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bo,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/extensions/childpanel/Makefile.am.orig Tue Feb 26 17:04:57 2002
+++ kicker/extensions/childpanel/Makefile.am
diff --git a/x11/kdebase3/patches/patch-bp b/x11/kdebase3/patches/patch-bp
index c9bac9d7585..1bcf5bb0c5e 100644
--- a/x11/kdebase3/patches/patch-bp
+++ b/x11/kdebase3/patches/patch-bp
@@ -1,4 +1,4 @@
-$NetBSD: patch-bp,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bp,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/extensions/childpanel/Makefile.in.orig Mon May 13 23:57:46 2002
+++ kicker/extensions/childpanel/Makefile.in
diff --git a/x11/kdebase3/patches/patch-bq b/x11/kdebase3/patches/patch-bq
index 975db3337d9..77816aa48d4 100644
--- a/x11/kdebase3/patches/patch-bq
+++ b/x11/kdebase3/patches/patch-bq
@@ -1,4 +1,4 @@
-$NetBSD: patch-bq,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $
+$NetBSD: patch-bq,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/kicker_main.cpp.orig Thu May 30 09:59:49 2002
+++ kicker/kicker_main.cpp
diff --git a/x11/kdebase3/patches/patch-br b/x11/kdebase3/patches/patch-br
index f713852b02c..851fcdac2f7 100644
--- a/x11/kdebase3/patches/patch-br
+++ b/x11/kdebase3/patches/patch-br
@@ -1,4 +1,4 @@
-$NetBSD: patch-br,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-br,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/proxy/Makefile.am.orig Wed Feb 13 10:18:52 2002
+++ kicker/proxy/Makefile.am
diff --git a/x11/kdebase3/patches/patch-bs b/x11/kdebase3/patches/patch-bs
index aa67d33a4d0..a6dcd702a01 100644
--- a/x11/kdebase3/patches/patch-bs
+++ b/x11/kdebase3/patches/patch-bs
@@ -1,4 +1,4 @@
-$NetBSD: patch-bs,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/proxy/Makefile.in.orig Mon May 13 23:57:47 2002
+++ kicker/proxy/Makefile.in
diff --git a/x11/kdebase3/patches/patch-bt b/x11/kdebase3/patches/patch-bt
index 1bf274ffd96..03fb0a75923 100644
--- a/x11/kdebase3/patches/patch-bt
+++ b/x11/kdebase3/patches/patch-bt
@@ -1,4 +1,4 @@
-$NetBSD: patch-bt,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-bt,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- kicker/proxy/appletproxy.cpp.orig Wed May 8 19:21:58 2002
+++ kicker/proxy/appletproxy.cpp
diff --git a/x11/kdebase3/patches/patch-bu b/x11/kdebase3/patches/patch-bu
index 7f09b8dde46..5a128bf3213 100644
--- a/x11/kdebase3/patches/patch-bu
+++ b/x11/kdebase3/patches/patch-bu
@@ -1,4 +1,4 @@
-$NetBSD: patch-bu,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-bu,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- kicker/proxy/appletproxy_main.cpp.orig Thu May 30 09:59:50 2002
+++ kicker/proxy/appletproxy_main.cpp
diff --git a/x11/kdebase3/patches/patch-bv b/x11/kdebase3/patches/patch-bv
index 7a97a701f42..e3a0d2cd649 100644
--- a/x11/kdebase3/patches/patch-bv
+++ b/x11/kdebase3/patches/patch-bv
@@ -1,4 +1,4 @@
-$NetBSD: patch-bv,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-bv,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- kicker/proxy/extensionproxy.cpp.orig Wed May 8 19:21:58 2002
+++ kicker/proxy/extensionproxy.cpp
diff --git a/x11/kdebase3/patches/patch-bw b/x11/kdebase3/patches/patch-bw
index 7896239388e..0890f87e5ab 100644
--- a/x11/kdebase3/patches/patch-bw
+++ b/x11/kdebase3/patches/patch-bw
@@ -1,4 +1,4 @@
-$NetBSD: patch-bw,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-bw,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- kicker/proxy/extensionproxy_main.cpp.orig Thu May 30 09:59:50 2002
+++ kicker/proxy/extensionproxy_main.cpp
diff --git a/x11/kdebase3/patches/patch-bx b/x11/kdebase3/patches/patch-bx
index 2d9e02ebde7..625a9412bdb 100644
--- a/x11/kdebase3/patches/patch-bx
+++ b/x11/kdebase3/patches/patch-bx
@@ -1,4 +1,4 @@
-$NetBSD: patch-bx,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-bx,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- kioslave/info/kde-info2html.conf.orig Wed Aug 2 11:07:17 2000
+++ kioslave/info/kde-info2html.conf
diff --git a/x11/kdebase3/patches/patch-by b/x11/kdebase3/patches/patch-by
index 63a14655c70..d95c09717b1 100644
--- a/x11/kdebase3/patches/patch-by
+++ b/x11/kdebase3/patches/patch-by
@@ -1,4 +1,4 @@
-$NetBSD: patch-by,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-by,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- klipper/Makefile.am.orig Fri Mar 1 09:59:20 2002
+++ klipper/Makefile.am
diff --git a/x11/kdebase3/patches/patch-bz b/x11/kdebase3/patches/patch-bz
index f1598378027..9c293577502 100644
--- a/x11/kdebase3/patches/patch-bz
+++ b/x11/kdebase3/patches/patch-bz
@@ -1,4 +1,4 @@
-$NetBSD: patch-bz,v 1.2 2002/06/25 22:14:12 skrll Exp $
+$NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $
--- klipper/Makefile.in.orig Tue Jun 25 19:31:40 2002
+++ klipper/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ca b/x11/kdebase3/patches/patch-ca
index 2504ecb4d7a..c1eff03867c 100644
--- a/x11/kdebase3/patches/patch-ca
+++ b/x11/kdebase3/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-ca,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- klipper/klipper_main.cpp.orig Thu May 30 09:59:52 2002
+++ klipper/klipper_main.cpp
diff --git a/x11/kdebase3/patches/patch-cb b/x11/kdebase3/patches/patch-cb
index 9cd640a4f8d..309b92a919e 100644
--- a/x11/kdebase3/patches/patch-cb
+++ b/x11/kdebase3/patches/patch-cb
@@ -1,4 +1,4 @@
-$NetBSD: patch-cb,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-cb,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- klipper/main.cpp.orig Wed Feb 20 21:50:04 2002
+++ klipper/main.cpp
diff --git a/x11/kdebase3/patches/patch-cc b/x11/kdebase3/patches/patch-cc
index 2edd78934ef..27ec62314d8 100644
--- a/x11/kdebase3/patches/patch-cc
+++ b/x11/kdebase3/patches/patch-cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-cc,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-cc,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- kmenuedit/Makefile.am.orig Thu Jun 7 15:26:30 2001
+++ kmenuedit/Makefile.am
diff --git a/x11/kdebase3/patches/patch-cd b/x11/kdebase3/patches/patch-cd
index 925ccd838f3..f0c53cd4865 100644
--- a/x11/kdebase3/patches/patch-cd
+++ b/x11/kdebase3/patches/patch-cd
@@ -1,4 +1,4 @@
-$NetBSD: patch-cd,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- kmenuedit/Makefile.in.orig Mon May 13 23:57:48 2002
+++ kmenuedit/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ce b/x11/kdebase3/patches/patch-ce
index 92504fca83e..c4a6b1749a1 100644
--- a/x11/kdebase3/patches/patch-ce
+++ b/x11/kdebase3/patches/patch-ce
@@ -1,4 +1,4 @@
-$NetBSD: patch-ce,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-ce,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- kmenuedit/kmenuedit_main.cpp.orig Thu May 30 09:59:53 2002
+++ kmenuedit/kmenuedit_main.cpp
diff --git a/x11/kdebase3/patches/patch-cf b/x11/kdebase3/patches/patch-cf
index 10b141748da..fff0c72023c 100644
--- a/x11/kdebase3/patches/patch-cf
+++ b/x11/kdebase3/patches/patch-cf
@@ -1,4 +1,4 @@
-$NetBSD: patch-cf,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-cf,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- kmenuedit/main.cpp.orig Mon Feb 11 20:09:39 2002
+++ kmenuedit/main.cpp
diff --git a/x11/kdebase3/patches/patch-cg b/x11/kdebase3/patches/patch-cg
index 9d20d5eb5e0..52c6a252a73 100644
--- a/x11/kdebase3/patches/patch-cg
+++ b/x11/kdebase3/patches/patch-cg
@@ -1,4 +1,4 @@
-$NetBSD: patch-cg,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $
+$NetBSD: patch-cg,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- konqueror/Makefile.am.orig Wed May 8 19:22:28 2002
+++ konqueror/Makefile.am
diff --git a/x11/kdebase3/patches/patch-ch b/x11/kdebase3/patches/patch-ch
index c9310dcce0b..122a9e32376 100644
--- a/x11/kdebase3/patches/patch-ch
+++ b/x11/kdebase3/patches/patch-ch
@@ -1,4 +1,4 @@
-$NetBSD: patch-ch,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $
+$NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- konqueror/Makefile.in.orig Mon May 13 23:57:50 2002
+++ konqueror/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ci b/x11/kdebase3/patches/patch-ci
index c22372824d5..509be8919c1 100644
--- a/x11/kdebase3/patches/patch-ci
+++ b/x11/kdebase3/patches/patch-ci
@@ -1,4 +1,4 @@
-$NetBSD: patch-ci,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $
+$NetBSD: patch-ci,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- konqueror/client/Makefile.am.orig Wed Aug 9 18:10:36 2000
+++ konqueror/client/Makefile.am
diff --git a/x11/kdebase3/patches/patch-cj b/x11/kdebase3/patches/patch-cj
index 99e685722df..ae7038a4977 100644
--- a/x11/kdebase3/patches/patch-cj
+++ b/x11/kdebase3/patches/patch-cj
@@ -1,4 +1,4 @@
-$NetBSD: patch-cj,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $
+$NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- konqueror/client/Makefile.in.orig Mon May 13 23:57:50 2002
+++ konqueror/client/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ck b/x11/kdebase3/patches/patch-ck
index 9a5b5f54522..8e4226ca9aa 100644
--- a/x11/kdebase3/patches/patch-ck
+++ b/x11/kdebase3/patches/patch-ck
@@ -1,4 +1,4 @@
-$NetBSD: patch-ck,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $
+$NetBSD: patch-ck,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- konqueror/client/kfmclient.cc.orig Wed May 8 19:22:30 2002
+++ konqueror/client/kfmclient.cc
diff --git a/x11/kdebase3/patches/patch-cl b/x11/kdebase3/patches/patch-cl
index c8e03ad5de0..60be521145b 100644
--- a/x11/kdebase3/patches/patch-cl
+++ b/x11/kdebase3/patches/patch-cl
@@ -1,4 +1,4 @@
-$NetBSD: patch-cl,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $
+$NetBSD: patch-cl,v 1.2 2002/08/25 19:23:42 jlam Exp $
--- konqueror/client/kfmclient_main.cc.orig Thu May 30 09:59:56 2002
+++ konqueror/client/kfmclient_main.cc
diff --git a/x11/kdebase3/patches/patch-cm b/x11/kdebase3/patches/patch-cm
index 0500a1f7c0b..6d401396fb4 100644
--- a/x11/kdebase3/patches/patch-cm
+++ b/x11/kdebase3/patches/patch-cm
@@ -1,4 +1,4 @@
-$NetBSD: patch-cm,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $
+$NetBSD: patch-cm,v 1.2 2002/08/25 19:23:42 jlam Exp $
--- konqueror/keditbookmarks/Makefile.am.orig Sun Mar 3 04:35:00 2002
+++ konqueror/keditbookmarks/Makefile.am
diff --git a/x11/kdebase3/patches/patch-cn b/x11/kdebase3/patches/patch-cn
index 49d2c51f1fc..f6ff9aaa224 100644
--- a/x11/kdebase3/patches/patch-cn
+++ b/x11/kdebase3/patches/patch-cn
@@ -1,4 +1,4 @@
-$NetBSD: patch-cn,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $
--- konqueror/keditbookmarks/Makefile.in.orig Mon May 13 23:57:51 2002
+++ konqueror/keditbookmarks/Makefile.in
diff --git a/x11/kdebase3/patches/patch-co b/x11/kdebase3/patches/patch-co
index 422ba7316b5..fe23bb2a702 100644
--- a/x11/kdebase3/patches/patch-co
+++ b/x11/kdebase3/patches/patch-co
@@ -1,4 +1,4 @@
-$NetBSD: patch-co,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-co,v 1.2 2002/08/25 19:23:42 jlam Exp $
--- konqueror/keditbookmarks/keditbookmarks_main.cpp.orig Thu May 30 09:59:58 2002
+++ konqueror/keditbookmarks/keditbookmarks_main.cpp
diff --git a/x11/kdebase3/patches/patch-cp b/x11/kdebase3/patches/patch-cp
index a9354050631..a1ba9e376a4 100644
--- a/x11/kdebase3/patches/patch-cp
+++ b/x11/kdebase3/patches/patch-cp
@@ -1,4 +1,4 @@
-$NetBSD: patch-cp,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cp,v 1.2 2002/08/25 19:23:42 jlam Exp $
--- konqueror/keditbookmarks/main.cpp.orig Wed May 8 19:22:33 2002
+++ konqueror/keditbookmarks/main.cpp
diff --git a/x11/kdebase3/patches/patch-cq b/x11/kdebase3/patches/patch-cq
index 6acb0b2d7a4..79d094bbea3 100644
--- a/x11/kdebase3/patches/patch-cq
+++ b/x11/kdebase3/patches/patch-cq
@@ -1,4 +1,4 @@
-$NetBSD: patch-cq,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cq,v 1.2 2002/08/25 19:23:42 jlam Exp $
--- konqueror/konq_main.cc.orig Fri Jan 11 15:29:36 2002
+++ konqueror/konq_main.cc
diff --git a/x11/kdebase3/patches/patch-cr b/x11/kdebase3/patches/patch-cr
index 5680866c4ca..7a820bc9daa 100644
--- a/x11/kdebase3/patches/patch-cr
+++ b/x11/kdebase3/patches/patch-cr
@@ -1,4 +1,4 @@
-$NetBSD: patch-cr,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cr,v 1.2 2002/08/25 19:23:42 jlam Exp $
--- konqueror/konqueror_main.cc.orig Thu May 30 10:00:00 2002
+++ konqueror/konqueror_main.cc
diff --git a/x11/kdebase3/patches/patch-cs b/x11/kdebase3/patches/patch-cs
index 41ddc0d3b33..530f876c0d0 100644
--- a/x11/kdebase3/patches/patch-cs
+++ b/x11/kdebase3/patches/patch-cs
@@ -1,4 +1,4 @@
-$NetBSD: patch-cs,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cs,v 1.2 2002/08/25 19:23:43 jlam Exp $
--- konsole/konsole/Makefile.am.orig Wed May 8 19:22:37 2002
+++ konsole/konsole/Makefile.am
diff --git a/x11/kdebase3/patches/patch-ct b/x11/kdebase3/patches/patch-ct
index b7799652f48..6b295534604 100644
--- a/x11/kdebase3/patches/patch-ct
+++ b/x11/kdebase3/patches/patch-ct
@@ -1,4 +1,4 @@
-$NetBSD: patch-ct,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $
--- konsole/konsole/Makefile.in.orig Mon May 13 23:57:52 2002
+++ konsole/konsole/Makefile.in
diff --git a/x11/kdebase3/patches/patch-cu b/x11/kdebase3/patches/patch-cu
index 79659ecd527..18c497cd25a 100644
--- a/x11/kdebase3/patches/patch-cu
+++ b/x11/kdebase3/patches/patch-cu
@@ -1,4 +1,4 @@
-$NetBSD: patch-cu,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cu,v 1.2 2002/08/25 19:23:43 jlam Exp $
--- konsole/konsole/konsole_main.cpp.orig Thu May 30 10:00:02 2002
+++ konsole/konsole/konsole_main.cpp
diff --git a/x11/kdebase3/patches/patch-cv b/x11/kdebase3/patches/patch-cv
index d9af9620723..22d8f2b85f2 100644
--- a/x11/kdebase3/patches/patch-cv
+++ b/x11/kdebase3/patches/patch-cv
@@ -1,4 +1,4 @@
-$NetBSD: patch-cv,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cv,v 1.2 2002/08/25 19:23:43 jlam Exp $
--- konsole/konsole/kwrited.cpp.orig Wed May 8 19:22:40 2002
+++ konsole/konsole/kwrited.cpp
diff --git a/x11/kdebase3/patches/patch-cw b/x11/kdebase3/patches/patch-cw
index b047719b533..c29c47f9194 100644
--- a/x11/kdebase3/patches/patch-cw
+++ b/x11/kdebase3/patches/patch-cw
@@ -1,4 +1,4 @@
-$NetBSD: patch-cw,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cw,v 1.2 2002/08/25 19:23:43 jlam Exp $
--- konsole/konsole/kwrited_main.cpp.orig Thu May 30 10:00:03 2002
+++ konsole/konsole/kwrited_main.cpp
diff --git a/x11/kdebase3/patches/patch-cx b/x11/kdebase3/patches/patch-cx
index f2eee012fa7..d964a9c4687 100644
--- a/x11/kdebase3/patches/patch-cx
+++ b/x11/kdebase3/patches/patch-cx
@@ -1,4 +1,4 @@
-$NetBSD: patch-cx,v 1.2 2002/07/17 07:54:08 skrll Exp $
+$NetBSD: patch-cx,v 1.3 2002/08/25 19:23:43 jlam Exp $
--- konsole/konsole/main.cpp.orig Mon Jun 24 12:57:09 2002
+++ konsole/konsole/main.cpp
diff --git a/x11/kdebase3/patches/patch-cy b/x11/kdebase3/patches/patch-cy
index a2b759a6a1c..1ddc744f9c3 100644
--- a/x11/kdebase3/patches/patch-cy
+++ b/x11/kdebase3/patches/patch-cy
@@ -1,4 +1,4 @@
-$NetBSD: patch-cy,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cy,v 1.2 2002/08/25 19:23:43 jlam Exp $
--- ksmserver/Makefile.am.orig Wed May 8 19:22:50 2002
+++ ksmserver/Makefile.am
diff --git a/x11/kdebase3/patches/patch-cz b/x11/kdebase3/patches/patch-cz
index 2f21b1b7f55..7d9c1b92c62 100644
--- a/x11/kdebase3/patches/patch-cz
+++ b/x11/kdebase3/patches/patch-cz
@@ -1,4 +1,4 @@
-$NetBSD: patch-cz,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $
--- ksmserver/Makefile.in.orig Mon May 13 23:57:53 2002
+++ ksmserver/Makefile.in
diff --git a/x11/kdebase3/patches/patch-da b/x11/kdebase3/patches/patch-da
index 7e962e31905..e1d9fd299ea 100644
--- a/x11/kdebase3/patches/patch-da
+++ b/x11/kdebase3/patches/patch-da
@@ -1,4 +1,4 @@
-$NetBSD: patch-da,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-da,v 1.2 2002/08/25 19:23:44 jlam Exp $
--- ksmserver/ksmserver_main.cpp.orig Thu May 30 10:00:04 2002
+++ ksmserver/ksmserver_main.cpp
diff --git a/x11/kdebase3/patches/patch-db b/x11/kdebase3/patches/patch-db
index 9e22434c472..fae796d5410 100644
--- a/x11/kdebase3/patches/patch-db
+++ b/x11/kdebase3/patches/patch-db
@@ -1,4 +1,4 @@
-$NetBSD: patch-db,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-db,v 1.2 2002/08/25 19:23:44 jlam Exp $
--- ksmserver/main.cpp.orig Sun Jan 20 18:26:13 2002
+++ ksmserver/main.cpp
diff --git a/x11/kdebase3/patches/patch-dc b/x11/kdebase3/patches/patch-dc
index afbb5bde21f..d768342ae6c 100644
--- a/x11/kdebase3/patches/patch-dc
+++ b/x11/kdebase3/patches/patch-dc
@@ -1,4 +1,4 @@
-$NetBSD: patch-dc,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-dc,v 1.2 2002/08/25 19:23:45 jlam Exp $
--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig Fri Dec 28 09:48:05 2001
+++ ksysguard/ksysguardd/FreeBSD/CPU.c
diff --git a/x11/kdebase3/patches/patch-dd b/x11/kdebase3/patches/patch-dd
index 180a425df61..9bac5e55370 100644
--- a/x11/kdebase3/patches/patch-dd
+++ b/x11/kdebase3/patches/patch-dd
@@ -1,4 +1,4 @@
-$NetBSD: patch-dd,v 1.2 2002/08/21 15:33:05 skrll Exp $
+$NetBSD: patch-dd,v 1.3 2002/08/25 19:23:45 jlam Exp $
--- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Fri Sep 14 22:11:20 2001
+++ ksysguard/ksysguardd/FreeBSD/Memory.c Tue Aug 20 14:20:49 2002
diff --git a/x11/kdebase3/patches/patch-de b/x11/kdebase3/patches/patch-de
index b7f7bd97854..6051d22d3f8 100644
--- a/x11/kdebase3/patches/patch-de
+++ b/x11/kdebase3/patches/patch-de
@@ -1,4 +1,4 @@
-$NetBSD: patch-de,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-de,v 1.2 2002/08/25 19:23:45 jlam Exp $
--- ksysguard/ksysguardd/FreeBSD/apm.c.orig Tue Sep 18 15:03:53 2001
+++ ksysguard/ksysguardd/FreeBSD/apm.c
diff --git a/x11/kdebase3/patches/patch-df b/x11/kdebase3/patches/patch-df
index 88fcf63fcdf..b0d33d0e43d 100644
--- a/x11/kdebase3/patches/patch-df
+++ b/x11/kdebase3/patches/patch-df
@@ -1,4 +1,4 @@
-$NetBSD: patch-df,v 1.4 2002/08/21 16:00:13 skrll Exp $
+$NetBSD: patch-df,v 1.5 2002/08/25 19:23:45 jlam Exp $
--- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Wed Aug 21 17:39:19 2002
+++ ksysguard/ksysguardd/FreeBSD/netdev.c
diff --git a/x11/kdebase3/patches/patch-dg b/x11/kdebase3/patches/patch-dg
index a43468d73e7..e6fe6ee2a6e 100644
--- a/x11/kdebase3/patches/patch-dg
+++ b/x11/kdebase3/patches/patch-dg
@@ -1,4 +1,4 @@
-$NetBSD: patch-dg,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $
+$NetBSD: patch-dg,v 1.2 2002/08/25 19:23:45 jlam Exp $
--- kwin/Makefile.am.orig Wed May 8 19:23:01 2002
+++ kwin/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dh b/x11/kdebase3/patches/patch-dh
index 1b1a0f868ce..c9bc7cf1f77 100644
--- a/x11/kdebase3/patches/patch-dh
+++ b/x11/kdebase3/patches/patch-dh
@@ -1,4 +1,4 @@
-$NetBSD: patch-dh,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $
--- kwin/Makefile.in.orig Mon May 13 23:57:54 2002
+++ kwin/Makefile.in
diff --git a/x11/kdebase3/patches/patch-di b/x11/kdebase3/patches/patch-di
index c941e333b2f..621c0707bbb 100644
--- a/x11/kdebase3/patches/patch-di
+++ b/x11/kdebase3/patches/patch-di
@@ -1,4 +1,4 @@
-$NetBSD: patch-di,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-di,v 1.2 2002/08/25 19:23:45 jlam Exp $
--- kwin/clients/b2/Makefile.am.orig Tue Feb 19 16:56:14 2002
+++ kwin/clients/b2/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dj b/x11/kdebase3/patches/patch-dj
index 95c66829738..ffc1433b3d3 100644
--- a/x11/kdebase3/patches/patch-dj
+++ b/x11/kdebase3/patches/patch-dj
@@ -1,4 +1,4 @@
-$NetBSD: patch-dj,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dj,v 1.2 2002/08/25 19:23:45 jlam Exp $
--- kwin/clients/b2/Makefile.in.orig Mon May 13 23:57:54 2002
+++ kwin/clients/b2/Makefile.in
diff --git a/x11/kdebase3/patches/patch-dk b/x11/kdebase3/patches/patch-dk
index a9198c5ef5c..b5d7ee8aa2f 100644
--- a/x11/kdebase3/patches/patch-dk
+++ b/x11/kdebase3/patches/patch-dk
@@ -1,4 +1,4 @@
-$NetBSD: patch-dk,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dk,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/default/Makefile.am.orig Tue Feb 19 16:56:14 2002
+++ kwin/clients/default/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dl b/x11/kdebase3/patches/patch-dl
index 9d5b5bec7f3..d22bb61b99c 100644
--- a/x11/kdebase3/patches/patch-dl
+++ b/x11/kdebase3/patches/patch-dl
@@ -1,4 +1,4 @@
-$NetBSD: patch-dl,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dl,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/default/Makefile.in.orig Mon May 13 23:57:54 2002
+++ kwin/clients/default/Makefile.in
diff --git a/x11/kdebase3/patches/patch-dm b/x11/kdebase3/patches/patch-dm
index af723c401b5..313bf139848 100644
--- a/x11/kdebase3/patches/patch-dm
+++ b/x11/kdebase3/patches/patch-dm
@@ -1,4 +1,4 @@
-$NetBSD: patch-dm,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dm,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/icewm/Makefile.am.orig Tue Feb 19 16:56:14 2002
+++ kwin/clients/icewm/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dn b/x11/kdebase3/patches/patch-dn
index 078788c27ce..d9d32fb964b 100644
--- a/x11/kdebase3/patches/patch-dn
+++ b/x11/kdebase3/patches/patch-dn
@@ -1,4 +1,4 @@
-$NetBSD: patch-dn,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dn,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/icewm/Makefile.in.orig Mon May 13 23:57:55 2002
+++ kwin/clients/icewm/Makefile.in
diff --git a/x11/kdebase3/patches/patch-do b/x11/kdebase3/patches/patch-do
index ddb2d551513..2463e823cbf 100644
--- a/x11/kdebase3/patches/patch-do
+++ b/x11/kdebase3/patches/patch-do
@@ -1,4 +1,4 @@
-$NetBSD: patch-do,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-do,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/kde1/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/kde1/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dp b/x11/kdebase3/patches/patch-dp
index a8c49220cb2..d91d4963d80 100644
--- a/x11/kdebase3/patches/patch-dp
+++ b/x11/kdebase3/patches/patch-dp
@@ -1,4 +1,4 @@
-$NetBSD: patch-dp,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dp,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/kde1/Makefile.in.orig Mon May 13 23:57:56 2002
+++ kwin/clients/kde1/Makefile.in
diff --git a/x11/kdebase3/patches/patch-dq b/x11/kdebase3/patches/patch-dq
index ac3b88ef49e..807344da2e6 100644
--- a/x11/kdebase3/patches/patch-dq
+++ b/x11/kdebase3/patches/patch-dq
@@ -1,4 +1,4 @@
-$NetBSD: patch-dq,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dq,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/kstep/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/kstep/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dr b/x11/kdebase3/patches/patch-dr
index fb1c2dfb202..0d481e73db6 100644
--- a/x11/kdebase3/patches/patch-dr
+++ b/x11/kdebase3/patches/patch-dr
@@ -1,4 +1,4 @@
-$NetBSD: patch-dr,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dr,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/kstep/Makefile.in.orig Mon May 13 23:57:56 2002
+++ kwin/clients/kstep/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ds b/x11/kdebase3/patches/patch-ds
index d30edb61d45..4ed267fe56f 100644
--- a/x11/kdebase3/patches/patch-ds
+++ b/x11/kdebase3/patches/patch-ds
@@ -1,4 +1,4 @@
-$NetBSD: patch-ds,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ds,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/kwmtheme/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/kwmtheme/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dt b/x11/kdebase3/patches/patch-dt
index dd8571f7533..609b0bc9faf 100644
--- a/x11/kdebase3/patches/patch-dt
+++ b/x11/kdebase3/patches/patch-dt
@@ -1,4 +1,4 @@
-$NetBSD: patch-dt,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dt,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/kwmtheme/Makefile.in.orig Mon May 13 23:57:56 2002
+++ kwin/clients/kwmtheme/Makefile.in
diff --git a/x11/kdebase3/patches/patch-du b/x11/kdebase3/patches/patch-du
index c4123e3bf17..44459e99288 100644
--- a/x11/kdebase3/patches/patch-du
+++ b/x11/kdebase3/patches/patch-du
@@ -1,4 +1,4 @@
-$NetBSD: patch-du,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-du,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/laptop/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/laptop/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dv b/x11/kdebase3/patches/patch-dv
index 6c7d5e25728..6ff97037d15 100644
--- a/x11/kdebase3/patches/patch-dv
+++ b/x11/kdebase3/patches/patch-dv
@@ -1,4 +1,4 @@
-$NetBSD: patch-dv,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dv,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/laptop/Makefile.in.orig Mon May 13 23:57:56 2002
+++ kwin/clients/laptop/Makefile.in
diff --git a/x11/kdebase3/patches/patch-dw b/x11/kdebase3/patches/patch-dw
index 16c7195d2e6..6a9b35ba3ca 100644
--- a/x11/kdebase3/patches/patch-dw
+++ b/x11/kdebase3/patches/patch-dw
@@ -1,4 +1,4 @@
-$NetBSD: patch-dw,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dw,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/modernsystem/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/modernsystem/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dx b/x11/kdebase3/patches/patch-dx
index 23d075d1d98..78c90c5500d 100644
--- a/x11/kdebase3/patches/patch-dx
+++ b/x11/kdebase3/patches/patch-dx
@@ -1,4 +1,4 @@
-$NetBSD: patch-dx,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dx,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/modernsystem/Makefile.in.orig Mon May 13 23:57:56 2002
+++ kwin/clients/modernsystem/Makefile.in
diff --git a/x11/kdebase3/patches/patch-dy b/x11/kdebase3/patches/patch-dy
index 45880515e90..167af0fa2f4 100644
--- a/x11/kdebase3/patches/patch-dy
+++ b/x11/kdebase3/patches/patch-dy
@@ -1,4 +1,4 @@
-$NetBSD: patch-dy,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dy,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/quartz/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/quartz/Makefile.am
diff --git a/x11/kdebase3/patches/patch-dz b/x11/kdebase3/patches/patch-dz
index f9400e10fea..0d27ab27b5c 100644
--- a/x11/kdebase3/patches/patch-dz
+++ b/x11/kdebase3/patches/patch-dz
@@ -1,4 +1,4 @@
-$NetBSD: patch-dz,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-dz,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/quartz/Makefile.in.orig Mon May 13 23:57:57 2002
+++ kwin/clients/quartz/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ea b/x11/kdebase3/patches/patch-ea
index 431413a0e83..9b88ec54c2c 100644
--- a/x11/kdebase3/patches/patch-ea
+++ b/x11/kdebase3/patches/patch-ea
@@ -1,4 +1,4 @@
-$NetBSD: patch-ea,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ea,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/redmond/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/redmond/Makefile.am
diff --git a/x11/kdebase3/patches/patch-eb b/x11/kdebase3/patches/patch-eb
index 2c87032d196..b924583f2e5 100644
--- a/x11/kdebase3/patches/patch-eb
+++ b/x11/kdebase3/patches/patch-eb
@@ -1,4 +1,4 @@
-$NetBSD: patch-eb,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-eb,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/redmond/Makefile.in.orig Mon May 13 23:57:57 2002
+++ kwin/clients/redmond/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ec b/x11/kdebase3/patches/patch-ec
index 70bc2057449..5d5fc5002cf 100644
--- a/x11/kdebase3/patches/patch-ec
+++ b/x11/kdebase3/patches/patch-ec
@@ -1,4 +1,4 @@
-$NetBSD: patch-ec,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ec,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/riscos/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/riscos/Makefile.am
diff --git a/x11/kdebase3/patches/patch-ed b/x11/kdebase3/patches/patch-ed
index 6014d36f826..2a25961355f 100644
--- a/x11/kdebase3/patches/patch-ed
+++ b/x11/kdebase3/patches/patch-ed
@@ -1,4 +1,4 @@
-$NetBSD: patch-ed,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ed,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/riscos/Makefile.in.orig Mon May 13 23:57:57 2002
+++ kwin/clients/riscos/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ee b/x11/kdebase3/patches/patch-ee
index d5b20a1c86e..6544c5097d7 100644
--- a/x11/kdebase3/patches/patch-ee
+++ b/x11/kdebase3/patches/patch-ee
@@ -1,4 +1,4 @@
-$NetBSD: patch-ee,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ee,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/system/Makefile.am.orig Tue Feb 19 16:56:16 2002
+++ kwin/clients/system/Makefile.am
diff --git a/x11/kdebase3/patches/patch-ef b/x11/kdebase3/patches/patch-ef
index 877681938e9..d8db6c5bd63 100644
--- a/x11/kdebase3/patches/patch-ef
+++ b/x11/kdebase3/patches/patch-ef
@@ -1,4 +1,4 @@
-$NetBSD: patch-ef,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ef,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/system/Makefile.in.orig Mon May 13 23:57:57 2002
+++ kwin/clients/system/Makefile.in
diff --git a/x11/kdebase3/patches/patch-eg b/x11/kdebase3/patches/patch-eg
index 1defdf9deee..18556454a48 100644
--- a/x11/kdebase3/patches/patch-eg
+++ b/x11/kdebase3/patches/patch-eg
@@ -1,4 +1,4 @@
-$NetBSD: patch-eg,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-eg,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/web/Makefile.am.orig Tue Feb 19 16:56:16 2002
+++ kwin/clients/web/Makefile.am
diff --git a/x11/kdebase3/patches/patch-eh b/x11/kdebase3/patches/patch-eh
index cf9103acc48..b51fe994d91 100644
--- a/x11/kdebase3/patches/patch-eh
+++ b/x11/kdebase3/patches/patch-eh
@@ -1,4 +1,4 @@
-$NetBSD: patch-eh,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-eh,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/web/Makefile.in.orig Mon May 13 23:57:57 2002
+++ kwin/clients/web/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ei b/x11/kdebase3/patches/patch-ei
index 25e080fd8f4..8a1309d7081 100644
--- a/x11/kdebase3/patches/patch-ei
+++ b/x11/kdebase3/patches/patch-ei
@@ -1,4 +1,4 @@
-$NetBSD: patch-ei,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ei,v 1.2 2002/08/25 19:23:48 jlam Exp $
--- kxkb/Makefile.am.orig Wed May 8 19:23:13 2002
+++ kxkb/Makefile.am
diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej
index 776f7019c0a..2e43c2d3c46 100644
--- a/x11/kdebase3/patches/patch-ej
+++ b/x11/kdebase3/patches/patch-ej
@@ -1,4 +1,4 @@
-$NetBSD: patch-ej,v 1.2 2002/06/25 22:14:12 skrll Exp $
+$NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $
--- kxkb/Makefile.in.orig Tue Jun 25 19:31:39 2002
+++ kxkb/Makefile.in
diff --git a/x11/kdebase3/patches/patch-ek b/x11/kdebase3/patches/patch-ek
index 5624f5dd5ad..6422757bb40 100644
--- a/x11/kdebase3/patches/patch-ek
+++ b/x11/kdebase3/patches/patch-ek
@@ -1,4 +1,4 @@
-$NetBSD: patch-ek,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ek,v 1.2 2002/08/25 19:23:48 jlam Exp $
--- kxkb/kxkb.cpp.orig Sat Mar 2 22:03:52 2002
+++ kxkb/kxkb.cpp
diff --git a/x11/kdebase3/patches/patch-el b/x11/kdebase3/patches/patch-el
index f58fb0b3637..b71071f1c23 100644
--- a/x11/kdebase3/patches/patch-el
+++ b/x11/kdebase3/patches/patch-el
@@ -1,4 +1,4 @@
-$NetBSD: patch-el,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-el,v 1.2 2002/08/25 19:23:48 jlam Exp $
--- kxkb/kxkb_main.cpp.orig Thu May 30 10:00:15 2002
+++ kxkb/kxkb_main.cpp
diff --git a/x11/kdebase3/patches/patch-em b/x11/kdebase3/patches/patch-em
index 95503708c36..2f3fc0bc555 100644
--- a/x11/kdebase3/patches/patch-em
+++ b/x11/kdebase3/patches/patch-em
@@ -1,4 +1,4 @@
-$NetBSD: patch-em,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-em,v 1.2 2002/08/25 19:23:48 jlam Exp $
--- legacyimport/Makefile.am.orig Wed May 16 02:41:36 2001
+++ legacyimport/Makefile.am
diff --git a/x11/kdebase3/patches/patch-en b/x11/kdebase3/patches/patch-en
index eafc0a8bcbb..a26085a943d 100644
--- a/x11/kdebase3/patches/patch-en
+++ b/x11/kdebase3/patches/patch-en
@@ -1,4 +1,4 @@
-$NetBSD: patch-en,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-en,v 1.2 2002/08/25 19:23:48 jlam Exp $
--- legacyimport/klegacyimport_main.cpp.orig Thu May 30 10:00:16 2002
+++ legacyimport/klegacyimport_main.cpp
diff --git a/x11/kdebase3/patches/patch-eo b/x11/kdebase3/patches/patch-eo
index 607acd48197..f49ded0220b 100644
--- a/x11/kdebase3/patches/patch-eo
+++ b/x11/kdebase3/patches/patch-eo
@@ -1,4 +1,4 @@
-$NetBSD: patch-eo,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-eo,v 1.2 2002/08/25 19:23:48 jlam Exp $
--- legacyimport/legacyimport.cpp.orig Sat Jan 5 13:21:31 2002
+++ legacyimport/legacyimport.cpp
diff --git a/x11/kdebase3/patches/patch-ep b/x11/kdebase3/patches/patch-ep
index a4145f3dbdd..4e788466687 100644
--- a/x11/kdebase3/patches/patch-ep
+++ b/x11/kdebase3/patches/patch-ep
@@ -1,4 +1,4 @@
-$NetBSD: patch-ep,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $
+$NetBSD: patch-ep,v 1.2 2002/08/25 19:23:48 jlam Exp $
--- startkde.orig Wed May 8 22:08:15 2002
+++ startkde
diff --git a/x11/kdebase3/patches/patch-eq b/x11/kdebase3/patches/patch-eq
index e9958aa648d..211efb43ae6 100644
--- a/x11/kdebase3/patches/patch-eq
+++ b/x11/kdebase3/patches/patch-eq
@@ -1,4 +1,4 @@
-$NetBSD: patch-eq,v 1.1 2002/06/25 22:14:12 skrll Exp $
+$NetBSD: patch-eq,v 1.2 2002/08/25 19:23:48 jlam Exp $
--- admin/am_edit.orig Tue Jun 25 10:10:02 2002
+++ admin/am_edit
diff --git a/x11/kdebase3/patches/patch-er b/x11/kdebase3/patches/patch-er
index 9c304dc1182..c7c30767dcb 100644
--- a/x11/kdebase3/patches/patch-er
+++ b/x11/kdebase3/patches/patch-er
@@ -1,4 +1,4 @@
-$NetBSD: patch-er,v 1.1 2002/06/25 22:14:13 skrll Exp $
+$NetBSD: patch-er,v 1.2 2002/08/25 19:23:49 jlam Exp $
--- konqueror/sidebar/trees/Makefile.in.orig Tue Jun 25 19:31:48 2002
+++ konqueror/sidebar/trees/Makefile.in
diff --git a/x11/kdebase3/patches/patch-es b/x11/kdebase3/patches/patch-es
index 67fbee37571..77bd391cc4e 100644
--- a/x11/kdebase3/patches/patch-es
+++ b/x11/kdebase3/patches/patch-es
@@ -1,4 +1,4 @@
-$NetBSD: patch-es,v 1.1 2002/06/25 22:14:13 skrll Exp $
+$NetBSD: patch-es,v 1.2 2002/08/25 19:23:49 jlam Exp $
--- konqueror/sidebar/Makefile.in.orig Tue Jun 25 19:31:48 2002
+++ konqueror/sidebar/Makefile.in
diff --git a/x11/kdebase3/patches/patch-et b/x11/kdebase3/patches/patch-et
index b125f2aa9cb..cf6047daa09 100644
--- a/x11/kdebase3/patches/patch-et
+++ b/x11/kdebase3/patches/patch-et
@@ -1,4 +1,4 @@
-$NetBSD: patch-et,v 1.1 2002/06/25 22:14:14 skrll Exp $
+$NetBSD: patch-et,v 1.2 2002/08/25 19:23:49 jlam Exp $
--- libkonq/Makefile.in.orig Tue Jun 25 19:31:42 2002
+++ libkonq/Makefile.in
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 663cbbc40d9..196df2e4175 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/15 08:22:09 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:23:49 jlam Exp $
DISTNAME= kdelibs-3.0.2
PKGREVISION= 1
diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index b10167d3cef..22d70cd194f 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/06/28 07:44:32 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/08/25 19:23:49 jlam Exp $
bin/artsmessage
bin/checkXML
${CUPS}bin/cupsdconf
diff --git a/x11/kdelibs3/buildlink.mk b/x11/kdelibs3/buildlink.mk
index c45a88a5675..94e86416f6b 100644
--- a/x11/kdelibs3/buildlink.mk
+++ b/x11/kdelibs3/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/08/15 08:48:09 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:23:50 jlam Exp $
#
# This Makefile fragment is included by packages that use kdelibs3.
#
diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk
new file mode 100644
index 00000000000..ab8e8169cbe
--- /dev/null
+++ b/x11/kdelibs3/buildlink2.mk
@@ -0,0 +1,37 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:50 jlam Exp $
+
+.if !defined(KDELIBS3_BUILDLINK2_MK)
+KDELIBS3_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= kdelibs3
+BUILDLINK_DEPENDS.kdelibs3?= kdelibs>=3.0.2nb1
+BUILDLINK_PKGSRCDIR.kdelibs3?= ../../x11/kdelibs3
+
+.include "../../mk/bsd.prefs.mk"
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.kdelibs3=kdelibs
+BUILDLINK_PREFIX.kdelibs3_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.kdelibs3!= ${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdelibs3/PLIST
+
+KDEDIR= ${BUILDLINK_PREFIX.kdelibs3}
+
+BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9
+BUILDLINK_DEPENDS.qt3-libs= qt3-libs>=3.0.3
+USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096}
+
+.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../audio/arts/buildlink2.mk"
+.include "../../devel/pcre/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../x11/qt3-libs/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+
+.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
+. include "../../print/cups/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+= kdelibs3-buildlink
+
+kdelibs3-buildlink: _BUILDLINK_USE
+
+.endif # KDELIBS3_BUILDLINK2_MK
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 94dfd082a82..59222fb92e4 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/20 17:08:07 skrll Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 19:23:50 jlam Exp $
SHA1 (kdelibs-3.0.2.tar.bz2) = 6985e289b22a728045f829cb52412270f03b10cf
Size (kdelibs-3.0.2.tar.bz2) = 7612798 bytes
diff --git a/x11/kdelibs3/patches/patch-aa b/x11/kdelibs3/patches/patch-aa
index 7e06f776e20..a7ca1b7792b 100644
--- a/x11/kdelibs3/patches/patch-aa
+++ b/x11/kdelibs3/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:16:42 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:50 jlam Exp $
--- arts/knotify/Makefile.am.orig Wed Feb 13 21:06:57 2002
+++ arts/knotify/Makefile.am
diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab
index 7059610c6e0..d66a06b3a4a 100644
--- a/x11/kdelibs3/patches/patch-ab
+++ b/x11/kdelibs3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:16:44 skrll Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $
--- arts/knotify/Makefile.in.orig Tue May 21 15:42:03 2002
+++ arts/knotify/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-ac b/x11/kdelibs3/patches/patch-ac
index 9e353cb87ce..d65a7921b7a 100644
--- a/x11/kdelibs3/patches/patch-ac
+++ b/x11/kdelibs3/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:16:44 skrll Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- arts/knotify/knotify.cpp.orig Wed May 8 19:27:11 2002
+++ arts/knotify/knotify.cpp
diff --git a/x11/kdelibs3/patches/patch-ad b/x11/kdelibs3/patches/patch-ad
index 6333d7bfad6..40d7103d69f 100644
--- a/x11/kdelibs3/patches/patch-ad
+++ b/x11/kdelibs3/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:16:44 skrll Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- arts/knotify/knotify_main.cpp.orig Thu May 30 09:48:48 2002
+++ arts/knotify/knotify_main.cpp
diff --git a/x11/kdelibs3/patches/patch-ae b/x11/kdelibs3/patches/patch-ae
index ed205715b15..b13dedaf113 100644
--- a/x11/kdelibs3/patches/patch-ae
+++ b/x11/kdelibs3/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:16:44 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- configure.orig Tue May 21 15:42:33 2002
+++ configure
diff --git a/x11/kdelibs3/patches/patch-af b/x11/kdelibs3/patches/patch-af
index ad64521ce47..8ae3112f350 100644
--- a/x11/kdelibs3/patches/patch-af
+++ b/x11/kdelibs3/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:16:44 skrll Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- dcop/Makefile.am.orig Sun Feb 17 06:36:25 2002
+++ dcop/Makefile.am
diff --git a/x11/kdelibs3/patches/patch-ag b/x11/kdelibs3/patches/patch-ag
index cd3cda7ae96..99269840d45 100644
--- a/x11/kdelibs3/patches/patch-ag
+++ b/x11/kdelibs3/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:16:44 skrll Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- dcop/Makefile.in.orig Tue May 21 15:42:04 2002
+++ dcop/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-ah b/x11/kdelibs3/patches/patch-ah
index 9a5a509b5e5..b7c7c6858bc 100644
--- a/x11/kdelibs3/patches/patch-ah
+++ b/x11/kdelibs3/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:16:44 skrll Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- dcop/dcopserver.cpp.orig Fri Jan 4 11:03:18 2002
+++ dcop/dcopserver.cpp
diff --git a/x11/kdelibs3/patches/patch-ai b/x11/kdelibs3/patches/patch-ai
index 4f58c00f17c..fc80b3419a9 100644
--- a/x11/kdelibs3/patches/patch-ai
+++ b/x11/kdelibs3/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:16:44 skrll Exp $
+$NetBSD: patch-ai,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- dcop/dcopserver_main.cpp.orig Thu May 30 09:48:50 2002
+++ dcop/dcopserver_main.cpp
diff --git a/x11/kdelibs3/patches/patch-aj b/x11/kdelibs3/patches/patch-aj
index 2276a19e463..aeadc51cbf3 100644
--- a/x11/kdelibs3/patches/patch-aj
+++ b/x11/kdelibs3/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:16:44 skrll Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- kconf_update/Makefile.am.orig Wed Apr 18 00:54:02 2001
+++ kconf_update/Makefile.am
diff --git a/x11/kdelibs3/patches/patch-ak b/x11/kdelibs3/patches/patch-ak
index 5556534346b..5f7057f8f1a 100644
--- a/x11/kdelibs3/patches/patch-ak
+++ b/x11/kdelibs3/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- kconf_update/Makefile.in.orig Tue May 21 15:42:05 2002
+++ kconf_update/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-al b/x11/kdelibs3/patches/patch-al
index 354dccabf44..9532746415f 100644
--- a/x11/kdelibs3/patches/patch-al
+++ b/x11/kdelibs3/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-al,v 1.2 2002/08/25 19:23:51 jlam Exp $
--- kconf_update/kconf_update.cpp.orig Wed May 8 19:27:22 2002
+++ kconf_update/kconf_update.cpp
diff --git a/x11/kdelibs3/patches/patch-am b/x11/kdelibs3/patches/patch-am
index 53f11007817..cfdf7e09202 100644
--- a/x11/kdelibs3/patches/patch-am
+++ b/x11/kdelibs3/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-am,v 1.2 2002/08/25 19:23:52 jlam Exp $
--- kconf_update/kconf_update_main.cpp.orig Thu May 30 09:48:50 2002
+++ kconf_update/kconf_update_main.cpp
diff --git a/x11/kdelibs3/patches/patch-an b/x11/kdelibs3/patches/patch-an
index 0100e19f10c..6547605642a 100644
--- a/x11/kdelibs3/patches/patch-an
+++ b/x11/kdelibs3/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-an,v 1.2 2002/08/25 19:23:52 jlam Exp $
--- kdecore/kstandarddirs.cpp.orig Wed May 8 19:27:28 2002
+++ kdecore/kstandarddirs.cpp
diff --git a/x11/kdelibs3/patches/patch-ao b/x11/kdelibs3/patches/patch-ao
index f3a8b80d0d5..9b10e555400 100644
--- a/x11/kdelibs3/patches/patch-ao
+++ b/x11/kdelibs3/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-ao,v 1.2 2002/08/25 19:23:52 jlam Exp $
--- kded/Makefile.am.orig Fri Feb 22 11:05:02 2002
+++ kded/Makefile.am
diff --git a/x11/kdelibs3/patches/patch-ap b/x11/kdelibs3/patches/patch-ap
index b141d471f71..41bfd19f9d6 100644
--- a/x11/kdelibs3/patches/patch-ap
+++ b/x11/kdelibs3/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $
--- kded/Makefile.in.orig Tue May 21 15:42:06 2002
+++ kded/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-aq b/x11/kdelibs3/patches/patch-aq
index 95b36ee6005..2a924b851d4 100644
--- a/x11/kdelibs3/patches/patch-aq
+++ b/x11/kdelibs3/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-aq,v 1.2 2002/08/25 19:23:52 jlam Exp $
--- kded/kbuildsycoca.cpp.orig Tue May 21 15:37:35 2002
+++ kded/kbuildsycoca.cpp
diff --git a/x11/kdelibs3/patches/patch-ar b/x11/kdelibs3/patches/patch-ar
index 362a4e3bf3d..a323686025a 100644
--- a/x11/kdelibs3/patches/patch-ar
+++ b/x11/kdelibs3/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-ar,v 1.2 2002/08/25 19:23:52 jlam Exp $
--- kded/kbuildsycoca_main.cpp.orig Thu May 30 09:48:50 2002
+++ kded/kbuildsycoca_main.cpp
diff --git a/x11/kdelibs3/patches/patch-as b/x11/kdelibs3/patches/patch-as
index 613f1ce3ade..e90cd965aa8 100644
--- a/x11/kdelibs3/patches/patch-as
+++ b/x11/kdelibs3/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-as,v 1.2 2002/08/25 19:23:52 jlam Exp $
--- kded/kded.cpp.orig Wed May 8 19:27:28 2002
+++ kded/kded.cpp
diff --git a/x11/kdelibs3/patches/patch-at b/x11/kdelibs3/patches/patch-at
index c3e2815467f..3ffa16379af 100644
--- a/x11/kdelibs3/patches/patch-at
+++ b/x11/kdelibs3/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-at,v 1.2 2002/08/25 19:23:52 jlam Exp $
--- kded/kded_main.cpp.orig Thu May 30 09:48:51 2002
+++ kded/kded_main.cpp
diff --git a/x11/kdelibs3/patches/patch-au b/x11/kdelibs3/patches/patch-au
index f2e341b3fc4..a43553b3f13 100644
--- a/x11/kdelibs3/patches/patch-au
+++ b/x11/kdelibs3/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.1.1.1 2002/05/31 13:16:46 skrll Exp $
+$NetBSD: patch-au,v 1.2 2002/08/25 19:23:53 jlam Exp $
--- kdeprint/management/Makefile.am.orig Mon Feb 18 17:54:40 2002
+++ kdeprint/management/Makefile.am
diff --git a/x11/kdelibs3/patches/patch-av b/x11/kdelibs3/patches/patch-av
index 9de42ac9103..2afd69910e7 100644
--- a/x11/kdelibs3/patches/patch-av
+++ b/x11/kdelibs3/patches/patch-av
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $
--- kdeprint/management/Makefile.in.orig Tue May 21 15:42:07 2002
+++ kdeprint/management/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-aw b/x11/kdelibs3/patches/patch-aw
index 4c666eb28ef..9c97818dbc2 100644
--- a/x11/kdelibs3/patches/patch-aw
+++ b/x11/kdelibs3/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-aw,v 1.2 2002/08/25 19:23:53 jlam Exp $
--- kdeprint/management/kaddprinterwizard.cpp.orig Wed May 8 19:27:33 2002
+++ kdeprint/management/kaddprinterwizard.cpp
diff --git a/x11/kdelibs3/patches/patch-ax b/x11/kdelibs3/patches/patch-ax
index cb1525e9ad8..fb8817b52fb 100644
--- a/x11/kdelibs3/patches/patch-ax
+++ b/x11/kdelibs3/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-ax,v 1.2 2002/08/25 19:23:53 jlam Exp $
--- kdeprint/management/kaddprinterwizard_main.cpp.orig Thu May 30 09:48:52 2002
+++ kdeprint/management/kaddprinterwizard_main.cpp
diff --git a/x11/kdelibs3/patches/patch-ay b/x11/kdelibs3/patches/patch-ay
index 88e3d107f3d..9dd3d3061f9 100644
--- a/x11/kdelibs3/patches/patch-ay
+++ b/x11/kdelibs3/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-ay,v 1.2 2002/08/25 19:23:53 jlam Exp $
--- kdoctools/xslt.cpp.orig Wed May 8 19:27:41 2002
+++ kdoctools/xslt.cpp
diff --git a/x11/kdelibs3/patches/patch-az b/x11/kdelibs3/patches/patch-az
index c47bc0f4fbf..b283240a79a 100644
--- a/x11/kdelibs3/patches/patch-az
+++ b/x11/kdelibs3/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-az,v 1.2 2002/08/25 19:23:53 jlam Exp $
--- kinit/Makefile.am.orig Wed Jan 23 06:28:28 2002
+++ kinit/Makefile.am
diff --git a/x11/kdelibs3/patches/patch-ba b/x11/kdelibs3/patches/patch-ba
index 60fabf7c2cf..2a93504785d 100644
--- a/x11/kdelibs3/patches/patch-ba
+++ b/x11/kdelibs3/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $
--- kinit/Makefile.in.orig Tue May 21 15:42:12 2002
+++ kinit/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-bb b/x11/kdelibs3/patches/patch-bb
index 215b06bee1b..79edfe33c97 100644
--- a/x11/kdelibs3/patches/patch-bb
+++ b/x11/kdelibs3/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.2 2002/07/17 07:54:12 skrll Exp $
+$NetBSD: patch-bb,v 1.3 2002/08/25 19:23:53 jlam Exp $
--- kinit/klauncher_main.cpp.orig Mon Jun 24 13:04:02 2002
+++ kinit/klauncher_main.cpp
diff --git a/x11/kdelibs3/patches/patch-bc b/x11/kdelibs3/patches/patch-bc
index eb614c778ac..2884769c99d 100644
--- a/x11/kdelibs3/patches/patch-bc
+++ b/x11/kdelibs3/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-bc,v 1.2 2002/08/25 19:23:53 jlam Exp $
--- kinit/main.cpp.orig Thu May 30 09:48:52 2002
+++ kinit/main.cpp
diff --git a/x11/kdelibs3/patches/patch-bd b/x11/kdelibs3/patches/patch-bd
index 09cfb260643..1d821ad78eb 100644
--- a/x11/kdelibs3/patches/patch-bd
+++ b/x11/kdelibs3/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.2 2002/08/15 08:22:10 skrll Exp $
+$NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $
--- kio/kssl/kopenssl.cc.orig Wed Aug 14 15:37:35 2002
+++ kio/kssl/kopenssl.cc
diff --git a/x11/kdelibs3/patches/patch-be b/x11/kdelibs3/patches/patch-be
index fb2d339b2d8..0f7d74a122e 100644
--- a/x11/kdelibs3/patches/patch-be
+++ b/x11/kdelibs3/patches/patch-be
@@ -1,4 +1,4 @@
-$NetBSD: patch-be,v 1.2 2002/08/15 08:22:10 skrll Exp $
+$NetBSD: patch-be,v 1.3 2002/08/25 19:23:54 jlam Exp $
--- kio/kssl/ksslcertificate.cc.orig Wed Aug 14 15:48:38 2002
+++ kio/kssl/ksslcertificate.cc
diff --git a/x11/kdelibs3/patches/patch-bf b/x11/kdelibs3/patches/patch-bf
index 704944f93e2..d92f5554b08 100644
--- a/x11/kdelibs3/patches/patch-bf
+++ b/x11/kdelibs3/patches/patch-bf
@@ -1,4 +1,4 @@
-$NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-bf,v 1.2 2002/08/25 19:23:54 jlam Exp $
--- kio/kssl/ksslsettings.cc.orig Thu Feb 7 22:16:52 2002
+++ kio/kssl/ksslsettings.cc
diff --git a/x11/kdelibs3/patches/patch-bg b/x11/kdelibs3/patches/patch-bg
index a0a563ab12a..2d9789ca09b 100644
--- a/x11/kdelibs3/patches/patch-bg
+++ b/x11/kdelibs3/patches/patch-bg
@@ -1,4 +1,4 @@
-$NetBSD: patch-bg,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-bg,v 1.2 2002/08/25 19:23:54 jlam Exp $
--- kio/misc/Makefile.am.orig Fri Jan 4 10:52:42 2002
+++ kio/misc/Makefile.am
diff --git a/x11/kdelibs3/patches/patch-bh b/x11/kdelibs3/patches/patch-bh
index 6754b61e9c2..afafa74ef63 100644
--- a/x11/kdelibs3/patches/patch-bh
+++ b/x11/kdelibs3/patches/patch-bh
@@ -1,4 +1,4 @@
-$NetBSD: patch-bh,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $
--- kio/misc/Makefile.in.orig Tue May 21 15:42:15 2002
+++ kio/misc/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-bi b/x11/kdelibs3/patches/patch-bi
index 9603bb22e7e..b8cd03fdc22 100644
--- a/x11/kdelibs3/patches/patch-bi
+++ b/x11/kdelibs3/patches/patch-bi
@@ -1,4 +1,4 @@
-$NetBSD: patch-bi,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-bi,v 1.2 2002/08/25 19:23:54 jlam Exp $
--- kio/misc/kio_uiserver_main.cpp.orig Thu May 30 09:48:54 2002
+++ kio/misc/kio_uiserver_main.cpp
diff --git a/x11/kdelibs3/patches/patch-bj b/x11/kdelibs3/patches/patch-bj
index b8b3d273708..a415dd89383 100644
--- a/x11/kdelibs3/patches/patch-bj
+++ b/x11/kdelibs3/patches/patch-bj
@@ -1,4 +1,4 @@
-$NetBSD: patch-bj,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-bj,v 1.2 2002/08/25 19:23:54 jlam Exp $
--- kio/misc/kssld/kssld.cpp.orig Wed May 8 19:28:06 2002
+++ kio/misc/kssld/kssld.cpp
diff --git a/x11/kdelibs3/patches/patch-bk b/x11/kdelibs3/patches/patch-bk
index 2ffaeef49a1..a926ef6ff7c 100644
--- a/x11/kdelibs3/patches/patch-bk
+++ b/x11/kdelibs3/patches/patch-bk
@@ -1,4 +1,4 @@
-$NetBSD: patch-bk,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-bk,v 1.2 2002/08/25 19:23:54 jlam Exp $
--- kio/misc/uiserver.cpp.orig Fri Mar 1 19:47:27 2002
+++ kio/misc/uiserver.cpp
diff --git a/x11/kdelibs3/patches/patch-bl b/x11/kdelibs3/patches/patch-bl
index f22c511e4a9..140feb6cc35 100644
--- a/x11/kdelibs3/patches/patch-bl
+++ b/x11/kdelibs3/patches/patch-bl
@@ -1,4 +1,4 @@
-$NetBSD: patch-bl,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-bl,v 1.2 2002/08/25 19:23:54 jlam Exp $
--- kioslave/file/file.cc.orig Thu Feb 28 14:50:26 2002
+++ kioslave/file/file.cc
diff --git a/x11/kdelibs3/patches/patch-bm b/x11/kdelibs3/patches/patch-bm
index e4a4a750016..5d1c55818cd 100644
--- a/x11/kdelibs3/patches/patch-bm
+++ b/x11/kdelibs3/patches/patch-bm
@@ -1,4 +1,4 @@
-$NetBSD: patch-bm,v 1.1.1.1 2002/05/31 13:16:47 skrll Exp $
+$NetBSD: patch-bm,v 1.2 2002/08/25 19:23:54 jlam Exp $
--- kioslave/http/Makefile.am.orig Fri Jan 18 16:04:23 2002
+++ kioslave/http/Makefile.am
diff --git a/x11/kdelibs3/patches/patch-bn b/x11/kdelibs3/patches/patch-bn
index 55ce6de7421..c5d94a28785 100644
--- a/x11/kdelibs3/patches/patch-bn
+++ b/x11/kdelibs3/patches/patch-bn
@@ -1,4 +1,4 @@
-$NetBSD: patch-bn,v 1.2 2002/06/27 07:10:14 skrll Exp $
+$NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $
--- kioslave/http/Makefile.in.orig Wed Jun 26 08:21:42 2002
+++ kioslave/http/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-bo b/x11/kdelibs3/patches/patch-bo
index 050c10657a6..1aec66da79a 100644
--- a/x11/kdelibs3/patches/patch-bo
+++ b/x11/kdelibs3/patches/patch-bo
@@ -1,4 +1,4 @@
-$NetBSD: patch-bo,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
+$NetBSD: patch-bo,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- kioslave/http/http_cache_cleaner.cpp.orig Fri Dec 21 07:23:33 2001
+++ kioslave/http/http_cache_cleaner.cpp
diff --git a/x11/kdelibs3/patches/patch-bp b/x11/kdelibs3/patches/patch-bp
index 504a7ff13ef..f1c7f2abed9 100644
--- a/x11/kdelibs3/patches/patch-bp
+++ b/x11/kdelibs3/patches/patch-bp
@@ -1,4 +1,4 @@
-$NetBSD: patch-bp,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
+$NetBSD: patch-bp,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- kioslave/http/http_cache_cleaner_main.cpp.orig Thu May 30 09:48:55 2002
+++ kioslave/http/http_cache_cleaner_main.cpp
diff --git a/x11/kdelibs3/patches/patch-bq b/x11/kdelibs3/patches/patch-bq
index 02debeacc98..25c08040085 100644
--- a/x11/kdelibs3/patches/patch-bq
+++ b/x11/kdelibs3/patches/patch-bq
@@ -1,4 +1,4 @@
-$NetBSD: patch-bq,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
+$NetBSD: patch-bq,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- kioslave/http/kcookiejar/Makefile.am.orig Fri May 11 02:23:55 2001
+++ kioslave/http/kcookiejar/Makefile.am
diff --git a/x11/kdelibs3/patches/patch-br b/x11/kdelibs3/patches/patch-br
index 4340a0862bc..458e9fa80b6 100644
--- a/x11/kdelibs3/patches/patch-br
+++ b/x11/kdelibs3/patches/patch-br
@@ -1,4 +1,4 @@
-$NetBSD: patch-br,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
+$NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- kioslave/http/kcookiejar/Makefile.in.orig Tue May 21 15:42:15 2002
+++ kioslave/http/kcookiejar/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-bs b/x11/kdelibs3/patches/patch-bs
index 0c1f6cc9924..fedee546142 100644
--- a/x11/kdelibs3/patches/patch-bs
+++ b/x11/kdelibs3/patches/patch-bs
@@ -1,4 +1,4 @@
-$NetBSD: patch-bs,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
+$NetBSD: patch-bs,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- kioslave/http/kcookiejar/kcookiejar_main.cpp.orig Thu May 30 09:48:55 2002
+++ kioslave/http/kcookiejar/kcookiejar_main.cpp
diff --git a/x11/kdelibs3/patches/patch-bt b/x11/kdelibs3/patches/patch-bt
index 28ac4c882f7..ebf050e597d 100644
--- a/x11/kdelibs3/patches/patch-bt
+++ b/x11/kdelibs3/patches/patch-bt
@@ -1,4 +1,4 @@
-$NetBSD: patch-bt,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
+$NetBSD: patch-bt,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- kioslave/http/kcookiejar/main.cpp.orig Wed Dec 27 18:59:18 2000
+++ kioslave/http/kcookiejar/main.cpp
diff --git a/x11/kdelibs3/patches/patch-bu b/x11/kdelibs3/patches/patch-bu
index de0f7cb3bcd..5dd7099c573 100644
--- a/x11/kdelibs3/patches/patch-bu
+++ b/x11/kdelibs3/patches/patch-bu
@@ -1,4 +1,4 @@
-$NetBSD: patch-bu,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
+$NetBSD: patch-bu,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- libkmid/sndcard.h.orig Sat Jun 24 14:35:18 2000
+++ libkmid/sndcard.h
diff --git a/x11/kdelibs3/patches/patch-bv b/x11/kdelibs3/patches/patch-bv
index 71c8139b7f6..b91364ada0c 100644
--- a/x11/kdelibs3/patches/patch-bv
+++ b/x11/kdelibs3/patches/patch-bv
@@ -1,4 +1,4 @@
-$NetBSD: patch-bv,v 1.1.1.1 2002/05/31 13:16:48 skrll Exp $
+$NetBSD: patch-bv,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- mimetypes/application/x-core.desktop.orig Wed May 8 19:28:25 2002
+++ mimetypes/application/x-core.desktop
diff --git a/x11/kdelibs3/patches/patch-bw b/x11/kdelibs3/patches/patch-bw
index 915702fa739..6cedaf864e7 100644
--- a/x11/kdelibs3/patches/patch-bw
+++ b/x11/kdelibs3/patches/patch-bw
@@ -1,4 +1,4 @@
-$NetBSD: patch-bw,v 1.1 2002/06/27 07:10:15 skrll Exp $
+$NetBSD: patch-bw,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- admin/am_edit.orig Wed Jun 26 08:27:56 2002
+++ admin/am_edit
diff --git a/x11/kdelibs3/patches/patch-bx b/x11/kdelibs3/patches/patch-bx
index 5ce76c826b3..d07ecd68a5f 100644
--- a/x11/kdelibs3/patches/patch-bx
+++ b/x11/kdelibs3/patches/patch-bx
@@ -1,4 +1,4 @@
-$NetBSD: patch-bx,v 1.1 2002/06/27 07:10:15 skrll Exp $
+$NetBSD: patch-bx,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- khtml/Makefile.in.orig Wed Jun 26 08:21:40 2002
+++ khtml/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-by b/x11/kdelibs3/patches/patch-by
index 54c7e394047..80a2442bd66 100644
--- a/x11/kdelibs3/patches/patch-by
+++ b/x11/kdelibs3/patches/patch-by
@@ -1,4 +1,4 @@
-$NetBSD: patch-by,v 1.1 2002/06/27 07:10:15 skrll Exp $
+$NetBSD: patch-by,v 1.2 2002/08/25 19:23:55 jlam Exp $
--- kdeprint/Makefile.in.orig Wed Jun 26 08:21:44 2002
+++ kdeprint/Makefile.in
diff --git a/x11/kdelibs3/patches/patch-bz b/x11/kdelibs3/patches/patch-bz
index 5492635d414..963f21bde93 100644
--- a/x11/kdelibs3/patches/patch-bz
+++ b/x11/kdelibs3/patches/patch-bz
@@ -1,4 +1,4 @@
-$NetBSD: patch-bz,v 1.1 2002/08/15 08:22:10 skrll Exp $
+$NetBSD: patch-bz,v 1.2 2002/08/25 19:23:56 jlam Exp $
--- kio/kssl/kopenssl.h.orig Wed Apr 10 23:00:44 2002
+++ kio/kssl/kopenssl.h
diff --git a/x11/kdelibs3/patches/patch-ca b/x11/kdelibs3/patches/patch-ca
index dc1ffc5b0ce..03793a1b377 100644
--- a/x11/kdelibs3/patches/patch-ca
+++ b/x11/kdelibs3/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.1 2002/08/20 17:08:08 skrll Exp $
+$NetBSD: patch-ca,v 1.2 2002/08/25 19:23:56 jlam Exp $
--- kdesu/kdesu_pty.cpp.orig Mon Aug 19 20:55:44 2002
+++ kdesu/kdesu_pty.cpp
diff --git a/x11/py-Pmw/buildlink2.mk b/x11/py-Pmw/buildlink2.mk
new file mode 100644
index 00000000000..33016503f7f
--- /dev/null
+++ b/x11/py-Pmw/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:56 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pypmw
+BUILDLINK_DEPENDS.pypmw?= ${PYPKGPREFIX}-Pmw-*
+BUILDLINK_PKGSRCDIR.pypmw?= ../../x11/py-Pmw
diff --git a/x11/py-Tk/buildlink2.mk b/x11/py-Tk/buildlink2.mk
new file mode 100644
index 00000000000..839ff27e0fe
--- /dev/null
+++ b/x11/py-Tk/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:56 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pytk
+BUILDLINK_DEPENDS.pytk?= ${PYPKGPREFIX}-Tk-*
+BUILDLINK_PKGSRCDIR.pytk?= ../../x11/py-Tk
diff --git a/x11/py-qt2-sip/buildlink2.mk b/x11/py-qt2-sip/buildlink2.mk
new file mode 100644
index 00000000000..b4a403da80b
--- /dev/null
+++ b/x11/py-qt2-sip/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:57 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pyqt2sip
+BUILDLINK_DEPENDS.pyqt2sip?= ${PYPKGPREFIX}-qt2-sip-*
+BUILDLINK_PKGSRCDIR.pyqt2sip?= ../../x11/py-qt2-sip
diff --git a/x11/py-qt2/buildlink2.mk b/x11/py-qt2/buildlink2.mk
new file mode 100644
index 00000000000..d22e7461381
--- /dev/null
+++ b/x11/py-qt2/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:57 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pyqt2
+BUILDLINK_DEPENDS.pyqt2?= ${PYPKGPREFIX}-qt2-[0-9]*
+BUILDLINK_PKGSRCDIR.pyqt2?= ../../x11/py-qt2
diff --git a/x11/pygtk/buildlink2.mk b/x11/pygtk/buildlink2.mk
new file mode 100644
index 00000000000..2ae8cd5bd4b
--- /dev/null
+++ b/x11/pygtk/buildlink2.mk
@@ -0,0 +1,7 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:58 jlam Exp $
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+= pygtk
+BUILDLINK_DEPENDS.pygtk?= ${PYPKGPREFIX}-gtk-*
+BUILDLINK_PKGSRCDIR.pygtk?= ../../x11/pygtk
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index 4d6770aa627..e7100c8636f 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/04 16:45:04 jdolecek Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 19:23:58 jlam Exp $
#
.include "../qt3-libs/Makefile.common"
diff --git a/x11/qt3-tools/buildlink.mk b/x11/qt3-tools/buildlink.mk
index eb14d32ae60..7a8566c5ef5 100644
--- a/x11/qt3-tools/buildlink.mk
+++ b/x11/qt3-tools/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/05/29 19:09:56 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:23:58 jlam Exp $
#
# This Makefile fragment is included by packages that use qt3-tools.
#
diff --git a/x11/qt3-tools/buildlink2.mk b/x11/qt3-tools/buildlink2.mk
new file mode 100644
index 00000000000..188a7fa1456
--- /dev/null
+++ b/x11/qt3-tools/buildlink2.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:58 jlam Exp $
+
+.if !defined(QT3_TOOLS_BUILDLINK2_MK)
+QT3_TOOLS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= qt3-tools
+BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.4
+BUILDLINK_PKGSRCDIR.qt3-tools?= ../../x11/qt3-tools
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-tools=qt3-tools
+BUILDLINK_PREFIX.qt3-tools= ${X11PREFIX}
+BUILDLINK_FILES.qt3-tools+= qt3/lib/libeditor.*
+BUILDLINK_FILES.qt3-tools+= qt3/lib/libqui.*
+BUILDLINK_FILES.qt3-tools+= qt3/plugins/designer/libdlgplugin.*
+BUILDLINK_FILES.qt3-tools+= qt3/plugins/designer/librcplugin.*
+BUILDLINK_FILES.qt3-tools+= qt3/plugins/designer/libwizards.*
+BUILDLINK_FILES.qt3-tools+= qt3/plugins/imageformats/libqjpeg.*
+BUILDLINK_FILES.qt3-tools+= qt3/plugins/imageformats/libqmng.*
+
+.include "../../x11/qt3-libs/buildlink2.mk"
+
+CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic"
+MAKE_ENV+= UIC="${QTDIR}/bin/uic"
+
+BUILDLINK_TARGETS+= qt3-tools-buildlink
+
+qt3-tools-buildlink: _BUILDLINK_USE
+
+.endif # QT3_TOOLS_BUILDLINK2_MK
diff --git a/x11/wx1Motif/Makefile b/x11/wx1Motif/Makefile
index 95087c080e2..a13044d9dc8 100644
--- a/x11/wx1Motif/Makefile
+++ b/x11/wx1Motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/17 02:24:56 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 19:23:59 jlam Exp $
#
DISTNAME= wx1Motif-1.68e
diff --git a/x11/wx1Motif/PLIST b/x11/wx1Motif/PLIST
index 734b8e72b8a..d588811f202 100644
--- a/x11/wx1Motif/PLIST
+++ b/x11/wx1Motif/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/17 02:24:56 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:23:59 jlam Exp $
bin/wx1help_motif
include/wxwindows1/bdiag.xbm
include/wxwindows1/cdiag.xbm
diff --git a/x11/wx1Motif/buildlink.mk b/x11/wx1Motif/buildlink.mk
index 1cef5c2a44b..295c8aaf5ae 100644
--- a/x11/wx1Motif/buildlink.mk
+++ b/x11/wx1Motif/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/06/17 02:24:56 dmcmahill Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:23:59 jlam Exp $
#
# This Makefile fragment is included by packages that use wx1Motif.
#
diff --git a/x11/wx1Motif/buildlink2.mk b/x11/wx1Motif/buildlink2.mk
new file mode 100644
index 00000000000..78846b21c4e
--- /dev/null
+++ b/x11/wx1Motif/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:59 jlam Exp $
+
+.if !defined(WX1MOTIF_BUILDLINK2_MK)
+WX1MOTIF_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= wx1Motif
+BUILDLINK_DEPENDS.wx1Motif?= wx1Motif>=1.68e
+BUILDLINK_PKGSRCDIR.wx1Motif?= ../../x11/wx1Motif
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.wx1Motif=wx1Motif
+BUILDLINK_PREFIX.wx1Motif_DEFAULT= ${X11PREFIX}
+
+BUILDLINK_FILES.wx1Motif= include/wxwindows1/*
+BUILDLINK_FILES.wx1Motif+= lib/wxwindows1/libwx_motif.a
+
+WX1MOTIF_CPPFLAGS= -I${BUILDLINK_PREFIX.wx1Motif}/include/wxwindows1
+WX1MOTIF_LDFLAGS= -L${BUILDLINK_PREFIX.wx1Motif}/lib/wxwindows1
+
+CFLAGS+= ${WX1MOTIF_CPPFLAGS}
+CXXFLAGS+= ${WX1MOTIF_CPPFLAGS}
+CPPFLAGS+= ${WX1MOTIF_CPPFLAGS}
+LDFLAGS+= ${WX1MOTIF_LDFLAGS}
+
+.include "../../mk/motif.buildlink2.mk"
+
+BUILDLINK_TARGETS+= wx1Motif-buildlink
+
+wx1Motif-buildlink: _BUILDLINK_USE
+
+.endif # WX1MOTIF_BUILDLINK2_MK
diff --git a/x11/wx1Motif/distinfo b/x11/wx1Motif/distinfo
index 1ea60d9aeee..3f2ff4a081d 100644
--- a/x11/wx1Motif/distinfo
+++ b/x11/wx1Motif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/08/12 12:05:15 agc Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:23:59 jlam Exp $
SHA1 (wx168_1.tgz) = 771e5301d81560c4750c7b28f3ed843267232af3
Size (wx168_1.tgz) = 3267398 bytes
diff --git a/x11/wx1Motif/patches/patch-aa b/x11/wx1Motif/patches/patch-aa
index 21dbc8a5666..1dae94e0839 100644
--- a/x11/wx1Motif/patches/patch-aa
+++ b/x11/wx1Motif/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:24:00 jlam Exp $
--- src/make.env.orig Wed Oct 22 09:13:30 1997
+++ src/make.env
diff --git a/x11/wx1Motif/patches/patch-ab b/x11/wx1Motif/patches/patch-ab
index 55410b18c3f..bfa7d2f156f 100644
--- a/x11/wx1Motif/patches/patch-ab
+++ b/x11/wx1Motif/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:24:00 jlam Exp $
--- utils/prologio/src/makefile.unx.orig Wed Aug 20 16:07:48 1997
+++ utils/prologio/src/makefile.unx
diff --git a/x11/wx1Motif/patches/patch-ac b/x11/wx1Motif/patches/patch-ac
index ae9e19c4245..bd64fe1d9e2 100644
--- a/x11/wx1Motif/patches/patch-ac
+++ b/x11/wx1Motif/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 19:24:00 jlam Exp $
--- contrib/wxxpm/makefile.unx.orig Thu Jul 24 20:41:32 1997
+++ contrib/wxxpm/makefile.unx
diff --git a/x11/wx1Motif/patches/patch-ad b/x11/wx1Motif/patches/patch-ad
index de4d5c2014c..ce69b997cba 100644
--- a/x11/wx1Motif/patches/patch-ad
+++ b/x11/wx1Motif/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/08/07 12:23:41 agc Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/25 19:24:00 jlam Exp $
--- src/x/wx_utils.cpp.orig Tue Oct 21 00:02:44 1997
+++ src/x/wx_utils.cpp
diff --git a/x11/wx1Motif/patches/patch-ae b/x11/wx1Motif/patches/patch-ae
index df98ede73c7..5ed9872b2eb 100644
--- a/x11/wx1Motif/patches/patch-ae
+++ b/x11/wx1Motif/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:24:00 jlam Exp $
--- utils/wxhelp/src/makefile.unx.orig Sun Apr 21 16:56:48 1996
+++ utils/wxhelp/src/makefile.unx
diff --git a/x11/wx1Motif/patches/patch-af b/x11/wx1Motif/patches/patch-af
index ab22f0a42cc..1deff693b7c 100644
--- a/x11/wx1Motif/patches/patch-af
+++ b/x11/wx1Motif/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 19:24:00 jlam Exp $
--- src/base/wb_utils.cpp.orig Fri Nov 20 11:57:58 1998
+++ src/base/wb_utils.cpp
diff --git a/x11/wx1Motif/patches/patch-ag b/x11/wx1Motif/patches/patch-ag
index b795a77c196..2e716da8874 100644
--- a/x11/wx1Motif/patches/patch-ag
+++ b/x11/wx1Motif/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/25 19:24:00 jlam Exp $
--- src/x/wx_gdi.cpp.orig Sun Sep 20 21:50:02 1998
+++ src/x/wx_gdi.cpp
diff --git a/x11/wx1Motif/patches/patch-ah b/x11/wx1Motif/patches/patch-ah
index 6e513699791..1c7f6bdf42f 100644
--- a/x11/wx1Motif/patches/patch-ah
+++ b/x11/wx1Motif/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.3 2002/08/12 12:05:16 agc Exp $
+$NetBSD: patch-ah,v 1.4 2002/08/25 19:24:00 jlam Exp $
--- src/x/wx_ipc.cpp.orig Thu Mar 26 17:15:44 1998
+++ src/x/wx_ipc.cpp
diff --git a/x11/wx1Motif/patches/patch-ai b/x11/wx1Motif/patches/patch-ai
index d19b609942e..7b3fcd53655 100644
--- a/x11/wx1Motif/patches/patch-ai
+++ b/x11/wx1Motif/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.2 2002/08/25 19:24:00 jlam Exp $
--- utils/image/src/wx_imgx.h.orig Thu Jul 24 12:14:56 1997
+++ utils/image/src/wx_imgx.h
diff --git a/x11/wx1Motif/patches/patch-aj b/x11/wx1Motif/patches/patch-aj
index 32dd22a904f..d7a18815d93 100644
--- a/x11/wx1Motif/patches/patch-aj
+++ b/x11/wx1Motif/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/06/17 02:24:58 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/25 19:24:00 jlam Exp $
--- src/base/wb_help.cpp.orig Mon Feb 24 17:29:08 1997
+++ src/base/wb_help.cpp
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 474becc61af..a6bf5e28f1e 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/07/26 15:21:08 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2002/08/25 19:24:01 jlam Exp $
#
DISTNAME= xforms-0.9999
diff --git a/x11/xforms/buildlink2.mk b/x11/xforms/buildlink2.mk
new file mode 100644
index 00000000000..7c5a75fcf95
--- /dev/null
+++ b/x11/xforms/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:24:01 jlam Exp $
+
+.if !defined(XFORMS_BUILDLINK2_MK)
+XFORMS_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= xforms
+BUILDLINK_DEPENDS.xforms?= xforms>=0.9999
+BUILDLINK_PKGSRCDIR.xforms?= ../../x11/xforms
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.xforms=xforms
+BUILDLINK_PREFIX.xforms_DEFAULT= ${X11PREFIX}
+BUILDLINK_FILES.xforms= include/X11/forms.h
+BUILDLINK_FILES.xforms+= lib/libforms.*
+BUILDLINK_FILES.xforms+= lib/libxforms.*
+
+.include "../../graphics/xpm/buildlink2.mk"
+
+BUILDLINK_TARGETS+= xforms-buildlink
+
+xforms-buildlink: _BUILDLINK_USE
+
+.endif # XFORMS_BUILDLINK2_MK
diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo
index 2c693481ac4..241b47b8d96 100644
--- a/x11/xforms/distinfo
+++ b/x11/xforms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/08/08 10:37:11 wiz Exp $
+$NetBSD: distinfo,v 1.10 2002/08/25 19:24:01 jlam Exp $
SHA1 (xforms-0.9999.tgz) = d88d24a37ab4fe37fbcb8b85f0c6a727638db217
Size (xforms-0.9999.tgz) = 1040128 bytes
diff --git a/x11/xforms/patches/patch-aa b/x11/xforms/patches/patch-aa
index e80b52b5b11..bb0146937e4 100644
--- a/x11/xforms/patches/patch-aa
+++ b/x11/xforms/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/08/08 10:37:12 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/25 19:24:01 jlam Exp $
--- Imakefile.orig Tue Apr 2 19:05:09 2002
+++ Imakefile
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index ecaaa66a8a3..cb98451ca4d 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/05/02 21:46:08 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/25 19:24:03 jlam Exp $
# $FreeBSD Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp
#
@@ -10,13 +10,14 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= jlam@netbsd.org
COMMENT= OpenLook applications and man pages
-DEPENDS+= xview-lib>=3.2.1:../../x11/xview-lib
NOT_FOR_PLATFORM= *-*-alpha # it builds but everything segfaults...
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
EXTRACT_ELEMENTS= ${DISTNAME}/clients ${DISTNAME}/images
WRKSRC= ${WRKDIR}/${DISTNAME}/clients
+
+USE_BUILDLINK2= # defined
USE_IMAKE= # defined
post-patch:
@@ -29,4 +30,5 @@ post-patch:
${RM} -f $${file}.tmp; \
done
+.include "../../x11/xview-lib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview/Makefile b/x11/xview/Makefile
index a20781c1ef0..766eb472556 100644
--- a/x11/xview/Makefile
+++ b/x11/xview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/17 17:07:28 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/25 19:24:02 jlam Exp $
#
DISTNAME= xview3.2p1-X11R6
@@ -16,7 +16,8 @@ DEPENDS+= xview-clients>=3.2.1:../xview-clients
NOT_FOR_PLATFORM= *-*-alpha # broken va_arg handling in xview-lib
-USE_X11= # defined
+USE_BUILDLINK2= # defined
+USE_X11BASE= # defined
EXTRACT_ONLY= # empty
NO_CHECKSUM= # defined