- Update to 7.2.1

PR:		ports/106485
Submitted by:	Evgueni V. Gavrilov <aquatique-ports@rambler.ru> (maintainer)

1 files changed, 24 insertions, 24 deletions

diff --git a/russian/ircd-hybrid/Makefile b/russian/ircd-hybrid/Makefile
index 0f526448e76d..e80237e1754f 100644
--- a/russian/ircd-hybrid/Makefile
+++ b/russian/ircd-hybrid/Makefile
@@ -6,37 +6,36 @@
 #
 
 PORTNAME=	ircd
-PORTVERSION=	7.1
-PORTREVISION=	5
+PORTVERSION=	7.2.1
 CATEGORIES=	irc russian
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	ircd-hybrid-ru
 PKGNAMESUFFIX=	-hybrid-ru
-DISTNAME=	ircd-hybrid-ru-7.0rc12
+DISTNAME=	ircd-hybrid-ru-7.2.1
 
 MAINTAINER=	aquatique-ports@rambler.ru
 COMMENT=	Russian version of well known hybrid IRC server
 
-CONFLICTS=	ircd-hybrid-7* ircd-ru[0-9]*
+CONFLICTS=	ircd-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
 USE_OPENSSL=	yes
 USE_BISON=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru --enable-kqueue
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru
 
-MANCOMPRESSED=	no
 MAN8=		ircd.8
 
-.if defined(WITHOUT_NLS)
-BROKEN=		"Incorrect pkg-plist"
-.endif
-
 .if defined(WITH_SMALL_NET)
 CONFIGURE_ARGS+=-enable-small-net
 .endif
 
+.if defined(WITH_SYSLOG)
+CONFIGURE_ARGS+=--enable-syslog=\"kill squit connect users oper\"
+.endif
+
 .if defined(NICKLENGTH)
 CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 .endif
@@ -45,30 +44,31 @@ CONFIGURE_ARGS+=--with-nicklen=${NICKLENGTH}
 CONFIGURE_ARGS+=--with-topiclen=${TOPICLENGTH}
 .endif
 
-.if defined(MAXCLIENTS)
-CONFIGURE_ARGS+=--with-maxclients=${MAXCLIENTS}
+.if defined(MAXCONN)
+CONFIGURE_ARGS+=--with-maxconn=${MAXCONN}
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,"-g,",; s,-O2 -g,-O,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,/modules/,/lib/ircd-hybrid-ru-modules/,' ${WRKSRC}/include/config.h
-	@${REINPLACE_CMD} -e 's,/etc,/etc/ircd-hybrid-ru,' ${WRKSRC}/include/config.h
-	@${REINPLACE_CMD} -e 's,IRCD_PREFIX "/logs","/var/log/ircd-hybrid-ru",' ${WRKSRC}/include/config.h
-	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-		-e "s,/modules,/lib/ircd-hybrid-ru-modules,"
-
 pre-extract:
 	@${ECHO_MSG} "* * * Build options for ircd-hybrid-ru * * *"
 	@${ECHO_MSG} "Issue make WITH_SMALL_NET=yes to build server optimized for small network"
+	@${ECHO_MSG} "Issue make WITH_SYSLOG=yes to enable logging via syslogd"
 	@${ECHO_MSG} "You can define maximum nick length. For example make NICKLENGTH=46 (default is 30)"
 	@${ECHO_MSG} "You can define maximum topic length. For example make TOPICLENGTH=254 (default is 120; maximum is 390)"
-	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCLIENTS=512"
+	@${ECHO_MSG} "You can define maximum number of connections for ircd. For example make MAXCONN=512"
+
+post-extract:
+	@${CP} ${WRKSRC}/contrib/m_ojoin.c ${WRKSRC}/modules/
+	@${CP} ${WRKSRC}/contrib/m_force.c ${WRKSRC}/modules/
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,-g -O2,-O2,' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,"-g","",' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,ac_cv_prog_cc_g=yes,ac_cv_prog_cc_g=no,' ${WRKSRC}/configure
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/doc/example.conf
-	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/doc/example.conf
-	@${REINPLACE_CMD} -e 's,logs/,/var/log/ircd-hybrid-ru/,' ${WRKSRC}/doc/example.conf
+	@${REINPLACE_CMD} -e 's,ircd/etc/codepage,etc/ircd-hybrid-ru/codepage,' ${WRKSRC}/etc/example.conf
+	@${REINPLACE_CMD} -e 's,/ircd/modules,/lib/ircd-hybrid-ru-modules,' ${WRKSRC}/etc/example.conf
 
 post-install:
 	@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd-hybrid-ru.sh.sample ${PREFIX}/etc/rc.d