From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 2 10:10:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7958F395 for ; Fri, 2 May 2014 10:10:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 654D31442 for ; Fri, 2 May 2014 10:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s42AA1gb034766 for ; Fri, 2 May 2014 10:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s42AA1Uu034765; Fri, 2 May 2014 10:10:01 GMT (envelope-from gnats) Date: Fri, 2 May 2014 10:10:01 GMT Message-Id: <201405021010.s42AA1Uu034765@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: Alexander Subject: Re: ports/189198: [patch] net-mgmt/cnagios update to 0.31 and add stage support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Alexander List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 May 2014 10:10:01 -0000 The following reply was made to PR ports/189198; it has been noted by GNATS. From: Alexander To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/189198: [patch] net-mgmt/cnagios update to 0.31 and add stage support Date: Fri, 2 May 2014 14:01:41 +0400 --LZvS9be/3tNcYl/X Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Looks like portlint wants extra '\n' at the end of pkg-plist. Also, I noticed that Cnagios still reports v.0.30 (and no mention of v.0.31 in CHANGES). Not sure if we should do something about it, but I made some changes in your diff file to fix it. If mentioned above not matters, then I think your patch is ok. --LZvS9be/3tNcYl/X Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="cnagios-0.31.diff" Index: Makefile =================================================================== --- Makefile (revision 352778) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cnagios -PORTVERSION= 0.30 +PORTVERSION= 0.31 CATEGORIES= net-mgmt MASTER_SITES= ftp://noc.hep.wisc.edu/src/cnagios/ \ ftp://noc.hep.wisc.edu/src/cnagios/old-versions/ @@ -24,18 +24,4 @@ USES= perl5 ALL_TARGET= cnagios -MAN1= cnagios.1 - -NO_STAGE= yes -post-install: - @if [ ! -f ${ETCDIR}/cnagiosrc ]; then \ - ${CP} -p ${ETCDIR}/cnagiosrc.sample ${ETCDIR}/cnagiosrc ; \ - fi - @if [ ! -f ${ETCDIR}/cnagios.help ]; then \ - ${CP} -p ${ETCDIR}/cnagios.help.sample ${ETCDIR}/cnagios.help ; \ - fi - @if [ ! -f ${ETCDIR}/cnagios.pl ]; then \ - ${CP} -p ${ETCDIR}/cnagios.pl.sample ${ETCDIR}/cnagios.pl ; \ - fi - .include Index: distinfo =================================================================== --- distinfo (revision 352778) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (cnagios-0.30.tar.gz) = a07774a0eb3b459192a658102024d874d1ff76f9f1f7fe8f206ecb0036ff1438 -SIZE (cnagios-0.30.tar.gz) = 81813 +SHA256 (cnagios-0.31.tar.gz) = 26c1658f53bae66b9cb4d615c002a051343cd42dcd0adeb180390d2f6069ab52 +SIZE (cnagios-0.31.tar.gz) = 82058 Index: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 352778) +++ files/patch-Makefile.in (working copy) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2011-03-28 17:45:52.000000000 +0200 -+++ Makefile.in 2012-05-25 19:38:11.948782413 +0200 -@@ -27,39 +27,20 @@ +--- ./Makefile.in.orig 2013-03-28 22:35:00.000000000 +0100 ++++ ./Makefile.in 2014-05-01 14:23:32.000000000 +0200 +@@ -27,39 +27,11 @@ install: @@ -8,12 +8,12 @@ - echo mv @prefix@/bin/cnagios @prefix@/bin/cnagios.OLD ; \ - mv @prefix@/bin/cnagios @prefix@/bin/cnagios.OLD ; \ - fi - @echo installing cnagios in @prefix@/bin - @$(INSTALL) -c -m 755 cnagios @prefix@/bin/cnagios - - @echo installing cnagios.1 in @prefix@/man/man1 - @$(INSTALL) -c -m 755 cnagios.1 @prefix@/man/man1/cnagios.1 - +- @echo installing cnagios in @prefix@/bin +- @$(INSTALL) -c -m 755 cnagios @prefix@/bin/cnagios +- +- @echo installing cnagios.1 in @prefix@/man/man1 +- @$(INSTALL) -c -m 755 cnagios.1 @prefix@/man/man1/cnagios.1 +- - @if [ ! -f @NAGIOS_ETC_DIR@/cnagiosrc ]; then \ - echo installing cnagiosrc in @NAGIOS_ETC_DIR@ ; \ - $(INSTALL) -c -m 644 cnagiosrc @NAGIOS_ETC_DIR@/cnagiosrc ; \ @@ -21,9 +21,7 @@ - echo installing cnagiosrc as @NAGIOS_ETC_DIR@/cnagiosrc.NEW ; \ - $(INSTALL) -c -m 644 cnagiosrc @NAGIOS_ETC_DIR@/cnagiosrc.NEW ; \ - fi -+ echo installing cnagiosrc.sample in @NAGIOS_ETC_DIR@ -+ $(INSTALL) -c -m 644 cnagiosrc @NAGIOS_ETC_DIR@/cnagiosrc.sample - +- - @if [ ! -f @NAGIOS_ETC_DIR@/cnagios.help ]; then \ - echo installing cnagios.help in @NAGIOS_ETC_DIR@ ; \ - $(INSTALL) -c -m 644 cnagios.help @NAGIOS_ETC_DIR@/cnagios.help ; \ @@ -31,9 +29,7 @@ - echo installing cnagios.help as @NAGIOS_ETC_DIR@/cnagios.help.NEW ; \ - $(INSTALL) -c -m 644 cnagios.help @NAGIOS_ETC_DIR@/cnagios.help.NEW ; \ - fi -+ echo installing cnagios.help.sample in @NAGIOS_ETC_DIR@ -+ $(INSTALL) -c -m 644 cnagios.help @NAGIOS_ETC_DIR@/cnagios.help.sample - +- - @if [ ! -f @NAGIOS_ETC_DIR@/cnagios.pl ]; then \ - echo installing cnagios.pl in @NAGIOS_ETC_DIR@ ; \ - $(INSTALL) -c -m 644 cnagios.pl @NAGIOS_ETC_DIR@/cnagios.pl ; \ @@ -41,8 +37,11 @@ - echo installing cnagios.pl as @NAGIOS_ETC_DIR@/cnagios.pl.NEW ; \ - $(INSTALL) -c -m 644 cnagios.pl @NAGIOS_ETC_DIR@/cnagios.pl.NEW ; \ - fi -+ echo installing cnagios.pl in @NAGIOS_ETC_DIR@ -+ $(INSTALL) -c -m 644 cnagios.pl @NAGIOS_ETC_DIR@/cnagios.pl.sample ++ $(INSTALL) -c -m 755 cnagios $(DESTDIR)@prefix@/bin/cnagios ++ $(INSTALL) -c -m 444 cnagios.1 $(DESTDIR)@prefix@/man/man1/cnagios.1 ++ $(INSTALL) -c -m 644 cnagiosrc $(DESTDIR)@NAGIOS_ETC_DIR@/cnagiosrc.sample ++ $(INSTALL) -c -m 644 cnagios.help $(DESTDIR)@NAGIOS_ETC_DIR@/cnagios.help.sample ++ $(INSTALL) -c -m 644 cnagios.pl $(DESTDIR)@NAGIOS_ETC_DIR@/cnagios.pl.sample install2: @if [ -f /usr/local/bin/cnagios ]; then \ Index: files/patch-version.h =================================================================== --- files/patch-version.h (revision 0) +++ files/patch-version.h (working copy) @@ -0,0 +1,5 @@ +--- ./version.h.orig 2014-05-02 12:07:02.223146443 +0400 ++++ ./version.h 2013-03-29 01:35:00.000000000 +0400 +@@ -1 +1 @@ +-#define VERSION "0.30" ++#define VERSION "0.31" Property changes on: files/patch-version.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 352778) +++ pkg-plist (working copy) @@ -1,10 +1,6 @@ bin/cnagios -@unexec if cmp -s %D/%%ETCDIR%%/cnagiosrc.sample %D/%%ETCDIR%%/cnagiosrc; then rm -f %D/%%ETCDIR%%/cnagiosrc; fi -%%ETCDIR%%/cnagiosrc.sample -@exec if [ ! -f %D/%%ETCDIR%%/cnagiosrc ] ; then cp -p %D/%F %B/cnagiosrc; fi -@unexec if cmp -s %D/%%ETCDIR%%/cnagios.help.sample %D/%%ETCDIR%%/cnagios.help; then rm -f %D/%%ETCDIR%%/cnagios.help; fi -%%ETCDIR%%/cnagios.help.sample -@exec if [ ! -f %D/%%ETCDIR%%/cnagios.help ] ; then cp -p %D/%F %B/cnagios.help; fi -@unexec if cmp -s %D/%%ETCDIR%%/cnagios.pl.sample %D/%%ETCDIR%%/cnagios.pl; then rm -f %D/%%ETCDIR%%/cnagios.pl; fi -%%ETCDIR%%/cnagios.pl.sample -@exec if [ ! -f %D/%%ETCDIR%%/cnagios.pl ] ; then cp -p %D/%F %B/cnagios.pl; fi +@sample %%ETCDIR%%/cnagios.help.sample +@sample %%ETCDIR%%/cnagios.pl.sample +@sample %%ETCDIR%%/cnagiosrc.sample +man/man1/cnagios.1.gz + --LZvS9be/3tNcYl/X--