8 files changed, 60 insertions, 88 deletions

diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 7232d761abf7..1870564ec0e0 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -18,41 +18,25 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-USE_LIBTOOL=	yes
 USE_BZIP2=	yes
 USE_QT=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+="--with-extra-includes=${PREFIX}/include" \
-		"--x-inc=$(X11BASE)/include" \
-		"--x-lib=$(X11BASE)/lib" \
-		--enable-shared
+CONFIGURE_ARGS=	--enable-shared --x-includes="$(X11BASE)/include" \
+		--x-libraries="$(X11BASE)/lib" --disable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
+LIBVER=		3
+PLIST_SUB+=	LIBVER="${LIBVER}"
+MAKE_ENV+=	SOMAJOR="${LIBVER}" SOMINOR="0"
 
 # generate KDE style mtree
 MTREE_CMD=	${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree
 MTREE_ARGS=	-U -d -e -p
 
-.include <bsd.port.pre.mk>
-
-LIBMAJOR=	3
-LIBMINOR=	0
-.if ${PORTOBJFORMAT} == "aout"
-LIBVER=		${LIBMAJOR}.${LIBMINOR}
-.else
-LIBVER=		${LIBMAJOR}
-.endif
-PLIST_SUB=	LIBVER=${LIBVER}
-MAKE_ENV=	SOMAJOR=${LIBMAJOR} SOMINOR=${LIBMINOR}
-
 post-install:
-	@${TOUCH} ${PREFIX}/lib/libkdecore.la
 .for LIB in jscript kab kdecore kdeui kfile kfm khtmlw kimgio kspell mediatool
 	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${LIBVER} ${PREFIX}/lib/lib${LIB}.so
-.if ${PORTOBJFORMAT} == "aout"
-	@${RM} -f ${PREFIX}/lib/lib${LIB}.so.${LIBMAJOR}
-.endif
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdelibs11/pkg-plist b/x11/kdelibs11/pkg-plist
index 64bc4aff5ecd..02d7bbabb68d 100644
--- a/x11/kdelibs11/pkg-plist
+++ b/x11/kdelibs11/pkg-plist
@@ -124,16 +124,25 @@ include/sections.h
 include/stl_headers.h
 include/xview.h
 lib/libjscript.so.%%LIBVER%%
+lib/libjscript.la
 lib/libkab.so.%%LIBVER%%
+lib/libkab.la
 lib/libkdecore.so.%%LIBVER%%
 lib/libkdecore.la
 lib/libkdeui.so.%%LIBVER%%
+lib/libkdeui.la
 lib/libkfile.so.%%LIBVER%%
+lib/libkfile.la
 lib/libkfm.so.%%LIBVER%%
+lib/libkfm.la
 lib/libkhtmlw.so.%%LIBVER%%
+lib/libkhtmlw.la
 lib/libkimgio.so.%%LIBVER%%
+lib/libkimgio.la
 lib/libkspell.so.%%LIBVER%%
+lib/libkspell.la
 lib/libmediatool.so.%%LIBVER%%
+lib/libmediatool.la
 share/apps/kab/pics/background_1.jpg
 share/apps/kab/pics/dialog_background.jpg
 share/apps/kde/pics/arrow_down.xbm
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 7232d761abf7..1870564ec0e0 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -18,41 +18,25 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-USE_LIBTOOL=	yes
 USE_BZIP2=	yes
 USE_QT=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+="--with-extra-includes=${PREFIX}/include" \
-		"--x-inc=$(X11BASE)/include" \
-		"--x-lib=$(X11BASE)/lib" \
-		--enable-shared
+CONFIGURE_ARGS=	--enable-shared --x-includes="$(X11BASE)/include" \
+		--x-libraries="$(X11BASE)/lib" --disable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
+LIBVER=		3
+PLIST_SUB+=	LIBVER="${LIBVER}"
+MAKE_ENV+=	SOMAJOR="${LIBVER}" SOMINOR="0"
 
 # generate KDE style mtree
 MTREE_CMD=	${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree
 MTREE_ARGS=	-U -d -e -p
 
-.include <bsd.port.pre.mk>
-
-LIBMAJOR=	3
-LIBMINOR=	0
-.if ${PORTOBJFORMAT} == "aout"
-LIBVER=		${LIBMAJOR}.${LIBMINOR}
-.else
-LIBVER=		${LIBMAJOR}
-.endif
-PLIST_SUB=	LIBVER=${LIBVER}
-MAKE_ENV=	SOMAJOR=${LIBMAJOR} SOMINOR=${LIBMINOR}
-
 post-install:
-	@${TOUCH} ${PREFIX}/lib/libkdecore.la
 .for LIB in jscript kab kdecore kdeui kfile kfm khtmlw kimgio kspell mediatool
 	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${LIBVER} ${PREFIX}/lib/lib${LIB}.so
-.if ${PORTOBJFORMAT} == "aout"
-	@${RM} -f ${PREFIX}/lib/lib${LIB}.so.${LIBMAJOR}
-.endif
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist
index 64bc4aff5ecd..02d7bbabb68d 100644
--- a/x11/kdelibs2/pkg-plist
+++ b/x11/kdelibs2/pkg-plist
@@ -124,16 +124,25 @@ include/sections.h
 include/stl_headers.h
 include/xview.h
 lib/libjscript.so.%%LIBVER%%
+lib/libjscript.la
 lib/libkab.so.%%LIBVER%%
+lib/libkab.la
 lib/libkdecore.so.%%LIBVER%%
 lib/libkdecore.la
 lib/libkdeui.so.%%LIBVER%%
+lib/libkdeui.la
 lib/libkfile.so.%%LIBVER%%
+lib/libkfile.la
 lib/libkfm.so.%%LIBVER%%
+lib/libkfm.la
 lib/libkhtmlw.so.%%LIBVER%%
+lib/libkhtmlw.la
 lib/libkimgio.so.%%LIBVER%%
+lib/libkimgio.la
 lib/libkspell.so.%%LIBVER%%
+lib/libkspell.la
 lib/libmediatool.so.%%LIBVER%%
+lib/libmediatool.la
 share/apps/kab/pics/background_1.jpg
 share/apps/kab/pics/dialog_background.jpg
 share/apps/kde/pics/arrow_down.xbm
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 7232d761abf7..1870564ec0e0 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -18,41 +18,25 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-USE_LIBTOOL=	yes
 USE_BZIP2=	yes
 USE_QT=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+="--with-extra-includes=${PREFIX}/include" \
-		"--x-inc=$(X11BASE)/include" \
-		"--x-lib=$(X11BASE)/lib" \
-		--enable-shared
+CONFIGURE_ARGS=	--enable-shared --x-includes="$(X11BASE)/include" \
+		--x-libraries="$(X11BASE)/lib" --disable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
+LIBVER=		3
+PLIST_SUB+=	LIBVER="${LIBVER}"
+MAKE_ENV+=	SOMAJOR="${LIBVER}" SOMINOR="0"
 
 # generate KDE style mtree
 MTREE_CMD=	${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree
 MTREE_ARGS=	-U -d -e -p
 
-.include <bsd.port.pre.mk>
-
-LIBMAJOR=	3
-LIBMINOR=	0
-.if ${PORTOBJFORMAT} == "aout"
-LIBVER=		${LIBMAJOR}.${LIBMINOR}
-.else
-LIBVER=		${LIBMAJOR}
-.endif
-PLIST_SUB=	LIBVER=${LIBVER}
-MAKE_ENV=	SOMAJOR=${LIBMAJOR} SOMINOR=${LIBMINOR}
-
 post-install:
-	@${TOUCH} ${PREFIX}/lib/libkdecore.la
 .for LIB in jscript kab kdecore kdeui kfile kfm khtmlw kimgio kspell mediatool
 	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${LIBVER} ${PREFIX}/lib/lib${LIB}.so
-.if ${PORTOBJFORMAT} == "aout"
-	@${RM} -f ${PREFIX}/lib/lib${LIB}.so.${LIBMAJOR}
-.endif
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 64bc4aff5ecd..02d7bbabb68d 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -124,16 +124,25 @@ include/sections.h
 include/stl_headers.h
 include/xview.h
 lib/libjscript.so.%%LIBVER%%
+lib/libjscript.la
 lib/libkab.so.%%LIBVER%%
+lib/libkab.la
 lib/libkdecore.so.%%LIBVER%%
 lib/libkdecore.la
 lib/libkdeui.so.%%LIBVER%%
+lib/libkdeui.la
 lib/libkfile.so.%%LIBVER%%
+lib/libkfile.la
 lib/libkfm.so.%%LIBVER%%
+lib/libkfm.la
 lib/libkhtmlw.so.%%LIBVER%%
+lib/libkhtmlw.la
 lib/libkimgio.so.%%LIBVER%%
+lib/libkimgio.la
 lib/libkspell.so.%%LIBVER%%
+lib/libkspell.la
 lib/libmediatool.so.%%LIBVER%%
+lib/libmediatool.la
 share/apps/kab/pics/background_1.jpg
 share/apps/kab/pics/dialog_background.jpg
 share/apps/kde/pics/arrow_down.xbm
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 7232d761abf7..1870564ec0e0 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -18,41 +18,25 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-USE_LIBTOOL=	yes
 USE_BZIP2=	yes
 USE_QT=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+="--with-extra-includes=${PREFIX}/include" \
-		"--x-inc=$(X11BASE)/include" \
-		"--x-lib=$(X11BASE)/lib" \
-		--enable-shared
+CONFIGURE_ARGS=	--enable-shared --x-includes="$(X11BASE)/include" \
+		--x-libraries="$(X11BASE)/lib" --disable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
+LIBVER=		3
+PLIST_SUB+=	LIBVER="${LIBVER}"
+MAKE_ENV+=	SOMAJOR="${LIBVER}" SOMINOR="0"
 
 # generate KDE style mtree
 MTREE_CMD=	${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree
 MTREE_ARGS=	-U -d -e -p
 
-.include <bsd.port.pre.mk>
-
-LIBMAJOR=	3
-LIBMINOR=	0
-.if ${PORTOBJFORMAT} == "aout"
-LIBVER=		${LIBMAJOR}.${LIBMINOR}
-.else
-LIBVER=		${LIBMAJOR}
-.endif
-PLIST_SUB=	LIBVER=${LIBVER}
-MAKE_ENV=	SOMAJOR=${LIBMAJOR} SOMINOR=${LIBMINOR}
-
 post-install:
-	@${TOUCH} ${PREFIX}/lib/libkdecore.la
 .for LIB in jscript kab kdecore kdeui kfile kfm khtmlw kimgio kspell mediatool
 	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${LIBVER} ${PREFIX}/lib/lib${LIB}.so
-.if ${PORTOBJFORMAT} == "aout"
-	@${RM} -f ${PREFIX}/lib/lib${LIB}.so.${LIBMAJOR}
-.endif
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 64bc4aff5ecd..02d7bbabb68d 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -124,16 +124,25 @@ include/sections.h
 include/stl_headers.h
 include/xview.h
 lib/libjscript.so.%%LIBVER%%
+lib/libjscript.la
 lib/libkab.so.%%LIBVER%%
+lib/libkab.la
 lib/libkdecore.so.%%LIBVER%%
 lib/libkdecore.la
 lib/libkdeui.so.%%LIBVER%%
+lib/libkdeui.la
 lib/libkfile.so.%%LIBVER%%
+lib/libkfile.la
 lib/libkfm.so.%%LIBVER%%
+lib/libkfm.la
 lib/libkhtmlw.so.%%LIBVER%%
+lib/libkhtmlw.la
 lib/libkimgio.so.%%LIBVER%%
+lib/libkimgio.la
 lib/libkspell.so.%%LIBVER%%
+lib/libkspell.la
 lib/libmediatool.so.%%LIBVER%%
+lib/libmediatool.la
 share/apps/kab/pics/background_1.jpg
 share/apps/kab/pics/dialog_background.jpg
 share/apps/kde/pics/arrow_down.xbm