12 files changed, 62 insertions, 56 deletions

diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index 266e94697680..4e6314f8f9f2 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.11 1998/08/12 06:29:24 asami Exp $
+# $Id: Makefile,v 1.12 1998/10/01 01:07:21 jseger Exp $
 #
 
 DISTNAME=	kdesupport-1.0
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN_ELF=	package
-
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -26,4 +24,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
+post-install:
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
 .include <bsd.port.mk>
diff --git a/converters/kdesupport11/pkg-plist b/converters/kdesupport11/pkg-plist
index 099f9f59b283..9c403a773627 100644
--- a/converters/kdesupport11/pkg-plist
+++ b/converters/kdesupport11/pkg-plist
@@ -1,5 +1,5 @@
 lib/libmimelib.la
-lib/libmimelib.so.1.0
+lib/libmimelib.so.1
 lib/libmimelib.a
 lib/libQwSpriteField.la
 lib/libQwSpriteField.so.5.2
@@ -42,6 +42,6 @@ include/Pix.h
 include/QwCluster.h
 include/QwPublicList.h
 include/QwSpriteField.h
-@exec /sbin/ldconfig -m %B
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm include/mimelib
-@unexec /sbin/ldconfig -R
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 266e94697680..4e6314f8f9f2 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.11 1998/08/12 06:29:24 asami Exp $
+# $Id: Makefile,v 1.12 1998/10/01 01:07:21 jseger Exp $
 #
 
 DISTNAME=	kdesupport-1.0
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR= stable/1.0/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
-BROKEN_ELF=	package
-
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -26,4 +24,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
+post-install:
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
 .include <bsd.port.mk>
diff --git a/converters/kdesupport2/pkg-plist b/converters/kdesupport2/pkg-plist
index 099f9f59b283..9c403a773627 100644
--- a/converters/kdesupport2/pkg-plist
+++ b/converters/kdesupport2/pkg-plist
@@ -1,5 +1,5 @@
 lib/libmimelib.la
-lib/libmimelib.so.1.0
+lib/libmimelib.so.1
 lib/libmimelib.a
 lib/libQwSpriteField.la
 lib/libQwSpriteField.so.5.2
@@ -42,6 +42,6 @@ include/Pix.h
 include/QwCluster.h
 include/QwPublicList.h
 include/QwSpriteField.h
-@exec /sbin/ldconfig -m %B
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm include/mimelib
-@unexec /sbin/ldconfig -R
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 733fa9de2d4d..5424a7270307 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.18 1998/09/19 01:33:48 steve Exp $
+# $Id: Makefile,v 1.19 1998/09/30 01:57:21 jseger Exp $
 #
 
 DISTNAME=	kdelibs-1.0
@@ -16,8 +16,6 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-BROKEN_ELF=	this hasn't been converted to ELF yet
-
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -25,4 +23,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-lib=$(X11BASE)/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
+post-install:
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
 .include <bsd.port.mk>
diff --git a/x11/kdelibs11/pkg-plist b/x11/kdelibs11/pkg-plist
index e1c466f3b57c..4ffec62a2d67 100644
--- a/x11/kdelibs11/pkg-plist
+++ b/x11/kdelibs11/pkg-plist
@@ -102,17 +102,17 @@ include/xview.h
 lib/libjscript.la
 lib/libjscript.so.0.90
 lib/libkdecore.la
-lib/libkdecore.so.1.0
+lib/libkdecore.so.1
 lib/libkdeui.la
-lib/libkdeui.so.1.0
+lib/libkdeui.so.1
 lib/libkfile.la
-lib/libkfile.so.1.0
+lib/libkfile.so.1
 lib/libkfm.la
-lib/libkfm.so.1.0
+lib/libkfm.so.1
 lib/libkhtmlw.la
-lib/libkhtmlw.so.1.0
+lib/libkhtmlw.so.1
 lib/libmediatool.la
-lib/libmediatool.so.1.0
+lib/libmediatool.so.1
 share/apps/kde/pics/arrow_down.xbm
 share/apps/kde/pics/arrow_left.xbm
 share/apps/kde/pics/arrow_right.xbm
@@ -218,7 +218,7 @@ share/toolbar/viewmag+.xpm
 share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
-@exec /sbin/ldconfig -m %B
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/toolbar
 @dirrm share/locale/zh_TW.Big5/LC_MESSAGES
 @dirrm share/locale/zh_TW.Big5
@@ -281,4 +281,4 @@ share/toolbar/viewzoom.xpm
 @dirrm share/apps/kde/pics
 @dirrm share/apps/kde
 @dirrm share/apps
-@unexec /sbin/ldconfig -R
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 733fa9de2d4d..5424a7270307 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.18 1998/09/19 01:33:48 steve Exp $
+# $Id: Makefile,v 1.19 1998/09/30 01:57:21 jseger Exp $
 #
 
 DISTNAME=	kdelibs-1.0
@@ -16,8 +16,6 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-BROKEN_ELF=	this hasn't been converted to ELF yet
-
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -25,4 +23,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-lib=$(X11BASE)/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
+post-install:
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
 .include <bsd.port.mk>
diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist
index e1c466f3b57c..4ffec62a2d67 100644
--- a/x11/kdelibs2/pkg-plist
+++ b/x11/kdelibs2/pkg-plist
@@ -102,17 +102,17 @@ include/xview.h
 lib/libjscript.la
 lib/libjscript.so.0.90
 lib/libkdecore.la
