From 5d48443269043d602e83f08d247c43b3a779a8d6 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Sat, 18 Apr 2015 09:47:29 +0000 Subject: [PATCH] - Remove libtool hacks and patches that are now handled by USES=libtool - Remove CONFIG_SHELL from CONFIGURE_ENV because bsd.port.mk handles that --- audio/fluidsynth-dssi/Makefile | 4 ---- audio/mpg123/Makefile | 1 - audio/portaudio2/Makefile | 1 - audio/sphinx/Makefile | 2 -- audio/zinf/Makefile | 1 - chinese/scim-fcitx/Makefile | 4 ---- databases/pgpool-II-22/Makefile | 2 -- databases/pgpool-II-23/Makefile | 2 -- deskutils/orage/Makefile | 1 - devel/autoconf/Makefile | 2 +- devel/autoconf213/Makefile | 2 +- devel/libopensync022/Makefile | 1 - devel/oniguruma4/Makefile | 5 ----- devel/sdl12/Makefile | 2 +- devel/wand-libconfig/Makefile | 4 ---- games/duel/Makefile | 3 --- games/sdlCC/Makefile | 3 --- graphics/aalib/Makefile | 3 +-- graphics/dia/Makefile | 1 - graphics/gtkdps/Makefile | 2 -- graphics/guilib/Makefile | 4 ---- graphics/libmorph/Makefile | 4 ---- japanese/ochusha/Makefile | 2 -- mail/meta1/Makefile | 11 ++++------- math/libneural/Makefile | 2 -- math/spar/Makefile | 2 -- math/testu01/Makefile | 1 - misc/xosd/Makefile | 1 - multimedia/xtheater/Makefile | 2 -- net-im/icqlib/Makefile | 4 ---- net/libmxp/Makefile | 4 ---- net/libtrace/Makefile | 4 ---- security/mhash/files/patch-libtool | 21 --------------------- sysutils/cpu/Makefile | 3 --- sysutils/libieee1284/Makefile | 4 ---- sysutils/monit/Makefile | 3 --- textproc/btparse/Makefile | 3 --- textproc/libxode/Makefile | 4 ---- www/apache22/Makefile | 3 +-- www/apache24/Makefile | 3 +-- x11-fm/thunar-vfs/Makefile | 3 --- 41 files changed, 10 insertions(+), 124 deletions(-) delete mode 100644 security/mhash/files/patch-libtool diff --git a/audio/fluidsynth-dssi/Makefile b/audio/fluidsynth-dssi/Makefile index e1b5924488f1..f2c20d548019 100644 --- a/audio/fluidsynth-dssi/Makefile +++ b/audio/fluidsynth-dssi/Makefile @@ -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 diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index d06111c182c5..c529872d67eb 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -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 diff --git a/audio/portaudio2/Makefile b/audio/portaudio2/Makefile index 83c731c5c73a..064d6d28ea59 100644 --- a/audio/portaudio2/Makefile +++ b/audio/portaudio2/Makefile @@ -59,7 +59,6 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen .endif post-patch: - @${REINPLACE_CMD} -e 's|#include |#include |' ${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 diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile index bc1a60f6ddb9..7d4fec87f1d8 100644 --- a/audio/sphinx/Makefile +++ b/audio/sphinx/Makefile @@ -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} diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile index 39c27a9eecb7..ebe7040116d1 100644 --- a/audio/zinf/Makefile +++ b/audio/zinf/Makefile @@ -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: diff --git a/chinese/scim-fcitx/Makefile b/chinese/scim-fcitx/Makefile index 77fb33db0641..b98f2f04030d 100644 --- a/chinese/scim-fcitx/Makefile +++ b/chinese/scim-fcitx/Makefile @@ -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 diff --git a/databases/pgpool-II-22/Makefile b/databases/pgpool-II-22/Makefile index a0a7c161807a..445a2ce4885f 100644 --- a/databases/pgpool-II-22/Makefile +++ b/databases/pgpool-II-22/Makefile @@ -29,8 +29,6 @@ PORTDOCShtml+= tutorial-en.html tutorial-ja.html 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 diff --git a/databases/pgpool-II-23/Makefile b/databases/pgpool-II-23/Makefile index 08edeb1fbb87..a6c1f27a8569 100644 --- a/databases/pgpool-II-23/Makefile +++ b/databases/pgpool-II-23/Makefile @@ -29,8 +29,6 @@ PORTDOCShtml+= tutorial-en.html tutorial-ja.html 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 diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile index 0f01b4162c96..50a14873d03b 100644 --- a/deskutils/orage/Makefile +++ b/deskutils/orage/Makefile @@ -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 diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index d4de8a4956c4..7a26388fdf7c 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -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 diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile index 88a98d82c0c6..d68dde43c74e 100644 --- a/devel/autoconf213/Makefile +++ b/devel/autoconf213/Makefile @@ -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} diff --git a/devel/libopensync022/Makefile b/devel/libopensync022/Makefile index f0eaf4788829..0b954af7a502 100644 --- a/devel/libopensync022/Makefile +++ b/devel/libopensync022/Makefile @@ -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 diff --git a/devel/oniguruma4/Makefile b/devel/oniguruma4/Makefile index 4a673e5d86e6..87956c2a13d5 100644 --- a/devel/oniguruma4/Makefile +++ b/devel/oniguruma4/Makefile @@ -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 diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index ba048c452453..c2445b9bed91 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -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 diff --git a/devel/wand-libconfig/Makefile b/devel/wand-libconfig/Makefile index 00c1ce622199..b0f0f47cc7dc 100644 --- a/devel/wand-libconfig/Makefile +++ b/devel/wand-libconfig/Makefile @@ -24,8 +24,4 @@ PLIST_FILES= include/libconfig.h lib/libconfig.a \ 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 diff --git a/games/duel/Makefile b/games/duel/Makefile index 7926cde60dc6..10d36049403e 100644 --- a/games/duel/Makefile +++ b/games/duel/Makefile @@ -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 diff --git a/games/sdlCC/Makefile b/games/sdlCC/Makefile index 56b2e68c0386..fd182f6f67a7 100644 --- a/games/sdlCC/Makefile +++ b/games/sdlCC/Makefile @@ -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} diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index 7ef682dcca40..ff938496f935 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -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' \ diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index afe11e907af2..687bc5976a5f 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -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 diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile index b273b87ea783..051795fa6658 100644 --- a/graphics/gtkdps/Makefile +++ b/graphics/gtkdps/Makefile @@ -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 diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile index 445f40259155..3b3214efb0e3 100644 --- a/graphics/guilib/Makefile +++ b/graphics/guilib/Makefile @@ -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 diff --git a/graphics/libmorph/Makefile b/graphics/libmorph/Makefile index f72d37a90e74..3f5685f5d886 100644 --- a/graphics/libmorph/Makefile +++ b/graphics/libmorph/Makefile @@ -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 diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile index e9738f08d5c2..300217e25c9f 100644 --- a/japanese/ochusha/Makefile +++ b/japanese/ochusha/Makefile @@ -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 diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile index c03a86724945..2159dfd4c605 100644 --- a/mail/meta1/Makefile +++ b/mail/meta1/Makefile @@ -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 SASL2 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 diff --git a/math/libneural/Makefile b/math/libneural/Makefile index ae6f1c0e4f56..2990b260e76a 100644 --- a/math/libneural/Makefile +++ b/math/libneural/Makefile @@ -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 diff --git a/math/spar/Makefile b/math/spar/Makefile index 2792411db6e5..74c3f683a16b 100644 --- a/math/spar/Makefile +++ b/math/spar/Makefile @@ -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 diff --git a/math/testu01/Makefile b/math/testu01/Makefile index 998beae1180d..209c5fe21ba1 100644 --- a/math/testu01/Makefile +++ b/math/testu01/Makefile @@ -31,7 +31,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include 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 diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile index 72e2ccda56cd..fe5c0ece3b8a 100644 --- a/misc/xosd/Makefile +++ b/misc/xosd/Makefile @@ -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 diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile index 62daf6a224e9..2e7155154e78 100644 --- a/multimedia/xtheater/Makefile +++ b/multimedia/xtheater/Makefile @@ -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' diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile index b7a393cfaac0..4ca791fbb122 100644 --- a/net-im/icqlib/Makefile +++ b/net-im/icqlib/Makefile @@ -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 diff --git a/net/libmxp/Makefile b/net/libmxp/Makefile index b44d9352d3bb..abe49d69d776 100644 --- a/net/libmxp/Makefile +++ b/net/libmxp/Makefile @@ -12,8 +12,4 @@ COMMENT= Parser for the MUD eXtension protocol USES= cmake USE_LDCONFIG= yes -post-patch: - ${REINPLACE_CMD} -e 's|objformat=.*|objformat=elf|g' \ - ${WRKSRC}/configure - .include diff --git a/net/libtrace/Makefile b/net/libtrace/Makefile index 2eb61a419d67..19432d4d4073 100644 --- a/net/libtrace/Makefile +++ b/net/libtrace/Makefile @@ -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 diff --git a/security/mhash/files/patch-libtool b/security/mhash/files/patch-libtool deleted file mode 100644 index c5dd17e00332..000000000000 --- a/security/mhash/files/patch-libtool +++ /dev/null @@ -1,21 +0,0 @@ -Description: Do not install the useless .la file. - This is a FreeBSD-specific patch, upstream doesn't really need it. -Author: Ying-Chieh Liao -Forwarded: not-needed -Last-Update: 2009-09-10 - ---- ltmain.sh.orig -+++ ltmain.sh -@@ -6003,10 +6003,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/sysutils/cpu/Makefile b/sysutils/cpu/Makefile index 1b7c94741f70..3f3657df08e8 100644 --- a/sysutils/cpu/Makefile +++ b/sysutils/cpu/Makefile @@ -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 diff --git a/sysutils/libieee1284/Makefile b/sysutils/libieee1284/Makefile index 2a6d2ee27d7b..51ce2208212f 100644 --- a/sysutils/libieee1284/Makefile +++ b/sysutils/libieee1284/Makefile @@ -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} diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile index e1f8a6b32bf2..cb6abf4eaa81 100644 --- a/sysutils/monit/Makefile +++ b/sysutils/monit/Makefile @@ -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 diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile index 82a9eac5e695..596c957ed16c 100644 --- a/textproc/btparse/Makefile +++ b/textproc/btparse/Makefile @@ -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 diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile index 7e859a6fc797..f5c8ed092074 100644 --- a/textproc/libxode/Makefile +++ b/textproc/libxode/Makefile @@ -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 diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 613208f5deaa..93bd486343cb 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -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}" \ diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 766baa11fe7e..24628a65f1cb 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -100,8 +100,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \ --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}" \ diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile index 73e4d17ab41d..9499d7ec1dff 100644 --- a/x11-fm/thunar-vfs/Makefile +++ b/x11-fm/thunar-vfs/Makefile @@ -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