- Fix after objformat removal

Reported by:	pointyhat

8 files changed, 15 insertions, 3 deletions

diff --git a/lang/pnet-base/Makefile b/lang/pnet-base/Makefile
index 5c0877d8323e..e31356183474 100644
--- a/lang/pnet-base/Makefile
+++ b/lang/pnet-base/Makefile
@@ -77,6 +77,8 @@ post-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|`$$CC -print-multi-os-directory 2>/dev/null`|elf|' \
 		${WRKSRC}/libffi/configure ${WRKSRC}/libffi/configure.in
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/ltconfig \
+		${WRKSRC}/libgc/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/multimedia/gaim-xmms-remote/Makefile b/multimedia/gaim-xmms-remote/Makefile
index 2bec588bcf86..725649c8956f 100644
--- a/multimedia/gaim-xmms-remote/Makefile
+++ b/multimedia/gaim-xmms-remote/Makefile
@@ -28,5 +28,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
 		-e 's#\([@(]\)GAIM_LIBDIR\([@)]\)#\1libdir\2#' \
 		-e 's#\([@(]\)GAIM_DATADIR\([@)]\)#\1datadir\2#'
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net-im/gaim-bangexec/Makefile b/net-im/gaim-bangexec/Makefile
index 1740b734838a..721d230d0404 100644
--- a/net-im/gaim-bangexec/Makefile
+++ b/net-im/gaim-bangexec/Makefile
@@ -26,6 +26,6 @@ GNU_CONFIGURE=	yes
 PLIST_FILES=	lib/gaim/bangexec.la lib/gaim/bangexec.so
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-g3||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-g3|| ; s|echo aout|echo elf|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net-im/gaim-extprefs/Makefile b/net-im/gaim-extprefs/Makefile
index 1db0b358f2f1..f27b713bcf7e 100644
--- a/net-im/gaim-extprefs/Makefile
+++ b/net-im/gaim-extprefs/Makefile
@@ -27,6 +27,6 @@ CFLAGS+=	"-fPIC"
 PLIST_FILES=	lib/gaim/libextprefs.la lib/gaim/libextprefs.so
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/-g3//' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's/-g3// ; s|echo aout|echo elf|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net-im/gaim-ignorance/Makefile b/net-im/gaim-ignorance/Makefile
index bba7aa20af45..72e7035079e2 100644
--- a/net-im/gaim-ignorance/Makefile
+++ b/net-im/gaim-ignorance/Makefile
@@ -27,7 +27,7 @@ SUB_FILES=	pkg-message
 PORTDOCS=	README
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-g3||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-g3|| ; s|echo aout|echo elf|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s/ignorance.conf/ignorance.conf.sample/g" ${WRKSRC}/Makefile.in
 	@${MV} ${WRKSRC}/ignorance.conf ${WRKSRC}/ignorance.conf.sample
 
diff --git a/net-im/gaim-slashexec/Makefile b/net-im/gaim-slashexec/Makefile
index 4e69fc4d7007..f61f7971b499 100644
--- a/net-im/gaim-slashexec/Makefile
+++ b/net-im/gaim-slashexec/Makefile
@@ -23,4 +23,7 @@ GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/gaim/se.la lib/gaim/se.so
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/security/gaim-otr/Makefile b/security/gaim-otr/Makefile
index d1ddf1b3b2ae..a9e9a952059c 100644
--- a/security/gaim-otr/Makefile
+++ b/security/gaim-otr/Makefile
@@ -28,4 +28,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib \
 		--with-libotr-inc-prefix=${LOCALBASE}/include
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index d1ddf1b3b2ae..a9e9a952059c 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -28,4 +28,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libotr-prefix=${LOCALBASE}/lib \
 		--with-libotr-inc-prefix=${LOCALBASE}/include
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+
 .include <bsd.port.mk>