diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 19:21:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 19:21:43 +0000 |
| commit | efb93b17bd48d49105d00f52887445a53f7cd60b (patch) | |
| tree | c69c41be2f3b44bedceeee7e348c2ae58c476c6a /x11 | |
| parent | 653dc760d3901b3c7e67803c589352e8353a5030 (diff) | |
| download | pkgsrc-efb93b17bd48d49105d00f52887445a53f7cd60b.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.
Diffstat (limited to 'x11')
249 files changed, 823 insertions, 229 deletions
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 |