4 files changed, 81 insertions, 57 deletions

diff --git a/irc/irssistats/Makefile b/irc/irssistats/Makefile
index 2a15513fa769..6e26abff5992 100644
--- a/irc/irssistats/Makefile
+++ b/irc/irssistats/Makefile
@@ -6,16 +6,25 @@
 #
 
 PORTNAME=	irssistats
-PORTVERSION=	0.6
+PORTVERSION=	0.70
 CATEGORIES=	irc
 MASTER_SITES=	http://royale.zerezo.com/irssistats/
 
-MAINTAINER=	tlp@liquidx.org
+MAINTAINER=	az@inec.ru
 COMMENT=	Generate IRC statistics based on irssi logs
 
 USE_REINPLACE=	yes
 
+MAKE_ARGS+=	DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" EXAMPLESDIR="${EXAMPLESDIR}" PREFIX="${PREFIX}" \
+		CC="${CC}" CFLAGS="${CFLAGS}"
+
+MAN1=	irssistats.1
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/etc/irssistats.conf|${PREFIX}/etc/irssistats.conf|g' ${WRKSRC}/irssistats.c
+
+.if defined(NOPORTDOCS)
+MAKE_ARGS+=	NOPORTDOCS="${NOPORTDOCS}"
+.endif
 
 .include <bsd.port.mk>
diff --git a/irc/irssistats/distinfo b/irc/irssistats/distinfo
index e17f178bc39b..7537bcc936b6 100644
--- a/irc/irssistats/distinfo
+++ b/irc/irssistats/distinfo
@@ -1,2 +1,2 @@
-MD5 (irssistats-0.6.tar.gz) = 3e109eaf8070c9072623446002f28212
-SIZE (irssistats-0.6.tar.gz) = 41909
+MD5 (irssistats-0.70.tar.gz) = 9fd99eb73166f2e8dad2328a52e884a1
+SIZE (irssistats-0.70.tar.gz) = 53795
diff --git a/irc/irssistats/files/patch-Makefile b/irc/irssistats/files/patch-Makefile
index 59cb06cc4f87..8694700c5a23 100644
--- a/irc/irssistats/files/patch-Makefile
+++ b/irc/irssistats/files/patch-Makefile
@@ -1,35 +1,41 @@
-$FreeBSD$
-
---- Makefile.orig	Sun Dec 14 10:40:10 2003
-+++ Makefile	Sun Mar 14 22:17:20 2004
-@@ -1,19 +1,25 @@
- PRE = /usr/local
- BIN = $(PRE)/bin
-+SMP = $(PRE)/share/irssistats
- DAT = $(PRE)/share/irssistats/data
--DOC = $(PRE)/doc/irssistats
-+DOC = $(PRE)/share/doc/irssistats
-+CC ?= gcc
+--- Makefile.orig	Sun Feb  6 04:54:00 2005
++++ Makefile	Thu Apr 21 14:12:23 2005
+@@ -1,12 +1,13 @@
+ VER = 0.70
+-PRE = /usr/local
+-BIN = $(PRE)/bin
+-DAT = $(PRE)/share/irssistats/data
+-DOC = $(PRE)/share/doc/irssistats
+-MAN = $(PRE)/share/man/man1
++PRE = $(PREFIX)
++BIN = $(PREFIX)/bin
++DAT = $(DATADIR)
++SMP = $(EXAMPLESDIR)
++DOC = $(DOCSDIR)
++MAN = $(PREFIX)/man/man1
  
 -irssistats:irssistats.c
--	gcc -o irssistats irssistats.c
+-	gcc -O2 -o irssistats irssistats.c
 +all:irssistats.c
 +	${CC} ${CFLAGS} -o irssistats irssistats.c
  
  clean:
- 	rm -f irssistats 
+ 	rm -f irssistats irssistats.exe
+@@ -14,10 +15,15 @@
+ 	rm -rf debian/irssistats rpm/BUILD rpm/SPECS rpm/SOURCES rpm/SRPMS rpm/RPMS
  
  install:irssistats
