From owner-svn-ports-all@freebsd.org  Sat Feb  6 23:19:52 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 621CFA9F2F8;
 Sat,  6 Feb 2016 23:19:52 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 18900122F;
 Sat,  6 Feb 2016 23:19:52 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u16NJpFC020043;
 Sat, 6 Feb 2016 23:19:51 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u16NJptZ020041;
 Sat, 6 Feb 2016 23:19:51 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201602062319.u16NJptZ020041@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sat, 6 Feb 2016 23:19:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408325 - in head/irc/irssistats: . files
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2016 23:19:52 -0000

Author: amdmi3
Date: Sat Feb  6 23:19:50 2016
New Revision: 408325
URL: https://svnweb.freebsd.org/changeset/ports/408325

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers
  - Silence patching
  - Fix build with CC containing slashes
  - Regenerate patches with `make makepatch`

Modified:
  head/irc/irssistats/Makefile
  head/irc/irssistats/files/patch-irssistats.c

Modified: head/irc/irssistats/Makefile
==============================================================================
--- head/irc/irssistats/Makefile	Sat Feb  6 23:17:35 2016	(r408324)
+++ head/irc/irssistats/Makefile	Sat Feb  6 23:19:50 2016	(r408325)
@@ -9,22 +9,29 @@ MASTER_SITES=	http://royale.zerezo.com/i
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate IRC statistics based on irssi logs
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 ALL_TARGET=	irssistats
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/etc/irssistats.conf|${PREFIX}/etc/irssistats.conf|g' ${WRKSRC}/irssistats.c
-	${REINPLACE_CMD} -e 's/gcc/$$(CC)/g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/etc/irssistats.conf|${PREFIX}/etc/irssistats.conf|g' ${WRKSRC}/irssistats.c
+	@${REINPLACE_CMD} -e 's|gcc|$$(CC)|g' ${WRKSRC}/Makefile
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${DATADIR}
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample.* ${STAGEDIR}${EXAMPLESDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/irc/irssistats/files/patch-irssistats.c
==============================================================================
--- head/irc/irssistats/files/patch-irssistats.c	Sat Feb  6 23:17:35 2016	(r408324)
+++ head/irc/irssistats/files/patch-irssistats.c	Sat Feb  6 23:19:50 2016	(r408325)
@@ -1,6 +1,6 @@
---- irssistats.c.orig	2007-11-10 19:40:55.000000000 +0100
-+++ irssistats.c	2012-12-03 11:42:45.000000000 +0100
-@@ -1561,19 +1561,19 @@
+--- irssistats.c.orig	2007-11-10 18:40:55 UTC
++++ irssistats.c
+@@ -1561,19 +1561,19 @@ void gen_xhtml(char *xhtmlfile)
    fclose(fic);
  }