svn commit: r384215 - in head: audio/fluidsynth-dssi audio/mpg123 audio/portaudio2 audio/sphinx audio/zinf chinese/scim-fcitx databases/pgpool-II-22 databases/pgpool-II-23 deskutils/orage devel/aut...

Tijl Coosemans tijl at FreeBSD.org
Sat Apr 18 09:47:42 UTC 2015 

Author: tijl
Date: Sat Apr 18 09:47:29 2015
New Revision: 384215
URL: https://svnweb.freebsd.org/changeset/ports/384215

Log:
  - Remove libtool hacks and patches that are now handled by USES=libtool
  - Remove CONFIG_SHELL from CONFIGURE_ENV because bsd.port.mk handles that

Deleted:
  head/security/mhash/files/patch-libtool
Modified:
  head/audio/fluidsynth-dssi/Makefile
  head/audio/mpg123/Makefile
  head/audio/portaudio2/Makefile
  head/audio/sphinx/Makefile
  head/audio/zinf/Makefile
  head/chinese/scim-fcitx/Makefile
  head/databases/pgpool-II-22/Makefile
  head/databases/pgpool-II-23/Makefile
  head/deskutils/orage/Makefile
  head/devel/autoconf/Makefile
  head/devel/autoconf213/Makefile
  head/devel/libopensync022/Makefile
  head/devel/oniguruma4/Makefile
  head/devel/sdl12/Makefile
  head/devel/wand-libconfig/Makefile
  head/games/duel/Makefile
  head/games/sdlCC/Makefile
  head/graphics/aalib/Makefile
  head/graphics/dia/Makefile
  head/graphics/gtkdps/Makefile
  head/graphics/guilib/Makefile
  head/graphics/libmorph/Makefile
  head/japanese/ochusha/Makefile
  head/mail/meta1/Makefile
  head/math/libneural/Makefile
  head/math/spar/Makefile
  head/math/testu01/Makefile
  head/misc/xosd/Makefile
  head/multimedia/xtheater/Makefile
  head/net-im/icqlib/Makefile
  head/net/libmxp/Makefile
  head/net/libtrace/Makefile
  head/sysutils/cpu/Makefile
  head/sysutils/libieee1284/Makefile
  head/sysutils/monit/Makefile
  head/textproc/btparse/Makefile
  head/textproc/libxode/Makefile
  head/www/apache22/Makefile
  head/www/apache24/Makefile
  head/x11-fm/thunar-vfs/Makefile