-lib/libkdecore.so.1.0
+lib/libkdecore.so.1
 lib/libkdeui.la
-lib/libkdeui.so.1.0
+lib/libkdeui.so.1
 lib/libkfile.la
-lib/libkfile.so.1.0
+lib/libkfile.so.1
 lib/libkfm.la
-lib/libkfm.so.1.0
+lib/libkfm.so.1
 lib/libkhtmlw.la
-lib/libkhtmlw.so.1.0
+lib/libkhtmlw.so.1
 lib/libmediatool.la
-lib/libmediatool.so.1.0
+lib/libmediatool.so.1
 share/apps/kde/pics/arrow_down.xbm
 share/apps/kde/pics/arrow_left.xbm
 share/apps/kde/pics/arrow_right.xbm
@@ -218,7 +218,7 @@ share/toolbar/viewmag+.xpm
 share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
-@exec /sbin/ldconfig -m %B
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/toolbar
 @dirrm share/locale/zh_TW.Big5/LC_MESSAGES
 @dirrm share/locale/zh_TW.Big5
@@ -281,4 +281,4 @@ share/toolbar/viewzoom.xpm
 @dirrm share/apps/kde/pics
 @dirrm share/apps/kde
 @dirrm share/apps
-@unexec /sbin/ldconfig -R
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 733fa9de2d4d..5424a7270307 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.18 1998/09/19 01:33:48 steve Exp $
+# $Id: Makefile,v 1.19 1998/09/30 01:57:21 jseger Exp $
 #
 
 DISTNAME=	kdelibs-1.0
@@ -16,8 +16,6 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-BROKEN_ELF=	this hasn't been converted to ELF yet
-
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -25,4 +23,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-lib=$(X11BASE)/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
+post-install:
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
 .include <bsd.port.mk>
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index e1c466f3b57c..4ffec62a2d67 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -102,17 +102,17 @@ include/xview.h
 lib/libjscript.la
 lib/libjscript.so.0.90
 lib/libkdecore.la
-lib/libkdecore.so.1.0
+lib/libkdecore.so.1
 lib/libkdeui.la
-lib/libkdeui.so.1.0
+lib/libkdeui.so.1
 lib/libkfile.la
-lib/libkfile.so.1.0
+lib/libkfile.so.1
 lib/libkfm.la
-lib/libkfm.so.1.0
+lib/libkfm.so.1
 lib/libkhtmlw.la
-lib/libkhtmlw.so.1.0
+lib/libkhtmlw.so.1
 lib/libmediatool.la
-lib/libmediatool.so.1.0
+lib/libmediatool.so.1
 share/apps/kde/pics/arrow_down.xbm
 share/apps/kde/pics/arrow_left.xbm
 share/apps/kde/pics/arrow_right.xbm
@@ -218,7 +218,7 @@ share/toolbar/viewmag+.xpm
 share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
-@exec /sbin/ldconfig -m %B
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/toolbar
 @dirrm share/locale/zh_TW.Big5/LC_MESSAGES
 @dirrm share/locale/zh_TW.Big5
@@ -281,4 +281,4 @@ share/toolbar/viewzoom.xpm
 @dirrm share/apps/kde/pics
 @dirrm share/apps/kde
 @dirrm share/apps
-@unexec /sbin/ldconfig -R
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 733fa9de2d4d..5424a7270307 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.18 1998/09/19 01:33:48 steve Exp $
+# $Id: Makefile,v 1.19 1998/09/30 01:57:21 jseger Exp $
 #
 
 DISTNAME=	kdelibs-1.0
@@ -16,8 +16,6 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-BROKEN_ELF=	this hasn't been converted to ELF yet
-
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
@@ -25,4 +23,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-lib=$(X11BASE)/lib"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
+post-install:
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
 .include <bsd.port.mk>
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index e1c466f3b57c..4ffec62a2d67 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -102,17 +102,17 @@ include/xview.h
 lib/libjscript.la
 lib/libjscript.so.0.90
 lib/libkdecore.la
-lib/libkdecore.so.1.0
+lib/libkdecore.so.1
 lib/libkdeui.la
-lib/libkdeui.so.1.0
+lib/libkdeui.so.1
 lib/libkfile.la
-lib/libkfile.so.1.0
+lib/libkfile.so.1
 lib/libkfm.la
-lib/libkfm.so.1.0
+lib/libkfm.so.1
 lib/libkhtmlw.la
-lib/libkhtmlw.so.1.0
+lib/libkhtmlw.so.1
 lib/libmediatool.la
-lib/libmediatool.so.1.0
+lib/libmediatool.so.1
 share/apps/kde/pics/arrow_down.xbm
 share/apps/kde/pics/arrow_left.xbm
 share/apps/kde/pics/arrow_right.xbm
@@ -218,7 +218,7 @@ share/toolbar/viewmag+.xpm
 share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
-@exec /sbin/ldconfig -m %B
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/toolbar
 @dirrm share/locale/zh_TW.Big5/LC_MESSAGES
 @dirrm share/locale/zh_TW.Big5
@@ -281,4 +281,4 @@ share/toolbar/viewzoom.xpm
 @dirrm share/apps/kde/pics
 @dirrm share/apps/kde
 @dirrm share/apps
-@unexec /sbin/ldconfig -R
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R