o Update to 1.04a

o Make portlint happier
o Patch got integrated into source
o Add OpenSSL knob

PR:		47257
Approved by:	alex (mentor)

8 files changed, 76 insertions, 74 deletions

diff --git a/irc/ezbounce-devel/Makefile b/irc/ezbounce-devel/Makefile
index 8f90a79fdad2..bde23a41e49e 100644
--- a/irc/ezbounce-devel/Makefile
+++ b/irc/ezbounce-devel/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	ezbounce
-PORTVERSION=	1.02
-PORTREVISION=	1
+PORTVERSION=	1.04.a
 CATEGORIES=	irc
-MASTER_SITES=  	http://druglord.freelsd.org/ezbounce/
+MASTER_SITES=	http://druglord.freelsd.org/ezbounce/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/a/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A highly configurable IRC Proxy
 
-GNU_CONFIGURE= 	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		ezbounce.1
 
@@ -25,6 +25,23 @@ PLIST_SUB+=	MDIDENTD="@comment "
 PLIST_SUB+=	MDIDENTD=""
 .endif
 
+.if defined(WITH_SSL)
+USE_OPENSSL=	YES
+CONFIGURE_ARGS+=	--with-ssl
+PLIST_SUB+=	SSL=""
+.else
+PLIST_SUB+=	SSL="@comment "
+.endif
+
+pre-everything::
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_SSL=yes      Enable SSL support"
+	@${ECHO} "	WITH_MDIDENTD=yes Install the mdidentd binary to"
+	@${ECHO} "                        modify ident replies"
+	@${ECHO} ""
+
 post-patch:
 	@${SED} -e "s:/path/to:${PREFIX}/sbin:" ${WRKSRC}/sample.conf > \
 		${WRKSRC}/ezb.conf.default
@@ -44,15 +61,18 @@ do-install:
 	fi
 
 .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
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/worklog ${DOCSDIR}
 
 .if defined(WITH_MDIDENTD)
 	${INSTALL_DATA} ${WRKSRC}/mdidentd/README \
-		${PREFIX}/share/doc/ezbounce/mdidentd.README
+		${DOCSDIR}/mdidentd.README
+.endif
+.if defined(WITH_SSL)
+	${INSTALL_DATA} ${WRKSRC}/README.SSL ${DOCSDIR}
 .endif
 
 .endif
diff --git a/irc/ezbounce-devel/distinfo b/irc/ezbounce-devel/distinfo
index 6e74a6e473d1..e8ebd58b587b 100644
--- a/irc/ezbounce-devel/distinfo
+++ b/irc/ezbounce-devel/distinfo
@@ -1 +1 @@
-MD5 (ezbounce-1.02.tar.gz) = 66cb545793acf078516ec7f62ae4147a
+MD5 (ezbounce-1.04a.tar.gz) = f214fbd8ec1d95981639c9e1087436cb
diff --git a/irc/ezbounce-devel/files/patch-src-server.cpp b/irc/ezbounce-devel/files/patch-src-server.cpp
deleted file mode 100644
index 8d9417a4fcf7..000000000000
--- a/irc/ezbounce-devel/files/patch-src-server.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/server.cpp	Sun May  5 17:53:00 2002
-+++ src/server.cpp	Mon Jul 22 04:27:26 2002
-@@ -204,7 +204,7 @@
-     if (now)
-     {
-         strcpy(buff, "Server terminating: ");
--        strncat(buff, reason, (sizeof buff) - strlen(buff) + 1);
-+        strncat(buff, reason, (sizeof buff) - (strlen(buff) + 1));
-         conn::broadcast(&conns,buff);
-         ircproxy_save_prefs(users, pcfg.userfile);
-         kill_conns();
-@@ -213,7 +213,7 @@
-     }
-     terminate_request = 1;
-     strcpy(buff, "Terminate request: ");
--    strncat(buff, reason, (sizeof buff) - strlen(buff) + 1);
-+    strncat(buff, reason, (sizeof buff) - (strlen(buff) + 1));
-     conn::broadcast(&conns,buff);
-     ircproxy_save_prefs(users, pcfg.userfile);
-     return 1;
diff --git a/irc/ezbounce-devel/pkg-plist b/irc/ezbounce-devel/pkg-plist
index 8d5793a25083..c380d7827f27 100644
--- a/irc/ezbounce-devel/pkg-plist
+++ b/irc/ezbounce-devel/pkg-plist
@@ -3,9 +3,10 @@ etc/ezb.conf.default
 @exec if [ ! -f %D/etc/ezb.conf ] ; then cp -p %D/%F %B/ezb.conf; fi
 sbin/ezbounce
 %%MDIDENTD%%sbin/mdidentd