Modified: head/audio/fluidsynth-dssi/Makefile
==============================================================================
--- head/audio/fluidsynth-dssi/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/audio/fluidsynth-dssi/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -20,8 +20,4 @@ GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig
 USE_GNOME=	gtk20
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-	${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/audio/mpg123/Makefile
==============================================================================
--- head/audio/mpg123/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/audio/mpg123/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -22,7 +22,6 @@ CONFIGURE_ARGS=	--with-optimization=0 \
 		--with-audio=oss \
 		--with-default-audio=oss \
 		--with-module-suffix=.so
-CONFIGURE_ENV=	CONFIG_SHELL=${SH}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 

Modified: head/audio/portaudio2/Makefile
==============================================================================
--- head/audio/portaudio2/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/audio/portaudio2/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -59,7 +59,6 @@ BUILD_DEPENDS+=	doxygen:${PORTSDIR}/deve
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|#include <malloc.h>|#include <stdlib.h>|' ${WRKSRC}/ltmain.sh
 	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/configure.in \
 		${WRKSRC}/src/hostapi/oss/pa_unix_oss.c ${WRKSRC}/src/SConscript
 	@${REINPLACE_CMD} -e 's|PACKAGE_NAME=|PACKAGE_NAME=portaudio2|' ${WRKSRC}/configure

Modified: head/audio/sphinx/Makefile
==============================================================================
--- head/audio/sphinx/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/audio/sphinx/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -28,8 +28,6 @@ post-patch:
 		${WRKSRC}/src/libsphinx2/hash.c	\
 		${WRKSRC}/src/libsphinx2/list.c	\
 		${WRKSRC}/src/libsphinx2/salloc.c
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-		${WRKSRC}/configure
 
 post-build:
 	${ECHO_CMD} "*** WARNING ***"				 > ${PKGMESSAGE}

Modified: head/audio/zinf/Makefile
==============================================================================
--- head/audio/zinf/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/audio/zinf/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -43,7 +43,6 @@ CONFIGURE_ARGS+=	--disable-x86opts
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|Player::||' ${WRKSRC}/base/include/player.h
 
 post-install:

Modified: head/chinese/scim-fcitx/Makefile
==============================================================================
--- head/chinese/scim-fcitx/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/chinese/scim-fcitx/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -28,8 +28,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 SUB_FILES=	pkg-message
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-	${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/databases/pgpool-II-22/Makefile
==============================================================================
--- head/databases/pgpool-II-22/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/databases/pgpool-II-22/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -29,8 +29,6 @@ PORTDOCShtml+=	tutorial-en.html tutorial
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-	${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's| pg_config| ${LOCALBASE}/bin/pg_config|g' \
 	${WRKSRC}/sql/pgpool-recovery/Makefile
 

Modified: head/databases/pgpool-II-23/Makefile
==============================================================================
--- head/databases/pgpool-II-23/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/databases/pgpool-II-23/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -29,8 +29,6 @@ PORTDOCShtml+=	tutorial-en.html tutorial
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-	${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's| pg_config| ${LOCALBASE}/bin/pg_config|g' \
 	${WRKSRC}/sql/pgpool-recovery/Makefile
 

Modified: head/deskutils/orage/Makefile
==============================================================================
--- head/deskutils/orage/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/deskutils/orage/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -34,7 +34,6 @@ CFLAGS+=	-I${LOCALBASE}/include/libical
 CONFIGURE_ARGS=	--enable-dbus
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|(datadir)/orage/doc/C|(datadir)/doc/orage/C|' \
 		${WRKSRC}/doc/C/Makefile.in \
 		${WRKSRC}/doc/C/images/Makefile.in

Modified: head/devel/autoconf/Makefile
==============================================================================
--- head/devel/autoconf/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/devel/autoconf/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -22,7 +22,7 @@ USES=		gmake makeinfo perl5 tar:xz
 INFO=		autoconf
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 AWK=${AWK} \
+CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 AWK=${AWK} \
 		ac_cv_prog_TEST_EMACS=no
 CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION} --without-lispdir
 

Modified: head/devel/autoconf213/Makefile
==============================================================================
--- head/devel/autoconf213/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/devel/autoconf213/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -24,7 +24,7 @@ BUILD_VERSION=	2.13
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 USES=		perl5 desthack makeinfo tar:bzip2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 AWK=${AWK}
+CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 AWK=${AWK}
 CONFIGURE_ARGS=	--program-suffix=-${BUILD_VERSION}
 WRKSRC=		${WRKDIR}/autoconf
 INFO=		autoconf-${BUILD_VERSION}

Modified: head/devel/libopensync022/Makefile
==============================================================================
--- head/devel/libopensync022/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/devel/libopensync022/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -26,6 +26,5 @@ post-patch:
 	    -e 's|-Werror||g'
 	@${REINPLACE_CMD} -e 's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e "s,echo aout, echo elf,g" ${WRKSRC}/configure
 
 .include <bsd.port.mk>

Modified: head/devel/oniguruma4/Makefile
==============================================================================
--- head/devel/oniguruma4/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/devel/oniguruma4/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -27,11 +27,6 @@ PKGNAMESUFFIX=	4
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
-		-e 's|freebsd1|freebsd1.|' \
-		${WRKSRC}/configure
-
 post-configure:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
 		${FILESDIR}/onig-config > ${WRKSRC}/onig-config

Modified: head/devel/sdl12/Makefile
==============================================================================
--- head/devel/sdl12/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/devel/sdl12/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -16,7 +16,7 @@ LICENSE=	LGPL21
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-USES=		gmake iconv libtool:oldver pathfix pkgconfig
+USES=		gmake iconv libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_libusbhid_h=no

Modified: head/devel/wand-libconfig/Makefile
==============================================================================
--- head/devel/wand-libconfig/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/devel/wand-libconfig/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -24,8 +24,4 @@ PLIST_FILES=	include/libconfig.h lib/lib
 		lib/libconfig.so lib/libconfig.so.1 \
 		lib/libconfig.so.1.0.4
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-	${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/games/duel/Makefile
==============================================================================
--- head/games/duel/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/games/duel/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -27,9 +27,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 SUB_FILES=	${PORTNAME}-sh
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/libexec

Modified: head/games/sdlCC/Makefile
==============================================================================
--- head/games/sdlCC/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/games/sdlCC/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -23,9 +23,6 @@ OPTIONS_DEFINE=	DOCS
 DESKTOP_ENTRIES="Chinese Checkers" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/libltdl/configure
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}

Modified: head/graphics/aalib/Makefile
==============================================================================
--- head/graphics/aalib/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/graphics/aalib/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -38,8 +38,7 @@ post-extract:
 post-patch:
 	@${RM} -f ${WRKSRC}/config.cache
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
-		s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g ; \
-		s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e 's|AC_DEFUN(AM_PATH_AALIB|AC_DEFUN([AM_PATH_AALIB]|g' \

Modified: head/graphics/dia/Makefile
==============================================================================
--- head/graphics/dia/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/graphics/dia/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -52,7 +52,6 @@ post-patch:
 		${XARGS} ${REINPLACE_CMD} -e \
 		's,\(^GTK_LIBS.*\),\1 -lpthread,'
 	@${REINPLACE_CMD} -e 's|http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl| ; \
-		s|echo aout|echo elf|g ; \
 		s|/usr/include/libEMF|${LOCALBASE}/include/libEMF|g ; \
 		s|-lstdc++||g'  ${WRKSRC}/configure
 

Modified: head/graphics/gtkdps/Makefile
==============================================================================
--- head/graphics/gtkdps/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/graphics/gtkdps/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -29,8 +29,6 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} 's|gnulocaledir)|DESTDIR)$$(&|' \
 		${WRKSRC}/po/Makefile.in.in
 

Modified: head/graphics/guilib/Makefile
==============================================================================
--- head/graphics/guilib/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/graphics/guilib/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -18,10 +18,6 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	aclocal:env
 INSTALL_TARGET=	install-strip
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
-
 post-configure:
 	@${REINPLACE_CMD} -e 's|^ACLOCAL =.*|ACLOCAL = ${ACLOCAL}|g' ${WRKSRC}/Makefile
 

Modified: head/graphics/libmorph/Makefile
==============================================================================
--- head/graphics/libmorph/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/graphics/libmorph/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -16,10 +16,6 @@ USES=		libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmorph.so \
 		${STAGEDIR}${PREFIX}/lib/morph/loaders/*.so

Modified: head/japanese/ochusha/Makefile
==============================================================================
--- head/japanese/ochusha/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/japanese/ochusha/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -25,7 +25,5 @@ DESKTOP_ENTRIES="Ochusha" "${COMMENT}" \
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-DG.*_DISABLE_DEPRECATED||g'
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure \
-		${WRKSRC}/libmodifiedghttp/configure ${WRKSRC}/libmodifiedgtk2/configure
 
 .include <bsd.port.mk>

Modified: head/mail/meta1/Makefile
==============================================================================
--- head/mail/meta1/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/mail/meta1/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -15,6 +15,7 @@ NOT_FOR_ARCHS=	ia64
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	smx-*
 NEED_ROOT=	yes
+USES=		libtool
 
 .if !defined(SENDMAIL_WITHOUT_SHMEM) && !defined(BUILDING_INDEX)
 IPCCHECK!=	ipcrm -q 0 2>&1 || true
@@ -106,20 +107,16 @@ IGNORE=		Option SASL2AUTHD needs option 
 TLS_SUFFIX?=	-notls
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
-		${WRKSRC}/db-4.3.28.NC/dist/configure
-
 post-configure:
 	@${CP} ${WRKSRC}/misc/sm.check.sh ${WRKSRC}/misc/sm.setup.sh \
 		${WRKDIR}/
-	 @${REINPLACE_CMD} -e 's|/etc/meta1|${META1CONFDIR}|g' \
+	@${REINPLACE_CMD} -e 's|/etc/meta1|${META1CONFDIR}|g' \
 		-e 's|$${SD}/misc|${PREFIX}/bin|' \
 		-e 's|$${SD}/libcheck|${PREFIX}/sbin|' \
 		-e 's|$${SD}/libmta|${PREFIX}/sbin|' \
 		-e 's|$${SD}/checks|${PREFIX}/sbin|' \
 		${WRKDIR}/sm.check.sh
-	 @${REINPLACE_CMD} -e 's|/etc/meta1|${META1CONFDIR}|g' \
+	@${REINPLACE_CMD} -e 's|/etc/meta1|${META1CONFDIR}|g' \
 		-e 's|[.]/misc|${PREFIX}/bin|' \
 		-e 's|$${S}/libconf|${PREFIX}/sbin|' \
 		-e 's|[.]/libmta|${PREFIX}/sbin|' \
@@ -129,7 +126,7 @@ post-configure:
 
 test:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-	${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 
 #fails on bento
 #regression-test:	test

Modified: head/math/libneural/Makefile
==============================================================================
--- head/math/libneural/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/math/libneural/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -16,8 +16,6 @@ USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|iostream.h|iostream|; s|fstream.h|fstream|; s|iomanip.h|iomanip|; \
 		s|endl|std::&|g; s|cerr|std::&|g; s|cout|std::&|g; s|cin|std::&|g; s|[oi]fstream |std::&|g' \
 		${WRKSRC}/lib/neuron.cc ${WRKSRC}/lib/nnwork.cc ${WRKSRC}/examples/*.cc

Modified: head/math/spar/Makefile
==============================================================================
--- head/math/spar/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/math/spar/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -16,8 +16,6 @@ USE_CSTD=	gnu89
 USE_LDCONFIG=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s,-ldl,,g" \
 		${WRKSRC}/lib/Makefile.in ${WRKSRC}/lib/module/Makefile.in
 

Modified: head/math/testu01/Makefile
==============================================================================
--- head/math/testu01/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/math/testu01/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -31,7 +31,6 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|return|& (0)|' ${WRKSRC}/testu01/fftc.c
 .if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e  '/^SUBDIRS \=/s/ doc / /' ${WRKSRC}/Makefile.in

Modified: head/misc/xosd/Makefile
==============================================================================
--- head/misc/xosd/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/misc/xosd/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -44,7 +44,6 @@ DELAY_UNITS=	seconds
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,echo aout,echo elf,' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I..\2,' \
 		${WRKSRC}/src/libxosd/Makefile.in \
 		${WRKSRC}/src/xmms_plugin/Makefile.in

Modified: head/multimedia/xtheater/Makefile
==============================================================================
--- head/multimedia/xtheater/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/multimedia/xtheater/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -28,8 +28,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[(]prefix[)]/Xtheater|(libdir)/Xtheater|g ; \
 		 s|-release.*$$|-module -avoid-version|g'

Modified: head/net-im/icqlib/Makefile
==============================================================================
--- head/net-im/icqlib/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/net-im/icqlib/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -14,10 +14,6 @@ USES=		gmake libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libicq.so
 

Modified: head/net/libmxp/Makefile
==============================================================================
--- head/net/libmxp/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/net/libmxp/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -12,8 +12,4 @@ COMMENT=	Parser for the MUD eXtension pr
 USES=		cmake
 USE_LDCONFIG=	yes
 
-post-patch:
-	${REINPLACE_CMD} -e 's|objformat=.*|objformat=elf|g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/net/libtrace/Makefile
==============================================================================
--- head/net/libtrace/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/net/libtrace/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -20,8 +20,4 @@ USE_LDCONFIG=	yes
 USES=		gmake libtool
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-	${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/sysutils/cpu/Makefile
==============================================================================
--- head/sysutils/cpu/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/sysutils/cpu/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -17,7 +17,4 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/cpu --with-ldap=${LOCALBASE}
 CPPFLAGS+=	-DLDAP_DEPRECATED
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/sysutils/libieee1284/Makefile
==============================================================================
--- head/sysutils/libieee1284/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/sysutils/libieee1284/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -29,10 +29,6 @@ PYTHON_LDFLAGS=	-L${PYTHON_LIBDIR}
 PYTHON_CONFIGURE_ON=	--with-python=yes
 PYTHON_CONFIGURE_OFF=	--with-python=no
 
-post-patch:
-	@${REINPLACE_CMD} -E -e 's,(objformat=).*,\1elf,' \
-		${WRKSRC}/configure
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

Modified: head/sysutils/monit/Makefile
==============================================================================
--- head/sysutils/monit/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/sysutils/monit/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -15,9 +15,6 @@ GNU_CONFIGURE=	yes
 USES=		bison gmake
 USE_RC_SUBR=	${PORTNAME}
 
-CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
-		LOCALBASE="${LOCALBASE}"
-
 OPTIONS_DEFINE=	DOCS SSL
 OPTIONS_DEFAULT=SSL
 

Modified: head/textproc/btparse/Makefile
==============================================================================
--- head/textproc/btparse/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/textproc/btparse/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -16,7 +16,4 @@ USE_LDCONFIG=	yes
 USES=		perl5 libtool
 USE_PERL5=	build
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>

Modified: head/textproc/libxode/Makefile
==============================================================================
--- head/textproc/libxode/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/textproc/libxode/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -18,10 +18,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxode.so
 

Modified: head/www/apache22/Makefile
==============================================================================
--- head/www/apache22/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/www/apache22/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -95,8 +95,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--with-apr=${APR_CONFIG} \
 		--with-apr-util=${APU_CONFIG}
 
-CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
-		LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 
 MAKE_ENV+=	EXPR_COMPAT=yes \
 		INSTALL_MAN="${INSTALL_MAN}" \

Modified: head/www/apache24/Makefile
==============================================================================
--- head/www/apache24/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/www/apache24/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -100,8 +100,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX_RELDES
 		--with-apr=${APR_CONFIG} \
 		--with-apr-util=${APU_CONFIG}
 
-CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
-		LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
 
 MAKE_ENV+=	EXPR_COMPAT=yes \
 		INSTALL_MAN="${INSTALL_MAN}" \

Modified: head/x11-fm/thunar-vfs/Makefile
==============================================================================
--- head/x11-fm/thunar-vfs/Makefile	Sat Apr 18 09:27:50 2015	(r384214)
+++ head/x11-fm/thunar-vfs/Makefile	Sat Apr 18 09:47:29 2015	(r384215)
@@ -45,7 +45,4 @@ GCONF_USE=	gnome=gconf2
 GCONF_CONFIGURE_ENABLE=	gnome-thumbnailers
 OPTIONS_SUB=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>

More information about the svn-ports-head mailing list