5 files changed, 44 insertions, 38 deletions

diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index 796ea10b9ce5..00cda9c47b1e 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	ircd-hybrid
-PORTVERSION=	6.3
+PORTVERSION=	6.3.1
 CATEGORIES=	irc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ircd-hybrid
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	davidt@yadt.co.uk
+MAINTAINER=	so14k@so14k.com
 
 MAN8=		ircd.8
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+CPIO?=		/usr/bin/cpio --quiet -pdum -R
+
 .if !defined(PACKAGE_BUILDING) && !defined(BATCH)
 IS_INTERACTIVE=	yes
 .endif
@@ -38,11 +40,14 @@ pre-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
+	@cd ${WRKSRC}/doc && ${FIND} * -type f -print \
+		| ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	@${CHMOD} -R ${SHAREMODE} ${DOCSDIR}
+	@${CHMOD} -R a+X ${DOCSDIR}
 .endif
 	@${SED} -e "s#%PREFIX%#${PREFIX}#" ${FILESDIR}/ircd.sh \
 		> ${WRKDIR}/ircd.sh
 	@${INSTALL_SCRIPT} ${WRKDIR}/ircd.sh ${PREFIX}/etc/rc.d
-	@${CAT} ${PKGMESSAGE}
+	@${SED} -e "s#/usr/local/#${PREFIX}/#" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/irc/ircd-hybrid/distinfo b/irc/ircd-hybrid/distinfo
index 781a312ecb57..4f4c12a2d83d 100644
--- a/irc/ircd-hybrid/distinfo
+++ b/irc/ircd-hybrid/distinfo
@@ -1 +1 @@
-MD5 (ircd-hybrid-6.3.tgz) = 47c14c797142ca3e2fb22d74adfaa727
+MD5 (ircd-hybrid-6.3.1.tgz) = 117bb857b165a2a92e7f43eeac3e78d6
diff --git a/irc/ircd-hybrid/pkg-descr b/irc/ircd-hybrid/pkg-descr
index ffc5c5cf7447..12b464aeda49 100644
--- a/irc/ircd-hybrid/pkg-descr
+++ b/irc/ircd-hybrid/pkg-descr
@@ -1,8 +1,8 @@
 A port of the ircd-hybrid IRC daemon.
 
-ircd-hybrid includes a number of improvements over a standard ircd-2.8
-server, including compressed server<->server links, chamode +e, and TS5
-support.
+ircd-hybrid includes a number of improvements over a standard
+ircd-2.8 server, including compressed server<->server links, chamode
++e, and TS5 support.
 
 WWW: http://www.ircd-hybrid.org/
 
diff --git a/irc/ircd-hybrid/pkg-message b/irc/ircd-hybrid/pkg-message
index 67f0ff30fe14..8acba36152a9 100644
--- a/irc/ircd-hybrid/pkg-message
+++ b/irc/ircd-hybrid/pkg-message
@@ -1,12 +1,13 @@
 ircd-hybrid has now been installed.
 
