Update to 3.1.3a. Use USE_OPENLDAP macro.

Approved by:	arved (Mentor)

10 files changed, 12 insertions, 76 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index ee7c2cb..fe867b1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTVERSION=	${KDE_VERSION}a
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
@@ -34,6 +33,7 @@ USE_QT_VER=	3
 PREFIX=		${KDE_PREFIX}
 USE_OPENSSL=	yes
 
+USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -53,23 +53,11 @@ FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-# fam provides a measurable performance increase for file watching
-# operations within KDE
-.if exists(${LOCALBASE}/bin/fam)
-LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
-.endif # exists(${LOCALBASE}/bin/fam)
-
 # bzip2 is required as a libdepend for the help: kioslave
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif # !exists(/usr/bin/bzip2)
 
-# kabc (the addressbook backend) can use ldap if it's available
-.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
-PLIST_APPEND+=	plist.ldap
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} "s, kspell,,g" ${WRKSRC}/doc/Makefile.in
 	${REINPLACE_CMD} "s,-pedantic ,," ${WRKSRC}/configure
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index af67b67..47d8bbb 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.3.tar.bz2) = 0069e199dd69f27f20afbd5b64449725
+MD5 (KDE/kdelibs-3.1.3a.tar.bz2) = d05854938dcbda2e571f7f1ba51cdda7
diff --git a/x11/kdelibs3/files/patch-khtml::rendering::render_root.cpp b/x11/kdelibs3/files/patch-khtml::rendering::render_root.cpp
deleted file mode 100644
index 47adcce..0000000
--- a/x11/kdelibs3/files/patch-khtml::rendering::render_root.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- khtml/rendering/render_root.cpp	16 Jul 2003 00:13:32 -0000	1.116.2.3
-+++ khtml/rendering/render_root.cpp	2 Aug 2003 21:28:49 -0000	1.116.2.4
-@@ -118,7 +118,7 @@ void RenderRoot::layout()
- #endif
-     if (!m_printingMode) {
-         QSize s = m_view->viewportSize(m_view->contentsWidth(),
--                                       0);
-+                                       m_view->contentsHeight());
-         m_width = s.width();
-         m_height = s.height();
-     }
-@@ -132,7 +132,7 @@ void RenderRoot::layout()
-     if (!m_printingMode) {
-         m_view->resizeContents(docWidth(), docHeight());
-         QSize s = m_view->viewportSize(m_view->contentsWidth(),
--                                       m_view->contentsHeight());
-+                                       0);
-         setWidth( m_viewportWidth = s.width() );
-         setHeight(  m_viewportHeight = s.height() );
-     }
diff --git a/x11/kdelibs3/files/plist.base b/x11/kdelibs3/files/plist.base
index f4a1ed0..c146729 100644
--- a/x11/kdelibs3/files/plist.base
+++ b/x11/kdelibs3/files/plist.base
@@ -577,6 +577,8 @@ lib/kcookiejar.la
 lib/kcookiejar.so
 lib/kde3/kabc_dir.la
 lib/kde3/kabc_dir.so
+lib/kde3/kabc_ldap.la
+lib/kde3/kabc_ldap.so
 lib/kde3/kabcformat_binary.la
 lib/kde3/kabcformat_binary.so
 lib/kde3/kbzip2filter.la
@@ -751,6 +753,7 @@ share/apps/LICENSES/LGPL_V2
 share/apps/LICENSES/QPL_V1.0
 share/apps/kabc/formats/binary.desktop
 share/apps/kabc/plugins/dir.desktop
+share/apps/kabc/plugins/ldap.desktop
 share/apps/katepart/katepartreadonlyui.rc
 share/apps/katepart/katepartui.rc
 share/apps/katepart/syntax/ada.xml
