Index: head/irc/iroffer/Makefile
===================================================================
--- head/irc/iroffer/Makefile	(revision 398802)
+++ head/irc/iroffer/Makefile	(revision 398803)
@@ -1,44 +1,42 @@
 # Created by: Donald Burr <dburr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	iroffer
 PORTVERSION=	1.4.3
 CATEGORIES=	irc
 MASTER_SITES=	http://iroffer.org/archive/v1.4/
 DISTNAME=	iroffer1.4.b03
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	IRC "bot" that makes sharing files via DCC extremely easy
 
 LICENSE=	GPLv2
 
 CONFLICTS=	iroffer-lamm-1.* iroffer-dinoex-3.*
 
+USES=		tar:tgz
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e 's|cctype="gcc"|cctype="${CC}"|' \
 		${WRKSRC}/Configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/convertxdccfile ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${STAGEDIR}${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/dynip.sh ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/iroffer.cron ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/sample.config ${STAGEDIR}${EXAMPLESDIR}/
-.endif
 
 .include <bsd.port.mk>
Index: head/irc/iroffer-dinoex/Makefile
===================================================================
--- head/irc/iroffer-dinoex/Makefile	(revision 398802)
+++ head/irc/iroffer-dinoex/Makefile	(revision 398803)
@@ -1,78 +1,76 @@
 # $FreeBSD$
 
 PORTNAME=	iroffer
 PORTVERSION=	3.30
 CATEGORIES=	irc
 MASTER_SITES=	http://iroffer.dinoex.net/
 PKGNAMESUFFIX=	-dinoex${PKGNAMESUFFIX2}
 DISTNAME=	iroffer-dinoex-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	IRC "bot" that makes sharing files via DCC extremely easy
 
 LICENSE=	GPLv2
 
 CONFLICTS=	iroffer-1* iroffer-lamm-1.*
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	CC="${CC}" LDFLAGS="${LDFLAGS}" LOCALBASE="${LOCALBASE}"
 ALL_TARGET=	all-lang doc
 USE_RC_SUBR=	iroffer-dinoex
 
 IROFFER_DOCS=	README README.modDinoex LIESMICH.modDinoex \
 		LICENSE THANKS TODO \
 		help-admin-de.txt help-admin-en.txt \
 		help-admin-fr.txt help-admin-it.txt \
 		doc/iroffer.1.txt doc/iroffer.1.html doc/iroffer.1.ps \
 		doc/INSTALL-linux-de.html doc/INSTALL-linux-de.txt \
 		doc/INSTALL-linux-en.html doc/INSTALL-linux-en.txt \
 		doc/INSTALL-linux-fr.html doc/INSTALL-linux-fr.txt \
 		doc/INSTALL-linux-it.html doc/INSTALL-linux-it.txt \
 		doc/INSTALL-vhost-de.html doc/INSTALL-vhost-de.txt \
 		doc/INSTALL-vhost-en.html doc/INSTALL-vhost-en.txt \
 		doc/INSTALL-vhost-fr.html doc/INSTALL-vhost-fr.txt
-IROFFER_EXAMPLES= iroffer.cron \
+IROFFER_EXAMPLES=	iroffer.cron \
 		sample.config beispiel.config exemple.config \
 		header.html footer.html ruby-sample.rb
 IROFFER_HTDOCS=	iroffer-state.css robots.txt \
 		info.txt.rb json.txt.rb md5.txt.rb sfv.txt.rb
 
 OPTIONS_DEFINE=	CURL RUBY UPNP GEOIP DOCS EXAMPLES
 OPTIONS_DEFAULT=CURL RUBY UPNP GEOIP
 
 CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 CURL_CONFIGURE_ON=	-curl
 RUBY_USE=		RUBY=yes LIBRUBY=yes
 RUBY_CONFIGURE_ON=	-ruby
 UPNP_LIB_DEPENDS=	libminiupnpc.so:${PORTSDIR}/net/miniupnpc
 UPNP_CONFIGURE_ON=	-upnp
 GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
 GEOIP_CONFIGURE_ON=	-geoip
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-de ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-it ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer-fr ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/iroffer.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/xdcc.7 ${STAGEDIR}${PREFIX}/man/man7/
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${IROFFER_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/htdocs
 .for i in ${IROFFER_HTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/htdocs/${i} ${STAGEDIR}${EXAMPLESDIR}/htdocs/
 .endfor
 .for i in ${IROFFER_EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
-.endif
 
 .include <bsd.port.mk>
Index: head/irc/iroffer-lamm/Makefile
===================================================================
--- head/irc/iroffer-lamm/Makefile	(revision 398802)
+++ head/irc/iroffer-lamm/Makefile	(revision 398803)
@@ -1,44 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	iroffer
 PORTVERSION=	1.4.3.2
 CATEGORIES=	irc
 MASTER_SITES=	SF/${PORTNAME}-lamm/${PORTNAME}1.4-lamm/${PORTNAME}1.4.b03-lamm.b02
 PKGNAMESUFFIX=	-lamm${PKGNAMESUFFIX2}
 DISTNAME=	iroffer1.4.b03-lamm.b02
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	IRC "bot" that makes sharing files via DCC extremely easy
 
 LICENSE=	GPLv2
 
 CONFLICTS=	iroffer-1.* iroffer-dinoex-3.*
 
+USES=		tar:tgz
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -e 's|cctype="gcc"|cctype="${CC}"|' \
 		${WRKSRC}/Configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/convertxdccfile ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${STAGEDIR}${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/dynip.sh ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/iroffer.cron ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/sample.config ${STAGEDIR}${EXAMPLESDIR}/
-.endif
 
 .include <bsd.port.mk>