- update to 3.25

- add French files
- fix options for default package

3 files changed, 16 insertions, 7 deletions

diff --git a/irc/iroffer-dinoex/Makefile b/irc/iroffer-dinoex/Makefile
index 753c7991e1b6..9079e42ff5dc 100644
--- a/irc/iroffer-dinoex/Makefile
+++ b/irc/iroffer-dinoex/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	iroffer
-PORTVERSION=	3.24
+PORTVERSION=	3.25
 CATEGORIES=	irc
 MASTER_SITES=	http://iroffer.dinoex.net/
 PKGNAMESUFFIX=	-dinoex${PKGNAMESUFFIX2}
@@ -35,15 +35,15 @@ OPTIONS=	CURL	"build ftp/http support"	on \
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	-curl
 .endif
-.if defined(WITH_GEOIP)
+.if !defined(WITHOUT_GEOIP)
 LIB_DEPENDS+=	GeoIP:${PORTSDIR}/net/GeoIP
 CONFIGURE_ARGS+=	-geoip
 .endif
-.if defined(WITH_UPNP)
+.if !defined(WITHOUT_UPNP)
 LIB_DEPENDS+=	miniupnpc.4:${PORTSDIR}/net/miniupnpc
 CONFIGURE_ARGS+=	-upnp
 .endif
-.if defined(WITH_RUBY)
+.if !defined(WITHOUT_RUBY)
 USE_RUBY=	yes
 CONFIGURE_ARGS+=	-ruby
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
@@ -59,12 +59,17 @@ post-build:
 	@cd ${WRKSRC} && ./Lang it
 	@cd ${WRKSRC} && ${MAKE}
 	${MV} ${WRKSRC}/iroffer ${WRKSRC}/it-iroffer
+	${RM} -rf ${WRKSRC}/obj
+	@cd ${WRKSRC} && ./Lang fr
+	@cd ${WRKSRC} && ${MAKE}
+	${MV} ${WRKSRC}/iroffer ${WRKSRC}/fr-iroffer
 	${MV} ${WRKSRC}/en-iroffer ${WRKSRC}/iroffer
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/de-iroffer ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/it-iroffer ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/fr-iroffer ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README-iroffer.txt ${DOCSDIR}/
@@ -76,12 +81,14 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/help-admin-en.txt ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/help-admin-de.txt ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/help-admin-it.txt ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/help-admin-fr.txt ${DOCSDIR}/
 .endif
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}/htdocs
 	${INSTALL_DATA} ${WRKSRC}/iroffer.cron ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/sample.config ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/beispiel.config ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/exemple.config ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/header.html ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/footer.html ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/ruby-sample.rb ${EXAMPLESDIR}/
diff --git a/irc/iroffer-dinoex/distinfo b/irc/iroffer-dinoex/distinfo
index a50912dcefa0..4de6b4df3289 100644
--- a/irc/iroffer-dinoex/distinfo
+++ b/irc/iroffer-dinoex/distinfo
@@ -1,3 +1,2 @@
-MD5 (iroffer-dinoex-3.24.tar.gz) = cf387bbfd09458c332c2c5844098fb5a
-SHA256 (iroffer-dinoex-3.24.tar.gz) = 860e9359a5dbe20c6770eb73fd4181c91b71488d5b14ceba0401d81836451c1f
-SIZE (iroffer-dinoex-3.24.tar.gz) = 416833
+SHA256 (iroffer-dinoex-3.25.tar.gz) = 6ac21ef61cedc90b609b6975fb87bfbc403c778d2671c3cd8b35eecd2eda07e8
+SIZE (iroffer-dinoex-3.25.tar.gz) = 482696
diff --git a/irc/iroffer-dinoex/pkg-plist b/irc/iroffer-dinoex/pkg-plist
index 04886d94a438..7d9f49e69156 100644
--- a/irc/iroffer-dinoex/pkg-plist
+++ b/irc/iroffer-dinoex/pkg-plist
@@ -1,5 +1,6 @@
 bin/iroffer
 bin/de-iroffer
+bin/fr-iroffer
 bin/it-iroffer
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/LIESMICH.modDinoex
@@ -9,9 +10,11 @@ bin/it-iroffer
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/help-admin-de.txt
 %%PORTDOCS%%%%DOCSDIR%%/help-admin-en.txt
+%%PORTDOCS%%%%DOCSDIR%%/help-admin-fr.txt
 %%PORTDOCS%%%%DOCSDIR%%/help-admin-it.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beispiel.config
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exemple.config
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/footer.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/header.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iroffer.cron