buildlink1 -> buildlink2

Is this the first case of buildlink2 needing additional patches rather
than removing those no longer required?

Expand on the DESCR.  Partially addresses pkg/18374

11 files changed, 150 insertions, 8 deletions

diff --git a/misc/kdepim3/DESCR b/misc/kdepim3/DESCR
index 90ae45773be..8341d15a5f1 100644
--- a/misc/kdepim3/DESCR
+++ b/misc/kdepim3/DESCR
@@ -1 +1,21 @@
-KDE provides an integrated X11 based environment, much like CDE.
+This package provides personal information management applications that are
+part of the standard KDE environment:
+
+* kandy: sync phone book entries between your cell phone and computer
+         ("kandy" comes from "Handy", the german word used for a cellular)
+* korganizer: a calendar-of-events and todo-list manager
+* kpilot: to sync with your PalmPilot
+* kalarm: gui for setting up personal alarm/reminder messages
+* kalarmd: personal alarm/reminder messages daemon
+* knotes: yellow notes application
+
+There is also quite an amount of infrastructure in this package:
+
+* ldif: a parser for LDIF, the LDAP Information Interchange Format
+* libdif: dito, one of them is superfluous
+* libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
+* libimap: IMAP handling
+* libkcal: C++ api for the iCalendar and vCalendar formats
+* librmm: an Internet mail message parser (RFC 822 -> Class hierarchy)
+* kgantt: lib to display and manage Gantt diagrams
+* ksync: library for syncing collections of data entries
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index e065e108b00..25a5bb17791 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/10 16:06:46 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/03 12:08:46 markd Exp $
 
 DISTNAME=	kdepim-3.0.3
 PKGREVISION=	1
@@ -7,11 +7,10 @@ COMMENT=	Personal Information Management tools for the KDE desktop
 
 .include "../../x11/kde3/Makefile.kde3"
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libical/libtool
 
-.include "../../comms/pilot-link-libs/buildlink.mk"
-.include "../../x11/kde3/buildlink.mk"
-.include "../../x11/kdebase3/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../comms/pilot-link-libs/buildlink2.mk"
+.include "../../x11/kde3/buildlink2.mk"
+.include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 5213c6d9242..33c39447b84 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,4 +1,12 @@
-$NetBSD: distinfo,v 1.3 2002/08/28 07:15:36 skrll Exp $
+$NetBSD: distinfo,v 1.4 2002/10/03 12:08:46 markd Exp $
 
 SHA1 (kdepim-3.0.3.tar.bz2) = feeb8f6b3e1d07e68c461735b9c667e542f52ef5
 Size (kdepim-3.0.3.tar.bz2) = 3155568 bytes
