svn commit: r366523 - head/irc/ircII

[Adam Weinberger]

Author: adamw
Date: Fri Aug 29 15:56:59 2014
New Revision: 366523
URL: http://svnweb.freebsd.org/changeset/ports/366523
QAT: https://qat.redports.org/buildarchive/r366523/

Log:
  Update to 20140824.
  
  Big ticket change is SSL support. OPENSSL option
  added, defaults to on.

Modified:
  head/irc/ircII/Makefile
  head/irc/ircII/distinfo
  head/irc/ircII/pkg-plist

Modified: head/irc/ircII/Makefile
==============================================================================
--- head/irc/ircII/Makefile	Fri Aug 29 15:43:13 2014	(r366522)
+++ head/irc/ircII/Makefile	Fri Aug 29 15:56:59 2014	(r366523)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ircii
-PORTVERSION=	20131230
-PORTREVISION=	1
+PORTVERSION=	20140824
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://ircii.warped.com/
 
@@ -16,26 +15,30 @@ GNU_CONFIGURE=	yes
 DATADIR=	${PREFIX}/share/irc
 USES=		tar:bzip2
 
-OPTIONS_DEFINE=	IRCBUG EMACS_KEYS
+OPTIONS_DEFINE=	IRCBUG EMACS_KEYS OPENSSL
+OPTIONS_DEFAULT=OPENSSL
+OPTIONS_SUB=	yes
+
 IRCBUG_DESC=	Install ircII bug-reporting script
 EMACS_KEYS_DESC=Use emacs meta keys
-OPTIONS_SUB=	yes
 
 EMACS_KEYS_CONFIGURE_WITH=	emacs-meta-keys
+OPENSSL_USE=			OPENSSL=yes
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MOPENSSL}
+CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
+.else
+CONFIGURE_ARGS+=	--without-openssl
+.endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/irc ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/ircflush ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/ircbug ${STAGEDIR}${PREFIX}/bin
-
-	${INSTALL_PROGRAM} ${WRKSRC}/ircio ${STAGEDIR}${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/wserv ${STAGEDIR}${PREFIX}/libexec
-
-	${INSTALL_MAN} ${WRKSRC}/doc/ircII.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/ircbug.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${LN} -sf ircII.1 ${STAGEDIR}${MANPREFIX}/man/man1/irc.1
+post-patch:
+	@${REINPLACE_CMD} -e '/^mandir =/s/@mandir@/$$(DESTDIR)&/' \
+		-e '/^LDFLAGS =/s/$$/ -s/' \
+		${WRKSRC}/Makefile.in
 
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} "help script" ${STAGEDIR}${DATADIR})
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/irc-${PORTVERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/irc/ircII/distinfo
==============================================================================
--- head/irc/ircII/distinfo	Fri Aug 29 15:43:13 2014	(r366522)
+++ head/irc/ircII/distinfo	Fri Aug 29 15:56:59 2014	(r366523)
@@ -1,2 +1,2 @@
-SHA256 (ircii-20131230.tar.bz2) = 6effbbb44cfae0f7f688d3ac386366d97a3b5c62bbeec5a251971dda723526ce
-SIZE (ircii-20131230.tar.bz2) = 552149
+SHA256 (ircii-20140824.tar.bz2) = a753eb7cedcd291883d8770cf28232714ca38c6a553e6eda5679480933474333
+SIZE (ircii-20140824.tar.bz2) = 590349

Modified: head/irc/ircII/pkg-plist
==============================================================================
--- head/irc/ircII/pkg-plist	Fri Aug 29 15:43:13 2014	(r366522)
+++ head/irc/ircII/pkg-plist	Fri Aug 29 15:56:59 2014	(r366523)
@@ -313,7 +313,6 @@ man/man1/ircII.1.gz
 %%DATADIR%%/help/redirect
 %%DATADIR%%/help/rehash
 %%DATADIR%%/help/restart
-%%DATADIR%%/help/rules
 %%DATADIR%%/help/save
 %%DATADIR%%/help/say
 %%DATADIR%%/help/send
@@ -412,6 +411,10 @@ man/man1/ircII.1.gz
 %%DATADIR%%/help/set/show_stars
 %%DATADIR%%/help/set/show_status_all
 %%DATADIR%%/help/set/show_who_hopcount
+%%DATADIR%%/help/set/ssl_ca_chain_file
+%%DATADIR%%/help/set/ssl_ca_file
+%%DATADIR%%/help/set/ssl_ca_path
+%%DATADIR%%/help/set/ssl_ca_private_key_file
 %%DATADIR%%/help/set/star_prefix
 %%DATADIR%%/help/set/status_away
 %%DATADIR%%/help/set/status_channel