-%%PORTDOCS%%share/doc/ezbounce/CHANGES
-%%PORTDOCS%%share/doc/ezbounce/README
-%%PORTDOCS%%share/doc/ezbounce/TODO
-%%PORTDOCS%%share/doc/ezbounce/worklog
-%%MDIDENTD%%%%PORTDOCS%%share/doc/ezbounce/mdidentd.README
-%%PORTDOCS%%@dirrm share/doc/ezbounce
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%SSL%%%%DOCSDIR%%/README.SSL
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/worklog
+%%MDIDENTD%%%%PORTDOCS%%%%DOCSDIR%%/mdidentd.README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/irc/ezbounce/Makefile b/irc/ezbounce/Makefile
index 8f90a79fdad2..bde23a41e49e 100644
--- a/irc/ezbounce/Makefile
+++ b/irc/ezbounce/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	ezbounce
-PORTVERSION=	1.02
-PORTREVISION=	1
+PORTVERSION=	1.04.a
 CATEGORIES=	irc
-MASTER_SITES=  	http://druglord.freelsd.org/ezbounce/
+MASTER_SITES=	http://druglord.freelsd.org/ezbounce/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/a/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A highly configurable IRC Proxy
 
-GNU_CONFIGURE= 	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		ezbounce.1
 
@@ -25,6 +25,23 @@ PLIST_SUB+=	MDIDENTD="@comment "
 PLIST_SUB+=	MDIDENTD=""
 .endif
 
+.if defined(WITH_SSL)
+USE_OPENSSL=	YES
+CONFIGURE_ARGS+=	--with-ssl
+PLIST_SUB+=	SSL=""
+.else
+PLIST_SUB+=	SSL="@comment "
+.endif
+
+pre-everything::
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "	WITH_SSL=yes      Enable SSL support"
+	@${ECHO} "	WITH_MDIDENTD=yes Install the mdidentd binary to"
+	@${ECHO} "                        modify ident replies"
+	@${ECHO} ""
+
 post-patch:
 	@${SED} -e "s:/path/to:${PREFIX}/sbin:" ${WRKSRC}/sample.conf > \
 		${WRKSRC}/ezb.conf.default
@@ -44,15 +61,18 @@ do-install:
 	fi
 
 .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
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/worklog ${DOCSDIR}
 
 .if defined(WITH_MDIDENTD)
 	${INSTALL_DATA} ${WRKSRC}/mdidentd/README \
-		${PREFIX}/share/doc/ezbounce/mdidentd.README
+		${DOCSDIR}/mdidentd.README
+.endif
+.if defined(WITH_SSL)
+	${INSTALL_DATA} ${WRKSRC}/README.SSL ${DOCSDIR}
 .endif
 
 .endif
diff --git a/irc/ezbounce/distinfo b/irc/ezbounce/distinfo
index 6e74a6e473d1..e8ebd58b587b 100644
--- a/irc/ezbounce/distinfo
+++ b/irc/ezbounce/distinfo
@@ -1 +1 @@
-MD5 (ezbounce-1.02.tar.gz) = 66cb545793acf078516ec7f62ae4147a
+MD5 (ezbounce-1.04a.tar.gz) = f214fbd8ec1d95981639c9e1087436cb
diff --git a/irc/ezbounce/files/patch-src-server.cpp b/irc/ezbounce/files/patch-src-server.cpp
deleted file mode 100644
index 8d9417a4fcf7..000000000000
--- a/irc/ezbounce/files/patch-src-server.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/server.cpp	Sun May  5 17:53:00 2002
-+++ src/server.cpp	Mon Jul 22 04:27:26 2002
-@@ -204,7 +204,7 @@
-     if (now)
-     {
-         strcpy(buff, "Server terminating: ");
--        strncat(buff, reason, (sizeof buff) - strlen(buff) + 1);
-+        strncat(buff, reason, (sizeof buff) - (strlen(buff) + 1));
-         conn::broadcast(&conns,buff);
-         ircproxy_save_prefs(users, pcfg.userfile);
-         kill_conns();
-@@ -213,7 +213,7 @@
-     }
-     terminate_request = 1;
-     strcpy(buff, "Terminate request: ");
--    strncat(buff, reason, (sizeof buff) - strlen(buff) + 1);
-+    strncat(buff, reason, (sizeof buff) - (strlen(buff) + 1));
-     conn::broadcast(&conns,buff);
-     ircproxy_save_prefs(users, pcfg.userfile);
-     return 1;
diff --git a/irc/ezbounce/pkg-plist b/irc/ezbounce/pkg-plist
index 8d5793a25083..c380d7827f27 100644
--- a/irc/ezbounce/pkg-plist
+++ b/irc/ezbounce/pkg-plist
@@ -3,9 +3,10 @@ etc/ezb.conf.default
 @exec if [ ! -f %D/etc/ezb.conf ] ; then cp -p %D/%F %B/ezb.conf; fi
 sbin/ezbounce
 %%MDIDENTD%%sbin/mdidentd
-%%PORTDOCS%%share/doc/ezbounce/CHANGES
-%%PORTDOCS%%share/doc/ezbounce/README
-%%PORTDOCS%%share/doc/ezbounce/TODO
-%%PORTDOCS%%share/doc/ezbounce/worklog
-%%MDIDENTD%%%%PORTDOCS%%share/doc/ezbounce/mdidentd.README
-%%PORTDOCS%%@dirrm share/doc/ezbounce
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%SSL%%%%DOCSDIR%%/README.SSL
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/worklog
+%%MDIDENTD%%%%PORTDOCS%%%%DOCSDIR%%/mdidentd.README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%