mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

- Remove libtool hacks and patches that are now handled by USES=libtool

Browse Source 
- Remove CONFIG_SHELL from CONFIGURE_ENV because bsd.port.mk handles that
This commit is contained in:
Tijl Coosemans 2015-04-18 09:47:29 +00:00
parent ddf94f6362
commit 5d48443269
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=384215
41 changed files with 10 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/fluidsynth-dssi/Makefile
View File

@ -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>

1
audio/mpg123/Makefile
View File

@ -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

1
audio/portaudio2/Makefile
View File

@ -59,7 +59,6 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
.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

2
audio/sphinx/Makefile
View File

@ -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}

1
audio/zinf/Makefile
View File

@ -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:

4
chinese/scim-fcitx/Makefile
View File

@ -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>

2
databases/pgpool-II-22/Makefile
View File

@ -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

2
databases/pgpool-II-23/Makefile
View File

@ -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

1
deskutils/orage/Makefile
View File

@ -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

2
devel/autoconf/Makefile
View File

@ -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

2
devel/autoconf213/Makefile
View File

@ -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}

1
devel/libopensync022/Makefile
View File

@ -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>

5
devel/oniguruma4/Makefile
View File

@ -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

2
devel/sdl12/Makefile
View File

@ -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

4
devel/wand-libconfig/Makefile
View File

@ -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 <bsd.port.mk>

3
games/duel/Makefile
View File

@ -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

3
games/sdlCC/Makefile
View File

@ -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}

3
graphics/aalib/Makefile
View File

@ -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' \

1
graphics/dia/Makefile
View File

@ -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

2
graphics/gtkdps/Makefile
View File

@ -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

4
graphics/guilib/Makefile
View File

@ -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

4
graphics/libmorph/Makefile
View File

@ -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

2
japanese/ochusha/Makefile
View File

@ -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>

11
mail/meta1/Makefile
View File

@ -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

2
math/libneural/Makefile
View File

@ -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

2
math/spar/Makefile
View File

@ -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

1
math/testu01/Makefile
View File

@ -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

1
misc/xosd/Makefile
View File

@ -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

2
multimedia/xtheater/Makefile
View File

@ -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'

4
net-im/icqlib/Makefile
View File

@ -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

4
net/libmxp/Makefile
View File

@ -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 <bsd.port.mk>

4
net/libtrace/Makefile
View File

@ -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>

21
security/mhash/files/patch-libtool
View File

@ -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 <ijliao@FreeBSD.org>
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"

3
sysutils/cpu/Makefile
View File

@ -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>

4
sysutils/libieee1284/Makefile
View File

@ -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}

3
sysutils/monit/Makefile
View File

@ -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

3
textproc/btparse/Makefile
View File

@ -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>

4
textproc/libxode/Makefile
View File

@ -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

3
www/apache22/Makefile
View File

@ -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}" \

3
www/apache24/Makefile
View File

@ -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}" \

3
x11-fm/thunar-vfs/Makefile
View File

@ -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>