ports/176726: [PATCH] irc/ngircd: update to 20.2,1

[Kjetil Rustad]

>Number:         176726
>Category:       ports
>Synopsis:       [PATCH] irc/ngircd: update to 20.2,1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 07 13:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Kjetil Rustad
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
FreeBSD neo 9.1-RELEASE FreeBSD 9.1-RELEASE #2: Tue Nov 27 03:45:16 UTC 2012
>Description:
Update to 20.2,1
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN ../ngircd.orig/Makefile ./Makefile
--- ../ngircd.orig/Makefile	2013-03-07 11:40:17.000000000 +0000
+++ ./Makefile	2013-03-07 11:57:06.000000000 +0000
@@ -2,13 +2,12 @@
 # $FreeBSD: ports/irc/ngircd/Makefile,v 1.44 2013/02/05 16:54:22 svnexp Exp $
 
 PORTNAME=	ngircd
-PORTVERSION=	0.19.2
-PORTREVISION=	1
+PORTVERSION=	20.2
+PORTEPOCH=	1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	ftp://ftp.berlios.de/pub/%SUBDIR%/ \
 		http://arthur.barton.de/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTVERSION=	${PORTVERSION:S/0.//}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Free open source daemon for Internet Relay Chat (IRC)
diff -ruN ../ngircd.orig/distinfo ./distinfo
--- ../ngircd.orig/distinfo	2013-03-07 11:40:17.000000000 +0000
+++ ./distinfo	2013-03-07 11:44:24.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (ngircd-19.2.tar.gz) = bf1d5bc7554863e295d3175483f5bb01ccb0acf06a64ba9bb222150b808cf34d
-SIZE (ngircd-19.2.tar.gz) = 490590
+SHA256 (ngircd-20.2.tar.gz) = 306c0ef0d2ceac0836a84ecf871a6bc4dd16c25683aa87c0f172b6e68b93357d
+SIZE (ngircd-20.2.tar.gz) = 479987
diff -ruN ../ngircd.orig/files/patch-doc-Makefile.in ./files/patch-doc-Makefile.in
--- ../ngircd.orig/files/patch-doc-Makefile.in	2013-03-07 11:40:17.000000000 +0000
+++ ./files/patch-doc-Makefile.in	2013-03-07 12:20:56.000000000 +0000
@@ -1,21 +1,41 @@
---- doc/Makefile.in.orig	2010-11-07 17:25:30.000000000 +0100
-+++ doc/Makefile.in	2010-12-11 06:14:18.000000000 +0100
-@@ -505,8 +505,9 @@
- install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- 	if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
--	  $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \
-+	  $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf.sample; \
+--- doc/Makefile.in.orig	2013-02-15 11:30:58.000000000 +0000
++++ doc/Makefile.in	2013-03-07 12:19:53.000000000 +0000
+@@ -588,6 +588,7 @@
+ 	@if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
+ 	  make install-config; \
  	 fi
 +.if !defined(NOPORTDOCS)
  	$(mkinstalldirs) $(DESTDIR)$(docdir)
  	for f in $(static_docs) $(toplevel_docs); do \
  	  $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \
-@@ -514,6 +515,7 @@
+@@ -595,12 +596,13 @@
  	for f in $(generated_docs); do \
  	  $(INSTALL) -m 644 -c $$f $(DESTDIR)$(docdir)/; \
  	 done
 +.endif
  
+ install-config:
+-	$(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf
++	$(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf.sample
+ 	@echo; \
+ 	 echo " ** NOTE: Installed sample configuration file:"; \
+-	 echo " ** \"$(DESTDIR)$(sysconfdir)/ngircd.conf\""; \
++	 echo " ** \"$(DESTDIR)$(sysconfdir)/ngircd.conf.sample\""; \
+ 	 echo
+ 
  uninstall-hook:
- 	rm -rf $(DESTDIR)$(docdir)
+@@ -610,12 +612,12 @@
+ 	 else \
+ 	  echo; \
+ 	  echo " ** NOTE: Not uninstalling changed configuration file:"; \
+-	  echo " ** \"$(DESTDIR)$(sysconfdir)/ngircd.conf\""; \
++	  echo " ** \"$(DESTDIR)$(sysconfdir)/ngircd.conf.sample\""; \
+ 	  echo; \
+ 	 fi
+ 
+ uninstall-config:
+-	rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf
++	rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf.sample
+ 
+ srcdoc:
+ 	make -C src srcdoc
diff -ruN ../ngircd.orig/pkg-plist ./pkg-plist
--- ../ngircd.orig/pkg-plist	2013-03-07 11:40:17.000000000 +0000
+++ ./pkg-plist	2013-03-07 12:27:14.000000000 +0000
@@ -4,6 +4,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/Bopm.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/Capabilities.txt
+%%PORTDOCS%%%%DOCSDIR%%/Contributing.txt
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/GIT.txt


>Release-Note:
>Audit-Trail:
>Unformatted: