Date: Wed, 11 Sep 2013 19:32:19 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327006 - in head/mail/elm+ME: . scripts Message-ID: <201309111932.r8BJWJJD083686@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Wed Sep 11 19:32:19 2013 New Revision: 327006 URL: http://svnweb.freebsd.org/changeset/ports/327006 Log: Fix build on head after iconv change Approved by: portmgr (bapt, implicit) Modified: head/mail/elm+ME/Makefile head/mail/elm+ME/scripts/pre-configure (contents, props changed) Modified: head/mail/elm+ME/Makefile ============================================================================== --- head/mail/elm+ME/Makefile Wed Sep 11 19:31:03 2013 (r327005) +++ head/mail/elm+ME/Makefile Wed Sep 11 19:32:19 2013 (r327006) @@ -40,7 +40,8 @@ SCRIPTS_ENV= CONFIG_PATH="${CONFIG_PATH} LIB_DIR="${LIB_DIR}" SHLIB_DIR="${SHLIB_DIR}" \ STAGE_DIR="${STAGE_DIR}" ELM_SHLIBS="${ELM_SHLIBS}" \ OPENSSLLIB="${OPENSSLLIB}" OPENSSLINC="${OPENSSLINC}" \ - OPENSSLBASE="${OPENSSLBASE}" CC="${CC}" + OPENSSLBASE="${OPENSSLBASE}" CC="${CC}" \ + ICONV_PREFIX="${ICONV_PREFIX}" ICONV_LINK="${ICONV_LINK}" CONFIGURE_ARGS= -b -S -P ${PREFIX} -c ../${CONFIG_PATH:T} MAKE_ENV= MJ="FORMATTER=groff FORMATTER_OPTS=-Tlatin1" @@ -123,6 +124,14 @@ DOC_FILES= MIME.txt README.ME+ DOC_FILES+= shared_libs/${shlib:L}/README.${shlib:U} .endfor +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +ICONV_LINK= +.else +ICONV_LINK= iconv +.endif + # Post-patch # @@ -286,4 +295,4 @@ HOSTIPADDR= ${IFCONFIG} | ${AWK} '/inet FTP_PASSWORD?= ${USER}@`${HOSTIPADDR}` .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/mail/elm+ME/scripts/pre-configure ============================================================================== --- head/mail/elm+ME/scripts/pre-configure Wed Sep 11 19:31:03 2013 (r327005) +++ head/mail/elm+ME/scripts/pre-configure Wed Sep 11 19:32:19 2013 (r327006) @@ -359,10 +359,10 @@ CONFIG=true EOF tee -a ${CONFIG_PATH} >> ${WRKSRC}/shared_libs/iconv/config.res << EOF -iconv_dir='${LOCALBASE}' -iconv_include_dir='${LOCALBASE}/include' -iconv_lib_dir='${LOCALBASE}/lib' -iconv_link='iconv' +iconv_dir='${ICONV_PREFIX}' +iconv_include_dir='${ICONV_PREFIX}/include' +iconv_lib_dir='${ICONV_PREFIX}/lib' +iconv_link='${ICONV_LINK}' EOF tee -a ${CONFIG_PATH} >> ${WRKSRC}/shared_libs/tls/config.res << EOF
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309111932.r8BJWJJD083686>