5 files changed, 64 insertions, 99 deletions

diff --git a/irc/ircservices/Makefile b/irc/ircservices/Makefile
index aac4be279715..7250bfe3b001 100644
--- a/irc/ircservices/Makefile
+++ b/irc/ircservices/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	ircservices
-PORTVERSION=	5.0.63
+PORTVERSION=	5.1.18
 CATEGORIES=	irc
-MASTER_SITES=	http://www.ircservices.za.net/download/old/ \
-	http://banana.irc.gr/ircservices/old/ \
-	ftp://ftp.freenet.de/pub/ftp.ircservices.za.net/pub/ircservices/old/
+MASTER_SITES=	http://www.ircservices.za.net/download/ \
+		http://banana.irc.gr/ircservices/ \
+		ftp://ftp.freenet.de/pub/ftp.ircservices.za.net/pub/ircservices/
 
 MAINTAINER=	bu7cher@yandex.ru
 COMMENT=	A system of IRC services for IRC networks
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_RC_SUBR=	ircservices
 
 DIST_SUBDIR=	${PORTNAME}
-CONFIGURE_ARGS=	-prefix ${PREFIX} -cflags "${CFLAGS}" -cc "${CC}"
+CONFIGURE_ARGS=	-bindest ${PREFIX}/sbin -datdest ${PREFIX}/etc/ircservices -cflags "${CFLAGS}" -cc "${CC}"
 
 IRCSERVICES_LANG?=	EN_US
 
@@ -41,7 +41,7 @@ pre-patch:
 	@${ECHO_MSG} "communicating with users:"
 	@${ECHO_MSG} "(Be aware of the capitalization!)"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "DE EN_US ES FR HU IT JA_EUC JA_SJIS NL PT RU TR"
+	@${ECHO_MSG} "DE EN_US ES FR HU IT JA_EUC JA_SJIS NL PT TR"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|LANG_EN_US|LANG_${IRCSERVICES_LANG}|' \
@@ -50,8 +50,13 @@ post-patch:
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Changes ${WRKSRC}/KnownBugs ${DOCSDIR}
+	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "**********          IMPORTANT           **********"
+	@${ECHO_MSG} "The configuration directory has changed to ${PREFIX}/etc/ircservices"
+	@${ECHO_MSG} "Please copy your old config files there if updating"
+	@${ECHO_MSG} "**********          IMPORTANT           *********"
+	@${ECHO_MSG} ""
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/irc/ircservices/distinfo b/irc/ircservices/distinfo
index 93c9c16dff44..8d425e8031ef 100644
--- a/irc/ircservices/distinfo
+++ b/irc/ircservices/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircservices/ircservices-5.0.63.tar.gz) = 72ca8245d99fd1d7f841131ef55a09aa
-SHA256 (ircservices/ircservices-5.0.63.tar.gz) = 7cf68b2dc956c25da694e1650b3871a9a55feac191292062d3d568d377be6ce3
-SIZE (ircservices/ircservices-5.0.63.tar.gz) = 1167436
+MD5 (ircservices/ircservices-5.1.18.tar.gz) = 2e73c1c35706398d754778cdc8a94dba
+SHA256 (ircservices/ircservices-5.1.18.tar.gz) = 39f33b9ee6543b9e4b5fb8dc0a509a19ca7d8b43b45fff1270b97f7fd48f0f60
+SIZE (ircservices/ircservices-5.1.18.tar.gz) = 1532076
diff --git a/irc/ircservices/files/ircservices.in b/irc/ircservices/files/ircservices.in
index 7264bd6b3e5a..e7f16e74d874 100644
--- a/irc/ircservices/files/ircservices.in
+++ b/irc/ircservices/files/ircservices.in
@@ -11,9 +11,10 @@ name=ircservices
 rcvar=${name}_enable
 
 command="%%PREFIX%%/sbin/${name}"
-pidfile="%%PREFIX%%/lib/services/${name}.pid"
-required_files="%%PREFIX%%/lib/services/ircservices.conf \
-		%%PREFIX%%/lib/services/modules.conf"
+command_args="-dir=%%PREFIX%%/etc/ircservices"
+pidfile="/var/run/${name}.pid"
+required_files="%%PREFIX%%/etc/ircservices/ircservices.conf \
+		%%PREFIX%%/etc/ircservices/modules.conf"
 
 load_rc_config ${name}
 
diff --git a/irc/ircservices/pkg-descr b/irc/ircservices/pkg-descr
index 23aa9f560a3d..5ac60ad0a0bb 100644
--- a/irc/ircservices/pkg-descr
+++ b/irc/ircservices/pkg-descr
@@ -5,6 +5,3 @@ to offline users, and gives IRC operators considerably more
 control over the network.
 
 WWW: http://www.ircservices.za.net/
