From owner-svn-ports-all@FreeBSD.ORG Fri Jan 17 11:03:16 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4FD08E0F; Fri, 17 Jan 2014 11:03:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2237316E6; Fri, 17 Jan 2014 11:03:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HB3GQe033262; Fri, 17 Jan 2014 11:03:16 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HB3FKS033261; Fri, 17 Jan 2014 11:03:15 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401171103.s0HB3FKS033261@svn.freebsd.org> From: Pietro Cerutti Date: Fri, 17 Jan 2014 11:03:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340027 - head/net-im/climm X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 11:03:16 -0000 Author: gahr Date: Fri Jan 17 11:03:15 2014 New Revision: 340027 URL: http://svnweb.freebsd.org/changeset/ports/340027 QAT: https://qat.redports.org/buildarchive/r340027/ Log: - Convert to USES=tcl and USES=gmake - Convert to new LIB_DEPENDS format - STAGE-clean Modified: head/net-im/climm/Makefile Modified: head/net-im/climm/Makefile ============================================================================== --- head/net-im/climm/Makefile Fri Jan 17 10:33:08 2014 (r340026) +++ head/net-im/climm/Makefile Fri Jan 17 11:03:15 2014 (r340027) @@ -12,8 +12,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= johans@FreeBSD.org COMMENT= CLI-based Multi-Messenger -USES= pkgconfig -USE_GMAKE= yes +USES= gmake pkgconfig GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib @@ -28,13 +27,12 @@ OTR_DESC= Enable OTR encryption support REMOTE_DESC= Enable Remote control fifo support XMPP_DESC= Enable XMPP Jabber support -NO_STAGE= yes .include .if ${PORT_OPTIONS:MOTR} CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-otr -LIB_DEPENDS+= otr.4:${PORTSDIR}/security/libotr3 +LIB_DEPENDS+= libotr.so.4:${PORTSDIR}/security/libotr3 .else CONFIGURE_ARGS+= --disable-otr .endif @@ -52,8 +50,7 @@ CONFIGURE_ARGS+= --disable-peer2peer .endif .if ${PORT_OPTIONS:MTCL} -USE_TCL= yes -.include "${PORTSDIR}/Mk/bsd.tcl.mk" +USES+= tcl .else CONFIGURE_ARGS+= --disable-tcl .endif @@ -69,10 +66,10 @@ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --enable-xmpp --enable-ssl=gnutls \ --with-libgcrypt-prefix=${LOCALBASE} CONFIGURE_ENV+= LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkgconf gnutls" -LIB_DEPENDS+= iksemel:${PORTSDIR}/textproc/iksemel \ - gnutls:${PORTSDIR}/security/gnutls \ - gcrypt:${PORTSDIR}/security/libgcrypt \ - gpg-error:${PORTSDIR}/security/libgpg-error +LIB_DEPENDS+= libiksemel.so:${PORTSDIR}/textproc/iksemel \ + libgnutls.so:${PORTSDIR}/security/gnutls \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libgpg-error.so:${PORTSDIR}/security/libgpg-error .else USE_OPENSSL= yes CONFIGURE_ARGS+= --disable-xmpp --enable-ssl=openssl @@ -86,14 +83,12 @@ post-patch: ${WRKSRC}/configure post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/climm.1 ${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/climmrc.5 ${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/doc/climmcmds.7 ${MANPREFIX}/man/man7 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -. for ext in i18n logformat png txt xpm - ${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${DOCSDIR} -. endfor -.endif + ${INSTALL_MAN} ${WRKSRC}/doc/climm.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/climmrc.5 ${STAGEDIR}${PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/doc/climmcmds.7 ${STAGEDIR}${PREFIX}/man/man7 + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for ext in i18n logformat png txt xpm + ${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${STAGEDIR}${DOCSDIR} +.endfor .include