- NOPORTDOCS -> PORT_OPTIONS:MDOCS

- Staging
- Use OPTIONS where appropriate
- Rename old-style patch files

3 files changed, 15 insertions, 52 deletions

diff --git a/irc/irssistats/Makefile b/irc/irssistats/Makefile
index dc6b63fb6fc4..351d371cbf48 100644
--- a/irc/irssistats/Makefile
+++ b/irc/irssistats/Makefile
@@ -9,19 +9,20 @@ MASTER_SITES=	http://royale.zerezo.com/irssistats/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate IRC statistics based on irssi logs
 
-MAKE_ARGS+=	DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" EXAMPLESDIR="${EXAMPLESDIR}" PREFIX="${PREFIX}" \
-		CC="${CC}" CFLAGS="${CFLAGS}"
+LICENSE=	GPLv2
 
-MAN1=	irssistats.1
 ALL_TARGET=	irssistats
-INSTALL_TARGET=	install
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/irssistats.conf|${PREFIX}/etc/irssistats.conf|g' ${WRKSRC}/irssistats.c
+	${REINPLACE_CMD} -e 's|/etc/irssistats.conf|${PREFIX}/etc/irssistats.conf|g' ${WRKSRC}/irssistats.c
+	${REINPLACE_CMD} -e 's/gcc/$$(CC)/g' ${WRKSRC}/Makefile
 
-.if defined(NOPORTDOCS)
-MAKE_ARGS+=	NOPORTDOCS="${NOPORTDOCS}"
-.endif
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/sample.* ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/irc/irssistats/files/patch-Makefile b/irc/irssistats/files/patch-Makefile
deleted file mode 100644
index 2c6092292479..000000000000
--- a/irc/irssistats/files/patch-Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.orig	Fri Sep 21 00:30:00 2007
-+++ Makefile	Wed Dec 12 09:47:26 2007
-@@ -1,21 +1,26 @@
--PRE = /usr/local
--BIN = $(PRE)/bin
--DAT = $(PRE)/share/irssistats/data
--DOC = $(PRE)/share/doc/irssistats
--MAN = $(PRE)/share/man/man1
--CFLAGS ?= -O2
-+PRE = $(PREFIX)
-+BIN = $(PREFIX)/bin
-+DAT = $(DATADIR)
-+SMP = $(EXAMPLESDIR)
-+DOC = $(DOCSDIR)
-+MAN = $(PREFIX)/man/man1
- 
- irssistats:irssistats.c
--	gcc $(CFLAGS) -o irssistats irssistats.c
-+	${CC} ${CFLAGS} -o irssistats irssistats.c
- 
- clean:
- 	rm -f irssistats
- 
- install:irssistats
--	mkdir -p $(BIN) $(DAT) $(DOC) $(MAN)
-+	mkdir -p $(BIN) $(DAT) $(MAN) $(SMP)
- 	cp -f irssistats $(BIN)
- 	cp -f data/* $(DAT)
--	cp -f COPYING README sample.nickfile sample.configfile irssistats.sgml $(DOC)
-+	cp -f sample.nickfile sample.configfile sample.photofile $(SMP)
-+.ifndef NOPORTDOCS
-+	mkdir -p $(DOC)
-+	cp -f COPYING README $(DOC)
-+.endif
-+
- 	cp -f irssistats.1 $(MAN)
- 
- uninstall:
diff --git a/irc/irssistats/pkg-plist b/irc/irssistats/pkg-plist
index 1de96f82d12e..c19177d70a28 100644
--- a/irc/irssistats/pkg-plist
+++ b/irc/irssistats/pkg-plist
@@ -1,5 +1,5 @@
 bin/irssistats
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
+man/man1/irssistats.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/biseau.css
 %%DATADIR%%/biseau_corner1.gif
@@ -40,9 +40,9 @@ bin/irssistats
 %%DATADIR%%/vm.png
 %%DATADIR%%/zeduel.css
 %%DATADIR%%/zerezo.css
-%%EXAMPLESDIR%%/sample.configfile
-%%EXAMPLESDIR%%/sample.nickfile
-%%EXAMPLESDIR%%/sample.photofile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.configfile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.nickfile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.photofile
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%