svn commit: r325664 - head/irc/irssi-xmpp

[Alexey Dokuchaev]

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 at 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 <bsd.port.options.mk>
 
 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 <bsd.port.mk>