diff options
| author | madpilot <madpilot@FreeBSD.org> | 2013-09-05 02:06:07 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2013-09-05 02:06:07 +0800 |
| commit | 41290677b018da2819144b0188ac8bd1b91a88e4 (patch) | |
| tree | f71b3671c7729b9cbc9368cea2f2fede7b20d5c8 /multimedia | |
| parent | 02239bfdfc92a832c32cc57d07d3a1a4b3fc4ad9 (diff) | |
| download | freebsd-ports-graphics-41290677b018da2819144b0188ac8bd1b91a88e4.tar.gz freebsd-ports-graphics-41290677b018da2819144b0188ac8bd1b91a88e4.tar.zst freebsd-ports-graphics-41290677b018da2819144b0188ac8bd1b91a88e4.zip | |
- 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)
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libxine/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mkclean/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mkvalidator/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/vdr/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/w_scan/Makefile | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 6c2a100ff18..db6abcd290e 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -241,7 +241,7 @@ pre-configure: s|THREAD_CFLAGS=".*"|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \ s|-L/usr/local/lib||g ; \ s|-I/usr/local/include||g ; \ - s|-lgiconv|-liconv|g ; \ + s|-lgiconv|${ICONV_LIB}|g ; \ s|-funroll-loops||g ; \ s|LIBFFMPEG_CFLAGS|LIBFFMPEG_CPPFLAGS|g ; \ s|echo aout|echo elf|g' ${WRKSRC}/configure diff --git a/multimedia/mkclean/Makefile b/multimedia/mkclean/Makefile index 053c049efbc..dbb0245d99c 100644 --- a/multimedia/mkclean/Makefile +++ b/multimedia/mkclean/Makefile @@ -16,7 +16,7 @@ HAS_CONFIGURE= yes USES= iconv gmake CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -liconv +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_ENV+= "LFLAGS=${LDFLAGS}" MAKEFILE= GNUmakefile diff --git a/multimedia/mkvalidator/Makefile b/multimedia/mkvalidator/Makefile index 2b5fec85819..546b4e2c7a4 100644 --- a/multimedia/mkvalidator/Makefile +++ b/multimedia/mkvalidator/Makefile @@ -16,7 +16,7 @@ HAS_CONFIGURE= yes USES= iconv gmake CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -liconv +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_ENV+= "LFLAGS=${LDFLAGS}" MAKEFILE= GNUmakefile diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile index 8f4ac0afadb..0793d32e3cf 100644 --- a/multimedia/vdr/Makefile +++ b/multimedia/vdr/Makefile @@ -78,7 +78,8 @@ ALL_TARGET= vdr plugins post-patch: # clang doesn't know -MG: - @${REINPLACE_CMD} '/^MAKEDEP.*-MM/s/-MG[[:space:]]*$$/# -MG/' \ + @${REINPLACE_CMD} -e '/^MAKEDEP.*-MM/s/-MG[[:space:]]*$$/# -MG/' \ + -e '/^LIBS/s/-liconv/${ICONVLIB}/' \ ${WRKSRC}/Makefile ${WRKSRC}/libsi/Makefile \ ${WRKSRC}/PLUGINS/src/*/Makefile @[ ! -f ${WRKSRC}/s2apiwrapper.c ] || \ diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile index 5daada3d02e..bc0e13cb64a 100644 --- a/multimedia/w_scan/Makefile +++ b/multimedia/w_scan/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes PATCH_STRIP= -lp1 USES+= gettext CPPFLAGS+= -I"${LOCALBASE}/include" -LDFLAGS+= -L"${LOCALBASE}/lib\ -liconv" +LDFLAGS+= -L"${LOCALBASE}/lib\ ${ICONV_LIB}" PORTDOCS= COPYING ChangeLog README PLIST_FILES= bin/${PORTNAME} MAN1= w_scan.1 |