Date: Wed, 21 Aug 2013 08:42:49 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325097 - in head/irc/trickyirc: . files Message-ID: <201308210842.r7L8gn6a089521@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Aug 21 08:42:48 2013 New Revision: 325097 URL: http://svnweb.freebsd.org/changeset/ports/325097 Log: - Unbreak parallel builds (-jX) by fixing make(1) syntax (still remains to a certain degree a mess, though...); convert USE_GMAKE - Remove prehistoric files/patch-aa, use MAKE_ARGS for that purpose - Produce verbose build log when built on the cluster - Convert to OptionsNG (DOCS, EXAMPLES) - Tighten Makefile header and COMMENT while here Reported by: marino Approved by: miwi, bapt (portmgr, implicit) Deleted: head/irc/trickyirc/files/patch-aa Modified: head/irc/trickyirc/Makefile Modified: head/irc/trickyirc/Makefile ============================================================================== --- head/irc/trickyirc/Makefile Wed Aug 21 08:24:32 2013 (r325096) +++ head/irc/trickyirc/Makefile Wed Aug 21 08:42:48 2013 (r325097) @@ -1,9 +1,5 @@ -# New ports collection makefile for: TrickyIRC -# Date created: Jun 20th 1999 -# Whom: troll -# +# Created by: Adam Strohl <troll@digitalspark.net> # $FreeBSD$ -# PORTNAME= trickyirc PORTVERSION= 1.1.0 @@ -13,23 +9,40 @@ MASTER_SITES= http://www.leb.net/~troll/ DISTNAME= TrickyIRC-${PORTVERSION} MAINTAINER= gahr@FreeBSD.org -COMMENT= Allows client independent detaching and reattaching of IRC sessions +COMMENT= Client-independent detaching and reattaching of IRC sessions +USES= gmake MAKEFILE= GNUmakefile +MAKE_ARGS= CC="${CC}" OPTCC_OPTS="${CFLAGS}" WRKSRC= ${WRKDIR}/trickyirc -USE_GMAKE= YES + +.if defined(BATCH) || defined(PACKAGE_BUILDING) +MAKE_ARGS+= VERBOSE=YES +.endif PLIST_FILES= bin/${PORTNAME} PORTDOCS= * PORTEXAMPLES= * +OPTIONS_DEFINE= DOCS EXAMPLES + +.include <bsd.port.options.mk> + +# Use better make(1) syntax in attempt to fix parallel (-jX) builds; do not +# explicitly set MAKE, it's a builtin variable that make(1) must set itself +post-patch: + @${REINPLACE_CMD} -E \ + 's/cd (.+); gmake \$$@; cd \.\./$$(MAKE) -C \1 $$@/' \ + ${WRKSRC}/core/make/project.mk + @${REINPLACE_CMD} -e '/MAKE=/d' ${WRKSRC}/core/make/platforms.mk + post-install: -.if !defined(NOPORTDOCS) - @ ${MKDIR} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) - @ ${MKDIR} ${EXAMPLESDIR} +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/config.sample ${EXAMPLESDIR} .endif @${STRIP_CMD} ${PREFIX}/bin/${PORTNAME}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308210842.r7L8gn6a089521>