- Fix after objformat removal

Reported by:	pointyhat

7 files changed, 72 insertions, 48 deletions

diff --git a/biology/embassy/Makefile b/biology/embassy/Makefile
index 5d3ed872749a..bdabee8ee1b0 100644
--- a/biology/embassy/Makefile
+++ b/biology/embassy/Makefile
@@ -89,6 +89,9 @@ do-extract:
 	  fi
 .endfor
 
+post-patch:
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|'
+
 do-configure:
 .for app in ${APPLIST}
 	@ cd ${${app}_WRKSRC} && \
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 10c526be1844..8f285119b080 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -181,6 +181,8 @@ post-patch:
 		-e 's|api.mpt||' \
 		-e 's|^(install-man.*)install-manm|\1|' \
 		${WRKSRC}/doc/mp4v2/Makefile.in
+# objformat
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|'
 
 post-install:
 	@${MKDIR} ${DATADIR}
diff --git a/net-p2p/gkrellm-gift/Makefile b/net-p2p/gkrellm-gift/Makefile
index 638d46b1f942..8488fb25066f 100644
--- a/net-p2p/gkrellm-gift/Makefile
+++ b/net-p2p/gkrellm-gift/Makefile
@@ -27,6 +27,9 @@ USE_X_PREFIX=	yes
 PLIST_FILES=	libexec/gkrellm2/plugins/gift.la \
 		libexec/gkrellm2/plugins/gift.so
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+
 post-install:
 	${STRIP_CMD} ${PREFIX}/libexec/gkrellm2/plugins/${PORTNAME}.so
 
diff --git a/security/krb5-16/files/patch-config::shlib.conf b/security/krb5-16/files/patch-config::shlib.conf
index 272865fd23dc..18f91fffc6d5 100644
--- a/security/krb5-16/files/patch-config::shlib.conf
+++ b/security/krb5-16/files/patch-config::shlib.conf
@@ -1,23 +1,27 @@
---- config/shlib.conf.orig	Thu Apr  7 14:38:55 2005
-+++ config/shlib.conf	Wed Nov 23 16:32:40 2005
-@@ -238,17 +238,21 @@
- 	else
- 		objformat="aout"
- 	fi
+--- config/shlib.conf.orig	Mon Oct 23 05:20:11 2006
++++ config/shlib.conf	Wed Mar 28 17:17:55 2007
+@@ -258,22 +258,15 @@
+ 	;;
+ 
+ *-*-freebsd*)
+-	if test -x /usr/bin/objformat ; then
+-		objformat=`/usr/bin/objformat`
+-	else
+-		objformat="aout"
+-	fi
 -	PICFLAGS=-fpic
+-	if test "x$objformat" = "xelf" ; then
 +	case $krb5_cv_host in
 +	sparc64-*)	PICFLAGS=-fPIC;;
 +	*)		PICFLAGS=-fpic;;
 +	esac
- 	if test "x$objformat" = "xelf" ; then
  		SHLIBVEXT='.so.$(LIBMAJOR)'
 +		LDCOMBINE="libtool --mode=link cc -shared"
  		RPATH_FLAG='-Wl,-rpath -Wl,'
- 	else
-+		LDCOMBINE='ld -Bshareable'
- 		RPATH_FLAG=-R
- 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
- 	fi
+-	else
+-		RPATH_FLAG=-R
+-		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+-	fi
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
  	SHLIBEXT=.so
 -	LDCOMBINE='ld -Bshareable'
diff --git a/security/krb5-17/files/patch-config::shlib.conf b/security/krb5-17/files/patch-config::shlib.conf
index 272865fd23dc..18f91fffc6d5 100644
--- a/security/krb5-17/files/patch-config::shlib.conf
+++ b/security/krb5-17/files/patch-config::shlib.conf
@@ -1,23 +1,27 @@
---- config/shlib.conf.orig	Thu Apr  7 14:38:55 2005
-+++ config/shlib.conf	Wed Nov 23 16:32:40 2005
-@@ -238,17 +238,21 @@
- 	else
- 		objformat="aout"
- 	fi
+--- config/shlib.conf.orig	Mon Oct 23 05:20:11 2006
++++ config/shlib.conf	Wed Mar 28 17:17:55 2007
+@@ -258,22 +258,15 @@
+ 	;;
+ 
+ *-*-freebsd*)
+-	if test -x /usr/bin/objformat ; then
+-		objformat=`/usr/bin/objformat`
+-	else
+-		objformat="aout"
+-	fi
 -	PICFLAGS=-fpic
