Unbreak for ELF systems.

PR:		9556
Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

4 files changed, 32 insertions, 12 deletions

diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index f0a4485eb4ff..bbab9a8bb970 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:				23 September 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.7 1998/08/29 20:24:34 hoek Exp $
+# $Id: Makefile,v 1.8 1998/10/06 07:35:03 asami Exp $
 #
 
 DISTNAME=		ncurses-4.2
@@ -13,8 +13,6 @@ MASTER_SITES=		${MASTER_SITE_GNU} \
 
 MAINTAINER=		andy@icc.surw.chel.su
 
-BROKEN=	runs ldconfig without arguments
-
 MAN1=	captoinfo.1m clear.1 infocmp.1m tic.1m toe.1m tput.1 tset.1
 MAN3=	curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
 	curs_beep.3x curs_bkgd.3x curs_border.3x curs_clear.3x \
@@ -48,10 +46,18 @@ MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--disable-termcap --includedir=${PREFIX}/include/ncurses \
-		--prefix=${PREFIX} --with-profile --with-shared --with-debug
-CONFIGURE_ENV=		gnat_exists="no"
+		--prefix=${PREFIX} --with-profile --with-shared
+CONFIGURE_ENV=		gnat_exists="no" ac_cv_path_LDCONFIG="/usr/bin/env OBJFORMAT=${PORTOBJFORMAT} /sbin/ldconfig -m ${PREFIX}/lib"
+
+.include <bsd.port.pre.mk>
 
 post-install:
+.if ${PORTOBJFORMAT} == "aout"
+	@ ${LN} -sf ${PREFIX}/lib/libform.so.4.2 ${PREFIX}/lib/libform.so
+	@ ${LN} -sf ${PREFIX}/lib/libmenu.so.4.2 ${PREFIX}/lib/libmenu.so
+	@ ${LN} -sf ${PREFIX}/lib/libncurses.so.4.2 ${PREFIX}/lib/libncurses.so
+	@ ${LN} -sf ${PREFIX}/lib/libpanel.so.4.2 ${PREFIX}/lib/libpanel.so
+.endif
 	@ ${MKDIR} ${PREFIX}/share/doc/ncurses
 .for file in ANNOUNCE INSTALL NEWS README TO-DO announce.html misc/hackguide.doc misc/hackguide.html misc/ncurses-intro.doc misc/ncurses-intro.html
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ncurses
@@ -69,4 +75,4 @@ post-install:
 .endfor
 	@ ${INSTALL_DATA} ${FILESDIR}/Makefile.c++ ${PREFIX}/share/examples/ncurses/c++/Makefile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/ncurses-devel/pkg-plist b/devel/ncurses-devel/pkg-plist
index c30c270528de..485fcab7575d 100644
--- a/devel/ncurses-devel/pkg-plist
+++ b/devel/ncurses-devel/pkg-plist
@@ -24,19 +24,23 @@ include/ncurses/term.h
 include/ncurses/termcap.h
 include/ncurses/unctrl.h
 lib/libform.a
+lib/libform.so
 lib/libform.so.4.2
 lib/libform_g.a
 lib/libform_p.a
 lib/libmenu.a
+lib/libmenu.so
 lib/libmenu.so.4.2
 lib/libmenu_g.a
 lib/libmenu_p.a
 lib/libncurses++.a
 lib/libncurses.a
+lib/libncurses.so
 lib/libncurses.so.4.2
 lib/libncurses_g.a
 lib/libncurses_p.a
 lib/libpanel.a
+lib/libpanel.so
 lib/libpanel.so.4.2
 lib/libpanel_g.a
 lib/libpanel_p.a
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index f0a4485eb4ff..bbab9a8bb970 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -3,7 +3,7 @@
 # Date created:				23 September 1997
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.7 1998/08/29 20:24:34 hoek Exp $
+# $Id: Makefile,v 1.8 1998/10/06 07:35:03 asami Exp $
 #
 
 DISTNAME=		ncurses-4.2
@@ -13,8 +13,6 @@ MASTER_SITES=		${MASTER_SITE_GNU} \
 
 MAINTAINER=		andy@icc.surw.chel.su
 
-BROKEN=	runs ldconfig without arguments
-
 MAN1=	captoinfo.1m clear.1 infocmp.1m tic.1m toe.1m tput.1 tset.1
 MAN3=	curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
 	curs_beep.3x curs_bkgd.3x curs_border.3x curs_clear.3x \
@@ -48,10 +46,18 @@ MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--disable-termcap --includedir=${PREFIX}/include/ncurses \
-		--prefix=${PREFIX} --with-profile --with-shared --with-debug
-CONFIGURE_ENV=		gnat_exists="no"
+		--prefix=${PREFIX} --with-profile --with-shared
+CONFIGURE_ENV=		gnat_exists="no" ac_cv_path_LDCONFIG="/usr/bin/env OBJFORMAT=${PORTOBJFORMAT} /sbin/ldconfig -m ${PREFIX}/lib"
+
+.include <bsd.port.pre.mk>
 
 post-install:
+.if ${PORTOBJFORMAT} == "aout"
+	@ ${LN} -sf ${PREFIX}/lib/libform.so.4.2 ${PREFIX}/lib/libform.so
+	@ ${LN} -sf ${PREFIX}/lib/libmenu.so.4.2 ${PREFIX}/lib/libmenu.so
+	@ ${LN} -sf ${PREFIX}/lib/libncurses.so.4.2 ${PREFIX}/lib/libncurses.so
+	@ ${LN} -sf ${PREFIX}/lib/libpanel.so.4.2 ${PREFIX}/lib/libpanel.so
+.endif
 	@ ${MKDIR} ${PREFIX}/share/doc/ncurses
 .for file in ANNOUNCE INSTALL NEWS README TO-DO announce.html misc/hackguide.doc misc/hackguide.html misc/ncurses-intro.doc misc/ncurses-intro.html
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ncurses
@@ -69,4 +75,4 @@ post-install:
 .endfor
 	@ ${INSTALL_DATA} ${FILESDIR}/Makefile.c++ ${PREFIX}/share/examples/ncurses/c++/Makefile
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/ncurses/pkg-plist b/devel/ncurses/pkg-plist
index c30c270528de..485fcab7575d 100644
--- a/devel/ncurses/pkg-plist
+++ b/devel/ncurses/pkg-plist
@@ -24,19 +24,23 @@ include/ncurses/term.h
 include/ncurses/termcap.h
 include/ncurses/unctrl.h
 lib/libform.a
+lib/libform.so
 lib/libform.so.4.2
 lib/libform_g.a
 lib/libform_p.a
 lib/libmenu.a
+lib/libmenu.so
 lib/libmenu.so.4.2
 lib/libmenu_g.a
 lib/libmenu_p.a
 lib/libncurses++.a
 lib/libncurses.a
+lib/libncurses.so
 lib/libncurses.so.4.2
 lib/libncurses_g.a
 lib/libncurses_p.a
 lib/libpanel.a
+lib/libpanel.so
 lib/libpanel.so.4.2
 lib/libpanel_g.a
 lib/libpanel_p.a