From skreuzer@FreeBSD.org  Tue Mar 25 15:16:25 2014
Return-Path: <skreuzer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 410946F8;
	Tue, 25 Mar 2014 15:16:25 +0000 (UTC)
Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [IPv6:2001:4b98:c:538::195])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 01C53A47;
	Tue, 25 Mar 2014 15:16:25 +0000 (UTC)
Received: from mfilter32-d.gandi.net (mfilter32-d.gandi.net [217.70.178.163])
	by relay3-d.mail.gandi.net (Postfix) with ESMTP id 29E5EA80AC;
	Tue, 25 Mar 2014 16:16:22 +0100 (CET)
Received: from relay3-d.mail.gandi.net ([217.70.183.195])
	by mfilter32-d.gandi.net (mfilter32-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024)
	with ESMTP id oLi+plnBTxG8; Tue, 25 Mar 2014 16:16:20 +0100 (CET)
Received: from clamps.exit2shell.com (clamps.freebsd.your.org [216.14.102.10])
	(Authenticated sender: steven@kreuzer.cx)
	by relay3-d.mail.gandi.net (Postfix) with ESMTPA id 40673A80EB;
	Tue, 25 Mar 2014 16:16:19 +0100 (CET)
Received: by clamps.exit2shell.com (sSMTP sendmail emulation); Tue, 25 Mar 2014 15:16:17 +0000
Date: Tue, 25 Mar 2014 15:16:17 +0000
From: Steven Kreuzer <skreuzer@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: cy@FreeBSD.org
Subject: [PATCH] sysutils/cfengine35: Set sys.crontab to correct path on FreeBSD
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         187936
>Category:       ports
>Synopsis:       [PATCH] sysutils/cfengine35: Set sys.crontab to correct path on FreeBSD
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    cy
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 25 15:20:01 UTC 2014
>Closed-Date:    Wed Mar 26 13:09:26 UTC 2014
>Last-Modified:  Wed Mar 26 22:04:52 UTC 2014
>Originator:     Steven Kreuzer
>Release:        FreeBSD 9.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD clamps.exit2shell.com 9.1-RELEASE-p5 FreeBSD 9.1-RELEASE-p5 #0: Sat Jul 27 01:01:40 UTC 2013
>Description:
Correctly expand $(sys.crontab) on FreeBSD
Define LICENSE
Update LIB_DEPENDS to new format

Port maintainer (cy@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.02.11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- cfengine35-3.5.3.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 349151)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -11,6 +11,8 @@
 #		gjb@FreeBSD.org is also committer for this port
 COMMENT=	A systems administration tool for networks
 
+LICENSE=	GPLv3
+
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	35
 LATEST_LINK=	cfengine35
@@ -51,12 +53,12 @@
 
 .if ${PORT_OPTIONS:MTOKYOCABINET}
 CONFIGURE_ARGS+=	--with-tokyocabinet=${LOCALBASE}
-LIB_DEPENDS+=	libtokyocabinet.so.9:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
 .endif
 
 .if ${PORT_OPTIONS:MQDBM}
 CONFIGURE_ARGS+=	--with-qdbm=${LOCALBASE}