diff --git a/x11/kdelibs3/files/plist.ldap b/x11/kdelibs3/files/plist.ldap
deleted file mode 100644
index 2f30c7f..0000000
--- a/x11/kdelibs3/files/plist.ldap
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/kde3/kabc_ldap.la
-lib/kde3/kabc_ldap.so
-share/apps/kabc/plugins/ldap.desktop
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index ee7c2cb..fe867b1 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTVERSION=	${KDE_VERSION}a
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
@@ -34,6 +33,7 @@ USE_QT_VER=	3
 PREFIX=		${KDE_PREFIX}
 USE_OPENSSL=	yes
 
+USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -53,23 +53,11 @@ FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-# fam provides a measurable performance increase for file watching
-# operations within KDE
-.if exists(${LOCALBASE}/bin/fam)
-LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
-.endif # exists(${LOCALBASE}/bin/fam)
-
 # bzip2 is required as a libdepend for the help: kioslave
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif # !exists(/usr/bin/bzip2)
 
-# kabc (the addressbook backend) can use ldap if it's available
-.if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
-PLIST_APPEND+=	plist.ldap
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} "s, kspell,,g" ${WRKSRC}/doc/Makefile.in
 	${REINPLACE_CMD} "s,-pedantic ,," ${WRKSRC}/configure
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index af67b67..47d8bbb 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.3.tar.bz2) = 0069e199dd69f27f20afbd5b64449725
+MD5 (KDE/kdelibs-3.1.3a.tar.bz2) = d05854938dcbda2e571f7f1ba51cdda7
diff --git a/x11/kdelibs4/files/patch-khtml::rendering::render_root.cpp b/x11/kdelibs4/files/patch-khtml::rendering::render_root.cpp
deleted file mode 100644
index 47adcce..0000000
--- a/x11/kdelibs4/files/patch-khtml::rendering::render_root.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- khtml/rendering/render_root.cpp	16 Jul 2003 00:13:32 -0000	1.116.2.3
-+++ khtml/rendering/render_root.cpp	2 Aug 2003 21:28:49 -0000	1.116.2.4
-@@ -118,7 +118,7 @@ void RenderRoot::layout()
- #endif
-     if (!m_printingMode) {
-         QSize s = m_view->viewportSize(m_view->contentsWidth(),
--                                       0);
-+                                       m_view->contentsHeight());
-         m_width = s.width();
-         m_height = s.height();
-     }
-@@ -132,7 +132,7 @@ void RenderRoot::layout()
-     if (!m_printingMode) {
-         m_view->resizeContents(docWidth(), docHeight());
-         QSize s = m_view->viewportSize(m_view->contentsWidth(),
--                                       m_view->contentsHeight());
-+                                       0);
-         setWidth( m_viewportWidth = s.width() );
-         setHeight(  m_viewportHeight = s.height() );
-     }
diff --git a/x11/kdelibs4/files/plist.base b/x11/kdelibs4/files/plist.base
index f4a1ed0..c146729 100644
--- a/x11/kdelibs4/files/plist.base
+++ b/x11/kdelibs4/files/plist.base
@@ -577,6 +577,8 @@ lib/kcookiejar.la
 lib/kcookiejar.so
 lib/kde3/kabc_dir.la
 lib/kde3/kabc_dir.so
+lib/kde3/kabc_ldap.la
+lib/kde3/kabc_ldap.so
 lib/kde3/kabcformat_binary.la
 lib/kde3/kabcformat_binary.so
 lib/kde3/kbzip2filter.la
@@ -751,6 +753,7 @@ share/apps/LICENSES/LGPL_V2
 share/apps/LICENSES/QPL_V1.0
 share/apps/kabc/formats/binary.desktop
 share/apps/kabc/plugins/dir.desktop
+share/apps/kabc/plugins/ldap.desktop
 share/apps/katepart/katepartreadonlyui.rc
 share/apps/katepart/katepartui.rc
 share/apps/katepart/syntax/ada.xml
diff --git a/x11/kdelibs4/files/plist.ldap b/x11/kdelibs4/files/plist.ldap
deleted file mode 100644
index 2f30c7f..0000000
--- a/x11/kdelibs4/files/plist.ldap
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/kde3/kabc_ldap.la
-lib/kde3/kabc_ldap.so
-share/apps/kabc/plugins/ldap.desktop