ports/77859: [PATCH] sysutils/cfengine: update to 2.1.13

[Sergei Kolobov]

>Number:         77859
>Category:       ports
>Synopsis:       [PATCH] sysutils/cfengine: update to 2.1.13
>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:   Mon Feb 21 13:50:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
Elendil LLC
>Environment:
System: FreeBSD arnor.elendil.ru 5.3-STABLE FreeBSD 5.3-STABLE #0: Thu Dec 30 21:05:17 MSK 2004
>Description:
- Update to 2.1.13
- Minor Makefile tweaks

Port maintainer (paul at aps.org) is cc'd.

Generated with FreeBSD Port Tools 0.70
>How-To-Repeat:
>Fix:

--- cfengine-2.1.13.patch begins here ---
Index: Makefile
===================================================================
RCS file: /FreeBSD/cvs/ports/sysutils/cfengine2/Makefile,v
retrieving revision 1.36
diff -u -u -r1.36 Makefile
--- Makefile	12 Oct 2004 00:11:04 -0000	1.36
+++ Makefile	26 Jan 2005 14:33:31 -0000
@@ -5,13 +5,12 @@
 # $FreeBSD: ports/sysutils/cfengine2/Makefile,v 1.36 2004/10/12 00:11:04 pav Exp $
 #
 
-PORTNAME=	cfengine2
-PORTVERSION=	2.1.10
+PORTNAME=	cfengine
+PORTVERSION=	2.1.13
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	cfengine-${PORTVERSION}
 
 MAINTAINER=	paul at aps.org
 COMMENT=	A systems administration tool for networks
@@ -24,23 +23,20 @@
 
 INFO=		cfengine-Anomalies cfengine-Reference cfengine-Tutorial
 MAN8=		cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 \
-			cfrun.8 cfservd.8
+		cfrun.8 cfservd.8 cfshow.8
 
 WITH_BDB_VER?=	42
 
 .if ${WITH_BDB_VER} == 42
-BDBLIB=		db-4.2.2
-BDBVERSION=	db-4.2
+LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
+CPPFLAGS+=	-I${LOCALBASE}/include/db42
+LDFLAGS+=	-L${LOCALBASE}/lib/db42 -ldb-4.2
 .elif ${WITH_BDB_VER} == 41
-BDBLIB=		db41.1
-BDBVERSION=	db41
+LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
+CPPFLAGS+=	-I${LOCALBASE}/include/db41
+LDFLAGS+=	-L${LOCALBASE}/lib/db41 -ldb41
 .else
 .error WITH_BDB_VER must be 41 or 42
 .endif
 
-LIB_DEPENDS+=	${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
-
-post-patch:
-	@${REINPLACE_CMD} 's|-ldb|-l${BDBVERSION}|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /FreeBSD/cvs/ports/sysutils/cfengine2/distinfo,v
retrieving revision 1.15
diff -u -u -r1.15 distinfo
--- distinfo	12 Oct 2004 00:11:04 -0000	1.15
+++ distinfo	26 Jan 2005 13:06:12 -0000
@@ -1,2 +1,2 @@
-MD5 (cfengine-2.1.10.tar.gz) = 7a867c74ca3ad806a41b6f7339e67fa3
-SIZE (cfengine-2.1.10.tar.gz) = 3100323
+MD5 (cfengine-2.1.13.tar.gz) = 2c002fc37f2fc9f87248ad8b9e899091
+SIZE (cfengine-2.1.13.tar.gz) = 3153867
Index: pkg-plist
===================================================================
RCS file: /FreeBSD/cvs/ports/sysutils/cfengine2/pkg-plist,v
retrieving revision 1.10
diff -u -u -r1.10 pkg-plist
--- pkg-plist	26 Jan 2004 22:59:52 -0000	1.10
+++ pkg-plist	26 Jan 2005 14:33:20 -0000
@@ -6,6 +6,7 @@
 sbin/cfkey
 sbin/cfrun
 sbin/cfservd
+sbin/cfshow
 sbin/vicf
 %%EXAMPLESDIR%%/cf.chflags.example
 %%EXAMPLESDIR%%/cf.freebsd.example
Index: files/patch-contrib_Makefile.in
===================================================================
RCS file: /FreeBSD/cvs/ports/sysutils/cfengine2/files/patch-contrib_Makefile.in,v
retrieving revision 1.2
diff -u -u -r1.2 patch-contrib_Makefile.in
--- files/patch-contrib_Makefile.in	12 Oct 2004 00:11:04 -0000	1.2
+++ files/patch-contrib_Makefile.in	26 Jan 2005 14:19:44 -0000
@@ -5,7 +5,7 @@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine2
++pkgdatadir = $(prefix)/share/examples/cfengine
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = ..
Index: files/patch-doc_Makefile.in
===================================================================
RCS file: /FreeBSD/cvs/ports/sysutils/cfengine2/files/patch-doc_Makefile.in,v
retrieving revision 1.3
diff -u -u -r1.3 patch-doc_Makefile.in
--- files/patch-doc_Makefile.in	12 Oct 2004 00:11:04 -0000	1.3
+++ files/patch-doc_Makefile.in	26 Jan 2005 14:25:44 -0000
@@ -14,7 +14,7 @@
  man_MANS = cfengine.8 cfagent.8  cfenvd.8  cfenvgraph.8  cfexecd.8  cfkey.8  cfrun.8  cfservd.8
  info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo cfengine-Anomalies.texinfo
 -docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(prefix)/share/doc/cfengine2
++docdir = $(prefix)/share/doc/cfengine
  doc_DATA = 
  
  # Info used in building and installing HTML files
Index: files/patch-inputs_Makefile.in
===================================================================
RCS file: /FreeBSD/cvs/ports/sysutils/cfengine2/files/patch-inputs_Makefile.in,v
retrieving revision 1.3
diff -u -u -r1.3 patch-inputs_Makefile.in
--- files/patch-inputs_Makefile.in	12 Oct 2004 00:11:04 -0000	1.3
+++ files/patch-inputs_Makefile.in	26 Jan 2005 14:19:34 -0000
@@ -5,7 +5,7 @@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine2
++pkgdatadir = $(prefix)/share/examples/cfengine
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = ..
--- cfengine-2.1.13.patch ends here ---

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