From 41290677b018da2819144b0188ac8bd1b91a88e4 Mon Sep 17 00:00:00 2001 From: madpilot Date: Wed, 4 Sep 2013 18:06:07 +0000 Subject: - Make ports use the libc provided iconv implementation on 10-CURRENT after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code) --- audio/julius/Makefile | 2 +- audio/mp3unicode/Makefile | 2 +- audio/mpc/Makefile | 2 +- audio/mpiosh/Makefile | 3 ++- audio/mpiosh/files/patch-mpiosh_Makefile.am | 2 +- audio/osd-lyrics/Makefile | 2 +- audio/praat/Makefile | 4 +++- audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) (limited to 'audio') diff --git a/audio/julius/Makefile b/audio/julius/Makefile index 38652c705502..75047271b566 100644 --- a/audio/julius/Makefile +++ b/audio/julius/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USES= iconv CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -liconv +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} MANLANG= "" ja MAN1= accept_check.1 \ adinrec.1 \ diff --git a/audio/mp3unicode/Makefile b/audio/mp3unicode/Makefile index 32526c04c60d..c3c605d33c62 100644 --- a/audio/mp3unicode/Makefile +++ b/audio/mp3unicode/Makefile @@ -15,7 +15,7 @@ USE_BZIP2= yes USES= iconv pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= ICONV_CFLAGS="-I${LOCALBASE}/include" \ - ICONV_LIBS="-L${LOCALBASE}/lib -liconv" + ICONV_LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" MAN1= mp3unicode.1 PLIST_FILES= bin/mp3unicode diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile index f8074f37b36c..d1256de0fbdb 100644 --- a/audio/mpc/Makefile +++ b/audio/mpc/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--disable-iconv .endif post-patch: - @${REINPLACE_CMD} -e 's|-lintl|-liconv|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lintl|-l${ICONV_LIB}|g' ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile index 88c9408e8445..4c81e3df40a2 100644 --- a/audio/mpiosh/Makefile +++ b/audio/mpiosh/Makefile @@ -23,7 +23,7 @@ USE_AUTOTOOLS= aclocal automake autoconf libtool ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -liconv +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} .include @@ -31,5 +31,6 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure.in post-patch: ${RM} -f ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' ${WRKSRC}/mpiosh/Makefile.am .include diff --git a/audio/mpiosh/files/patch-mpiosh_Makefile.am b/audio/mpiosh/files/patch-mpiosh_Makefile.am index b994b24b822a..22e6b0fff8a6 100644 --- a/audio/mpiosh/files/patch-mpiosh_Makefile.am +++ b/audio/mpiosh/files/patch-mpiosh_Makefile.am @@ -5,7 +5,7 @@ AM_CFLAGS=-DSYSCONFDIR=\"@sysconfdir@\" -mpiosh_LDADD=../libmpio/libmpio.la -lreadline -lncurses -+mpiosh_LDADD=../libmpio/libmpio.la -lreadline -lncurses -liconv ++mpiosh_LDADD=../libmpio/libmpio.la -lreadline -lncurses %%ICONV_LIB%% noinst_HEADERS = mpiosh.h \ callback.h \ diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile index fad998fdf494..b5374487e439 100644 --- a/audio/osd-lyrics/Makefile +++ b/audio/osd-lyrics/Makefile @@ -27,7 +27,7 @@ USE_GNOME= gtk20 USE_SQLITE= yes INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog NEWS README -LDFLAGS= -liconv +LDFLAGS= ${ICONV_LIB} OPTIONS_DEFINE= DOCS MPD XMMS2 AMAROK MPD_DESC= Enable MPD support diff --git a/audio/praat/Makefile b/audio/praat/Makefile index b0ee0bb26996..c4213090dfb0 100644 --- a/audio/praat/Makefile +++ b/audio/praat/Makefile @@ -13,7 +13,7 @@ COMMENT= Phonetics by Computer USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*Makefile -USES= motif +USES= iconv motif WRKSRC= ${WRKDIR}/sources_4639 MAKEFILE= makefile PLIST_FILES= bin/praat @@ -25,6 +25,8 @@ post-patch: @${REINPLACE_CMD} -e 's/ log2/ NUMlog2/' ${WRKSRC}/dwtools/Sound_extensions.c @${FIND} ${WRKSRC} -name Makefile -exec \ ${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \; + @${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' \ + ${WRKSRC}/makefiles/makefile.defs.freebsd.dynamic @${CP} ${WRKSRC}/makefiles/makefile.defs.freebsd.dynamic \ ${WRKSRC}/makefile.defs diff --git a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic index eb32db9867d2..0abac883abef 100644 --- a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic +++ b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic @@ -8,7 +8,7 @@ +CC += -std=gnu99 -DUNIX -Dlinux -I${LOCALBASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -LIBS = /usr/X11R6/lib/libXm.a -L /usr/X11R6/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -+LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -lpng -ljpeg -liconv -lXft ++LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -lpng -ljpeg %%ICONV_LIB%% -lXft RANLIB = ls ICON = -- cgit