View | Details | Raw Unified | Return to bug 122057 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-12 / +3 lines)
Lines 6-17 Link Here
6
#
6
#
7
7
8
PORTNAME=	cfengine
8
PORTNAME=	cfengine
9
PORTVERSION=	2.2.3
9
PORTVERSION=	2.2.5
10
PORTREVISION=	1
10
PORTREVISION=	1
11
CATEGORIES=	sysutils
11
CATEGORIES=	sysutils
12
MASTER_SITES=	http://ftp.osuosl.org/pub/cfengine/ \
12
MASTER_SITES=	http://www.cfengine.org/downloads/
13
		ftp://ftp.iu.hio.no/pub/cfengine/
14
15
MAINTAINER=	sergei@FreeBSD.org
13
MAINTAINER=	sergei@FreeBSD.org
16
COMMENT=	A systems administration tool for networks
14
COMMENT=	A systems administration tool for networks
17
15
Lines 29-42 Link Here
29
		BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
27
		BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
30
		BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
28
		BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
31
29
32
.if !defined(NOPORTDOCS)
30
MAN8=		cfengine.8
33
INFO=		cfengine-Anomalies cfengine-Reference cfengine-Tutorial
34
.endif
35
36
MAN8=		cfagent.8 cfengine.8 cfenvd.8 cfenvgraph.8 cfetoolcheck.8 \
37
		cfetoolcreate.8 cfetooldump.8 cfetoolgraph.8 cfetoolimport.8 \
38
		cfetoolinfo.8 cfetoolupdate.8 cfexecd.8 cfkey.8 \
39
		cfrun.8 cfservd.8 cfshow.8
40
31
41
post-patch:
32
post-patch:
42
		@${REINPLACE_CMD} -e s,-pthread,${PTHREAD_CFLAGS},g \
33
		@${REINPLACE_CMD} -e s,-pthread,${PTHREAD_CFLAGS},g \
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (cfengine-2.2.3.tar.gz) = 903298e54e80fe0c617f1c51102caef1
1
MD5 (cfengine-2.2.5.tar.gz) = ba69627758fe8c99334012ab5a50aec0
2
SHA256 (cfengine-2.2.3.tar.gz) = 2f0f62f4ba28a0532f589092af76a3693c50c6f42236662e2d97a8fda8b8fc06
2
SHA256 (cfengine-2.2.5.tar.gz) = 06d11944fe051804e4c94075aebea6ab5444bcde763d61c6334d31a3302fcb01
3
SIZE (cfengine-2.2.3.tar.gz) = 3932061
3
SIZE (cfengine-2.2.5.tar.gz) = 973471
(-)pkg-plist (-9 lines)
Lines 36-49 Link Here
36
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
36
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
37
%%PORTDOCS%%%%DOCSDIR%%/README
37
%%PORTDOCS%%%%DOCSDIR%%/README
38
%%PORTDOCS%%%%DOCSDIR%%/TODO
38
%%PORTDOCS%%%%DOCSDIR%%/TODO
39
%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.html
40
%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.pdf
41
%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.ps
42
%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.html
43
%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.pdf
44
%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.ps
45
%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.html
46
%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.pdf
47
%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.ps
48
%%PORTDOCS%%@dirrm %%DOCSDIR%%
39
%%PORTDOCS%%@dirrm %%DOCSDIR%%
49
@dirrm %%EXAMPLESDIR%%
40
@dirrm %%EXAMPLESDIR%%
(-)files/patch-Makefile.in (-8 / +102 lines)
Lines 1-7 Link Here
1
--- Makefile.in_orig	Wed May 30 10:44:56 2007
1
--- Makefile.in.orig	Sat Mar 22 07:42:08 2008
2
+++ Makefile.in	Wed May 30 10:48:32 2007
2
+++ Makefile.in	Mon Mar 24 14:02:01 2008
3
@@ -174,7 +174,7 @@
3
@@ -187,7 +187,7 @@
4
 build_vendor = @build_vendor@
4
 builddir = @builddir@
5
 datadir = @datadir@
5
 datadir = @datadir@
6
 datarootdir = @datarootdir@
6
 datarootdir = @datarootdir@
7
-docdir = $(pkgdatadir)
7
-docdir = $(pkgdatadir)
Lines 9-24 Link Here
9
 dvidir = @dvidir@
