From fbff88f45c20bab691551cdbd0257b526c03dca2 Mon Sep 17 00:00:00 2001
From: Tilman Keskinoz <arved@FreeBSD.org>
Date: Sat, 17 Mar 2007 18:15:25 +0000
Subject: [PATCH] Revert previous commit and committing the real fix

pointyhat to:	arved (three in a row)
---
 x11-wm/bbconf/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index bcc0be721f47..d072dae8642d 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -20,7 +20,6 @@ USE_QT_VER=	3
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS=	libtool:15
 
 MAN1=		bbconf.1
 PORTDOCS=	AUTHORS ChangeLog README README.html TODO
@@ -40,7 +39,8 @@ PLIST_DIRS=	lib/bbconf/plugins lib/bbconf
 post-patch:
 	@${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|-O2 ||g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+		 s|-lpthread|${PTHREAD_LIBS}|g; s|echo aout|echo elf|' \
+		${WRKSRC}/configure
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 	@${REINPLACE_CMD} -e '/^CXXFLAGS =/s/$$/ -fPIC/' \
 	    ${WRKSRC}/bbconf/plugins/*/Makefile.in