diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2013-09-04 18:06:07 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2013-09-04 18:06:07 +0000 |
| commit | 642be1b81d8342d3a3323f43bcf5a0bd87a5d363 (patch) | |
| tree | f71b3671c7729b9cbc9368cea2f2fede7b20d5c8 /net | |
| parent | Dancer plugin which provides an easy way implement ExtDirect APIs. (diff) | |
- 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)
Notes
Notes:
svn path=/head/; revision=326307
Diffstat (limited to 'net')
| -rw-r--r-- | net/afpfs-ng/Makefile | 2 | ||||
| -rw-r--r-- | net/ldapdiff/Makefile | 11 | ||||
| -rw-r--r-- | net/xmlrpc-epi/Makefile | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/net/afpfs-ng/Makefile b/net/afpfs-ng/Makefile index c4889d2709cf..ecaf5fc57217 100644 --- a/net/afpfs-ng/Makefile +++ b/net/afpfs-ng/Makefile @@ -53,7 +53,7 @@ post-patch: .SILENT ${WRKSRC}/Makefile.am post-configure: .SILENT - ${REINPLACE_CMD} 's|LIBS = |LIBS = -liconv |' \ + ${REINPLACE_CMD} 's|LIBS = |LIBS = ${ICONV_LIB} |' \ ${WRKSRC}/cmdline/Makefile .include <bsd.port.post.mk> diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile index f71eac9e517e..b55a54ab2711 100644 --- a/net/ldapdiff/Makefile +++ b/net/ldapdiff/Makefile @@ -20,8 +20,7 @@ USES= iconv USE_OPENLDAP= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${LOCALBASE} \ - --with-ldap-dir=${LOCALBASE} \ - --with-iconv-dir=${LOCALBASE} + --with-ldap-dir=${LOCALBASE} SAMPLES= addentry.sh webtomware_without_jpeg.user.ldif \ webtomware.init.ldif webtomware.user.ldif MAN1= ldapdiff.1 @@ -30,6 +29,12 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTDOCS= CHANGES ChangeLog README TODO +.include <bsd.port.pre.mk> + +.if ! empty(ICONV_LIB) +CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE} +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1 @@ -46,4 +51,4 @@ do-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile index 065df427b175..ea1e09296cf5 100644 --- a/net/xmlrpc-epi/Makefile +++ b/net/xmlrpc-epi/Makefile @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -liconv +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS= --program-transform="s|^|xre-|" PORTDOCS= AUTHORS ChangeLog NEWS README |