9
 dvidir = @dvidir@
10
 exec_prefix = @exec_prefix@
10
 exec_prefix = @exec_prefix@
11
 host = @host@
11
 host = @host@
12
@@ -209,7 +209,11 @@
12
@@ -225,7 +225,15 @@
13
 @BUILD_DOC_TRUE@DOC_DIR = doc
13
 @BUILD_DOC_TRUE@DOC_DIR = doc
14
 SUBDIRS = pub src contrib inputs $(DOC_DIR)
14
 SUBDIRS = pub src contrib inputs # $(DOC_DIR)
15
 EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README
15
 EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README LICENSE
16
-doc_DATA = README ChangeLog INSTALL NEWS
16
-doc_DATA = README ChangeLog INSTALL NEWS
17
+.if defined(NOPORTDOCS)
17
+.if defined(NOPORTDOCS)
18
+doc_DATA = 
18
+doc_DATA = 
19
+.else
19
+.else
20
+doc_DATA = AUTHORS ChangeLog README TODO
20
+doc_DATA = README ChangeLog INSTALL NEWS AUTHORS TODO
21
+.endif
21
+.endif
22
+
23
+# Info used in building the MAN files
24
+man_MANS = doc/cfengine.8
25
+man8dir = $(mandir)/man8
22
 
26
 
23
 #
27
 #
24
 # Some basic clean ups
28
 # Some basic clean ups
29
@@ -298,6 +306,54 @@
30
 
31
 distclean-libtool:
32
 	-rm -f libtool
33
+
34
+install-man8: $(man8_MANS) $(man_MANS)
35
+	@$(NORMAL_INSTALL)
36
+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
37
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
38
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
39
+	for i in $$l2; do \
40
+	  case "$$i" in \
41
+	    *.8*) list="$$list $$i" ;; \
42
+	  esac; \
43
+	done; \
44
+	for i in $$list; do \
45
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
46
+	  else file=$$i; fi; \
47
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
48
+	  case "$$ext" in \
49
+	    8*) ;; \
50
+	    *) ext='8' ;; \
51
+	  esac; \
52
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
53
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
54
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
55
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
56
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
57
+	done
58
+
59
+uninstall-man8:
60
+	@$(NORMAL_UNINSTALL)
61
+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
62
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
63
+	for i in $$l2; do \
64
+	  case "$$i" in \
65
+	    *.8*) list="$$list $$i" ;; \
66
+	  esac; \
67
+	done; \
68
+	for i in $$list; do \
69
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
70
+	  case "$$ext" in \
71
+	    8*) ;; \
72
+	    *) ext='8' ;; \
73
+	  esac; \
74
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
75
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
76
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
77
+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
78
+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
79
+	done
80
+
81
 install-docDATA: $(doc_DATA)
82
 	@$(NORMAL_INSTALL)
83
 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
84
@@ -645,7 +701,7 @@
85
 
86
 info-am:
87
 
88
-install-data-am: install-docDATA
89
+install-data-am: install-docDATA install-man8
90
 
91
 install-dvi: install-dvi-recursive
92
 
93
@@ -681,7 +737,7 @@
94
 
95
 ps-am:
96
 
97
-uninstall-am: uninstall-docDATA
98
+uninstall-am: uninstall-docDATA uninstall-man8
99
 
100
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
101
 	install-strip
102
@@ -693,14 +749,14 @@
103
 	distclean-generic distclean-libtool distclean-tags \
104
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
105
 	html-am info info-am install install-am install-data \
106
-	install-data-am install-docDATA install-dvi install-dvi-am \
107
+	install-data-am install-docDATA install-man8 install-dvi install-dvi-am \
108
 	install-exec install-exec-am install-html install-html-am \
109
 	install-info install-info-am install-man install-pdf \
110
 	install-pdf-am install-ps install-ps-am install-strip \
111
 	installcheck installcheck-am installdirs installdirs-am \
112
 	maintainer-clean maintainer-clean-generic mostlyclean \
113
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
114
-	tags tags-recursive uninstall uninstall-am uninstall-docDATA
115
+	tags tags-recursive uninstall uninstall-am uninstall-docDATA uninstall-man8
116
 
117
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
118
 # Otherwise a system limit (for SysV at least) may be exceeded.

Return to bug 122057