3 files changed, 49 insertions, 32 deletions

diff --git a/irc/ircd-ru/Makefile b/irc/ircd-ru/Makefile
index 13dd1f54696d..3a1884b14f7a 100644
--- a/irc/ircd-ru/Makefile
+++ b/irc/ircd-ru/Makefile
@@ -17,8 +17,22 @@ COMMENT=	An irc daemon with translation schemes and other useful features
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
+PKGMESSAGE=	${WRKSRC}/pkg-message
 
-PLIST_SUB=	VARDIR=/var
+VARDIR=		/var
+PLIST_SUB=	VARDIR=${VARDIR}
+
+OPTIONS=	WENET "irc.wenet.ru specific options" off \
+		HUB "hub support" off \
+		ENCRYPTION "enable RC4 crypt (server to server connection)" off \
+		SYSLOGFILE "log to file instead of syslog" off \
+		DRONEMODULE "enable dronemodule support" off \
+		AUTHMODULE "enable authmodule support" off \
+		DNSBL "enable DNSBL support" off \
+		SELECT "enable select I/O" off
+
+.include <bsd.port.pre.mk>
 
 # irc.wenet.ru specific options
 .if defined(WITH_WENET)
@@ -33,7 +47,7 @@ CONFIGURE_ARGS+=--enable-hub
 # enable RC4 crypt (server to server connection)
 .if defined(WITH_ENCRYPTION)
 CONFIGURE_ARGS+=--enable-encryption
-LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
 .endif
 
 # log to file instead of syslog
@@ -61,12 +75,15 @@ CONFIGURE_ARGS+=--enable-dnsbl
 CONFIGURE_ARGS+=--enable-select
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "amd64"
 BROKEN=		"Does not compile on amd64"
 .endif
 
+post-patch:
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -Ee '/(dir_HPATH)|opers.txt/d' ${WRKSRC}/tools/install_ircd.in
+.endif
+
 pre-build:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "NOTE:"
@@ -77,12 +94,12 @@ pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd.sh.sample ${LOCALBASE}/etc/rc.d
-	@${CHOWN} -R ircd:ircd ${LOCALBASE}/etc/ircd-ru
-	@${CHOWN} -R ircd:ircd ${LOCALBASE}/share/ircd-ru
-	@${CHOWN} -R ircd:ircd ${LOCALBASE}/share/doc/ircd-ru
-	@${CHOWN} -R ircd:ircd /var/log/ircd-ru
-	@${CHOWN} -R ircd:ircd /var/run/ircd-ru
-	@cat ${PKGMESSAGE}
+	@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd.sh.sample ${PREFIX}/etc/rc.d
+	@${CHOWN} -R ircd:ircd ${PREFIX}/etc/ircd-ru ${DATADIR} ${VARDIR}/log/ircd-ru ${VARDIR}/run/ircd-ru
+.if !defined(NOPORTDOCS)
+	@${CHOWN} -R ircd:ircd ${DOCSDIR}
+.endif
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' pkg-message > ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/irc/ircd-ru/pkg-message b/irc/ircd-ru/pkg-message
index c1d83b95be61..edfa042c48c2 100644
--- a/irc/ircd-ru/pkg-message
+++ b/irc/ircd-ru/pkg-message
@@ -5,13 +5,13 @@ ircd-RU has now been installed.
 
 This port create user ircd and group ircd
 
-You should now edit /usr/local/ircd-RU/etc/ircd.conf
+You should now edit %%PREFIX%%/ircd-RU/etc/ircd.conf
  to suit your needs.
  (cp ircd.conf-dist ircd.conf; vi ircd.conf)
 
 You may then start the server by running:
- cd /usr/local/etc/rc.d/
+ cd %%PREFIX%%/etc/rc.d/
  mv ircd.sh.sample ircd.sh
- /usr/local/etc/rc.d/ircd.sh start
+ %%PREFIX%%/etc/rc.d/ircd.sh start
 
 ----------------------------------------------------
diff --git a/irc/ircd-ru/pkg-plist b/irc/ircd-ru/pkg-plist
index a9ff3f2e7226..2029ffd2d6ab 100644
--- a/irc/ircd-ru/pkg-plist
+++ b/irc/ircd-ru/pkg-plist
@@ -7,28 +7,28 @@ etc/ircd-ru/kline.conf
 etc/ircd-ru/ru_RU.CP1251/ircd.motd-dist
 etc/ircd-ru/ru_RU.CP1251/ircd.smotd-dist
 etc/ircd-ru/ru_RU.KOI8-R/ircd.conf-dist
-share/doc/ircd-ru/README.Ilines
-share/doc/ircd-ru/opers.txt
-share/doc/ircd-ru/ru_RU.KOI8-R/FAQ
-share/doc/ircd-ru/ru_RU.KOI8-R/README
-share/ircd-ru/codepages/cp1251.cp
-share/ircd-ru/codepages/cp866.cp
-share/ircd-ru/codepages/iso8859-5.cp
-share/ircd-ru/codepages/koi8-f.cp
-share/ircd-ru/codepages/koi8-r.cp
-share/ircd-ru/codepages/translit.cp
+etc/rc.d/ircd.sh.sample
+%%PORTDOCS%%%%DOCSDIR%%/README.Ilines
+%%PORTDOCS%%%%DOCSDIR%%/opers.txt
+%%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/ru_RU.KOI8-R/README
+%%DATADIR%%/codepages/cp1251.cp
+%%DATADIR%%/codepages/cp866.cp
+%%DATADIR%%/codepages/iso8859-5.cp
+%%DATADIR%%/codepages/koi8-f.cp
+%%DATADIR%%/codepages/koi8-r.cp
+%%DATADIR%%/codepages/translit.cp
 @dirrm etc/ircd-ru/ru_RU.CP1251
 @dirrm etc/ircd-ru/ru_RU.KOI8-R
-@dirrm share/ircd-ru/codepages
-@dirrm share/ircd-ru/modules
-@dirrm share/ircd-ru
-@dirrm share/doc/ircd-ru/ru_RU.KOI8-R
-@dirrm share/doc/ircd-ru
+@dirrm %%DATADIR%%/codepages
+@dirrm %%DATADIR%%/modules
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru_RU.KOI8-R
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -m 755 %%VARDIR%%/log/ircd-ru
 @exec chown ircd:ircd %%VARDIR%%/log/ircd-ru
 @exec mkdir -m 755 %%VARDIR%%/run/ircd-ru
 @exec chown ircd:ircd %%VARDIR%%/run/ircd-ru
-@unexec rm -R %%VARDIR%%/run/ircd-ru > /dev/null
-@unexec rm -R %%VARDIR%%/log/ircd-ru > /dev/null
-@unexec rm /usr/local/etc/rc.d/ircd.sh.sample
+@unexec rm -R %%VARDIR%%/run/ircd-ru 2>&1 >/dev/null || true
+@unexec rm -R %%VARDIR%%/log/ircd-ru 2>&1 >/dev/null || true
 @unexec (rmdir %D/etc/ircd-ru && pw user del ircd) || echo 'To completely remove this port delete user ircd, group ircd and remove etc/ircd-ru'