diff options
| author | johans <johans@FreeBSD.org> | 2009-06-26 00:29:45 +0800 |
|---|---|---|
| committer | johans <johans@FreeBSD.org> | 2009-06-26 00:29:45 +0800 |
| commit | af1470802fd6a96eb5f1c6f146bd999976697373 (patch) | |
| tree | df417098c641c1b69151f3b680aacc705f984b31 | |
| parent | a05abde4f1ed9f5c5dbed8d796942d1e5a302ff3 (diff) | |
| download | freebsd-ports-gnome-af1470802fd6a96eb5f1c6f146bd999976697373.tar.gz freebsd-ports-gnome-af1470802fd6a96eb5f1c6f146bd999976697373.tar.zst freebsd-ports-gnome-af1470802fd6a96eb5f1c6f146bd999976697373.zip | |
- Fix dependency checks and the logic of selected (conflicting) options
- Rename SSL option to clarify its purpose (SSL is used even if it's off)
Reported by: Simeon Simeonov
| -rw-r--r-- | net-im/climm/Makefile | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile index 960873db0196..59b7620c62dd 100644 --- a/net-im/climm/Makefile +++ b/net-im/climm/Makefile @@ -7,6 +7,7 @@ PORTNAME= climm PORTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.climm.org/source/ \ http://http.bg.climm.org/source/ @@ -16,7 +17,6 @@ MAINTAINER= johans@stack.nl COMMENT= CLI-based Multi-Messenger USE_GMAKE= yes -USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" LDFLAGS+= -L${LOCALBASE}/lib @@ -28,26 +28,18 @@ MAN7= climmcmds.7 OPTIONS= LIBICONV "Iconv character set conversion" on \ P2P "Peer2peer connection support" on \ TCL "TCL scripting support" on \ - SSL "SSL/OTR encryption support" on \ + OTR "OTR encryption support" on \ REMOTE "Remote control fifo support" on \ XMPP "XMPP Jabber support" off .include <bsd.port.pre.mk> -.if defined(WITHOUT_SSL) -CONFIGURE_ARGS+= --disable-ssl --disable-otr +.if defined(WITHOUT_OTR) +CONFIGURE_ARGS+= --disable-otr .else -. if defined(WITHOUT_XMPP) -CONFIGURE_ARGS+= --enable-ssl=openssl -. else -CONFIGURE_ARGS+= --enable-ssl=gnutls --with-libgnutls-prefix=${LOCALBASE} -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls -. endif CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS+= --with-libgcrypt-prefix=${LOCALBASE} -LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt \ - otr:${PORTSDIR}/security/libotr \ - gpg-error:${PORTSDIR}/security/libgpg-error +CONFIGURE_ARGS+= --enable-otr +LIB_DEPENDS+= otr:${PORTSDIR}/security/libotr .endif .if defined(WITHOUT_LIBICONV) @@ -56,8 +48,8 @@ CONFIGURE_ARGS+= --disable-iconv USE_ICONV= yes .endif -.if defined(WITHOUT_P2P) || defined(WITHOUT_SSL) -CONFIGURE_ARGS+= --disable-peer2peer --disable-ssl +.if defined(WITHOUT_P2P) +CONFIGURE_ARGS+= --disable-peer2peer .endif .if defined(WITHOUT_TCL) @@ -72,15 +64,22 @@ CONFIGURE_ARGS+= --disable-remote .endif .if defined(WITHOUT_XMPP) -CONFIGURE_ARGS+= --disable-xmpp +USE_OPENSSL= yes +CONFIGURE_ARGS+= --disable-xmpp --enable-ssl=openssl .else -LIB_DEPENDS+= iksemel:${PORTSDIR}/textproc/iksemel -CONFIGURE_ARGS+= --enable-xmpp +CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ARGS+= --enable-xmpp --enable-ssl=gnutls \ + --with-libgnutls-prefix=${LOCALBASE} \ + --with-libgcrypt-prefix=${LOCALBASE} +LIB_DEPENDS+= iksemel:${PORTSDIR}/textproc/iksemel \ + gnutls:${PORTSDIR}/security/gnutls \ + gcrypt:${PORTSDIR}/security/libgcrypt \ + gpg-error:${PORTSDIR}/security/libgpg-error .endif post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/ doc//' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e '/ac_lib/s/tcl8\.4/tcl84/' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/ac_lib/s/tcl8\./tcl8/g' ${WRKSRC}/configure post-install: ${INSTALL_MAN} ${WRKSRC}/doc/climm.1 ${MANPREFIX}/man/man1 |