From owner-svn-ports-all@FreeBSD.ORG Fri Aug 30 07:45:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5DD0CF25; Fri, 30 Aug 2013 07:45:59 +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 4BAB72E1D; Fri, 30 Aug 2013 07:45:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7U7jxDC054336; Fri, 30 Aug 2013 07:45:59 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7U7jxZV054335; Fri, 30 Aug 2013 07:45:59 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201308300745.r7U7jxZV054335@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 30 Aug 2013 07:45:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325664 - head/irc/irssi-xmpp 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.14 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, 30 Aug 2013 07:45:59 -0000 Author: danfe Date: Fri Aug 30 07:45:58 2013 New Revision: 325664 URL: http://svnweb.freebsd.org/changeset/ports/325664 Log: - Attempt to fix parallel builds (-jX) by calling sub-makes correctly - Properly respect CC and CFLAGS; add missing OPTIONS_DEFINE=DOCS - Tighten COMMENT; fix installation by adjusting DATADIR and DOCSDIR - Remove LICENSE_FILE (standard GPLv2 boilerplate) and other cleanups Reported by: marino Approved by: miwi, bapt (portmgr, implicit) Modified: head/irc/irssi-xmpp/Makefile Modified: head/irc/irssi-xmpp/Makefile ============================================================================== --- head/irc/irssi-xmpp/Makefile Fri Aug 30 07:24:07 2013 (r325663) +++ head/irc/irssi-xmpp/Makefile Fri Aug 30 07:45:58 2013 (r325664) @@ -7,25 +7,32 @@ CATEGORIES= irc MASTER_SITES= http://cybione.org/~irssi-xmpp/files/ MAINTAINER= jadawin@FreeBSD.org -COMMENT= Irssi-xmpp is an irssi plugin to connect to the Jabber network +COMMENT= Irssi plugin to connect to Jabber network LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= irssi:${PORTSDIR}/irc/irssi -RUN_DEPENDS= irssi:${PORTSDIR}/irc/irssi -LIB_DEPENDS= loudmouth:${PORTSDIR}/net-im/loudmouth +LIB_DEPENDS= libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth +RUN_DEPENDS:= ${BUILD_DEPENDS} USES= pkgconfig USE_LDCONFIG= yes +MAKE_ARGS= CC="${CC}" +DATADIR= ${PREFIX}/share/irssi +DOCSDIR= ${PREFIX}/share/doc/irssi -MAKE_JOBS_UNSAFE=yes +OPTIONS_DEFINE= DOCS .include post-patch: +# Try to unbreak parallel builds (-jX) + @${REINPLACE_CMD} -E 's|cd (.+) && (\$${MAKE})|\2 -C \1|' \ + ${WRKSRC}/Makefile ${WRKSRC}/src/Makefile +# Uphold CFLAGS + @${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=|' ${WRKSRC}/config.mk .if ! ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e 's/ doc-install / /g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|doc-install ||' ${WRKSRC}/Makefile .endif .include