mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-22 00:35:15 +00:00
Code Issues Releases Activity

Fix build on head after iconv change

Browse Source 
Approved by:	portmgr (bapt, implicit)
This commit is contained in:
Guido Falsi 2013-09-11 19:32:19 +00:00
parent d120560594
commit 945d2c96eb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=327006
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mail/elm+ME/Makefile
View File

@ -40,7 +40,8 @@ SCRIPTS_ENV= CONFIG_PATH="${CONFIG_PATH}" CFLAGS="${CFLAGS}" \
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 /{print $$2; exit}'
FTP_PASSWORD?= ${USER}@`${HOSTIPADDR}`
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

8
mail/elm+ME/scripts/pre-configure
View File

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