-LIB_DEPENDS+=	libqdbm.so.14:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
Index: files/patch-libpromises-sysinfo.c
===================================================================
--- files/patch-libpromises-sysinfo.c	(revision 0)
+++ files/patch-libpromises-sysinfo.c	(working copy)
@@ -0,0 +1,13 @@
+--- libpromises/sysinfo.c.orig	2013-12-09 12:13:14.000000000 +0000
++++ libpromises/sysinfo.c	2014-03-25 14:30:28.000000000 +0000
+@@ -1075,6 +1075,10 @@
+         {
+             snprintf(vbuff, CF_BUFSIZE, "/var/spool/cron/%s", pw->pw_name);
+         }
++        else if (IsDefinedClass(ctx, "freebsd", NULL))
++        {
++            snprintf(vbuff, CF_BUFSIZE, "/var/cron/tabs/%s", pw->pw_name);
++        }
+         else
+         {
+             snprintf(vbuff, CF_BUFSIZE, "/var/spool/cron/crontabs/%s", pw->pw_name);

Property changes on: files/patch-libpromises-sysinfo.c
___________________________________________________________________
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
--- cfengine35-3.5.3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->cy 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Mar 25 15:20:05 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187936 

Date: Tue, 25 Mar 2014 18:29:10 -0700
From: Cy Schubert <Cy.Schubert@komquats.com>
Reply-To: Cy Schubert <Cy.Schubert@komquats.com>
To: Steven Kreuzer <skreuzer@FreeBSD.org>
Subject: Re: [PATCH] sysutils/cfengine35: Set sys.crontab to correct path 
 on FreeBSD

 Hey Steve,
 
 Go ahead and commit this for me.
 
 We probably need the same for the other cfengine ports. Would you mind 
 terribly?
 
 Thanks.
 
 
 -- 
 Cheers,
 Cy Schubert <Cy.Schubert@komquats.com>
 FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  http://www.FreeBSD.org
 
 	The need of the many outweighs the greed of the few.

Date: Tue, 25 Mar 2014 21:32:23 -0400
From: Glen Barber <gjb@FreeBSD.org>
To: Cy Schubert <Cy.Schubert@komquats.com>
Subject: Re: [PATCH] sysutils/cfengine35: Set sys.crontab to correct path on
 FreeBSD

 --vOmOzSkFvhd7u8Ms
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Tue, Mar 25, 2014 at 06:29:10PM -0700, Cy Schubert wrote:
 > We probably need the same for the other cfengine ports. Would you mind=20
 > terribly?
 >=20
 
 FWIW, there are a huge number of linux-isms that are rather annoying.
 
 Steve, would you mind also submitting the patch upstream?  I think it is
 very important that they are aware FreeBSD consumers are also Cfengine
 consumers.
 
 Glen
 
 
 --vOmOzSkFvhd7u8Ms
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (FreeBSD)
 
 iQIcBAEBCAAGBQJTMi4nAAoJELls3eqvi17QnbEP/1GQKs2uRhhADSZ74f2eJIYd
 qTOObtZX+9dWsqHh9ln5pyrbJvX+MkZr/lkh7gWVM+LCLaBt7nbeVOA8UpITYVqX
 l4KBZXnggB2n65P3NLyxxtw28YJLE7UXd8cqxzdHqZhiudfaDn8E1+gjPPcgGtKG
 GI/TyjePwAJm2xWYk2M97rARqLZNxWgi20feAhH5rzUEk1IxTj9iu+eq5PznakvS
 J6MDi9A/szjkjrWDDAOE9z5cy0ts33e7+2o2hQ5TzPRp02wSCE9LiWBHxZEL0g2g
 u/7RDmILbK/lp8NkFtM9KgU5yGw1vAPPol+ZEWPDIyowuIJOCmhaTn4g+KGVFkGv
 RfZk88PyY0JJaYjX7Vx/hpOziQ7Xp58+DHOkzS9hV77s6V2/XHXHuU+4NNim9Kl0
 yiwEOqFBDJNT/QaGxQAdF+9BWwQsGbofsjpFN0EL6zfS9lsTH+loMEUTe4xbknIG
 cH6DtSQu9zFbA83uEVa76SRhgYCzOAwEXBqQj3eU8R8V6l6IaMkOl4iPm/EYuD7/
 Jj9qj/FAU/JsvKo22+nQAD0TdjPoxHv1a5tatr2YSXMZyDudcQTK8arbwSlKZtuq
 DiN2+PHPVTQ85zN3Ch9f2V5S4Xy/n57M02QAJ1cpvkYmN72NZutTGqQJuNmiEofP
 EkKxVV+HDXDGtxHW9uBi
 =KvpJ
 -----END PGP SIGNATURE-----
 
 --vOmOzSkFvhd7u8Ms--

Date: Wed, 26 Mar 2014 09:18:09 -0400
From: Steven Kreuzer <skreuzer@freebsd.org>
Sender: sjk4015@gmail.com
To: Cy Schubert <Cy.Schubert@komquats.com>
Subject: Re: [PATCH] sysutils/cfengine35: Set sys.crontab to correct path on FreeBSD

 On Tue, Mar 25, 2014 at 9:29 PM, Cy Schubert <Cy.Schubert@komquats.com> wrote:
 > Go ahead and commit this for me.
 
 Great. Its been committed. Thanks!
 
 > We probably need the same for the other cfengine ports. Would you mind
 > terribly?
 
 I sent cfengine a patch a while ago for their 3.6 branch and it made
 it into 3.6.0b1
 so nothing needs to be done with the cfengine-devel port. I suppose this is also
 broken in 3.4 so I will take a look

Date: Wed, 26 Mar 2014 12:53:44 -0700
From: Cy Schubert <Cy.Schubert@komquats.com>
Reply-To: Cy Schubert <Cy.Schubert@komquats.com>
To: Steven Kreuzer <skreuzer@freebsd.org>
Subject: Re: [PATCH] sysutils/cfengine35: Set sys.crontab to correct path 
 on FreeBSD

 In message <CAFFB+pS22DKSbu5oOLXSKaFG-kQvoy=BuCd3Uwmxjj+AyZwn_g@mail.gmail.com>
 > I suppose this is also broken in 3.4 so I will take a look
 
 Great! Thanks!
 
 
 -- 
 Cheers,
 Cy Schubert <Cy.Schubert@komquats.com>
 FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  http://www.FreeBSD.org
 
 	The need of the many outweighs the greed of the few.

State-Changed-From-To: open->closed 
State-Changed-By: skreuzer 
State-Changed-When: Wed Mar 26 13:09:25 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187936 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187936: commit references a PR
Date: Wed, 26 Mar 2014 13:09:10 +0000 (UTC)

 Author: skreuzer
 Date: Wed Mar 26 13:09:02 2014
 New Revision: 349249
 URL: http://svnweb.freebsd.org/changeset/ports/349249
 QAT: https://qat.redports.org/buildarchive/r349249/
 
 Log:
   Correctly expand $(sys.crontab) on FreeBSD
   Define LICENSE
   Update LIB_DEPENDS to new format
   
   PR:		ports/187936
   Approved by:	cy@FreeBSD.org (maintainer)
 
 Added:
   head/sysutils/cfengine35/files/patch-libpromises-sysinfo.c   (contents, props changed)
 Modified:
   head/sysutils/cfengine35/Makefile
 
 Modified: head/sysutils/cfengine35/Makefile
 ==============================================================================
 --- head/sysutils/cfengine35/Makefile	Wed Mar 26 13:07:07 2014	(r349248)
 +++ head/sysutils/cfengine35/Makefile	Wed Mar 26 13:09:02 2014	(r349249)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	cfengine
  PORTVERSION=	3.5.3
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	sysutils
  MASTER_SITES=	http://cfengine.com/source-code/download?file=
  
 @@ -11,6 +11,8 @@ MAINTAINER=	cy@FreeBSD.org
  #		gjb@FreeBSD.org is also committer for this port
  COMMENT=	A systems administration tool for networks
  
 +LICENSE=	GPLv3
 +
  .if !defined(MASTERDIR)
  PKGNAMESUFFIX=	35
  LATEST_LINK=	cfengine35
 @@ -51,12 +53,12 @@ OPTIONS_DEFAULT=TOKYOCABINET
  
  .if ${PORT_OPTIONS:MTOKYOCABINET}
  CONFIGURE_ARGS+=	--with-tokyocabinet=${LOCALBASE}
 -LIB_DEPENDS+=	libtokyocabinet.so.9:${PORTSDIR}/databases/tokyocabinet
 +LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
  .endif
  
  .if ${PORT_OPTIONS:MQDBM}
  CONFIGURE_ARGS+=	--with-qdbm=${LOCALBASE}
 -LIB_DEPENDS+=	libqdbm.so.14:${PORTSDIR}/databases/qdbm
 +LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
  .endif
  
  .if ${PORT_OPTIONS:MPGSQL}
 
 Added: head/sysutils/cfengine35/files/patch-libpromises-sysinfo.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/sysutils/cfengine35/files/patch-libpromises-sysinfo.c	Wed Mar 26 13:09:02 2014	(r349249)
 @@ -0,0 +1,13 @@
 +--- libpromises/sysinfo.c.orig	2013-12-09 12:13:14.000000000 +0000
 ++++ libpromises/sysinfo.c	2014-03-25 14:30:28.000000000 +0000
 +@@ -1075,6 +1075,10 @@
 +         {
 +             snprintf(vbuff, CF_BUFSIZE, "/var/spool/cron/%s", pw->pw_name);
 +         }
 ++        else if (IsDefinedClass(ctx, "freebsd", NULL))
 ++        {
 ++            snprintf(vbuff, CF_BUFSIZE, "/var/cron/tabs/%s", pw->pw_name);
 ++        }
 +         else
 +         {
 +             snprintf(vbuff, CF_BUFSIZE, "/var/spool/cron/crontabs/%s", pw->pw_name);
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: closed->closed 
State-Changed-By: linimon 
State-Changed-When: Wed Mar 26 21:59:28 UTC 2014 
State-Changed-Why:  
appending misfiled PRs. 


Responsible-Changed-From-To: cy->cy 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Mar 26 21:59:28 UTC 2014 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=187936 
>Unformatted:
