- Fix after objformat removal

Reported by:	pointyhat

14 files changed, 49 insertions, 37 deletions

diff --git a/devel/ngpt/Makefile b/devel/ngpt/Makefile
index 46952d276a00..6b7f7f99288a 100644
--- a/devel/ngpt/Makefile
+++ b/devel/ngpt/Makefile
@@ -23,4 +23,7 @@ USE_GMAKE=	yes
 
 ONLY_FOR_ARCHS=	amd64 i386
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/ltconfig
+
 .include <bsd.port.mk>
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index 1df22dea4b9d..41c51272c0d5 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ppl
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.unipr.it/pub/ppl/releases/%SUBDIR%/ \
 		http://www.cs.unipr.it/ppl/Download/ftp/releases/%SUBDIR%/
@@ -21,7 +21,8 @@ LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
+LIBTOOLFILES=	configure Watchdog/configure
 CONFIGURE_ARGS=	--disable-debugging \
 		--enable-optimization \
 		--with-cflags="${CFLAGS}" \
@@ -31,11 +32,4 @@ CONFIGURE_ARGS=	--disable-debugging \
 USE_LDCONFIG=	yes
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
-
-# ppl needs gcc > 3.1, with libgmp4 compiled with the same gcc version
-.if ${OSVERSION} < 500035
-IGNORE=		"Does not build with older versions of FreeBSD"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ppl/files/patch-ltmain.sh b/devel/ppl/files/patch-ltmain.sh
deleted file mode 100644
index bcd97fabe24a..000000000000
--- a/devel/ppl/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Mon Jul  1 23:54:06 2002
-+++ ltmain.sh	Mon Nov 11 22:34:15 2002
-@@ -4772,10 +4772,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/ppl/pkg-plist b/devel/ppl/pkg-plist
index a2b13429d105..0adafae82ace 100644
--- a/devel/ppl/pkg-plist
+++ b/devel/ppl/pkg-plist
@@ -3,9 +3,11 @@ include/ppl.hh
 include/ppl_c.h
 include/pwl.hh
 lib/libppl.a
+lib/libppl.la
 lib/libppl.so
 lib/libppl.so.3
 lib/libppl_c.a
+lib/libppl_c.la
 lib/libppl_c.so
 lib/libppl_c.so.1
 lib/libpwl.a
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index 5976fd9caeca..e6a1a4b38c2f 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
 
 USE_BZIP2=		yes
 WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
-GNU_CONFIGURE=		yes
-INSTALLS_SHLIB=		yes
+USE_AUTOTOOLS=		libtool:15
+USE_LDCONFIG=		yes
 CONFIGURE_ARGS+=	--with-db3=${LOCALBASE}
 CONFIGURE_SCRIPT=	../dist/configure
 MAN1=			ex.1 vi.1 view.1
diff --git a/japanese/mh/files/patch-configure b/japanese/mh/files/patch-configure
new file mode 100644
index 000000000000..0131d853ffae
--- /dev/null
+++ b/japanese/mh/files/patch-configure
@@ -0,0 +1,17 @@
+--- configure.orig	Thu Jun 14 18:41:51 2001
++++ configure	Tue Mar 27 17:56:32 2007
+@@ -1397,14 +1397,8 @@
+     if test "$use_sharedlib" != no
+     then
+       sharedlib=fbsd
+-      if test -x /usr/bin/objformat
+-      then
+-	if test x`/usr/bin/objformat` = xelf
+-	then
+ 	  sharedlib=gnuelf
+ 	  make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"'
+-	fi
+-      fi
+       echo __ELF__ | $CC -E - | grep -q __ELF__ || sharedlib=gnuelf
+       slflags="-fpic"
+       slibdir=$libdir
diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile
index ecd4e6624d2e..67376c026464 100644
--- a/lang/open-cobol-devel/Makefile
+++ b/lang/open-cobol-devel/Makefile
@@ -19,7 +19,7 @@ COMMENT=	An open-source COBOL compiler
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 
 USE_GETOPT_LONG=yes
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index ecd4e6624d2e..67376c026464 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -19,7 +19,7 @@ COMMENT=	An open-source COBOL compiler
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 
 USE_GETOPT_LONG=yes
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/misc/libhome/Makefile b/misc/libhome/Makefile
index be1a0d304761..cf4d6f2d5870 100644
--- a/misc/libhome/Makefile
+++ b/misc/libhome/Makefile
@@ -22,7 +22,7 @@ OPTIONS+=	PGSQL "Support for PostgreSQL (Experimental)" off
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .if defined(LIBHOME_WITH_BDB_VER)
 WITH_BDB_VER=	${LIBHOME_WITH_BDB_VER}
