- NOPORTDOCS -> PORT_OPTIONS:MDOCS

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

16 files changed, 199 insertions, 272 deletions

diff --git a/irc/gruftistats/Makefile b/irc/gruftistats/Makefile
index 9259211cdd2f..1975cd774c0a 100644
--- a/irc/gruftistats/Makefile
+++ b/irc/gruftistats/Makefile
@@ -11,15 +11,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produces a web page of statistics and quotes from IRC channel logs
 
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USES=	gmake
 
-.if defined(NOPORTDOCS)
-MAKE_ARGS=	NOPORTDOCS=1
-.endif
-
-MAN1=		gruftistats.1
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's,strcasestr,strcasestr_x,g' ${WRKSRC}/ircstats.h \
diff --git a/irc/gruftistats/files/patch-Makefile.in b/irc/gruftistats/files/patch-Makefile.in
deleted file mode 100644
index c976365512d9..000000000000
--- a/irc/gruftistats/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-$FreeBSD$
-
---- Makefile.in.orig	Sun Sep 16 06:57:25 2001
-+++ Makefile.in	Mon Dec 24 23:43:31 2001
-@@ -249,6 +249,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
- 
- install-docDATA: $(doc_DATA)
-+ifndef NOPORTDOCS
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(docdir)
- 	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -260,6 +261,7 @@
- 	    $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
- 	  fi; fi; \
- 	done
-+endif
- 
- uninstall-docDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/irc/gruftistats/pkg-plist b/irc/gruftistats/pkg-plist
index 903ac37e4979..bce05396eaee 100644
--- a/irc/gruftistats/pkg-plist
+++ b/irc/gruftistats/pkg-plist
@@ -1,4 +1,5 @@
 bin/gruftistats
+man/man1/gruftistats.1.gz
 %%PORTDOCS%%share/doc/gruftistats/AUTHORS
 %%PORTDOCS%%share/doc/gruftistats/COPYING
 %%PORTDOCS%%share/doc/gruftistats/ChangeLog
diff --git a/irc/infobot/Makefile b/irc/infobot/Makefile
index 41616525b9e7..bd4f60cca496 100644
--- a/irc/infobot/Makefile
+++ b/irc/infobot/Makefile
@@ -11,24 +11,27 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bot written in Perl with a rabid AI
 
 USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