+SHA1 (patch-aa) = 28d07a7e4063df62a055a40129338f9831b61c49
+SHA1 (patch-ab) = 24a1da2c4ef1c7625e750a8bee958abe15bea717
+SHA1 (patch-ac) = 86ab25fdb17ce974668946dcaab5417df33d8f96
+SHA1 (patch-ad) = 636a472961d9869bf0792b6eea0e02ddadbd99fe
+SHA1 (patch-ae) = 04a75a4a00012fc9a03ae25755abb8580f166e98
+SHA1 (patch-af) = 5e9e463878c145f4d0b21fe98eb2e16e83e51904
+SHA1 (patch-ag) = 9d53fcf4f5b14cd979bc1c416951dec6796fc4c2
+SHA1 (patch-ah) = 5d3848a86ca9e4ba9204e3f7526cea0acfe52a62
diff --git a/misc/kdepim3/patches/patch-aa b/misc/kdepim3/patches/patch-aa
new file mode 100644
index 00000000000..f80574d8593
--- /dev/null
+++ b/misc/kdepim3/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2002/10/03 12:08:46 markd Exp $
+
+--- kpilot/conduits/expense/Makefile.am.orig	Tue Jun 25 00:07:11 2002
++++ kpilot/conduits/expense/Makefile.am	Thu Oct  3 15:23:42 2002
+@@ -14,7 +14,7 @@
+ libexpenseconduit_la_SOURCES = expenseConduit.ui setupDialog.cc \
+ 	expense.cc expense-factory.cc
+ libexpenseconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
+-libexpenseconduit_la_LIBADD  =  -lkpilot
++libexpenseconduit_la_LIBADD  =  ../../lib/libkpilot.la
+ 
+ # this option you can leave out. Just, if you use "make dist", you need it
+ noinst_HEADERS = expense.h setupDialog.h 
diff --git a/misc/kdepim3/patches/patch-ab b/misc/kdepim3/patches/patch-ab
new file mode 100644
index 00000000000..e77b811a2a0
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/10/03 12:08:46 markd Exp $
+
+--- kpilot/conduits/expense/Makefile.in.orig	Thu Aug  8 06:10:08 2002
++++ kpilot/conduits/expense/Makefile.in	Thu Oct  3 15:24:03 2002
+@@ -250,7 +250,7 @@
+ 	expense.cc expense-factory.cc expenseConduit.cc
+ 
+ libexpenseconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
+-libexpenseconduit_la_LIBADD = -lkpilot
++libexpenseconduit_la_LIBADD = ../../lib/libkpilot.la
+ 
+ # this option you can leave out. Just, if you use "make dist", you need it
+ noinst_HEADERS = expense.h setupDialog.h 
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
new file mode 100644
index 00000000000..a8e2e538d75
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1 2002/10/03 12:08:46 markd Exp $
+
+--- kpilot/conduits/null/Makefile.am.orig	Tue Jun 25 00:07:11 2002
++++ kpilot/conduits/null/Makefile.am	Thu Oct  3 15:24:26 2002
+@@ -10,5 +10,5 @@
+ 
+ libnullconduit_la_SOURCES = setup_base.ui null-conduit.cc null-factory.cc
+ libnullconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
+-libnullconduit_la_LIBADD = -lkpilot
++libnullconduit_la_LIBADD = ../../lib/libkpilot.la
+ 
diff --git a/misc/kdepim3/patches/patch-ad b/misc/kdepim3/patches/patch-ad
new file mode 100644
index 00000000000..add8cc7a368
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/10/03 12:08:46 markd Exp $
+
+--- kpilot/conduits/null/Makefile.in.orig	Thu Aug  8 06:10:08 2002
++++ kpilot/conduits/null/Makefile.in	Thu Oct  3 15:24:39 2002
+@@ -244,7 +244,7 @@
+ #>+ 1
+ libnullconduit_la_SOURCES= null-conduit.cc null-factory.cc setup_base.cc
+ libnullconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
+-libnullconduit_la_LIBADD = -lkpilot
++libnullconduit_la_LIBADD = ../../lib/libkpilot.la
+ subdir = kpilot/conduits/null
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae
new file mode 100644
index 00000000000..d380cda1233
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/10/03 12:08:47 markd Exp $
+
+--- kpilot/conduits/popmail/Makefile.am.orig	Tue Jun 25 00:07:11 2002
++++ kpilot/conduits/popmail/Makefile.am	Thu Oct  3 15:25:02 2002
+@@ -17,7 +17,7 @@
+ libpopmailconduit_la_SOURCES = popmail-factory.cc setupDialog.cc \
+ 	passworddialog.cc popmail-conduit.cc parsedate.c
+ libpopmailconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
+-libpopmailconduit_la_LIBADD   =  -lkpilot
++libpopmailconduit_la_LIBADD   =  ../../lib/libkpilot.la
+ 
+ # this option you can leave out. Just, if you use "make dist", you need it
+ noinst_HEADERS = popmail-conduit.h passworddialog.h setupDialog.h
diff --git a/misc/kdepim3/patches/patch-af b/misc/kdepim3/patches/patch-af
new file mode 100644
index 00000000000..55a74378bfa
--- /dev/null
+++ b/misc/kdepim3/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2002/10/03 12:08:47 markd Exp $
+
+--- kpilot/conduits/popmail/Makefile.in.orig	Thu Aug  8 06:10:09 2002
++++ kpilot/conduits/popmail/Makefile.in	Thu Oct  3 15:25:17 2002
+@@ -251,7 +251,7 @@
+ 	passworddialog.cc popmail-conduit.cc parsedate.c
+ 
+ libpopmailconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
+-libpopmailconduit_la_LIBADD = -lkpilot
++libpopmailconduit_la_LIBADD = ../../lib/libkpilot.la
+ 
+ # this option you can leave out. Just, if you use "make dist", you need it
+ noinst_HEADERS = popmail-conduit.h passworddialog.h setupDialog.h
diff --git a/misc/kdepim3/patches/patch-ag b/misc/kdepim3/patches/patch-ag
new file mode 100644
index 00000000000..7746d281c22
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2002/10/03 12:08:47 markd Exp $
+
+--- kpilot/conduits/vcalconduit/Makefile.am.orig	Tue Jun 25 00:07:11 2002
++++ kpilot/conduits/vcalconduit/Makefile.am	Thu Oct  3 15:27:06 2002
+@@ -17,10 +17,10 @@
+ libvcalconduit_la_SOURCES = korganizerConduit.ui vcal-factorybase.cc vcal-factory.cc  \
+ 	vcal-setup.cc vcal-conduitbase.cc vcal-conduit.cc
+ libvcalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
+-libvcalconduit_la_LIBADD = -lkpilot -lkcal
++libvcalconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la
+ 
+ libtodoconduit_la_SOURCES = korganizertodoConduit.ui vcal-factorybase.cc todo-factory.cc  \
+ 	todo-setup.cc vcal-conduitbase.cc todo-conduit.cc
+ libtodoconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
+-libtodoconduit_la_LIBADD = -lkpilot -lkcal
++libtodoconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la
+ 
diff --git a/misc/kdepim3/patches/patch-ah b/misc/kdepim3/patches/patch-ah
new file mode 100644
index 00000000000..e718082652e
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1 2002/10/03 12:08:47 markd Exp $
+
+--- kpilot/conduits/vcalconduit/Makefile.in.orig	Thu Aug  8 06:10:09 2002
++++ kpilot/conduits/vcalconduit/Makefile.in	Thu Oct  3 15:27:32 2002
+@@ -255,7 +255,7 @@
+ 	vcal-setup.cc vcal-conduitbase.cc vcal-conduit.cc korganizerConduit.cc
+ 
+ libvcalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
+-libvcalconduit_la_LIBADD = -lkpilot -lkcal
++libvcalconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la
+ 
+ #>- libtodoconduit_la_SOURCES = korganizertodoConduit.ui vcal-factorybase.cc todo-factory.cc  \
+ #>- todo-setup.cc vcal-conduitbase.cc todo-conduit.cc
+@@ -264,7 +264,7 @@
+ 	todo-setup.cc vcal-conduitbase.cc todo-conduit.cc korganizertodoConduit.cc
+ 
+ libtodoconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal
+-libtodoconduit_la_LIBADD = -lkpilot -lkcal
++libtodoconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la
+ subdir = kpilot/conduits/vcalconduit
+ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h