- unbreak

- fix pkg-plist

3 files changed, 24 insertions, 12 deletions

diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index 879f3a619e5f..a0447f362612 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -9,8 +9,6 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Fast irc daemon with a number of new features
 
-BROKEN=		Fails to package
-
 INSTALL_IGNORES=	ircu-* ircd-rat* charby*
 
 # :keepla because port uses lt_dlopen
diff --git a/irc/ircd-hybrid/files/ircd-hybrid.in b/irc/ircd-hybrid/files/ircd-hybrid.in
index 394051d92904..69caf1f4fe7b 100644
--- a/irc/ircd-hybrid/files/ircd-hybrid.in
+++ b/irc/ircd-hybrid/files/ircd-hybrid.in
@@ -16,7 +16,7 @@
 name="ircd_hybrid"
 rcvar=ircd_hybrid_enable
 
-command=/usr/local/sbin/ircd
+command=/usr/local/bin/ircd
 
 start_precmd=pid_touch
 stop_postcmd=pid_rm
diff --git a/irc/ircd-hybrid/pkg-plist b/irc/ircd-hybrid/pkg-plist
index 475bc76e2e7e..692c8cd0334a 100644
--- a/irc/ircd-hybrid/pkg-plist
+++ b/irc/ircd-hybrid/pkg-plist
@@ -1,3 +1,4 @@
+bin/ircd
 bin/mkpasswd
 bin/respond
 %%ETCDIR%%/reference.conf
@@ -63,8 +64,6 @@ lib/ircd-hybrid/modules/autoload/m_names.la
 lib/ircd-hybrid/modules/autoload/m_names.so
 lib/ircd-hybrid/modules/autoload/m_oper.la
 lib/ircd-hybrid/modules/autoload/m_oper.so
-lib/ircd-hybrid/modules/autoload/m_operwall.la
-lib/ircd-hybrid/modules/autoload/m_operwall.so
 lib/ircd-hybrid/modules/autoload/m_pass.la
 lib/ircd-hybrid/modules/autoload/m_pass.so
 lib/ircd-hybrid/modules/autoload/m_ping.la
@@ -79,18 +78,24 @@ lib/ircd-hybrid/modules/autoload/m_restart.la
 lib/ircd-hybrid/modules/autoload/m_restart.so
 lib/ircd-hybrid/modules/autoload/m_resv.la
 lib/ircd-hybrid/modules/autoload/m_resv.so
-lib/ircd-hybrid/modules/autoload/m_services.la
-lib/ircd-hybrid/modules/autoload/m_services.so
 lib/ircd-hybrid/modules/autoload/m_set.la
 lib/ircd-hybrid/modules/autoload/m_set.so
 lib/ircd-hybrid/modules/autoload/m_stats.la
 lib/ircd-hybrid/modules/autoload/m_stats.so
 lib/ircd-hybrid/modules/autoload/m_svinfo.la
 lib/ircd-hybrid/modules/autoload/m_svinfo.so
+lib/ircd-hybrid/modules/autoload/m_svsjoin.la
+lib/ircd-hybrid/modules/autoload/m_svsjoin.so
+lib/ircd-hybrid/modules/autoload/m_svskill.la
+lib/ircd-hybrid/modules/autoload/m_svskill.so
 lib/ircd-hybrid/modules/autoload/m_svsmode.la
 lib/ircd-hybrid/modules/autoload/m_svsmode.so
 lib/ircd-hybrid/modules/autoload/m_svsnick.la
 lib/ircd-hybrid/modules/autoload/m_svsnick.so
+lib/ircd-hybrid/modules/autoload/m_svspart.la
+lib/ircd-hybrid/modules/autoload/m_svspart.so
+lib/ircd-hybrid/modules/autoload/m_svstag.la
+lib/ircd-hybrid/modules/autoload/m_svstag.so
 lib/ircd-hybrid/modules/autoload/m_tburst.la
 lib/ircd-hybrid/modules/autoload/m_tburst.so
 lib/ircd-hybrid/modules/autoload/m_time.la
@@ -99,12 +104,18 @@ lib/ircd-hybrid/modules/autoload/m_topic.la
 lib/ircd-hybrid/modules/autoload/m_topic.so
 lib/ircd-hybrid/modules/autoload/m_trace.la
 lib/ircd-hybrid/modules/autoload/m_trace.so
+lib/ircd-hybrid/modules/autoload/m_unkline.la
+lib/ircd-hybrid/modules/autoload/m_unkline.so
+lib/ircd-hybrid/modules/autoload/m_undline.la
+lib/ircd-hybrid/modules/autoload/m_undline.so
+lib/ircd-hybrid/modules/autoload/m_unresv.la
+lib/ircd-hybrid/modules/autoload/m_unresv.so
+lib/ircd-hybrid/modules/autoload/m_unxline.la
+lib/ircd-hybrid/modules/autoload/m_unxline.so
 lib/ircd-hybrid/modules/autoload/m_user.la
 lib/ircd-hybrid/modules/autoload/m_user.so
 lib/ircd-hybrid/modules/autoload/m_userhost.la
 lib/ircd-hybrid/modules/autoload/m_userhost.so
-lib/ircd-hybrid/modules/autoload/m_users.la
-lib/ircd-hybrid/modules/autoload/m_users.so
 lib/ircd-hybrid/modules/autoload/m_version.la
 lib/ircd-hybrid/modules/autoload/m_version.so
 lib/ircd-hybrid/modules/autoload/m_wallops.la
@@ -121,6 +132,10 @@ lib/ircd-hybrid/modules/autoload/m_whowas.la
 lib/ircd-hybrid/modules/autoload/m_whowas.so
 lib/ircd-hybrid/modules/autoload/m_xline.la
 lib/ircd-hybrid/modules/autoload/m_xline.so
+lib/ircd-hybrid/modules/extra/m_opme.la
+lib/ircd-hybrid/modules/extra/m_opme.so
+lib/ircd-hybrid/modules/m_bmask.la
+lib/ircd-hybrid/modules/m_bmask.so
 lib/ircd-hybrid/modules/m_die.la
 lib/ircd-hybrid/modules/m_die.so
 lib/ircd-hybrid/modules/m_error.la
@@ -147,8 +162,9 @@ lib/ircd-hybrid/modules/m_sjoin.la
 lib/ircd-hybrid/modules/m_sjoin.so
 lib/ircd-hybrid/modules/m_squit.la
 lib/ircd-hybrid/modules/m_squit.so
+lib/ircd-hybrid/modules/m_tmode.la
+lib/ircd-hybrid/modules/m_tmode.so
 man/man8/ircd.8.gz
-sbin/ircd
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/accept
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/admin
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/away
@@ -186,7 +202,6 @@ sbin/ircd
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/nick
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/notice
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/oper
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/operwall
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/part
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/pass
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/ping
@@ -213,7 +228,6 @@ sbin/ircd
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/unxline
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/user
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/userhost
-%%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/users
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/version
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/wallops
 %%DATADIR%%-%%PORTVERSION%%/ircd-hybrid/help/who