-NO_STAGE=	yes
+post-patch:
+	-@${RM} ${WRKSRC}/src/*.orig
+.for i in config help users
+	@${RM} ${WRKSRC}/conf/infobot.$i
+.endfor
+
 do-install:
-	${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${CP} -r ${WRKSRC}/src ${WRKSRC}/extras ${WRKSRC}/files \
-		${WRKSRC}/scripts ${DATADIR}/
-	${RM} ${DATADIR}/src/*.orig
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/REVISIONS ${DOCSDIR}
-.endif
-	${MKDIR} ${PREFIX}/etc/infobot
-	${INSTALL_DATA} ${WRKSRC}/conf/* ${PREFIX}/etc/infobot
+		${WRKSRC}/scripts ${STAGEDIR}${DATADIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/REVISIONS ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${ETCDIR}
 	${SED} -e 's,$$param{\(.\)basedir\(.\)} = .*,$$param{\1basedir\2} = "${DATADIR}";,' \
-	-e 's,$$param{\(.\)confdir\(.\)} = .*,$$param{\1confdir\2} = "${PREFIX}/etc/infobot";,' \
+	-e 's,$$param{\(.\)confdir\(.\)} = .*,$$param{\1confdir\2} = "${ETCDIR}";,' \
 	${WRKSRC}/infobot  > ${WRKDIR}/infobot
-	${INSTALL_SCRIPT} ${WRKDIR}/infobot ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/infobot ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/irc/infobot/pkg-plist b/irc/infobot/pkg-plist
index e676a5491076..dc819e5b511c 100644
--- a/irc/infobot/pkg-plist
+++ b/irc/infobot/pkg-plist
@@ -1,18 +1,21 @@
 bin/infobot
-etc/infobot/infobot-are.txt
-etc/infobot/infobot-is.txt
-etc/infobot/infobot.channels
-@unexec if cmp -s %D/etc/infobot/infobot.config %D/etc/infobot/infobot.config-dist; then rm -f %D/etc/infobot/infobot.config; fi
-etc/infobot/infobot.config-dist
-etc/infobot/infobot.crontab
-@unexec if cmp -s %D/etc/infobot/infobot.help %D/etc/infobot/infobot.help-dist; then rm -f %D/etc/infobot/infobot.help; fi
-etc/infobot/infobot.help-dist
-@unexec if cmp -s %D/etc/infobot/infobot.users %D/etc/infobot/infobot.users-dist; then rm -f %D/etc/infobot/infobot.users; fi
-etc/infobot/infobot.users-dist
-etc/infobot/magic8.txt
-etc/infobot/sane-are.txt
-etc/infobot/sane-ignore.txt
-etc/infobot/sane-is.txt
+%%ETCDIR%%/infobot-are.txt
+%%ETCDIR%%/infobot-is.txt
+%%ETCDIR%%/infobot.channels
+@unexec if cmp -s %D/%%ETCDIR%%/infobot.config %D/%%ETCDIR%%/infobot.config-dist; then rm -f %D/%%ETCDIR%%/infobot.config; fi
+%%ETCDIR%%/infobot.config-dist
+@exec if [ ! -f %D/%%ETCDIR%%/infobot.config ]; then cp -p %D/%F %B/infobot.config; fi
+%%ETCDIR%%/infobot.crontab
+@unexec if cmp -s %D/%%ETCDIR%%/infobot.help %D/%%ETCDIR%%/infobot.help-dist; then rm -f %D/%%ETCDIR%%/infobot.help; fi
+%%ETCDIR%%/infobot.help-dist
+@exec if [ ! -f %D/%%ETCDIR%%/infobot.help ]; then cp -p %D/%F %B/infobot.help; fi
+@unexec if cmp -s %D/%%ETCDIR%%/infobot.users %D/%%ETCDIR%%/infobot.users-dist; then rm -f %D/%%ETCDIR%%/infobot.users; fi
+%%ETCDIR%%/infobot.users-dist
+@exec if [ ! -f %D/%%ETCDIR%%/infobot.users ]; then cp -p %D/%F %B/infobot.users; fi
+%%ETCDIR%%/magic8.txt
+%%ETCDIR%%/sane-are.txt
+%%ETCDIR%%/sane-ignore.txt
+%%ETCDIR%%/sane-is.txt
 %%DATADIR%%/extras/ANSI.pl
 %%DATADIR%%/extras/Aviation.pl
 %%DATADIR%%/extras/DNS.pl
@@ -77,6 +80,6 @@ etc/infobot/sane-is.txt
 @dirrm %%DATADIR%%/extras
 @dirrm %%DATADIR%%/files
 @dirrm %%DATADIR%%/scripts
-@dirrmtry etc/infobot
-@dirrmtry share/infobot/src
-@dirrmtry share/infobot
+@dirrmtry %%DATADIR%%/src
+@dirrmtry %%DATADIR%%
+@dirrmtry %%ETCDIR%%
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%%
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index 672bf8351cc4..515b2051c9dc 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -13,25 +13,20 @@ COMMENT=	A simple and minimal IRC client for X
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 
-USES=        pathfix pkgconfig
+USES=		pathfix pkgconfig gettext
 USE_GNOME=	gnomeprefix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-kde
 
-MAN1=		lostirc.1
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in AUTHORS ChangeLog TODO README INSTALL
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/irc/lostirc/files/patch-src::libirc::DCC.cpp b/irc/lostirc/files/patch-src_libirc_DCC.cpp
index ebebd2531648..ebebd2531648 100644
--- a/irc/lostirc/files/patch-src::libirc::DCC.cpp
+++ b/irc/lostirc/files/patch-src_libirc_DCC.cpp
diff --git a/irc/lostirc/files/patch-src::libirc::Parser.cpp b/irc/lostirc/files/patch-src_libirc_Parser.cpp
index a71575d93d2a..a71575d93d2a 100644
--- a/irc/lostirc/files/patch-src::libirc::Parser.cpp
+++ b/irc/lostirc/files/patch-src_libirc_Parser.cpp
diff --git a/irc/lostirc/pkg-plist b/irc/lostirc/pkg-plist
index a7d25f92d373..b1e89d31ede8 100644
--- a/irc/lostirc/pkg-plist
+++ b/irc/lostirc/pkg-plist
@@ -1,4 +1,5 @@
 bin/lostirc
+man/man1/lostirc.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
diff --git a/irc/ratbox-respond/Makefile b/irc/ratbox-respond/Makefile
index 03a77c25e0f5..7f59f3ef68bf 100644
--- a/irc/ratbox-respond/Makefile
+++ b/irc/ratbox-respond/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ratbox-respond
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	irc sysutils
 MASTER_SITES=	http://respond.ratbox.org/download/
 EXTRACT_SUFX=	.tgz
@@ -16,24 +17,16 @@ BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
-SUB_FILES=	pkg-message
-
-PORTDOCS=	*
+PORTDOCS=	challenge.txt
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/ratbox-respond bin/makekeypair
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/makekeypair ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} challenge.txt ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}/client-scripts
-	${INSTALL_DATA} ${WRKSRC}/client-scripts/* ${EXAMPLESDIR}/client-scripts
-.endif
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/makekeypair ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/challenge.txt ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/client-scripts/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/irc/slirc/Makefile b/irc/slirc/Makefile
index 9737879e445f..254b16779212 100644
--- a/irc/slirc/Makefile
+++ b/irc/slirc/Makefile
@@ -46,8 +46,9 @@ NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/local,${LOCALBASE}," ${WRKSRC}/Makefile ${WRKSRC}/scripts/init.sl
 
+.include <bsd.port.options.mk>
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${PREFIX}/share/doc/slirc
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/slirc/
diff --git a/irc/thales/Makefile b/irc/thales/Makefile
index 307a15d0cf56..3f8d6ed86ce6 100644
--- a/irc/thales/Makefile
+++ b/irc/thales/Makefile
@@ -16,59 +16,53 @@ USE_GMAKE=	yes
 USE_MYSQL=	yes
 USE_RC_SUBR=	thales
 
+OPTIONS_DEFINE=	MODES
+OPTIONS_RADIO=	IRCD
+OPTIONS_RADIO_IRCD=	HYBRID IRCDRU UNREAL
+OPTIONS_DEFAULT=MODES UNREAL
+MODES_DESC=		Support modes in the database
+HYBRID_DESC=	Build for ircd-hybrid
+IRCDRU_DESC=	Build for ircd-ru
+UNREAL_DESC=	Build for unreal ircd
+
+HYBRID_RUN_DEPENDS=	${LOCALBASE}/bin/ircd:${PORTSDIR}/irc/ircd-hybrid
+IRCDRU_RUN_DEPENDS=	${LOCALBASE}/sbin/ircd:${PORTSDIR}/irc/ircd-ru
+UNREAL_RUN_DEPENDS=	${LOCALBASE}/libexec/ircd:${PORTSDIR}/irc/unreal
+
 # Currently, not all supported IRCDs are handled here, only the ones
 # I could find corresponding RUN_DEPENDS in our Ports Collection.
-.if defined(WITH_IRCD) && ${WITH_IRCD} == hybrid
-RUN_DEPENDS=	${LOCALBASE}/bin/ircd:${PORTSDIR}/irc/ircd-hybrid
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MHYBRID}
+_IRCD=	hybrid
 IS_INTERACTIVE=	yes
-.elif defined(WITH_IRCD) && ${WITH_IRCD} == ircdru
-RUN_DEPENDS=	${LOCALBASE}/sbin/ircd:${PORTSDIR}/irc/ircd-ru
+.elif ${PORT_OPTIONS:MIRCDRU}
+_IRCD=	ircdru
 IS_INTERACTIVE=	yes
 .else
-WITH_IRCD=	unreal
-RUN_DEPENDS=	${LOCALBASE}/libexec/ircd:${PORTSDIR}/irc/unreal
+_IRCD=	unreal
 .endif
 
 # ``Assign with expansion'' is needed here, otherwise we cannot override
 # WITH_IRCD value supplied as make(1) argument (which can be bogus).
-CONFIGURE_ARGS:=	--with-ircd=${WITH_IRCD} \
+CONFIGURE_ARGS:=	--with-ircd=${_IRCD} \
 			--prefix=${PREFIX}/sbin/thales \
 			--with-mysql=${LOCALBASE} \
 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
 
-.if defined(WITHOUT_MODES)
-CONFIGURE_ARGS+=	--enable-no-modes
-.endif
-
-pre-everything:: .SILENT
-	${ECHO_CMD} ""
-	${ECHO_CMD} "You may specify the IRCD which thales is compiled for"
-	${ECHO_CMD} ""
-	${ECHO_CMD} "	WITH_IRCD=foo"
-	${ECHO_CMD} ""
-	${ECHO_CMD} "The default value is \"unreal\".  Other possible values are:"
-	${ECHO_CMD} "  bahamut, hybrid, ircdru, unreal, ultimate28, ultimate30"
-	${ECHO_CMD} ""
-	${ECHO_CMD} "Additinal tunables:"
-	${ECHO_CMD} ""
-	${ECHO_CMD} "	WITHOUT_MODES	Disable modes in the database (default: on)"
-	${ECHO_CMD} ""
+MODES_CONFIGURE_OFF=	--enable-no-modes
 
 post-patch: .SILENT
 	${FIND} -d ${WRKSRC} -type d -name CVS -exec ${RM} -rf {} \;
 	${REINPLACE_CMD} -e 's,thales.conf,${PREFIX}/etc/&,' \
 		${WRKSRC}/src/conf.h
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/thales ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/data/thales.conf.default ${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/data/*.sql ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR} ${DATADIR}/tools
-	${CP} -r ${WRKSRC}/examples/* ${EXAMPLESDIR}
-	${CP} -r ${WRKSRC}/tools/* ${DATADIR}/tools
-.endif
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/thales ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/data/thales.conf.default ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/data/*.sql ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/tools
+	${CP} -r ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
+	${CP} -r ${WRKSRC}/tools/* ${STAGEDIR}${DATADIR}/tools
 
 .include <bsd.port.mk>
diff --git a/irc/thales/pkg-plist b/irc/thales/pkg-plist
index c4fdb8a209c6..d1d2895f32b9 100644
--- a/irc/thales/pkg-plist
+++ b/irc/thales/pkg-plist
@@ -6,92 +6,92 @@ etc/thales.conf.default
 %%DATADIR%%/mysql-ultimate28.sql
 %%DATADIR%%/mysql-ultimate30.sql
 %%DATADIR%%/mysql-unreal.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/MRTG/thalesinfo.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/nickinfo/img/online.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/nickinfo/img/offline.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/nickinfo/nickinfo.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/nickinfo/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/compteur_js.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/deb.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/0.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/1.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/2.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/3.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/4.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/5.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/6.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/7.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/8.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/9.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/visites.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/deb.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/0.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/1.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/2.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/3.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/4.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/5.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/6.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/7.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/8.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/9.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/visites.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/deb.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/0.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/1.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/2.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/3.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/4.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/5.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/6.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/7.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/8.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/9.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/visites.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/deb.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/0.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/1.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/2.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/3.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/4.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/5.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/6.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/7.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/8.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/9.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/visites.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/deb.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/0.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/1.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/2.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/3.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/4.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/5.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/6.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/7.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/8.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/9.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/visites.PNG
-%%PORTDOCS%%%%EXAMPLESDIR%%/whois/whois.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/whois/dowhois.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/mysql.ini.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/users_tc.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/chans_tc.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/servers_tc.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/chans_max.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/users_max.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/chan_po.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/status/server_on.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/status/user_ison.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/status/user_status.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/status/chan_topic.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/common.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/clones/clones.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/recycledcounter/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/recycledcounter/recycpt.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MRTG/thalesinfo.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nickinfo/img/online.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nickinfo/img/offline.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nickinfo/nickinfo.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nickinfo/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/compteur_js.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/deb.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/0.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/1.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/2.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/3.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/4.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/5.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/6.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/7.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/8.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/9.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/visites.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/deb.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/0.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/1.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/2.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/3.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/4.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/5.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/6.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/7.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/8.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/9.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/visites.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/deb.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/0.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/1.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/2.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/3.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/4.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/5.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/6.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/7.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/8.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/9.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/visites.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/deb.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/0.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/1.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/2.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/3.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/4.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/5.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/6.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/7.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/8.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/9.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/visites.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/deb.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/0.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/1.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/2.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/3.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/4.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/5.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/6.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/7.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/8.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/9.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/visites.PNG
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whois/whois.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whois/dowhois.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/mysql.ini.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/users_tc.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/chans_tc.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/servers_tc.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/chans_max.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/users_max.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/chan_po.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/status/server_on.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/status/user_ison.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/status/user_status.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/status/chan_topic.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/common.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clones/clones.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/recycledcounter/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/recycledcounter/recycpt.php
 %%PORTDOCS%%%%DATADIR%%/tools/crontab/cron.sh
 %%PORTDOCS%%%%DATADIR%%/tools/README
 %%PORTDOCS%%%%DATADIR%%/tools/logfilter/README
@@ -101,23 +101,23 @@ etc/thales.conf.default
 %%PORTDOCS%%%%DATADIR%%/tools/testbed/killall.sh
 %%PORTDOCS%%%%DATADIR%%/tools/testbed/compileall.sh
 %%PORTDOCS%%%%DATADIR%%/tools/testbed/chgCacheTime.sh
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/recycledcounter
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/clones
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/memphistools/status
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/memphistools/counters
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/memphistools
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/whois
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/5
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/4
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/3
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/1
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/nickinfo/img
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/nickinfo
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/MRTG
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/recycledcounter
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clones
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/memphistools/status
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/memphistools/counters
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/memphistools
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/whois
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/5
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/4
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/3
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/2
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/1
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/nickinfo/img
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/nickinfo
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/MRTG
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DATADIR%%/tools/testbed
 %%PORTDOCS%%@dirrm %%DATADIR%%/tools/logfilter
 %%PORTDOCS%%@dirrm %%DATADIR%%/tools/crontab