diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2015-04-15 08:20:27 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2015-04-15 08:20:27 +0000 |
| commit | 074ea5282a00d556c73d86231bec5444990597dc (patch) | |
| tree | eec3d608e84e79f0187985e5a1e29cd4f04f13eb /net-im/licq | |
| parent | 522c152d1c7b0c92982e310110fa6d59f915ffeb (diff) | |
| download | ports-074ea5282a00d556c73d86231bec5444990597dc.tar.gz ports-074ea5282a00d556c73d86231bec5444990597dc.zip | |
Notes
Diffstat (limited to 'net-im/licq')
| -rw-r--r-- | net-im/licq/Makefile | 9 | ||||
| -rw-r--r-- | net-im/licq/files/patch-cmake-Modules-FindIconv.cmake | 31 |
2 files changed, 34 insertions, 6 deletions
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index 4dba02d02883..c09a53737703 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -3,6 +3,7 @@ PORTNAME= base PORTVERSION= ${LICQ_VER} +PORTREVISION= 1 CATEGORIES= net-im PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2} @@ -17,17 +18,13 @@ USES= cmake iconv WRKSRC= ${WRKDIR}/${DISTNAME} LICQ_PORT?= net-im/licq -# workaround for installed autoconf/automake -LDFLAGS+= -lpthread -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic -CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include -CXXFLAGS+= -Wl,--export-dynamic -DGTEST_USE_OWN_TR1_TUPLE +CXXFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE -OPTIONS_DEFINE= OPENSSL +OPTIONS_DEFINE= NLS OPENSSL OPTIONS_DEFAULT=OPENSSL OPENSSL_USE= OPENSSL=yes -OPENSSL_CONFIGURE_ON= --with-openssl-inc=${OPENSSLINC} --with-openssl-lib=${OPENSSLLIB} .include <bsd.port.options.mk> diff --git a/net-im/licq/files/patch-cmake-Modules-FindIconv.cmake b/net-im/licq/files/patch-cmake-Modules-FindIconv.cmake new file mode 100644 index 000000000000..caa0375c4808 --- /dev/null +++ b/net-im/licq/files/patch-cmake-Modules-FindIconv.cmake @@ -0,0 +1,31 @@ +--- cmake/Modules/FindIconv.cmake.orig 2014-06-01 19:16:42 UTC ++++ cmake/Modules/FindIconv.cmake +@@ -10,6 +10,7 @@ + # + include(CheckCCompilerFlag) + include(CheckCXXSourceCompiles) ++include(CheckFunctionExists) + + IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + # Already in cache, be silent +@@ -18,11 +19,15 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRA + + FIND_PATH(ICONV_INCLUDE_DIR iconv.h) + +-FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c) +- +-IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) +- SET(ICONV_FOUND TRUE) +-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) ++IF(ICONV_INCLUDE_DIR) ++ CHECK_FUNCTION_EXISTS(iconv ICONV_FOUND) ++ IF(NOT ICONV_FOUND) ++ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2) ++ IF(ICONV_LIBRARIES) ++ SET(ICONV_FOUND TRUE) ++ ENDIF(ICONV_LIBRARIES) ++ ENDIF(NOT ICONV_FOUND) ++ENDIF(ICONV_INCLUDE_DIR) + + set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) |