- update to 0.15

- add options OPENSSL
- add options GNUTLS
- take maintainership for a while

5 files changed, 46 insertions, 39 deletions

diff --git a/irc/ngircd/Makefile b/irc/ngircd/Makefile
index a064576dda08..2e80c0bfaa16 100644
--- a/irc/ngircd/Makefile
+++ b/irc/ngircd/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	ngircd
-PORTVERSION=	0.10.1
+PORTVERSION=	0.15
 CATEGORIES=	irc
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITES=	${MASTER_SITE_BERLIOS} \
+		ftp://ngircd.barton.de/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-15
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Free open source daemon for Internet Relay Chat (IRC)
 
 USE_RC_SUBR=	ngircd
@@ -25,6 +27,8 @@ MAN8=		ngircd.8
 OPTIONS=	TCP_WRAPPERS	"Enable TCP wrappers support"	on \
 		SYSLOG		"Enable SYSLOG support"		on \
 		ZLIB		"Enable ZLIB compression"	on \
+		OPENSSL		"Enable OpenSSL support"	off \
+		GNUTLS		"Enable GnuTLS support"		off \
 		IRCPLUS		"Enable IRC+ protocol"		on \
 		IDENT		"Enable IDENT (AUTH) protocol support"	off \
 		SNIFFER		"Enable IRC traffic sniffer"	off \
@@ -44,6 +48,15 @@ CONFIGURE_ARGS+=	--without-syslog
 CONFIGURE_ARGS+=	--without-zlib
 .endif
 
+.if defined(WITH_OPENSSL)
+CONFIGURE_ARGS+=	--with-openssl
+.endif
+
+.if defined(WITH_GNUTLS)
+CONFIGURE_ARGS+=	--with-gnutls
+USE_OPENSSL=yes
+.endif
+
 .if defined(WITHOUT_IRCPLUS)
 CONFIGURE_ARGS+=	--disable-ircplus
 .endif
diff --git a/irc/ngircd/distinfo b/irc/ngircd/distinfo
index e38698810a9e..b4b747669f7c 100644
--- a/irc/ngircd/distinfo
+++ b/irc/ngircd/distinfo
@@ -1,3 +1,3 @@
-MD5 (ngircd-0.10.1.tar.gz) = d2314beaf6d393b7c13e230b4927b608
-SHA256 (ngircd-0.10.1.tar.gz) = 9ffc677d1bb26cde4ee85eb9cf747cbf49cd781a00d0180371b2c107720f7d09
-SIZE (ngircd-0.10.1.tar.gz) = 308228
+MD5 (ngircd-15.tar.gz) = c183a85eba6fe51255983848f099c8ae
+SHA256 (ngircd-15.tar.gz) = a8109685c950d69f31a3a6b7b64b40fcc30742427542fac9e8f0df83f47616ab
+SIZE (ngircd-15.tar.gz) = 405832
diff --git a/irc/ngircd/files/patch-doc-Makefile.in b/irc/ngircd/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..b4c5c06f29cf
--- /dev/null
+++ b/irc/ngircd/files/patch-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	2009-11-07 14:39:51.000000000 +0100
++++ doc/Makefile.in	2009-12-27 21:14:33.000000000 +0100
+@@ -494,7 +494,7 @@
+ install-data-hook:
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+ 	if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
+-	  $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \
++	  $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf.sample; \
+ 	 fi
+ 	$(mkinstalldirs) $(DESTDIR)$(docdir)
+ 	for f in $(documents); do \
diff --git a/irc/ngircd/files/patch-doc::Makefile.in b/irc/ngircd/files/patch-doc::Makefile.in
deleted file mode 100644
index fa65b15dfbbc..000000000000
--- a/irc/ngircd/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./doc/Makefile.in.orig	2006-12-17 16:07:28.000000000 +0200
-+++ ./doc/Makefile.in	2009-04-08 14:05:21.323301473 +0300
-@@ -159,12 +159,10 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- SUBDIRS = src
--EXTRA_DIST = CVS.txt FAQ.txt Protocol.txt Platforms.txt README-AUX.txt \
--	README-BeOS.txt RFC.txt Zeroconf.txt  sample-ngircd.conf
-+EXTRA_DIST =
- 
- docdir = $(datadir)/doc/$(PACKAGE)
--documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \
--	../NEWS ../README
-+documents = $(EXTRA_DIST)
- 
- all: all-recursive
- 
-@@ -475,13 +473,9 @@
- 
- install-data-hook:
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
--	if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
--	  $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \
-+	if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf.sample ]; then \
-+	  $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf.sample; \
- 	 fi
--	$(mkinstalldirs) $(DESTDIR)$(docdir)
--	for f in $(documents); do \
--	  $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \
--	 done
- 
- uninstall-hook:
- 	rm -rf $(DESTDIR)$(docdir)
diff --git a/irc/ngircd/pkg-plist b/irc/ngircd/pkg-plist
index befede1b4a51..610ab384d4ba 100644
--- a/irc/ngircd/pkg-plist
+++ b/irc/ngircd/pkg-plist
@@ -1,4 +1,20 @@
 etc/ngircd.conf.sample
 sbin/ngircd
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
+%%PORTDOCS%%%%DOCSDIR%%/GIT.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/Platforms.txt
+%%PORTDOCS%%%%DOCSDIR%%/Protocol.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-AUX.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-BeOS.txt
+%%PORTDOCS%%%%DOCSDIR%%/RFC.txt
+%%PORTDOCS%%%%DOCSDIR%%/SSL.txt
+%%PORTDOCS%%%%DOCSDIR%%/Services.txt
+%%PORTDOCS%%%%DOCSDIR%%/Zeroconf.txt
+%%PORTDOCS%%%%DOCSDIR%%/sample-ngircd.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%