View | Details | Raw Unified | Return to bug 113167
Collapse All | Expand All

(-)Makefile (-2 / +5 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	cfengine
8
PORTNAME=	cfengine
9
PORTVERSION=	2.1.22
9
PORTVERSION=	2.2.1
10
CATEGORIES=	sysutils
10
CATEGORIES=	sysutils
11
MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
11
MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
12
		${MASTER_SITE_GNU}
12
		${MASTER_SITE_GNU}
Lines 15-21 Link Here
15
MAINTAINER=	sergei@FreeBSD.org
15
MAINTAINER=	sergei@FreeBSD.org
16
COMMENT=	A systems administration tool for networks
16
COMMENT=	A systems administration tool for networks
17
17
18
USE_BDB=	44
19
USE_OPENSSL=	yes
18
USE_OPENSSL=	yes
20
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
21
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
20
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
Lines 24-29 Link Here
24
		BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \
23
		BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \
25
		BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
24
		BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
26
		BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
25
		BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
26
27
.if !defined(USE_BDB)
28
USE_BDB=	44
29
.endif
27
30
28
.if !defined(NOPORTDOCS)
31
.if !defined(NOPORTDOCS)
29
INFO=		cfengine-Anomalies cfengine-Reference cfengine-Tutorial
32
INFO=		cfengine-Anomalies cfengine-Reference cfengine-Tutorial
(-)files/patch-Makefile.in (-5 / +12 lines)
Lines 1-12 Link Here
1
--- Makefile.in.orig	Sat Oct  1 16:32:09 2005
1
--- Makefile.in_orig	Wed May 30 10:44:56 2007
2
+++ Makefile.in	Fri Oct  7 10:36:51 2005
2
+++ Makefile.in	Wed May 30 10:48:32 2007
3
@@ -201,8 +201,12 @@
3
@@ -174,7 +174,7 @@
4
 build_vendor = @build_vendor@
5
 datadir = @datadir@
6
 datarootdir = @datarootdir@
7
-docdir = $(pkgdatadir)
8
+docdir = $(prefix)/share/doc/cfengine
9
 dvidir = @dvidir@
10
 exec_prefix = @exec_prefix@
11
 host = @host@
12
@@ -209,7 +209,11 @@
4
 @BUILD_DOC_TRUE@DOC_DIR = doc
13
 @BUILD_DOC_TRUE@DOC_DIR = doc
5
 SUBDIRS = pub src contrib inputs $(DOC_DIR)
14
 SUBDIRS = pub src contrib inputs $(DOC_DIR)
6
 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
7
-docdir = $(pkgdatadir)
8
-doc_DATA = README ChangeLog INSTALL NEWS
16
-doc_DATA = README ChangeLog INSTALL NEWS
9
+docdir = $(prefix)/share/doc/cfengine
10
+.if defined(NOPORTDOCS)
17
+.if defined(NOPORTDOCS)
11
+doc_DATA = 
18
+doc_DATA = 
12
+.else
19
+.else
(-)files/patch-doc_Makefile.in (-17 / +31 lines)
Lines 1-5 Link Here
1
--- doc/Makefile.in.orig	Wed Sep 20 10:27:06 2006
1
--- doc/Makefile.in.orig	Tue May 29 11:07:06 2007
2
+++ doc/Makefile.in	Fri Dec 15 12:24:05 2006
2
+++ doc/Makefile.in	Wed May 30 10:58:27 2007
3
@@ -52,8 +52,12 @@
3
@@ -52,8 +52,12 @@
4
 CONFIG_CLEAN_FILES =
4
 CONFIG_CLEAN_FILES =
5
 SOURCES =
5
 SOURCES =
Lines 13-24 Link Here
13
 am__TEXINFO_TEX_DIR = $(srcdir)
13
 am__TEXINFO_TEX_DIR = $(srcdir)
14
 DVIS = cfengine-Reference.dvi cfengine-Tutorial.dvi \
14
 DVIS = cfengine-Reference.dvi cfengine-Tutorial.dvi \
15
 	cfengine-Anomalies.dvi
15
 	cfengine-Anomalies.dvi
16
@@ -205,15 +209,23 @@
16
@@ -171,7 +175,7 @@
17
 build_vendor = @build_vendor@
18
 datadir = @datadir@
19
 datarootdir = @datarootdir@
20
-docdir = $(pkgdatadir)/doc
21
+docdir = $(prefix)/share/doc/cfengine
22
 dvidir = @dvidir@
23
 exec_prefix = @exec_prefix@
24
 host = @host@
25
@@ -179,7 +183,7 @@
26
 host_cpu = @host_cpu@
27
 host_os = @host_os@
28
 host_vendor = @host_vendor@
29
-htmldir = $(pkgdatadir)/html
30
+htmldir = $(docdir)
31
 includedir = @includedir@
32
 infodir = @infodir@
33
 install_sh = @install_sh@
34
@@ -213,13 +217,21 @@
17
 
35
 
18
 # Info used in building and installing HTML files
36
 # Info used in building and installing HTML files
19
 htmlfiles = $(info_TEXINFOS:.texinfo=.html)
37
 htmlfiles = $(info_TEXINFOS:.texinfo=.html)
20
-htmldir = $(pkgdatadir)/html
21
+htmldir = $(docdir)
22
+.if defined(NOPORTDOCS)
38
+.if defined(NOPORTDOCS)
23
+html_DATA = 
39
+html_DATA = 
24
+.else
40
+.else
Lines 29-37 Link Here
29
 psfiles = $(info_TEXINFOS:.texinfo=.ps)
45
 psfiles = $(info_TEXINFOS:.texinfo=.ps)
30
 pdffiles = $(info_TEXINFOS:.texinfo=.pdf)
46
 pdffiles = $(info_TEXINFOS:.texinfo=.pdf)
31
 dvifiles = $(info_TEXINFOS:.texinfo=.dvi)
47
 dvifiles = $(info_TEXINFOS:.texinfo=.dvi)
32
-docdir = $(pkgdatadir)/doc
48
+if defined(NOPORTDOCS)
33
+docdir = $(prefix)/share/doc/cfengine
34
+.if defined(NOPORTDOCS)
35
+doc_DATA = 
49
+doc_DATA = 
36
+.else
50
+.else
37
 doc_DATA = $(psfiles) $(pdffiles)
51
 doc_DATA = $(psfiles) $(pdffiles)
Lines 39-45 Link Here
39
 
53
 
40
 # Make sure these get distributed with everything else.
54
 # Make sure these get distributed with everything else.
41
 EXTRA_DIST = cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfengine.8 cfshow.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 texinfo.tex $(htmlfiles) $(infofiles)  $(psfiles) $(dvifiles) $(pdffiles)
55
 EXTRA_DIST = cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfengine.8 cfshow.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 texinfo.tex $(htmlfiles) $(infofiles)  $(psfiles) $(dvifiles) $(pdffiles)
42
@@ -316,7 +328,7 @@
56
@@ -324,7 +336,7 @@
43
 	  exit 1; \
57
 	  exit 1; \
44
 	fi
58
 	fi
45
 $(srcdir)/version1.texi:  $(srcdir)/stamp-vti
59
 $(srcdir)/version1.texi:  $(srcdir)/stamp-vti
Lines 48-54 Link Here
48
 	@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \
62
 	@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \
49
 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \
63
 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \
50
 	echo "@set UPDATED $$1 $$2 $$3"; \
64
 	echo "@set UPDATED $$1 $$2 $$3"; \
51
@@ -375,7 +387,7 @@
65
@@ -385,7 +397,7 @@
52
 	  exit 1; \
66
 	  exit 1; \
53
 	fi
67
 	fi
54
 $(srcdir)/version2.texi:  $(srcdir)/stamp-1
68
 $(srcdir)/version2.texi:  $(srcdir)/stamp-1
Lines 57-63 Link Here
57
 	@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \
71
 	@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \
58
 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \
72
 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \
59
 	echo "@set UPDATED $$1 $$2 $$3"; \
73
 	echo "@set UPDATED $$1 $$2 $$3"; \
60
@@ -434,7 +446,7 @@
74
@@ -446,7 +458,7 @@
61
 	  exit 1; \
75
 	  exit 1; \
62
 	fi
76
 	fi
63
 $(srcdir)/version3.texi:  $(srcdir)/stamp-2
77
 $(srcdir)/version3.texi:  $(srcdir)/stamp-2
Lines 66-72 Link Here
66
 	@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \
80
 	@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \
67
 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \
81
 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \
68
 	echo "@set UPDATED $$1 $$2 $$3"; \
82
 	echo "@set UPDATED $$1 $$2 $$3"; \
69
@@ -579,6 +591,7 @@
83
@@ -592,6 +604,7 @@
70
 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
84
 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
71
 	done
85
 	done
72
 install-docDATA: $(doc_DATA)
86
 install-docDATA: $(doc_DATA)
Lines 74-80 Link Here
74
 	@$(NORMAL_INSTALL)
88
 	@$(NORMAL_INSTALL)
75
 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
89
 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
76
 	@list='$(doc_DATA)'; for p in $$list; do \
90
 	@list='$(doc_DATA)'; for p in $$list; do \
77
@@ -587,6 +600,7 @@
91
@@ -600,6 +613,7 @@
78
 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
92
 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
79
 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
93
 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
80
 	done
94
 	done
Lines 82-88 Link Here
82
 
96
 
83
 uninstall-docDATA:
97
 uninstall-docDATA:
84
 	@$(NORMAL_UNINSTALL)
98
 	@$(NORMAL_UNINSTALL)
85
@@ -596,6 +610,7 @@
99
@@ -609,6 +623,7 @@
86
 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
100
 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
87
 	done
101
 	done
88
 install-htmlDATA: $(html_DATA)
102
 install-htmlDATA: $(html_DATA)
Lines 90-96 Link Here
90
 	@$(NORMAL_INSTALL)
104
 	@$(NORMAL_INSTALL)
91
 	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
105
 	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
92
 	@list='$(html_DATA)'; for p in $$list; do \
106
 	@list='$(html_DATA)'; for p in $$list; do \
93
@@ -604,6 +619,7 @@
107
@@ -617,6 +632,7 @@
94
 	  echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
108
 	  echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
95
 	  $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
109
 	  $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
96
 	done
110
 	done
Lines 98-104 Link Here
98
 
112
 
99
 uninstall-htmlDATA:
113
 uninstall-htmlDATA:
100
 	@$(NORMAL_UNINSTALL)
114
 	@$(NORMAL_UNINSTALL)
101
@@ -712,6 +728,7 @@
115
@@ -725,6 +741,7 @@
102
 install-info: install-info-am
116
 install-info: install-info-am
103
 
117
 
104
 install-info-am: $(INFO_DEPS)
118
 install-info-am: $(INFO_DEPS)
Lines 106-112 Link Here
106
 	@$(NORMAL_INSTALL)
120
 	@$(NORMAL_INSTALL)
107
 	test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
121
 	test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
108
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
122
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
109
@@ -741,6 +758,7 @@
123
@@ -754,6 +771,7 @@
110
 	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
124
 	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
111
 	  done; \
125
 	  done; \
112
 	else : ; fi
126
 	else : ; fi
(-)files/patch-configure (-5 / +5 lines)
Lines 1-6 Link Here
1
--- configure.orig	Wed Sep 20 10:27:07 2006
1
--- configure.orig	Tue May 29 11:07:07 2007
2
+++ configure	Thu Dec 14 18:00:21 2006
2
+++ configure	Wed May 30 10:52:14 2007
3
@@ -8539,7 +8539,7 @@
3
@@ -9745,7 +9745,7 @@
4
         done
4
         done
5
 
5
 
6
         BERKELEY_DB_LIB="-ldb"
6
         BERKELEY_DB_LIB="-ldb"
Lines 9-15 Link Here
9
             if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
9
             if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
10
                 BERKELEY_DB_LIB="-l$v"
10
                 BERKELEY_DB_LIB="-l$v"
11
 		break
11
 		break
12
@@ -15998,7 +15998,7 @@
12
@@ -17933,7 +17933,7 @@
13
 
13
 
14
 
14
 
15
 
15
 
Lines 17-20 Link Here
17
+LIBS="../pub/libpub.a $LIBS"
17
+LIBS="../pub/libpub.a $LIBS"
18
 
18
 
19
 
19
 
20
 echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5
20
 { echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5

Return to bug 113167