4 files changed, 34 insertions, 16 deletions

diff --git a/irc/ezbounce/Makefile b/irc/ezbounce/Makefile
index 4ff24d140f70..113a71f425cd 100644
--- a/irc/ezbounce/Makefile
+++ b/irc/ezbounce/Makefile
@@ -6,34 +6,53 @@
 #
 
 PORTNAME=	ezbounce
-PORTVERSION=	0.99.12
+PORTVERSION=	1.0
 CATEGORIES=	irc
 MASTER_SITES=  	http://druglord.freelsd.org/ezbounce/
+DISTFILES=	${DISTNAME}-release${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE= 	yes
 
+MAN1=		ezbounce.1
+
+.if !defined(WANT_MDIDENTD)
+ALL_TARGET=	ezbounce_src
+PLIST_SUB+=	MDIDENTD="@comment "
+.else
+PLIST_SUB+=	MDIDENTD=""
+.endif
+
 post-patch:
 	@${SED} -e "s:/path/to:${PREFIX}/sbin:" ${WRKSRC}/sample.conf > \
-		${WRKSRC}/ezbounce.conf.default
+		${WRKSRC}/ezb.conf.default
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ezbounce ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/ezb.conf.default ${PREFIX}/etc
+
+.if defined(WANT_MDIDENTD)
 	${INSTALL_PROGRAM} ${WRKSRC}/mdidentd/mdidentd ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/ezbounce.conf.default ${PREFIX}/etc
-.if !exists(${PREFIX}/etc/ezbounce.conf)
-	${INSTALL_SCRIPT} ${WRKSRC}/ezbounce.conf.default \
-		${PREFIX}/etc/ezbounce.conf
 .endif
+
+@if [ ! -f ${PREFIX}/etc/ezb.conf ] ${INSTALL_SCRIPT} \
+	${WRKSRC}/ezb.conf.default ${PREFIX}/etc/ezb.conf
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/ezbounce
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/ezbounce
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ezbounce
 	${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/ezbounce
+	${INSTALL_DATA} ${WRKSRC}/worklog ${PREFIX}/share/doc/ezbounce
+	${INSTALL_MAN}	${WRKSRC}/misc/ezbounce.1 ${PREFIX}/man/man1
+
+.if defined(WANT_MDIDENTD)
 	${INSTALL_DATA} ${WRKSRC}/mdidentd/README \
 		${PREFIX}/share/doc/ezbounce/mdidentd.README
 .endif
+
+.endif
 	@${SED} -e "s:/usr/local:${PREFIX}:g" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/irc/ezbounce/distinfo b/irc/ezbounce/distinfo
index 665312c7a325..0e4ba274b67f 100644
--- a/irc/ezbounce/distinfo
+++ b/irc/ezbounce/distinfo
@@ -1 +1 @@
-MD5 (ezbounce-0.99.12.tar.gz) = 9bd0bed5b0240f495d281754ff3d6108
+MD5 (ezbounce-1.0-release.tar.gz) = ed50798896dce024ebd881a5975ed1c1
diff --git a/irc/ezbounce/pkg-message b/irc/ezbounce/pkg-message
index d296c6d75f4d..1b514d2563ec 100644
--- a/irc/ezbounce/pkg-message
+++ b/irc/ezbounce/pkg-message
@@ -1,6 +1,4 @@
 ------------------------------------------------------------------
-You will need to read /usr/local/share/doc/ezbounce/README
-and /usr/local/share/doc/ezbounce/mdidentd.README to set up
-this program.
-Also, edit /usr/local/etc/ezbounce.conf to your liking.
+You will need to edit /usr/local/etc/ezb.conf and read the docs in
+/usr/local/share/doc/ezbounce/README to set up this program.
 ------------------------------------------------------------------
diff --git a/irc/ezbounce/pkg-plist b/irc/ezbounce/pkg-plist
index 2114f82b49c4..8d5793a25083 100644
--- a/irc/ezbounce/pkg-plist
+++ b/irc/ezbounce/pkg-plist
@@ -1,10 +1,11 @@
-@unexec if [ -f %D/etc/ezbounce.conf ] && cmp -s %D/etc/ezbounce.conf %D/etc/ezbounce.conf.default; then rm -f %D/etc/ezbounce.conf; fi
-etc/ezbounce.conf.default
-@exec if [ ! -f %D/etc/ezbounce.conf ] ; then cp -p %D/%F %B/ezbounce.conf; fi
+@unexec if [ -f %D/etc/ezb.conf ] && cmp -s %D/etc/ezb.conf %D/etc/ezb.conf.default; then rm -f %D/etc/ezb.conf; fi
+etc/ezb.conf.default
+@exec if [ ! -f %D/etc/ezb.conf ] ; then cp -p %D/%F %B/ezb.conf; fi
 sbin/ezbounce
-sbin/mdidentd
+%%MDIDENTD%%sbin/mdidentd
 %%PORTDOCS%%share/doc/ezbounce/CHANGES
 %%PORTDOCS%%share/doc/ezbounce/README
 %%PORTDOCS%%share/doc/ezbounce/TODO
-%%PORTDOCS%%share/doc/ezbounce/mdidentd.README
+%%PORTDOCS%%share/doc/ezbounce/worklog
+%%MDIDENTD%%%%PORTDOCS%%share/doc/ezbounce/mdidentd.README
 %%PORTDOCS%%@dirrm share/doc/ezbounce