--	mkdir -p $(BIN) $(DAT) $(DOC)
-+	mkdir -p $(BIN) $(DAT)
+-	mkdir -p $(BIN) $(DAT) $(DOC) $(MAN)
++	mkdir -p $(BIN) $(DAT) $(MAN) $(SMP)
  	cp -f irssistats $(BIN)
 +	cp -f sample.nickfile sample.configfile $(SMP)
  	cp -f data/* $(DAT)
--	cp -f COPYING README sample.nickfile sample.configfile $(DOC)
+-	cp -f COPYING README sample.nickfile sample.configfile irssistats.sgml $(DOC)
 +.ifndef NOPORTDOCS
 +	mkdir -p $(DOC)
 +	cp -f COPYING README $(DOC)
 +.endif
++
+ 	cp -f irssistats.1 $(MAN)
  
  uninstall:
- 	rm -f $(BIN)/irssistats
diff --git a/irc/irssistats/pkg-plist b/irc/irssistats/pkg-plist
index 349a846c5455..e0ba6f867a1f 100644
--- a/irc/irssistats/pkg-plist
+++ b/irc/irssistats/pkg-plist
@@ -1,38 +1,47 @@
 bin/irssistats
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/irssistats/data/blue.css
-share/irssistats/data/dark.css
-share/irssistats/data/default.css
-share/irssistats/data/grayscale.css
-share/irssistats/data/h1.png
-share/irssistats/data/h2.png
-share/irssistats/data/h3.png
-share/irssistats/data/h4.png
-share/irssistats/data/hm.png
-share/irssistats/data/irssistats_black.png
-share/irssistats/data/irssistats_white.png
-share/irssistats/data/namour.css
-share/irssistats/data/pisg.css
-share/irssistats/data/pisg_blue-h.png
-share/irssistats/data/pisg_blue-v.png
-share/irssistats/data/pisg_green-h.png
-share/irssistats/data/pisg_green-v.png
-share/irssistats/data/pisg_red-h.png
-share/irssistats/data/pisg_red-v.png
-share/irssistats/data/pisg_yellow-h.png
-share/irssistats/data/pisg_yellow-v.png
-share/irssistats/data/v1.png
-share/irssistats/data/v2.png
-share/irssistats/data/v3.png
-share/irssistats/data/v4.png
-share/irssistats/data/valid-css.png
-share/irssistats/data/valid-xhtml10.png
-share/irssistats/data/vm.png
-share/irssistats/data/zeduel.css
-share/irssistats/data/zerezo.css
-share/irssistats/sample.configfile
-share/irssistats/sample.nickfile
-@dirrm share/irssistats/data
-@dirrm share/irssistats
+%%DATADIR%%/biseau.css
+%%DATADIR%%/biseau_corner1.gif
+%%DATADIR%%/biseau_corner2.gif
+%%DATADIR%%/biseau_corner3.gif
+%%DATADIR%%/biseau_corner4.gif
+%%DATADIR%%/blue.css
+%%DATADIR%%/damier.css
+%%DATADIR%%/damier_background.gif
+%%DATADIR%%/damier_title.png
+%%DATADIR%%/dark.css
+%%DATADIR%%/default.css
+%%DATADIR%%/grayscale.css
+%%DATADIR%%/h1.png
+%%DATADIR%%/h2.png
+%%DATADIR%%/h3.png
+%%DATADIR%%/h4.png
+%%DATADIR%%/hm.png
+%%DATADIR%%/irssistats_black.png
+%%DATADIR%%/irssistats_white.png
+%%DATADIR%%/namour.css
+%%DATADIR%%/niflheim.css
+%%DATADIR%%/pisg.css
+%%DATADIR%%/pisg_blue-h.png
+%%DATADIR%%/pisg_blue-v.png
+%%DATADIR%%/pisg_green-h.png
+%%DATADIR%%/pisg_green-v.png
+%%DATADIR%%/pisg_red-h.png
+%%DATADIR%%/pisg_red-v.png
+%%DATADIR%%/pisg_yellow-h.png
+%%DATADIR%%/pisg_yellow-v.png
+%%DATADIR%%/v1.png
+%%DATADIR%%/v2.png
+%%DATADIR%%/v3.png
+%%DATADIR%%/v4.png
+%%DATADIR%%/valid-css.png
+%%DATADIR%%/valid-xhtml10.png
+%%DATADIR%%/vm.png
+%%DATADIR%%/zeduel.css
+%%DATADIR%%/zerezo.css
+%%EXAMPLESDIR%%/sample.configfile
+%%EXAMPLESDIR%%/sample.nickfile
+@dirrm %%DATADIR%%
+@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%