diff options
| -rw-r--r-- | sysutils/cfengine2/Makefile | 20 | ||||
| -rw-r--r-- | sysutils/cfengine2/Makefile.common | 15 | ||||
| -rw-r--r-- | sysutils/cfengine2/PLIST | 3 | ||||
| -rw-r--r-- | sysutils/cfengine2/distinfo | 12 | ||||
| -rw-r--r-- | sysutils/cfengine2/patches/patch-aa | 14 | ||||
| -rw-r--r-- | sysutils/cfengine2/patches/patch-ab | 26 |
6 files changed, 39 insertions, 51 deletions
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile index 34a91df0991..0a2d15b74af 100644 --- a/sysutils/cfengine2/Makefile +++ b/sysutils/cfengine2/Makefile @@ -1,20 +1,24 @@ -# $NetBSD: Makefile,v 1.25 2008/09/06 20:54:34 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2008/09/07 10:14:31 rhaen Exp $ # -.include "../../sysutils/cfengine2/Makefile.common" - -PKGREVISION= 2 - -COMMENT= Automate configuration and administration of large systems +DISTNAME= cfengine-2.2.8 +CATEGORIES= sysutils net +MASTER_SITES= http://www.cfengine.org/downloads/ \ + http://ftp.osuosl.org/pub/cfengine/ \ + ftp://sunsite.uio.no/pub/cfengine/ +MAINTAINER= rhaen@NetBSD.org +HOMEPAGE= http://www.cfengine.org/ +COMMENT= Automate configuration and administration of large systems GNU_CONFIGURE= YES PTHREAD_OPTS+= require - BUILD_DEFS+= IPV6_READY CONFIGURE_ARGS+= --with-berkeleydb=${BUILDLINK_PREFIX.db4} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} -USE_TOOLS+= flex perl:run +USE_TOOLS+= flex +USE_LIBTOOL= yes +#USE_TOOLS+= flex perl:run REPLACE_PERL= contrib/cfdoc PKG_DESTDIR_SUPPORT= user-destdir diff --git a/sysutils/cfengine2/Makefile.common b/sysutils/cfengine2/Makefile.common deleted file mode 100644 index 38ddf0e9d19..00000000000 --- a/sysutils/cfengine2/Makefile.common +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: Makefile.common,v 1.11 2007/12/09 22:45:14 rhaen Exp $ -# - -CFENGINE_VERSION= 2.2.3 -DISTNAME= cfengine-${CFENGINE_VERSION} -CATEGORIES= sysutils net -MASTER_SITES= http://www.cfengine.org/downloads/ \ - http://ftp.osuosl.org/pub/cfengine/ \ - ftp://sunsite.uio.no/pub/cfengine/ - -MAINTAINER= rhaen@NetBSD.org -HOMEPAGE= http://www.cfengine.org/ - -DISTINFO_FILE= ${.CURDIR}/../../sysutils/cfengine2/distinfo -PATCHDIR= ${.CURDIR}/../../sysutils/cfengine2/patches diff --git a/sysutils/cfengine2/PLIST b/sysutils/cfengine2/PLIST index f4c9205e1c1..fe679d466d3 100644 --- a/sysutils/cfengine2/PLIST +++ b/sysutils/cfengine2/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2007/12/09 22:45:14 rhaen Exp $ -lib/libcfengine.a +@comment $NetBSD: PLIST,v 1.12 2008/09/07 10:14:31 rhaen Exp $ lib/libcfengine.la man/man8/cfagent.8 man/man8/cfengine.8 diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo index 2ceb61cce8d..0c2e1f11bfb 100644 --- a/sysutils/cfengine2/distinfo +++ b/sysutils/cfengine2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2007/12/10 14:12:41 rhaen Exp $ +$NetBSD: distinfo,v 1.11 2008/09/07 10:14:31 rhaen Exp $ -SHA1 (cfengine-2.2.3.tar.gz) = 584e451efb98bdd644568266a715507027f1e427 -RMD160 (cfengine-2.2.3.tar.gz) = e18e4b9f52f9e2dfc0cf21a9d627e6530f69abcd -Size (cfengine-2.2.3.tar.gz) = 3932061 bytes -SHA1 (patch-aa) = 97cb8cf6cdf200dcc7d6dab8010e7b0db5374f37 -SHA1 (patch-ab) = c47f7f45f0a9b1e0e641d79a17ad16d4d4290795 +SHA1 (cfengine-2.2.8.tar.gz) = 670b5fc15a4dd5c80b301adf1e1bf7979161a049 +RMD160 (cfengine-2.2.8.tar.gz) = a35ac5d87a345f38a779719314d3978ee9e3045c +Size (cfengine-2.2.8.tar.gz) = 2715678 bytes +SHA1 (patch-aa) = cdbebcf1a8d284bbaa9e8e0deb60112c5e33287c +SHA1 (patch-ab) = 5c90d568392cba0b1049b607f861a4cf65e82740 diff --git a/sysutils/cfengine2/patches/patch-aa b/sysutils/cfengine2/patches/patch-aa index bd66d863849..6f9dd87f34d 100644 --- a/sysutils/cfengine2/patches/patch-aa +++ b/sysutils/cfengine2/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2007/02/07 00:03:58 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2008/09/07 10:14:31 rhaen Exp $ ---- inputs/Makefile.in.orig 2007-01-25 20:15:25.000000000 +0000 -+++ inputs/Makefile.in -@@ -17,7 +17,7 @@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ +--- inputs/Makefile.in.orig 2008-08-26 10:31:10.000000000 +0200 ++++ inputs/Makefile.in 2008-08-26 10:32:26.000000000 +0200 +@@ -15,7 +15,7 @@ + @SET_MAKE@ + VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ +pkgdatadir = $(datadir)/examples/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd diff --git a/sysutils/cfengine2/patches/patch-ab b/sysutils/cfengine2/patches/patch-ab index f1bef8ccd0e..700cd499913 100644 --- a/sysutils/cfengine2/patches/patch-ab +++ b/sysutils/cfengine2/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.5 2007/12/10 14:12:41 rhaen Exp $ +$NetBSD: patch-ab,v 1.6 2008/09/07 10:14:31 rhaen Exp $ ---- configure.orig 2007-12-01 13:42:22.000000000 +0100 -+++ configure 2007-12-08 11:14:08.000000000 +0100 -@@ -25141,7 +25141,7 @@ - return 0; - } - _ACEOF --for ac_lib in '' db-4 db4 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do -+for ac_lib in '' db4 db-4 db4 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0; do - if test -z "$ac_lib"; then - ac_res="none required" - else -@@ -25273,7 +25273,7 @@ +--- configure.orig 2008-08-26 10:26:51.000000000 +0200 ++++ configure 2008-08-26 10:27:42.000000000 +0200 +@@ -24254,7 +24254,7 @@ + elif test -d "$BERKELEY_DB_DIR"; then + + BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include" +- for v in . db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do ++ for v in . db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db db4; do + if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then + BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v" + break +@@ -24262,7 +24262,7 @@ done BERKELEY_DB_LIB="-ldb" |