-
-- Alex Dupre
-ale@FreeBSD.org
diff --git a/irc/ircservices/pkg-plist b/irc/ircservices/pkg-plist
index 690438bebbf4..db7e706f50a2 100644
--- a/irc/ircservices/pkg-plist
+++ b/irc/ircservices/pkg-plist
@@ -1,66 +1,17 @@
-lib/services/convert-db
-lib/services/example-ircservices.conf
-lib/services/example-modules.conf
-lib/services/helpfiles/help
-lib/services/languages/de
-lib/services/languages/en_us
-lib/services/languages/es
-lib/services/languages/fr
-lib/services/languages/hu
-lib/services/languages/it
-lib/services/languages/ja_euc
-lib/services/languages/ja_sjis
-lib/services/languages/nl
-lib/services/languages/pt
-lib/services/languages/ru
-lib/services/languages/tr
-lib/services/modules/chanserv/access-levels.so
-lib/services/modules/chanserv/access-xop.so
-lib/services/modules/chanserv/main.so
-lib/services/modules/chanserv/sendpass.so
-lib/services/modules/database/version4.so
-lib/services/modules/encryption/md5.so
-lib/services/modules/httpd/auth-ip.so
-lib/services/modules/httpd/auth-password.so
-lib/services/modules/httpd/dbaccess.so
-lib/services/modules/httpd/debug.so
-lib/services/modules/httpd/main.so
-lib/services/modules/httpd/redirect.so
-lib/services/modules/httpd/top-page.so
-lib/services/modules/mail/main.so
-lib/services/modules/mail/sendmail.so
-lib/services/modules/mail/smtp.so
-lib/services/modules/memoserv/forward.so
-lib/services/modules/memoserv/ignore.so
-lib/services/modules/memoserv/main.so
-lib/services/modules/misc/devnull.so
-lib/services/modules/misc/helpserv.so
-lib/services/modules/misc/xml-export.so
-lib/services/modules/misc/xml-import.so
-lib/services/modules/nickserv/access.so
-lib/services/modules/nickserv/autojoin.so
-lib/services/modules/nickserv/link.so
-lib/services/modules/nickserv/mail-auth.so
-lib/services/modules/nickserv/main.so
-lib/services/modules/nickserv/oldlink.so
-lib/services/modules/nickserv/sendpass.so
-lib/services/modules/operserv/akill.so
-lib/services/modules/operserv/main.so
-lib/services/modules/operserv/news.so
-lib/services/modules/operserv/sessions.so
-lib/services/modules/operserv/sline.so
-lib/services/modules/protocol/bahamut.so
-lib/services/modules/protocol/dalnet.so
-lib/services/modules/protocol/dreamforge.so
-lib/services/modules/protocol/hybrid.so
-lib/services/modules/protocol/monkey.so
-lib/services/modules/protocol/ptlink.so
-lib/services/modules/protocol/rfc1459.so
-lib/services/modules/protocol/trircd.so
-lib/services/modules/protocol/ts8.so
-lib/services/modules/protocol/undernet-p9.so
-lib/services/modules/protocol/unreal.so
-lib/services/modules/statserv/main.so
+%%ETCDIR%%/convert-db
+%%ETCDIR%%/example-ircservices.conf
+%%ETCDIR%%/example-modules.conf
+%%ETCDIR%%/helpfiles/help
+%%ETCDIR%%/languages/de
+%%ETCDIR%%/languages/en_us
+%%ETCDIR%%/languages/es
+%%ETCDIR%%/languages/fr
+%%ETCDIR%%/languages/hu
+%%ETCDIR%%/languages/ja_euc
+%%ETCDIR%%/languages/ja_sjis
+%%ETCDIR%%/languages/nl
+%%ETCDIR%%/languages/ru
+%%ETCDIR%%/languages/tr
 sbin/ircservices
 sbin/ircservices-chk
 %%PORTDOCS%%%%DOCSDIR%%/0.html
@@ -70,30 +21,41 @@ sbin/ircservices-chk
 %%PORTDOCS%%%%DOCSDIR%%/4.html
 %%PORTDOCS%%%%DOCSDIR%%/5.html
 %%PORTDOCS%%%%DOCSDIR%%/6.html
-%%PORTDOCS%%%%DOCSDIR%%/7.html
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.html
+%%PORTDOCS%%%%DOCSDIR%%/Changes
+%%PORTDOCS%%%%DOCSDIR%%/Changes.old
+%%PORTDOCS%%%%DOCSDIR%%/FDL.html
+%%PORTDOCS%%%%DOCSDIR%%/GPL.html
+%%PORTDOCS%%%%DOCSDIR%%/WhatsNew
 %%PORTDOCS%%%%DOCSDIR%%/a.html
 %%PORTDOCS%%%%DOCSDIR%%/b.html
 %%PORTDOCS%%%%DOCSDIR%%/c.html
+%%PORTDOCS%%%%DOCSDIR%%/convert-db.8
 %%PORTDOCS%%%%DOCSDIR%%/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/d.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ircservices-chk.8
+%%PORTDOCS%%%%DOCSDIR%%/ircservices.8
+%%PORTDOCS%%%%DOCSDIR%%/tech/1.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/10.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/11.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/2.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/3.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/4.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/5.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/6.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/7.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/8.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/9.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/a.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/b.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/c.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/d.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/index.html
+%%PORTDOCS%%%%DOCSDIR%%/tech/style.css
 %%PORTDOCS%%%%DOCSDIR%%/upgrade.html
-%%PORTDOCS%%%%DOCSDIR%%/Changes
-%%PORTDOCS%%%%DOCSDIR%%/KnownBugs
-@dirrm lib/services/helpfiles
-@dirrm lib/services/languages
-@dirrm lib/services/modules/chanserv
-@dirrm lib/services/modules/database
-@dirrm lib/services/modules/encryption
-@dirrm lib/services/modules/httpd
-@dirrm lib/services/modules/mail
-@dirrm lib/services/modules/memoserv
-@dirrm lib/services/modules/misc
-@dirrm lib/services/modules/nickserv
-@dirrm lib/services/modules/operserv
-@dirrm lib/services/modules/protocol
-@dirrm lib/services/modules/statserv
-@dirrm lib/services/modules
-@dirrm lib/services
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%ETCDIR%%/languages
+@dirrm %%ETCDIR%%/helpfiles
+@dirrm %%ETCDIR%%