Attachment 103335 Details for Bug 143228 – cfengine3

cfengine3

cfengine3 (text/plain), 8.55 KB, created by Hung-Yi Chen on 2010-01-25 23:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hung-Yi Chen

Created: 2010-01-25 23:50:01 UTC

Size: 8.55 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/sysutils/cfengine3.orig/Makefile /usr/ports/sysutils/cfengine3/Makefile
>--- /usr/ports/sysutils/cfengine3.orig/Makefile	2009-12-23 00:49:27.000000000 +0800
>+++ /usr/ports/sysutils/cfengine3/Makefile	2010-01-26 07:32:34.000000000 +0800
>@@ -6,43 +6,40 @@
> #
> 
> PORTNAME=	cfengine
>-PORTVERSION=	3.0.2
>-PORTREVISION=	1
>+PORTVERSION=	3.0.3
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.cfengine.org/tarballs/
> 
> MAINTAINER=	cy@FreeBSD.org
> COMMENT=	A systems administration tool for networks
>-LATEST_LINK=	cfengine3
> 
> USE_RC_SUBR=	cf-execd cf-serverd
> 
> WITH_BDB_VER?=	47
>-USE_BDB=	yes
>+USE_BDB=	40+
>+CONFIGURE_ENV+=	DB_VER=db${BDB_VER}
>+CONFIGURE_ENV+=	DB_LIB=${BDB_LIB_NAME}
>+
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
>-BUILD_DEPENDS=
> # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
> DOCSDIR=	${PREFIX}/share/doc/cfengine3
> CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
> 		--htmldir=${DOCSDIR}/html \
> 		--with-berkeleydb=${LOCALBASE}
> 
>-CONFIGURE_ENV+=	BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \
>-		BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
>-		BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
>-
>-OPTIONS=        PCRE	"Enable Perl-compatible regular expressions"		on
>+OPTIONS=	PCRE	"Enable Perl-compatible regular expressions"		on
>+LATEST_LINK=	cfengine3
> .include <bsd.port.pre.mk>
> 
> .if defined(WITH_PCRE)
>-BUILD_DEPENDS+= ${PORTSDIR}/devel/pcre
>-CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}
>+BUILD_DEPENDS+=		pcre:${PORTSDIR}/devel/pcre
>+CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
> .endif
> 
>-MAN8=   cf-agent.8   cf-key.8      cf-monitord.8   \
>-        cf-report.8  cf-serverd.8  cf-execd.8      \
>-        cf-know.8    cf-promises.8 cf-runagent.8
>+MAN8=	cf-agent.8 cf-key.8 cf-monitord.8 \
>+	cf-report.8 cf-serverd.8 cf-execd.8 \
>+	cf-know.8 cf-promises.8 cf-runagent.8
> 
> post-patch:
> 		@# ${REINPLACE_CMD} -e '/^pkgdatadir/s!=.*!= ${EXAMPLESDIR}!'\
>diff -ruN --exclude=CVS /usr/ports/sysutils/cfengine3.orig/distinfo /usr/ports/sysutils/cfengine3/distinfo
>--- /usr/ports/sysutils/cfengine3.orig/distinfo	2009-11-20 14:19:01.000000000 +0800
>+++ /usr/ports/sysutils/cfengine3/distinfo	2010-01-26 06:17:34.000000000 +0800
>@@ -1,3 +1,3 @@
>-MD5 (cfengine-3.0.2.tar.gz) = ba23adb8c54c2da13953d8b24f303430
>-SHA256 (cfengine-3.0.2.tar.gz) = b509be871864e74ebb493cfb395d527797689d6581087fe03f9d0e7b57b3f5bc
>-SIZE (cfengine-3.0.2.tar.gz) = 2078775
>+MD5 (cfengine-3.0.3.tar.gz) = ba1af278e9f8b519766b6ca4e1377d22
>+SHA256 (cfengine-3.0.3.tar.gz) = 1fb18c93a272fccc484548a302b21e2b4b0cca3a21e6743849040ee65be8655e
>+SIZE (cfengine-3.0.3.tar.gz) = 2173283
>diff -ruN --exclude=CVS /usr/ports/sysutils/cfengine3.orig/files/patch-configure /usr/ports/sysutils/cfengine3/files/patch-configure
>--- /usr/ports/sysutils/cfengine3.orig/files/patch-configure	1970-01-01 08:00:00.000000000 +0800
>+++ /usr/ports/sysutils/cfengine3/files/patch-configure	2010-01-26 07:07:54.000000000 +0800
>@@ -0,0 +1,52 @@
>+--- configure.orig	2010-01-26 07:03:05.000000000 +0800
>++++ configure	2010-01-26 07:05:46.000000000 +0800
>+@@ -17025,26 +17025,29 @@
>+ $as_echo "$BERKELEY_DB_DIR" >&6; }
>+ 
>+     elif test -d "$BERKELEY_DB_DIR"; then
>+-
>+-        BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
>+-        for v in . db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
>+-            if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then
>+-                BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v"
>+-		break
>+-            fi
>+-        done
>+-
>+-        BERKELEY_DB_LIB="-ldb"
>+-        for v in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
>+-            if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
>+-                BERKELEY_DB_LIB="-l$v"
>+-		break
>+-            fi
>+-            if test -f "$BERKELEY_DB_DIR/lib64/lib$v.so"; then
>+-                BERKELEY_DB_LIB="-l$v"
>+-		break
>+-            fi
>+-        done
>++         BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
>++         BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/${DB_VER}"
>++         BERKELEY_DB_LIB="-l${DB_LIB}"
>++
>++#        BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
>++#        for v in . db47 db46 db45 db44 db43 db42 db41 db40 db4 db33 db32 db3 db; do
>++#            if test -f "$BERKELEY_DB_DIR/include/$v/db.h"; then
>++#                BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/$v"
>++#		break
>++#            fi
>++#        done
>++
>++#        BERKELEY_DB_LIB="-ldb"
>++#        for v in db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44; do
>++#            if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
>++#                BERKELEY_DB_LIB="-l$v"
>++#		break
>++#            fi
>++#            if test -f "$BERKELEY_DB_DIR/lib64/lib$v.so"; then
>++#                BERKELEY_DB_LIB="-l$v"
>++#		break
>++#            fi
>++#        done
>+ 
>+         case "$target_os" in
>+         solaris*)
>diff -ruN --exclude=CVS /usr/ports/sysutils/cfengine3.orig/files/patch-src_patches.c /usr/ports/sysutils/cfengine3/files/patch-src_patches.c
>--- /usr/ports/sysutils/cfengine3.orig/files/patch-src_patches.c	1970-01-01 08:00:00.000000000 +0800
>+++ /usr/ports/sysutils/cfengine3/files/patch-src_patches.c	2010-01-26 06:24:50.000000000 +0800
>@@ -0,0 +1,136 @@
>+--- src/patches.c.orig	2010-01-26 06:23:47.000000000 +0800
>++++ src/patches.c	2010-01-26 06:24:32.000000000 +0800
>+@@ -238,16 +238,6 @@
>+ # endif
>+ #endif
>+ 
>+-/*********************************************************/
>+-
>+-int setnetgrent(netgroup)
>+-
>+-const char *netgroup;
>+-
>+-{
>+-return 0;
>+-}
>+-
>+ /**********************************************************/
>+ 
>+ int getnetgrent(a,b,c)
>+@@ -339,116 +329,6 @@
>+ #endif  /* NOT HAVE_UNAME */
>+ 
>+ /***********************************************************/
>+-/* strstr() missing on old BSD systems                     */
>+-/***********************************************************/
>+-
>+-#ifndef HAVE_STRSTR
>+-
>+-#if !defined __STDC__ || !__STDC__
>+-/* This is a separate conditional since some stdc systems
>+-   reject `defined (const)'.  */
>+-
>+-# ifndef const
>+-#  define const
>+-# endif
>+-#endif
>+-
>+-
>+-char *strstr(char *s1,char *s2)
>+-
>+-{ char *sp;
>+-
>+-for (sp = s1; *sp != '\0'; sp++)
>+-   {
>+-   if (*sp != *s2)
>+-      {
>+-      continue;
>+-      }
>+-
>+-   if (strncmp(sp,s2,strlen(s2))== 0)
>+-      {
>+-      return sp;
>+-      }
>+-   }
>+-
>+-return NULL;
>+-}
>+-
>+-#endif
>+-
>+-/***********************************************************/
>+-/* strdup() missing on old BSD systems                     */
>+-/***********************************************************/
>+-
>+-#ifndef HAVE_STRDUP
>+-
>+-char *strdup(char *str)
>+-
>+-{ char *sp;
>+- 
>+-if (str == NULL)
>+-   {
>+-   return NULL;
>+-   }
>+-
>+-if ((sp = malloc(strlen(str)+1)) == NULL)
>+-   {
>+-   perror("malloc");
>+-   return NULL;
>+-   }
>+-
>+-strcpy(sp,str);
>+-return sp; 
>+-}
>+-
>+-#endif
>+-
>+-#ifndef HAVE_STRSEP
>+-
>+-char *strsep(char **stringp, const char *delim)
>+-
>+-{
>+-return strtok(*stringp,delim);
>+-}
>+-
>+-#endif
>+-
>+-
>+-/***********************************************************/
>+-/* strrchr() missing on old BSD systems                     */
>+-/***********************************************************/
>+-
>+-#ifndef HAVE_STRRCHR
>+-
>+-char *strrchr(char *str,char ch)
>+-
>+-{ char *sp;
>+- 
>+-if (str == NULL)
>+-   {
>+-   return NULL;
>+-   }
>+-
>+-if (strlen(str) == 0)
>+-   {
>+-   return NULL;
>+-   }
>+-
>+-for (sp = str+strlen(str)-1; sp > str; sp--)
>+-   {
>+-   if (*sp == ch)
>+-      {
>+-      return *sp;
>+-      }
>+-   }
>+-
>+-return NULL; 
>+-}
>+-
>+-#endif
>+-
>+-
>+-/***********************************************************/
>+ /* strerror() missing on systems                           */
>+ /***********************************************************/
>+ 
>diff -ruN --exclude=CVS /usr/ports/sysutils/cfengine3.orig/files/patch-src_prototypes3.h /usr/ports/sysutils/cfengine3/files/patch-src_prototypes3.h
>--- /usr/ports/sysutils/cfengine3.orig/files/patch-src_prototypes3.h	1970-01-01 08:00:00.000000000 +0800
>+++ /usr/ports/sysutils/cfengine3/files/patch-src_prototypes3.h	2010-01-26 06:23:31.000000000 +0800
>@@ -0,0 +1,25 @@
>+--- src/prototypes3.h.orig	2010-01-26 06:22:31.000000000 +0800
>++++ src/prototypes3.h	2010-01-26 06:22:56.000000000 +0800
>+@@ -1062,22 +1062,12 @@
>+ #endif
>+ 
>+ #ifndef HAVE_GETNETGRENT
>+-int setnetgrent (const char *netgroup);
>+ int getnetgrent (char **host, char **user, char **domain);
>+ void endnetgrent (void);
>+ #endif
>+ #ifndef HAVE_UNAME
>+ int uname  (struct utsname *name);
>+ #endif
>+-#ifndef HAVE_STRSTR
>+-char *strstr (char *s1,char *s2);
>+-#endif
>+-#ifndef HAVE_STRDUP
>+-char *strdup (char *str);
>+-#endif
>+-#ifndef HAVE_STRRCHR
>+-char *strrchr (char *str,char ch);
>+-#endif
>+ #ifndef HAVE_STRERROR
>+ char *strerror (int err);
>+ #endif
>===> Done

Actions: View

Attachments on bug 143228: 103335