1 files changed, 31 insertions, 51 deletions
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index 04adf502a86a..c60448889224 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -1,21 +1,22 @@
 bin/inspircd
-etc/inspircd/examples/opers.conf.example
-etc/inspircd/examples/modules/modules.conf.unreal
-etc/inspircd/examples/modules/modules.conf.charybdis
-etc/inspircd/examples/modules.conf.example
-etc/inspircd/examples/links.conf.example
-etc/inspircd/examples/inspircd.rules.example
-etc/inspircd/examples/inspircd.quotes.example
-etc/inspircd/examples/inspircd.motd.example
-etc/inspircd/examples/inspircd.helpop.example
-etc/inspircd/examples/inspircd.helpop-full.example
-etc/inspircd/examples/inspircd.filter.example
-etc/inspircd/examples/inspircd.conf.example
-etc/inspircd/examples/inspircd.censor.example
-etc/inspircd/examples/aliases/neostats.conf.example
-etc/inspircd/examples/aliases/ircservices.conf.example
-etc/inspircd/examples/aliases/atheme.conf.example
-etc/inspircd/examples/aliases/anope.conf.example
+%%ETCDIR%%/examples/aliases/anope.conf.example
+%%ETCDIR%%/examples/aliases/atheme.conf.example
+%%ETCDIR%%/examples/aliases/ircservices.conf.example
+%%ETCDIR%%/examples/aliases/neostats.conf.example
+%%ETCDIR%%/examples/censor.conf.example
+%%ETCDIR%%/examples/filter.conf.example
+%%ETCDIR%%/examples/helpop-full.conf.example
+%%ETCDIR%%/examples/helpop.conf.example
+%%ETCDIR%%/examples/inspircd.conf.example
+%%ETCDIR%%/examples/links.conf.example
+%%ETCDIR%%/examples/modules.conf.example
+%%ETCDIR%%/examples/modules/charybdis.conf.example
+%%ETCDIR%%/examples/modules/unrealircd.conf.example
+%%ETCDIR%%/examples/motd.txt.example
+%%ETCDIR%%/examples/opermotd.txt.example
+%%ETCDIR%%/examples/opers.conf.example
+%%ETCDIR%%/examples/quotes.txt.example
+%%ETCDIR%%/examples/rules.txt.example
 lib/inspircd/.gdbargs
 lib/inspircd/inspircd
 lib/inspircd/modules/cmd_admin.so
@@ -170,7 +171,6 @@ lib/inspircd/modules/m_permchannels.so
 lib/inspircd/modules/m_randquote.so
 lib/inspircd/modules/m_redirect.so
 lib/inspircd/modules/m_regex_glob.so
-lib/inspircd/modules/m_regex_posix.so
 lib/inspircd/modules/m_regonlycreate.so
 lib/inspircd/modules/m_remove.so
 lib/inspircd/modules/m_restrictchans.so
@@ -225,45 +225,25 @@ lib/inspircd/modules/m_userip.so
 lib/inspircd/modules/m_vhost.so
 lib/inspircd/modules/m_watch.so
 lib/inspircd/modules/m_xline_db.so
-@dirrm etc/inspircd/examples/aliases
-@dirrm etc/inspircd/examples/modules
-@dirrm etc/inspircd/examples
+@dirrmtry etc/inspircd/examples/aliases
+@dirrmtry etc/inspircd/examples/modules
+@dirrmtry etc/inspircd/examples
+@dirrmtry etc/inspircd
 @dirrm lib/inspircd/modules
 @dirrm lib/inspircd/logs
 @dirrm lib/inspircd/data
 @dirrm lib/inspircd
-@unexec if cmp -s %D/%%ETCDIR%%/examples/inspircd.censor.example %D/%%ETCDIR%%/inspircd.censor; then rm -f %D/%%ETCDIR%%/inspircd.censor; fi
-%%ETCDIR%%/examples/inspircd.censor.example
-@exec if [ ! -f %B/inspircd.censor ] ; then cp -p %D/%F %B/inspircd.censor; fi
+@unexec if cmp -s %D/%%ETCDIR%%/examples/censor.conf.example %D/%%ETCDIR%%/censor.conf; then rm -f %D/%%ETCDIR%%/censor.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/examples/filter.conf.example %D/%%ETCDIR%%/filter.conf; then rm -f %D/%%ETCDIR%%/filter.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/examples/helpop-full.conf.example %D/%%ETCDIR%%/helpop-full.conf; then rm -f %D/%%ETCDIR%%/helpop-full.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/examples/helpop.conf.example %D/%%ETCDIR%%/helpop.conf; then rm -f %D/%%ETCDIR%%/helpop.conf; fi
 @unexec if cmp -s %D/%%ETCDIR%%/examples/inspircd.conf.example %D/%%ETCDIR%%/inspircd.conf; then rm -f %D/%%ETCDIR%%/inspircd.conf; fi