-You should now copy ${PREFIX}/etc/ircd/*.sample to
-${PREFIX}/etc/ircd/*, and them to suit your needs.
+You should now copy /usr/local/etc/ircd/*.sample to
+/usr/local/etc/ircd/*, and them to suit your needs.
 
-Please note: you should copy _all_ the sample files to the corresponding
-configuration file, even if you just leave it empty, otherwise ircd-hybrid
-may refuse to start.
+Please note: you should copy _all_ the sample files
+to the corresponding configuration file, even if you
+just leave it empty, otherwise ircd-hybrid may refuse
+to start.
 
 You may then start the server by running:
 
-	${PREFIX}/etc/rc.d/ircd.sh start
+	/usr/local/etc/rc.d/ircd.sh start
diff --git a/irc/ircd-hybrid/pkg-plist b/irc/ircd-hybrid/pkg-plist
index 1b95dd2cd9b5..1cbb9b9378e6 100644
--- a/irc/ircd-hybrid/pkg-plist
+++ b/irc/ircd-hybrid/pkg-plist
@@ -8,30 +8,30 @@ etc/ircd/ircd.motd.sample
 etc/ircd/kline.conf.sample
 etc/ircd/opers.txt.sample
 etc/rc.d/ircd.sh
-@unexec rmdir %D/etc/ircd 2>/dev/null || true
-%%PORTDOCS%%share/doc/ircd-hybrid/CIDR.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/INDEX
-%%PORTDOCS%%share/doc/ircd-hybrid/Makefile
-%%PORTDOCS%%share/doc/ircd-hybrid/README.TSora
-%%PORTDOCS%%share/doc/ircd-hybrid/Tao-of-IRC.940110
-%%PORTDOCS%%share/doc/ircd-hybrid/blalloc.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/example.conf
-%%PORTDOCS%%share/doc/ircd-hybrid/example.conf.trillian
-%%PORTDOCS%%share/doc/ircd-hybrid/ircd.8
-%%PORTDOCS%%share/doc/ircd-hybrid/mtrie.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/old/Authors
-%%PORTDOCS%%share/doc/ircd-hybrid/old/Etiquette
-%%PORTDOCS%%share/doc/ircd-hybrid/old/README
-%%PORTDOCS%%share/doc/ircd-hybrid/old/US-Admin/Networking
-%%PORTDOCS%%share/doc/ircd-hybrid/old/US-Admin/Operators
-%%PORTDOCS%%share/doc/ircd-hybrid/old/US-Admin/README
-%%PORTDOCS%%share/doc/ircd-hybrid/operguide.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/opermyth.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/rfc1459.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/server-version-info
-%%PORTDOCS%%share/doc/ircd-hybrid/simple.conf
-%%PORTDOCS%%share/doc/ircd-hybrid/ts5.txt
-%%PORTDOCS%%share/doc/ircd-hybrid/yline.txt
+%%PORTDOCS%%/doc/ircd-hybrid/CIDR.txt
+%%PORTDOCS%%/doc/ircd-hybrid/INDEX
+%%PORTDOCS%%/doc/ircd-hybrid/Makefile
+%%PORTDOCS%%/doc/ircd-hybrid/README.TSora
+%%PORTDOCS%%/doc/ircd-hybrid/Tao-of-IRC.940110
+%%PORTDOCS%%/doc/ircd-hybrid/blalloc.txt
+%%PORTDOCS%%/doc/ircd-hybrid/example.conf
+%%PORTDOCS%%/doc/ircd-hybrid/example.conf.trillian
+%%PORTDOCS%%/doc/ircd-hybrid/ircd.8
+%%PORTDOCS%%/doc/ircd-hybrid/mtrie.txt
+%%PORTDOCS%%/doc/ircd-hybrid/old/Authors
+%%PORTDOCS%%/doc/ircd-hybrid/old/Etiquette
+%%PORTDOCS%%/doc/ircd-hybrid/old/README
+%%PORTDOCS%%/doc/ircd-hybrid/old/US-Admin/Networking
+%%PORTDOCS%%/doc/ircd-hybrid/old/US-Admin/Operators
+%%PORTDOCS%%/doc/ircd-hybrid/old/US-Admin/README
+%%PORTDOCS%%/doc/ircd-hybrid/operguide.txt
+%%PORTDOCS%%/doc/ircd-hybrid/opermyth.txt
+%%PORTDOCS%%/doc/ircd-hybrid/rfc1459.txt
+%%PORTDOCS%%/doc/ircd-hybrid/server-version-info
+%%PORTDOCS%%/doc/ircd-hybrid/simple.conf
+%%PORTDOCS%%/doc/ircd-hybrid/ts5.txt
+%%PORTDOCS%%/doc/ircd-hybrid/yline.txt
 %%PORTDOCS%%@dirrm share/doc/ircd-hybrid/old/US-Admin
 %%PORTDOCS%%@dirrm share/doc/ircd-hybrid/old
 %%PORTDOCS%%@dirrm share/doc/ircd-hybrid
+@unexec rmdir %D/etc/ircd 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/ircd`` to remove any configuration files left." | fmt