Only some platforms build the dynamically-loadable modules. On others,

the modules are statically-linked into the ircservices executable.
This fixes the installation of chat/ircservices on platforms where
dlopen() doesn't obey its "mode" argument, e.g. RTLD_NOW.  Unfortunately,
NetBSD/amd64 currently falls into this category (port-amd64/30570),
but this will also fix installation on any a.out NetBSD or OpenBSD
platform.

Approved for commit during the deep freeze by <agc>.

3 files changed, 75 insertions, 61 deletions

diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index f2c9f9623c4..bffcc9544ee 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/21 16:18:52 jlam Exp $
 #
 
 DISTNAME=	ircservices-5.0.49
@@ -53,6 +53,19 @@ CONF_FILES_PERMS+=	${PREFIX}/share/examples/ircservices/modules.conf \
 				${PREFIX}/lib/services/modules.conf \
 				${BINOWN} ${BINGRP} 0640
 
+INSTALLATION_DIRS=	lib/services man/man8 sbin
+
+.include "../../mk/bsd.prefs.mk"
+
+# Only some platforms build the dynamically-loadable modules.  On
+# others, the modules are statically-linked into the ircservices
+# executable.
+#
+.if exists(${WRKDIR}/${DISTNAME}/modules/mail/main.so)
+PLIST_SRC=	${.CURDIR}/PLIST.shared
+.endif
+PLIST_SRC+=	${.CURDIR}/PLIST
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ircservices
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ircservices
diff --git a/chat/ircservices/PLIST b/chat/ircservices/PLIST
index ae08436a583..aaf464afd06 100644
--- a/chat/ircservices/PLIST
+++ b/chat/ircservices/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:33:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/06/21 16:18:52 jlam Exp $
 lib/services/convert-db
 lib/services/helpfiles/help
 lib/services/languages/de
@@ -13,53 +13,6 @@ 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
 man/man8/convert-db.8
 man/man8/ircservices.8
 sbin/ircservices
@@ -98,16 +51,4 @@ share/examples/rc.d/ircservices
 @dirrm lib/services/helpfiles/ircii
 @dirrm lib/services/helpfiles
 @dirrm lib/services/languages
-@dirrm lib/services/modules/statserv
-@dirrm lib/services/modules/protocol
-@dirrm lib/services/modules/operserv
-@dirrm lib/services/modules/nickserv
-@dirrm lib/services/modules/misc
-@dirrm lib/services/modules/memoserv
-@dirrm lib/services/modules/mail
-@dirrm lib/services/modules/httpd
-@dirrm lib/services/modules/encryption
-@dirrm lib/services/modules/database
-@dirrm lib/services/modules/chanserv
-@dirrm lib/services/modules
 @dirrm lib/services
diff --git a/chat/ircservices/PLIST.shared b/chat/ircservices/PLIST.shared
new file mode 100644
index 00000000000..f13eeafec09
--- /dev/null
+++ b/chat/ircservices/PLIST.shared
@@ -0,0 +1,60 @@
+@comment $NetBSD: PLIST.shared,v 1.1 2005/06/21 16:18:52 jlam Exp $
+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
+@dirrm lib/services/modules/statserv
+@dirrm lib/services/modules/protocol
+@dirrm lib/services/modules/operserv
+@dirrm lib/services/modules/nickserv
+@dirrm lib/services/modules/misc
+@dirrm lib/services/modules/memoserv
+@dirrm lib/services/modules/mail
+@dirrm lib/services/modules/httpd
+@dirrm lib/services/modules/encryption
+@dirrm lib/services/modules/database
+@dirrm lib/services/modules/chanserv
+@dirrm lib/services/modules