@@ -88,6 +88,7 @@ PLIST_SUB=	NSS=""
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/ltconfig ${WRKSRC}/configure
 .if defined(WITH_BDB)
 	@${REINPLACE_CMD} -e 's;db-4.3 db-4.2;${BDB_LIB_NAME};g' \
 		${WRKSRC}/configure
diff --git a/net-mgmt/arts++/Makefile b/net-mgmt/arts++/Makefile
index 9a2707355325..9e3dea9fa2ab 100644
--- a/net-mgmt/arts++/Makefile
+++ b/net-mgmt/arts++/Makefile
@@ -24,6 +24,9 @@ MANL=		artsportagg.l artsports.l artsprotos.l artsnets.l artsdump.l \
 		artsasagg.l artsportms.l artsportmagg.l artsintfms.l \
 		artsintfmagg.l artsnexthops.l artsnexthopagg.l artstos.l
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/ltconfig
+
 post-configure:
 	@${REINPLACE_CMD} -E -e "s,( gcc\*),\1 | g++\*,g" ${WRKSRC}/libtool
 
diff --git a/science/libint/Makefile b/science/libint/Makefile
index 13bc61396b6f..0c637bd76225 100644
--- a/science/libint/Makefile
+++ b/science/libint/Makefile
@@ -19,14 +19,15 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 ALL_TARGET=	# empty
 
-.include <bsd.port.pre.mk>
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-shared
+CONFIGURE_ARGS=	--enable-shared
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 
 post-install:
 	@${LN} -sf ${PREFIX}/lib/libderiv-stable.so.1 ${PREFIX}/lib/libderiv.so.1
 	@${LN} -sf ${PREFIX}/lib/libint-stable.so.1 ${PREFIX}/lib/libint.so.1
 	@${LN} -sf ${PREFIX}/lib/libr12-stable.so.1 ${PREFIX}/lib/libr12.so.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index 41ed616e2b81..9fbb9f3dc453 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -27,8 +27,8 @@ COMMENT=	Medical Imaging NetCDF
 LIB_DEPENDS=	netcdf.1:${PORTSDIR}/science/netcdf \
 		hdf5.0:${PORTSDIR}/science/hdf5
 
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
 USE_GCC=	3.2+
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/sysutils/cpu/Makefile b/sysutils/cpu/Makefile
index a15c894d1d4f..b6e419a1e43c 100644
--- a/sysutils/cpu/Makefile
+++ b/sysutils/cpu/Makefile
@@ -18,11 +18,14 @@ COMMENT=	Change Password Utility for LDAP
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_OPENLDAP=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/cpu --with-ldap=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-DLDAP_DEPRECATED"
 
 MAN5=		cpu.conf.5
 MAN8=		cpu.8 cpu-ldap.8
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index 394128f3fa2e..8836f9a28b62 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -50,6 +50,9 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}
 EXTRA_PATCHES+=	${PATCHDIR}/RELENG_4-patch-htnet_SSLConnection.cc
 .endif
 
+post-patch:
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|'
+
 pre-install:
 .if exists(${PREFIX}/etc/htdig/htdig.conf)
 	${MV} ${PREFIX}/etc/htdig/htdig.conf ${PREFIX}/etc/htdig/htdig.conf.old