2 files changed, 23 insertions, 8 deletions

diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index 2d26a5c1d6f6..ff86b0f9d54d 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	inspircd
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://www.inspircd.org/downloads/ \
 		http://www.chatspike.net/downloads/
@@ -18,6 +19,7 @@ COMMENT=	A modular C++ IRC daemon
 WRKSRC=	${WRKDIR}/inspircd
 USE_GMAKE=	yes
 USE_BZIP2=	yes
+USE_LDCONFIG=	${PREFIX}/lib/inspircd
 
 # Configure script is written in perl
 USE_PERL5_BUILD=yes
@@ -46,5 +48,9 @@ post-install:
 	@${STRIP_CMD} ${PREFIX}/lib/inspircd/modules/*.so
 	@${STRIP_CMD} ${PREFIX}/lib/inspircd/*.so
 	@${STRIP_CMD} ${PREFIX}/bin/inspircd
+.for FILE in censor conf filter helpop motd quotes rules
+	@${TEST} -f ${PREFIX}/etc/inspircd/inspircd.${FILE} || \
+		${CP} ${PREFIX}/etc/inspircd/inspircd.${FILE}.example ${PREFIX}/etc/inspircd/inspircd.${FILE}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index 5a40ad0e810b..39f95bc04197 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -1,9 +1,4 @@
 bin/inspircd
-etc/inspircd/inspircd.motd.example
-etc/inspircd/inspircd.helpop-full.example
-etc/inspircd/inspircd.helpop.example
-etc/inspircd/inspircd.censor.example
-etc/inspircd/inspircd.filter.example
 inspircd/inspircd
 inspircd/.gdbargs
 lib/inspircd/libIRCDasyncdns.so
@@ -195,13 +190,27 @@ lib/inspircd/modules/m_antibear.so
 @dirrm inspircd
 @dirrm lib/inspircd/modules
 @dirrm lib/inspircd
+@unexec if cmp -s %D/etc/inspircd/inspircd.censor.example %D/etc/inspircd/inspircd.censor; then rm -f %D/etc/inspircd/inspircd.censor; fi
+etc/inspircd/inspircd.censor.example
+@exec if [ ! -f %B/inspircd.censor ] ; then cp -p %D/%F %B/inspircd.censor; fi
 @unexec if cmp -s %D/etc/inspircd/inspircd.conf.example %D/etc/inspircd/inspircd.conf; then rm -f %D/etc/inspircd/inspircd.conf; fi
 etc/inspircd/inspircd.conf.example
-@exec if [ ! -f %D/etc/inspircd/inspircd.conf ] ; then cp -p %D/%F %B/inspircd.conf; fi
+@exec if [ ! -f %B/inspircd.conf ] ; then cp -p %D/%F %B/inspircd.conf; fi
+@unexec if cmp -s %D/etc/inspircd/inspircd.filter.example %D/etc/inspircd/inspircd.filter; then rm -f %D/etc/inspircd/inspircd.filter; fi
+etc/inspircd/inspircd.filter.example
+@exec if [ ! -f %B/inspircd.filter ] ; then cp -p %D/%F %B/inspircd.filter; fi
+@unexec if cmp -s %D/etc/inspircd/inspircd.helpop.example %D/etc/inspircd/inspircd.helpop; then rm -f %D/etc/inspircd/inspircd.helpop; fi
+etc/inspircd/inspircd.helpop.example
+@exec if [ ! -f %B/inspircd.helpop ] ; then cp -p %D/%F %B/inspircd.helpop; fi
+@unexec if cmp -s %D/etc/inspircd/inspircd.helpop-full.example %D/etc/inspircd/inspircd.helpop; then rm -f %D/etc/inspircd/inspircd.helpop; fi
+etc/inspircd/inspircd.helpop-full.example
+@unexec if cmp -s %D/etc/inspircd/inspircd.motd.example %D/etc/inspircd/inspircd.motd; then rm -f %D/etc/inspircd/inspircd.motd; fi
+etc/inspircd/inspircd.motd.example
+@exec if [ ! -f %B/inspircd.motd ] ; then cp -p %D/%F %B/inspircd.motd; fi
 @unexec if cmp -s %D/etc/inspircd/inspircd.quotes.example %D/etc/inspircd/inspircd.quotes; then rm -f %D/etc/inspircd/inspircd.quotes; fi
 etc/inspircd/inspircd.quotes.example
-@exec if [ ! -f %D/etc/inspircd/inspircd.quotes ] ; then cp -p %D/%F %B/inspircd.quotes; fi
+@exec if [ ! -f %B/inspircd.quotes ] ; then cp -p %D/%F %B/inspircd.quotes; fi
 @unexec if cmp -s %D/etc/inspircd/inspircd.rules.example %D/etc/inspircd/inspircd.rules; then rm -f %D/etc/inspircd/inspircd.rules; fi
 etc/inspircd/inspircd.rules.example
-@exec if [ ! -f %D/etc/inspircd/inspircd.rules ] ; then cp -p %D/%F %B/inspircd.rules; fi
+@exec if [ ! -f %B/inspircd.rules ] ; then cp -p %D/%F %B/inspircd.rules; fi
 @dirrmtry etc/inspircd