diff options
| author | marcus <marcus@FreeBSD.org> | 2007-01-22 06:28:14 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2007-01-22 06:28:14 +0000 |
| commit | d58cd6ed8f98db14911a745338bbefad1d69bc64 (patch) | |
| tree | e66c35bb8b89985448b8aee6b22a5e86702f053a /net-im | |
| parent | 452675e136343208ab74a39b2f677f309ebe00f6 (diff) | |
| download | FreeBSD-ports-d58cd6ed8f98db14911a745338bbefad1d69bc64.zip FreeBSD-ports-d58cd6ed8f98db14911a745338bbefad1d69bc64.tar.gz | |
Fix SILC support.
PR: 108040
Submitted by: Sean Farley <sean-freebsd@farley.org>
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/libgaim/Makefile | 8 | ||||
| -rw-r--r-- | net-im/libpurple/Makefile | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/net-im/libgaim/Makefile b/net-im/libgaim/Makefile index 1ff2f48..8ae0c349 100644 --- a/net-im/libgaim/Makefile +++ b/net-im/libgaim/Makefile @@ -35,6 +35,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C # Gaim slave ports that require the following functionality, must explicitly # set these macros themselves. USE_GETTEXT= yes +USE_ICONV= yes USE_LDCONFIG= yes WANT_GNOME= yes USE_PYTHON= yes @@ -127,8 +128,9 @@ CONFIGURE_ARGS+= --enable-cyrus-sasl .endif .if defined(WITH_SILC) -LIB_DEPENDS+= silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit -CONFIGURE_ARGS+= --with-silc-includes=${LOCALBASE}/include/silc +LIB_DEPENDS+= silcclient-1.0.4:${PORTSDIR}/devel/silc-toolkit +CONFIGURE_ARGS+= --with-silc-includes=${LOCALBASE}/include/silc \ + --with-silc-libs=${LOCALBASE}/lib PLIST_SUB+= SILC="" PRPL_MODULES:= ${PRPL_MODULES},silc .else @@ -210,7 +212,7 @@ post-patch: -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|-lpanel |-lpanel -lncurses|g' \ -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \ - -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} -ldl|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \ + -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \ -e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \ -e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \ ${WRKSRC}/configure diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index 1ff2f48..8ae0c349 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -35,6 +35,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C # Gaim slave ports that require the following functionality, must explicitly # set these macros themselves. USE_GETTEXT= yes +USE_ICONV= yes USE_LDCONFIG= yes WANT_GNOME= yes USE_PYTHON= yes @@ -127,8 +128,9 @@ CONFIGURE_ARGS+= --enable-cyrus-sasl .endif .if defined(WITH_SILC) -LIB_DEPENDS+= silcclient-1.0.3:${PORTSDIR}/devel/silc-toolkit -CONFIGURE_ARGS+= --with-silc-includes=${LOCALBASE}/include/silc +LIB_DEPENDS+= silcclient-1.0.4:${PORTSDIR}/devel/silc-toolkit +CONFIGURE_ARGS+= --with-silc-includes=${LOCALBASE}/include/silc \ + --with-silc-libs=${LOCALBASE}/lib PLIST_SUB+= SILC="" PRPL_MODULES:= ${PRPL_MODULES},silc .else @@ -210,7 +212,7 @@ post-patch: -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|-lpanel |-lpanel -lncurses|g' \ -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \ - -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} -ldl|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \ + -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \ -e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \ -e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \ ${WRKSRC}/configure |
