Fix the KDE ports to not use objprelink, if OSVERSION >= 500029. This is

not tested other than for syntax, but should DTRT from what I understand
of the problem.

Submitted by:	bento

11 files changed, 66 insertions, 22 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 66e26fa7ceeb..042ef81f0608 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--without-ldap --disable-closure
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+
 .if exists(${X11BASE}/include/Xm/Xm.h)
 WITH_MOTIF=	yes
 .endif
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 66e26fa7ceeb..042ef81f0608 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--without-ldap --disable-closure
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+
 .if exists(${X11BASE}/include/Xm/Xm.h)
 WITH_MOTIF=	yes
 .endif
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 66e26fa7ceeb..042ef81f0608 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--without-ldap --disable-closure
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+
 .if exists(${X11BASE}/include/Xm/Xm.h)
 WITH_MOTIF=	yes
 .endif
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 66e26fa7ceeb..042ef81f0608 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--without-ldap --disable-closure
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+
 .if exists(${X11BASE}/include/Xm/Xm.h)
 WITH_MOTIF=	yes
 .endif
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 66e26fa7ceeb..042ef81f0608 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--without-ldap --disable-closure
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+
 .if exists(${X11BASE}/include/Xm/Xm.h)
 WITH_MOTIF=	yes
 .endif
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 66e26fa7ceeb..042ef81f0608 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--without-ldap --disable-closure
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+
 .if exists(${X11BASE}/include/Xm/Xm.h)
 WITH_MOTIF=	yes
 .endif
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 66e26fa7ceeb..042ef81f0608 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--without-ldap --disable-closure
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+
 .if exists(${X11BASE}/include/Xm/Xm.h)
 WITH_MOTIF=	yes
 .endif
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 66e26fa7ceeb..042ef81f0608 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -32,10 +32,14 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--without-ldap --disable-closure
 USE_GMAKE=	yes
 
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
+.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
+
 .if exists(${X11BASE}/include/Xm/Xm.h)
 WITH_MOTIF=	yes
 .endif
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 48a1f7455feb..1a1de25b5580 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -37,14 +37,18 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
 .include "${.CURDIR}/../../x11/kde2/Makefile.kde"
 
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}" LDCONFIG="${LDCONFIG}"
 
-.include <bsd.port.pre.mk>
-
 pre-fetch:
 .if ${OSVERSION} <= 410002
 	@${ECHO}
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 48a1f7455feb..1a1de25b5580 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -37,14 +37,18 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
 .include "${.CURDIR}/../../x11/kde2/Makefile.kde"
 
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}" LDCONFIG="${LDCONFIG}"
 
-.include <bsd.port.pre.mk>
-
 pre-fetch:
 .if ${OSVERSION} <= 410002
 	@${ECHO}
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 48a1f7455feb..1a1de25b5580 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -37,14 +37,18 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
 .include "${.CURDIR}/../../x11/kde2/Makefile.kde"
 
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}" LDCONFIG="${LDCONFIG}"
 
-.include <bsd.port.pre.mk>
-
 pre-fetch:
 .if ${OSVERSION} <= 410002
 	@${ECHO}