-%%ETCDIR%%/examples/inspircd.conf.example
-@exec if [ ! -f %B/inspircd.conf ] ; then cp -p %D/%F %B/inspircd.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/examples/inspircd.filter.example %D/%%ETCDIR%%/inspircd.filter; then rm -f %D/%%ETCDIR%%/inspircd.filter; fi
-%%ETCDIR%%/examples/inspircd.filter.example
-@exec if [ ! -f %B/inspircd.filter ] ; then cp -p %D/%F %B/inspircd.filter; fi
-@unexec if cmp -s %D/%%ETCDIR%%/examples/inspircd.helpop.example %D/%%ETCDIR%%/inspircd.helpop; then rm -f %D/%%ETCDIR%%/inspircd.helpop; fi
-%%ETCDIR%%/examples/inspircd.helpop.example
-@exec if [ ! -f %B/inspircd.helpop ] ; then cp -p %D/%F %B/inspircd.helpop; fi
-@unexec if cmp -s %D/%%ETCDIR%%/examples/inspircd.helpop-full.example %D/%%ETCDIR%%/inspircd.helpop-full; then rm -f %D/%%ETCDIR%%/inspircd.helpop-full; fi
-%%ETCDIR%%/examples/inspircd.helpop-full.example
-@exec if [ ! -f %B/inspircd.helpop-full ] ; then cp -p %D/%F %B/inspircd.helpop-full; fi
-@unexec if cmp -s %D/%%ETCDIR%%/examples/inspircd.motd.example %D/%%ETCDIR%%/inspircd.motd; then rm -f %D/%%ETCDIR%%/inspircd.motd; fi
-%%ETCDIR%%/examples/inspircd.motd.example
-@exec if [ ! -f %B/inspircd.motd ] ; then cp -p %D/%F %B/inspircd.motd; fi
-@unexec if cmp -s %D/%%ETCDIR%%/examples/inspircd.quotes.example %D/%%ETCDIR%%/inspircd.quotes; then rm -f %D/%%ETCDIR%%/inspircd.quotes; fi
-%%ETCDIR%%/examples/inspircd.quotes.example
-@exec if [ ! -f %B/inspircd.quotes ] ; then cp -p %D/%F %B/inspircd.quotes; fi
-@unexec if cmp -s %D/%%ETCDIR%%/examples/inspircd.rules.example %D/%%ETCDIR%%/inspircd.rules; then rm -f %D/%%ETCDIR%%/inspircd.rules; fi
-%%ETCDIR%%/examples/inspircd.rules.example
-@exec if [ ! -f %B/inspircd.rules ] ; then cp -p %D/%F %B/inspircd.rules; fi
 @unexec if cmp -s %D/%%ETCDIR%%/examples/links.conf.example %D/%%ETCDIR%%/links.conf; then rm -f %D/%%ETCDIR%%/links.conf; fi
-%%ETCDIR%%/examples/links.conf.example
-@exec if [ ! -f %B/links.conf ] ; then cp -p %D/%F %B/links.conf; fi
 @unexec if cmp -s %D/%%ETCDIR%%/examples/modules.conf.example %D/%%ETCDIR%%/modules.conf; then rm -f %D/%%ETCDIR%%/modules.conf; fi
-%%ETCDIR%%/examples/modules.conf.example
-@exec if [ ! -f %B/modules.conf ] ; then cp -p %D/%F %B/modules.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/examples/motd.txt.example %D/%%ETCDIR%%/motd.txt; then rm -f %D/%%ETCDIR%%/motd.txt; fi
+@unexec if cmp -s %D/%%ETCDIR%%/examples/opermotd.txt.example %D/%%ETCDIR%%/opermotd.txt; then rm -f %D/%%ETCDIR%%/opermotd.txt; fi
 @unexec if cmp -s %D/%%ETCDIR%%/examples/opers.conf.example %D/%%ETCDIR%%/opers.conf; then rm -f %D/%%ETCDIR%%/opers.conf; fi
-%%ETCDIR%%/examples/opers.conf.example
-@exec if [ ! -f %B/opers.conf ] ; then cp -p %D/%F %B/opers.conf; fi
-@dirrmtry %%ETCDIR%%
+@unexec if cmp -s %D/%%ETCDIR%%/examples/quotes.txt.example %D/%%ETCDIR%%/quotes.txt; then rm -f %D/%%ETCDIR%%/quotes.txt; fi
+@unexec if cmp -s %D/%%ETCDIR%%/examples/rules.txt.example %D/%%ETCDIR%%/rules.txt; then rm -f %D/%%ETCDIR%%/rules.txt; fi
 @unexec echo "If permanently removing software, you may wish to remove the configuration directory by running \"rm -rf %%LOCALBASE%%/%%ETCDIR%%\""
+@exec for FILE in censor.conf filter.conf helpop-full.conf helpop.conf inspircd.conf links.conf modules.conf motd.txt opermotd.txt opers.conf quotes.txt rules.txt; do if [ ! -f %D/%%ETCDIR%%/${FILE} ]; then install %D/%%ETCDIR%%/examples/${FILE}.example %D/%%ETCDIR%%/${FILE}; fi; done