svn commit: r398803 - in head/irc: iroffer iroffer-dinoex iroffer-lamm

[Dirk Meyer]

Author: dinoex
Date: Thu Oct  8 04:32:29 2015
New Revision: 398803
URL: https://svnweb.freebsd.org/changeset/ports/398803

Log:
  - cleanup

Modified:
  head/irc/iroffer-dinoex/Makefile
  head/irc/iroffer-lamm/Makefile
  head/irc/iroffer/Makefile

Modified: head/irc/iroffer-dinoex/Makefile
==============================================================================
--- head/irc/iroffer-dinoex/Makefile	Thu Oct  8 04:11:34 2015	(r398802)
+++ head/irc/iroffer-dinoex/Makefile	Thu Oct  8 04:32:29 2015	(r398803)
@@ -32,7 +32,7 @@ IROFFER_DOCS=	README README.modDinoex LI
 		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 \
@@ -50,8 +50,6 @@ 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/
@@ -59,13 +57,14 @@ do-install:
 	${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/
@@ -73,6 +72,5 @@ do-install:
 .for i in ${IROFFER_EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/irc/iroffer-lamm/Makefile
==============================================================================
--- head/irc/iroffer-lamm/Makefile	Thu Oct  8 04:11:34 2015	(r398802)
+++ head/irc/iroffer-lamm/Makefile	Thu Oct  8 04:32:29 2015	(r398803)
@@ -6,7 +6,6 @@ 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 at FreeBSD.org
 COMMENT=	IRC "bot" that makes sharing files via DCC extremely easy
@@ -15,13 +14,12 @@ 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
@@ -29,16 +27,16 @@ post-patch:
 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>

Modified: head/irc/iroffer/Makefile
==============================================================================
--- head/irc/iroffer/Makefile	Thu Oct  8 04:11:34 2015	(r398802)
+++ head/irc/iroffer/Makefile	Thu Oct  8 04:32:29 2015	(r398803)
@@ -6,7 +6,6 @@ PORTVERSION=	1.4.3
 CATEGORIES=	irc
 MASTER_SITES=	http://iroffer.org/archive/v1.4/
 DISTNAME=	iroffer1.4.b03
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	IRC "bot" that makes sharing files via DCC extremely easy
@@ -15,13 +14,12 @@ 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
@@ -29,16 +27,16 @@ post-patch:
 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>