Attachment 85771 Details for Bug 122057 – cfengine-2.2.5.txt

cfengine-2.2.5.txt

cfengine-2.2.5.txt (text/plain; x-unix-mode=0644), 6.37 KB, created by Jo Rhett on 2008-03-24 23:03:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jo Rhett

Created: 2008-03-24 23:03:57 UTC

Size: 6.37 KB

patch

obsolete

>--- Makefile.orig	Mon Mar 24 11:33:31 2008
>+++ Makefile	Mon Mar 24 15:12:26 2008
>@@ -6,12 +6,9 @@
> #
> 
> PORTNAME=	cfengine
>-PORTVERSION=	2.2.3
>-PORTREVISION=	1
>+PORTVERSION=	2.2.5
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://ftp.osuosl.org/pub/cfengine/ \
>-		ftp://ftp.iu.hio.no/pub/cfengine/
>-
>+MASTER_SITES=	http://www.cfengine.org/downloads/
> MAINTAINER=	sergei@FreeBSD.org
> COMMENT=	A systems administration tool for networks
> 
>@@ -29,14 +26,7 @@
> 		BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
> 		BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
> 
>-.if !defined(NOPORTDOCS)
>-INFO=		cfengine-Anomalies cfengine-Reference cfengine-Tutorial
>-.endif
>-
>-MAN8=		cfagent.8 cfengine.8 cfenvd.8 cfenvgraph.8 cfetoolcheck.8 \
>-		cfetoolcreate.8 cfetooldump.8 cfetoolgraph.8 cfetoolimport.8 \
>-		cfetoolinfo.8 cfetoolupdate.8 cfexecd.8 cfkey.8 \
>-		cfrun.8 cfservd.8 cfshow.8
>+MAN8=		cfengine.8
> 
> post-patch:
> 		@${REINPLACE_CMD} -e s,-pthread,${PTHREAD_CFLAGS},g \
>--- distinfo.orig	Mon Mar 24 11:33:35 2008
>+++ distinfo	Mon Mar 24 11:35:45 2008
>@@ -1,3 +1,3 @@
>-MD5 (cfengine-2.2.3.tar.gz) = 903298e54e80fe0c617f1c51102caef1
>-SHA256 (cfengine-2.2.3.tar.gz) = 2f0f62f4ba28a0532f589092af76a3693c50c6f42236662e2d97a8fda8b8fc06
>-SIZE (cfengine-2.2.3.tar.gz) = 3932061
>+MD5 (cfengine-2.2.5.tar.gz) = ba69627758fe8c99334012ab5a50aec0
>+SHA256 (cfengine-2.2.5.tar.gz) = 06d11944fe051804e4c94075aebea6ab5444bcde763d61c6334d31a3302fcb01
>+SIZE (cfengine-2.2.5.tar.gz) = 973471
>--- pkg-plist.orig	Mon Mar 24 13:57:30 2008
>+++ pkg-plist	Mon Mar 24 15:13:37 2008
>@@ -36,14 +36,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.html
>-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.ps
>-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.html
>-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.ps
>-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.html
>-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.ps
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+%%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm %%EXAMPLESDIR%%
>--- files.orig/patch-Makefile.in	Mon Mar 24 11:37:18 2008
>+++ files/patch-Makefile.in	Mon Mar 24 14:02:34 2008
>@@ -1,7 +1,7 @@
>---- Makefile.in_orig	Wed May 30 10:44:56 2007
>-+++ Makefile.in	Wed May 30 10:48:32 2007
>-@@ -174,7 +174,7 @@
>- build_vendor = @build_vendor@
>+--- Makefile.in.orig	Sat Mar 22 07:42:08 2008
>++++ Makefile.in	Mon Mar 24 14:02:01 2008
>+@@ -187,7 +187,7 @@
>+ builddir = @builddir@
>  datadir = @datadir@
>  datarootdir = @datarootdir@
> -docdir = $(pkgdatadir)
>@@ -9,16 +9,110 @@
>  dvidir = @dvidir@
>  exec_prefix = @exec_prefix@
>  host = @host@
>-@@ -209,7 +209,11 @@
>+@@ -225,7 +225,15 @@
>  @BUILD_DOC_TRUE@DOC_DIR = doc
>- SUBDIRS = pub src contrib inputs $(DOC_DIR)
>- EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README
>+ SUBDIRS = pub src contrib inputs # $(DOC_DIR)
>+ EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README LICENSE
> -doc_DATA = README ChangeLog INSTALL NEWS
> +.if defined(NOPORTDOCS)
> +doc_DATA = 
> +.else
>-+doc_DATA = AUTHORS ChangeLog README TODO
>++doc_DATA = README ChangeLog INSTALL NEWS AUTHORS TODO
> +.endif
>++
>++# Info used in building the MAN files
>++man_MANS = doc/cfengine.8
>++man8dir = $(mandir)/man8
>  
>  #
>  # Some basic clean ups
>+@@ -298,6 +306,54 @@
>+ 
>+ distclean-libtool:
>+ 	-rm -f libtool
>++
>++install-man8: $(man8_MANS) $(man_MANS)
>++	@$(NORMAL_INSTALL)
>++	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
>++	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
>++	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
>++	for i in $$l2; do \
>++	  case "$$i" in \
>++	    *.8*) list="$$list $$i" ;; \
>++	  esac; \
>++	done; \
>++	for i in $$list; do \
>++	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
>++	  else file=$$i; fi; \
>++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
>++	  case "$$ext" in \
>++	    8*) ;; \
>++	    *) ext='8' ;; \
>++	  esac; \
>++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
>++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
>++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
>++	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
>++	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
>++	done
>++
>++uninstall-man8:
>++	@$(NORMAL_UNINSTALL)
>++	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
>++	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
>++	for i in $$l2; do \
>++	  case "$$i" in \
>++	    *.8*) list="$$list $$i" ;; \
>++	  esac; \
>++	done; \
>++	for i in $$list; do \
>++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
>++	  case "$$ext" in \
>++	    8*) ;; \
>++	    *) ext='8' ;; \
>++	  esac; \
>++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
>++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
>++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
>++	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
>++	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
>++	done
>++
>+ install-docDATA: $(doc_DATA)
>+ 	@$(NORMAL_INSTALL)
>+ 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
>+@@ -645,7 +701,7 @@
>+ 
>+ info-am:
>+ 
>+-install-data-am: install-docDATA
>++install-data-am: install-docDATA install-man8
>+ 
>+ install-dvi: install-dvi-recursive
>+ 
>+@@ -681,7 +737,7 @@
>+ 
>+ ps-am:
>+ 
>+-uninstall-am: uninstall-docDATA
>++uninstall-am: uninstall-docDATA uninstall-man8
>+ 
>+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
>+ 	install-strip
>+@@ -693,14 +749,14 @@
>+ 	distclean-generic distclean-libtool distclean-tags \
>+ 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
>+ 	html-am info info-am install install-am install-data \
>+-	install-data-am install-docDATA install-dvi install-dvi-am \
>++	install-data-am install-docDATA install-man8 install-dvi install-dvi-am \
>+ 	install-exec install-exec-am install-html install-html-am \
>+ 	install-info install-info-am install-man install-pdf \
>+ 	install-pdf-am install-ps install-ps-am install-strip \
>+ 	installcheck installcheck-am installdirs installdirs-am \
>+ 	maintainer-clean maintainer-clean-generic mostlyclean \
>+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
>+-	tags tags-recursive uninstall uninstall-am uninstall-docDATA
>++	tags tags-recursive uninstall uninstall-am uninstall-docDATA uninstall-man8
>+ 
>+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
>+ # Otherwise a system limit (for SysV at least) may be exceeded.

Actions: View

Attachments on bug 122057: 85770 | 85771 | 85772 | 85773 | 85774