Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Mar 2014 15:40:01 GMT
From:      Kjetil Rustad <kjetil@cckengine.com>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/187996: [PATCH] irc/ngircd: update to 21.1,1
Message-ID:  <201403291540.s2TFe1SK096372@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/187996; it has been noted by GNATS.

From: Kjetil Rustad <kjetil@cckengine.com>
To: bug-followup@FreeBSD.org, kjetil@cckengine.com
Cc:  
Subject: Re: ports/187996: [PATCH] irc/ngircd: update to 21.1,1
Date: Sat, 29 Mar 2014 16:26:52 +0100

 This is a multi-part message in MIME format.
 --------------020405030703070203060201
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 In addition to updating to 21.1,1
 
 Updating MASTER_SITES
 - BerliOS mirror will be unreachable in the future and therefore removed.
 - New mirror added.
 
 Fixing portlint warnings:
 - changing LIB_DEPENDS to new format.
 - renaming patch files to conform to standards.
 
 --------------020405030703070203060201
 Content-Type: text/plain; charset=UTF-8;
  name="patch_rev2.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch_rev2.txt"
 
 diff -ruN ../ngircd.orig/Makefile ./Makefile
 --- ../ngircd.orig/Makefile	2014-03-27 01:12:39.000000000 +0100
 +++ ./Makefile	2014-03-29 15:02:03.000000000 +0100
 @@ -2,11 +2,11 @@
  # $FreeBSD: head/irc/ngircd/Makefile 333229 2013-11-08 14:17:56Z wg $
  
  PORTNAME=	ngircd
 -PORTVERSION=	21
 +PORTVERSION=	21.1
  PORTEPOCH=	1
  CATEGORIES=	irc ipv6
 -MASTER_SITES=	ftp://ftp.berlios.de/pub/%SUBDIR%/ \
 -		http://arthur.barton.de/pub/%SUBDIR%/
 +MASTER_SITES=	http://ngircd.barton.de/pub/%SUBDIR%/ \
 +	        http://ngircd.mirror.3rz.org/pub/%SUBDIR%/
  MASTER_SITE_SUBDIR=	${PORTNAME}
  
  MAINTAINER=	ports@FreeBSD.org
 @@ -55,7 +55,7 @@
  
  .if ${PORT_OPTIONS:MGNUTLS}
  CONFIGURE_ARGS+=	--with-gnutls
 -LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
 +LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
  .endif
  
  .if empty(PORT_OPTIONS:MIRCPLUS)
 @@ -63,7 +63,7 @@
  .endif
  
  .if ${PORT_OPTIONS:MIDENT}
 -LIB_DEPENDS+=		ident:${PORTSDIR}/security/libident
 +LIB_DEPENDS+=		libident.so:${PORTSDIR}/security/libident
  CONFIGURE_ARGS+=	--with-ident
  .endif
  
 diff -ruN ../ngircd.orig/distinfo ./distinfo
 --- ../ngircd.orig/distinfo	2014-03-27 01:12:39.000000000 +0100
 +++ ./distinfo	2014-03-27 01:16:37.000000000 +0100
 @@ -1,2 +1,2 @@
 -SHA256 (ngircd-21.tar.gz) = 0edbd41304186e43f9d907a7017b40520cc90c2ce29b1339bdcd7622fffe19a0
 -SIZE (ngircd-21.tar.gz) = 500668
 +SHA256 (ngircd-21.1.tar.gz) = 96083ae7dbc5df852efc904fff4800959f103554de2c6d096deaa5408135f59e
 +SIZE (ngircd-21.1.tar.gz) = 503084
 diff -ruN ../ngircd.orig/files/patch-doc-Makefile.in ./files/patch-doc-Makefile.in
 --- ../ngircd.orig/files/patch-doc-Makefile.in	2014-03-27 01:12:39.000000000 +0100
 +++ ./files/patch-doc-Makefile.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,41 +0,0 @@
 ---- 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)/; \
 -@@ -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:
 -@@ -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/files/patch-doc__Makefile.in ./files/patch-doc__Makefile.in
 --- ../ngircd.orig/files/patch-doc__Makefile.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/patch-doc__Makefile.in	2014-03-27 02:36:33.000000000 +0100
 @@ -0,0 +1,41 @@
 +--- doc/Makefile.in.orig	2014-03-25 13:48:41.000000000 +0000
 ++++ doc/Makefile.in	2014-03-27 01:33:25.000000000 +0000
 +@@ -590,6 +590,7 @@
 + 	@if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
 + 	  make install-config; \
 + 	 fi
 ++.if !defined(NOPORTDOCS)
 + 	$(MKDIR_P) -m 755 $(DESTDIR)$(docdir)
 + 	for f in $(static_docs) $(toplevel_docs); do \
 + 	  $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \
 +@@ -597,12 +598,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:
 +@@ -612,12 +614,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/files/patch-man::Makefile.in ./files/patch-man::Makefile.in
 --- ../ngircd.orig/files/patch-man::Makefile.in	2014-03-27 01:12:39.000000000 +0100
 +++ ./files/patch-man::Makefile.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,10 +0,0 @@
 ---- man/Makefile.in.orig	2010-11-07 08:25:30.000000000 -0800
 -+++ man/Makefile.in	2010-12-07 12:38:35.848917613 -0800
 -@@ -36,7 +36,6 @@
 - install_sh_PROGRAM = $(install_sh) -c
 - install_sh_SCRIPT = $(install_sh) -c
 - INSTALL_HEADER = $(INSTALL_DATA)
 --transform = $(program_transform_name)
 - NORMAL_INSTALL = :
 - PRE_INSTALL = :
 - POST_INSTALL = :
 diff -ruN ../ngircd.orig/files/patch-man__Makefile.in ./files/patch-man__Makefile.in
 --- ../ngircd.orig/files/patch-man__Makefile.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/patch-man__Makefile.in	2014-01-22 18:40:44.000000000 +0100
 @@ -0,0 +1,10 @@
 +--- man/Makefile.in.orig	2010-11-07 08:25:30.000000000 -0800
 ++++ man/Makefile.in	2010-12-07 12:38:35.848917613 -0800
 +@@ -36,7 +36,6 @@
 + install_sh_PROGRAM = $(install_sh) -c
 + install_sh_SCRIPT = $(install_sh) -c
 + INSTALL_HEADER = $(INSTALL_DATA)
 +-transform = $(program_transform_name)
 + NORMAL_INSTALL = :
 + PRE_INSTALL = :
 + POST_INSTALL = :
 diff -ruN ../ngircd.orig/files/patch-src::ngircd_Makefile.in ./files/patch-src::ngircd_Makefile.in
 --- ../ngircd.orig/files/patch-src::ngircd_Makefile.in	2014-03-27 01:12:39.000000000 +0100
 +++ ./files/patch-src::ngircd_Makefile.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,10 +0,0 @@
 ---- src/ngircd/Makefile.in.orig	2010-11-07 08:25:30.000000000 -0800
 -+++ src/ngircd/Makefile.in	2010-12-07 12:39:20.309256054 -0800
 -@@ -35,7 +35,6 @@
 - install_sh_PROGRAM = $(install_sh) -c
 - install_sh_SCRIPT = $(install_sh) -c
 - INSTALL_HEADER = $(INSTALL_DATA)
 --transform = $(program_transform_name)
 - NORMAL_INSTALL = :
 - PRE_INSTALL = :
 - POST_INSTALL = :
 diff -ruN ../ngircd.orig/files/patch-src__ngircd__Makefile.in ./files/patch-src__ngircd__Makefile.in
 --- ../ngircd.orig/files/patch-src__ngircd__Makefile.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./files/patch-src__ngircd__Makefile.in	2014-01-22 18:40:44.000000000 +0100
 @@ -0,0 +1,10 @@
 +--- src/ngircd/Makefile.in.orig	2010-11-07 08:25:30.000000000 -0800
 ++++ src/ngircd/Makefile.in	2010-12-07 12:39:20.309256054 -0800
 +@@ -35,7 +35,6 @@
 + install_sh_PROGRAM = $(install_sh) -c
 + install_sh_SCRIPT = $(install_sh) -c
 + INSTALL_HEADER = $(INSTALL_DATA)
 +-transform = $(program_transform_name)
 + NORMAL_INSTALL = :
 + PRE_INSTALL = :
 + POST_INSTALL = :
 
 --------------020405030703070203060201--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403291540.s2TFe1SK096372>