svn commit: r408325 - in head/irc/irssistats: . files

[Dmitry Marakasov]

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 at 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);
  }