+-	if test "x$objformat" = "xelf" ; then
 +	case $krb5_cv_host in
 +	sparc64-*)	PICFLAGS=-fPIC;;
 +	*)		PICFLAGS=-fpic;;
 +	esac
- 	if test "x$objformat" = "xelf" ; then
  		SHLIBVEXT='.so.$(LIBMAJOR)'
 +		LDCOMBINE="libtool --mode=link cc -shared"
  		RPATH_FLAG='-Wl,-rpath -Wl,'
- 	else
-+		LDCOMBINE='ld -Bshareable'
- 		RPATH_FLAG=-R
- 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
- 	fi
+-	else
+-		RPATH_FLAG=-R
+-		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+-	fi
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
  	SHLIBEXT=.so
 -	LDCOMBINE='ld -Bshareable'
diff --git a/security/krb5-appl/files/patch-config::shlib.conf b/security/krb5-appl/files/patch-config::shlib.conf
index 272865fd23dc..18f91fffc6d5 100644
--- a/security/krb5-appl/files/patch-config::shlib.conf
+++ b/security/krb5-appl/files/patch-config::shlib.conf
@@ -1,23 +1,27 @@
---- config/shlib.conf.orig	Thu Apr  7 14:38:55 2005
-+++ config/shlib.conf	Wed Nov 23 16:32:40 2005
-@@ -238,17 +238,21 @@
- 	else
- 		objformat="aout"
- 	fi
+--- config/shlib.conf.orig	Mon Oct 23 05:20:11 2006
++++ config/shlib.conf	Wed Mar 28 17:17:55 2007
+@@ -258,22 +258,15 @@
+ 	;;
+ 
+ *-*-freebsd*)
+-	if test -x /usr/bin/objformat ; then
+-		objformat=`/usr/bin/objformat`
+-	else
+-		objformat="aout"
+-	fi
 -	PICFLAGS=-fpic
+-	if test "x$objformat" = "xelf" ; then
 +	case $krb5_cv_host in
 +	sparc64-*)	PICFLAGS=-fPIC;;
 +	*)		PICFLAGS=-fpic;;
 +	esac
- 	if test "x$objformat" = "xelf" ; then
  		SHLIBVEXT='.so.$(LIBMAJOR)'
 +		LDCOMBINE="libtool --mode=link cc -shared"
  		RPATH_FLAG='-Wl,-rpath -Wl,'
- 	else
-+		LDCOMBINE='ld -Bshareable'
- 		RPATH_FLAG=-R
- 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
- 	fi
+-	else
+-		RPATH_FLAG=-R
+-		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+-	fi
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
  	SHLIBEXT=.so
 -	LDCOMBINE='ld -Bshareable'
diff --git a/security/krb5/files/patch-config::shlib.conf b/security/krb5/files/patch-config::shlib.conf
index 272865fd23dc..18f91fffc6d5 100644
--- a/security/krb5/files/patch-config::shlib.conf
+++ b/security/krb5/files/patch-config::shlib.conf
@@ -1,23 +1,27 @@
---- config/shlib.conf.orig	Thu Apr  7 14:38:55 2005
-+++ config/shlib.conf	Wed Nov 23 16:32:40 2005
-@@ -238,17 +238,21 @@
- 	else
- 		objformat="aout"
- 	fi
+--- config/shlib.conf.orig	Mon Oct 23 05:20:11 2006
++++ config/shlib.conf	Wed Mar 28 17:17:55 2007
+@@ -258,22 +258,15 @@
+ 	;;
+ 
+ *-*-freebsd*)
+-	if test -x /usr/bin/objformat ; then
+-		objformat=`/usr/bin/objformat`
+-	else
+-		objformat="aout"
+-	fi
 -	PICFLAGS=-fpic
+-	if test "x$objformat" = "xelf" ; then
 +	case $krb5_cv_host in
 +	sparc64-*)	PICFLAGS=-fPIC;;
 +	*)		PICFLAGS=-fpic;;
 +	esac
- 	if test "x$objformat" = "xelf" ; then
  		SHLIBVEXT='.so.$(LIBMAJOR)'
 +		LDCOMBINE="libtool --mode=link cc -shared"
  		RPATH_FLAG='-Wl,-rpath -Wl,'
- 	else
-+		LDCOMBINE='ld -Bshareable'
- 		RPATH_FLAG=-R
- 		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
- 	fi
+-	else
+-		RPATH_FLAG=-R
+-		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+-	fi
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
  	SHLIBEXT=.so
 -	LDCOMBINE='ld -Bshareable'