From owner-svn-ports-head@FreeBSD.ORG Fri Aug 9 11:41:12 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id BAA8D930; Fri, 9 Aug 2013 11:41:12 +0000 (UTC) (envelope-from danfe@FreeBSD.org) 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 8E3972280; Fri, 9 Aug 2013 11:41:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r79BfC10006826; Fri, 9 Aug 2013 11:41:12 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r79BfC4X006825; Fri, 9 Aug 2013 11:41:12 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201308091141.r79BfC4X006825@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 9 Aug 2013 11:41:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324426 - head/net-im/zephyr X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Aug 2013 11:41:12 -0000 Author: danfe Date: Fri Aug 9 11:41:12 2013 New Revision: 324426 URL: http://svnweb.freebsd.org/changeset/ports/324426 Log: - Unbreak parallel (-jX) builds: add missing inter-source dependencies - Drop leading indefinite article from the COMMENT - Add missing HEIMDAL_DESC, use new syntax for LIB_DEPENDS - Improve the order of the knobs within the Makefile Modified: head/net-im/zephyr/Makefile Modified: head/net-im/zephyr/Makefile ============================================================================== --- head/net-im/zephyr/Makefile Fri Aug 9 10:00:56 2013 (r324425) +++ head/net-im/zephyr/Makefile Fri Aug 9 11:41:12 2013 (r324426) @@ -7,38 +7,46 @@ CATEGORIES= net-im MASTER_SITES= http://zephyr.1ts.org/export/2642/distribution/ MAINTAINER= kaduk-fbsd@mit.edu -COMMENT= An enterprise-scale distributed messaging system +COMMENT= Enterprise-scale distributed messaging system LICENSE= MIT -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include +USES= iconv +GNU_CONFIGURE= yes USE_RC_SUBR= zhm USE_LDCONFIG= yes -GNU_CONFIGURE= yes -USES= iconv + +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include MAN1= zephyr.1 zaway.1 zctl.1 zleave.1 zlocate.1 znol.1 zwrite.1 zwgc.1 MAN8= zhm.8 zephyrd.8 zstat.8 zshutdown_notify.8 OPTIONS_DEFINE= HEIMDAL +HEIMDAL_DESC= Link against libss.so from security/heimdal .include .if ${PORT_OPTIONS:MHEIMDAL} BROKEN= bad depobj -LIB_DEPENDS+= ss.1:${PORTSDIR}/security/heimdal +LIB_DEPENDS+= libss.so.1:${PORTSDIR}/security/heimdal .if defined(HEIMDAL_HOME) KRB5_DIR?= ${HEIMDAL_HOME} .else KRB5_DIR?= ${LOCALBASE} .endif .else -LIB_DEPENDS+= ss.2:${PORTSDIR}/devel/e2fsprogs-libss +LIB_DEPENDS+= libss.so.2:${PORTSDIR}/devel/e2fsprogs-libss KRB5_DIR?= ${DESTDIR}/usr .endif # it is an upstream bug that --with-krb5 needs a path CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}" +# try to fix parallel (-jX) builds: add missing inter-source dependencies +post-patch: + @${REINPLACE_CMD} -e \ + '/^eval\.o/,$$s,port\.h,& string_stack.h new_string.h, ; \ + s,_aux\.h,.h,' ${WRKSRC}/zwgc/Makefile.in + .include