mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-04 11:23:46 +00:00
Code Issues Releases Activity

- Patch to fix berkeley db detection in configure script. Fixes compilation

Browse Source 
when multiple db ports are installed
- Patch to explicitly link with included libpub.a, instead of one in /usr/local
- Patch to never rebuild documentation, the full copy is included

PR:		ports/106790
Submitted by:	Nick Barkas <snb@threerings.net>
Approved by:	maintainer timeout (sergei; 1 month)
This commit is contained in:
Pav Lucistnik 2007-01-24 22:47:36 +00:00
parent 9a237e46b7
commit 74e93340df
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=183223
9 changed files with 150 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/cfengine/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 2.1.21
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
${MASTER_SITE_GNU}

20
sysutils/cfengine/files/patch-configure Normal file
View File

@ -0,0 +1,20 @@
--- configure.orig Wed Sep 20 10:27:07 2006
+++ configure Thu Dec 14 18:00:21 2006
@@ -8539,7 +8539,7 @@
done
BERKELEY_DB_LIB="-ldb"
- for v in db4.4 db44 db41 db40 db4 db33 db32 db3 db; do
+ for v in db-4.4 db4.4 db44 db-4.3 db-4.2 db41 db40 db4 db33 db32 db3 db; do
if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
BERKELEY_DB_LIB="-l$v"
break
@@ -15998,7 +15998,7 @@
-LIBS="-L../pub -lpub $LIBS"
+LIBS="../pub/libpub.a $LIBS"
echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5

31
sysutils/cfengine/files/patch-doc_Makefile.in
View File

@ -1,5 +1,5 @@
--- doc/Makefile.in.orig Sat Oct 1 16:32:08 2005
+++ doc/Makefile.in Fri Oct 7 10:07:40 2005
--- doc/Makefile.in.orig Wed Sep 20 10:27:06 2006
+++ doc/Makefile.in Fri Dec 15 12:24:05 2006
@@ -52,8 +52,12 @@
CONFIG_CLEAN_FILES =
SOURCES =
@ -39,6 +39,33 @@
# Make sure these get distributed with everything else.
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)
@@ -316,7 +328,7 @@
exit 1; \
fi
$(srcdir)/version1.texi: $(srcdir)/stamp-vti
-$(srcdir)/stamp-vti: cfengine-Reference.texinfo $(top_srcdir)/configure
+$(srcdir)/stamp-vti: cfengine-Reference.texinfo
@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
@@ -375,7 +387,7 @@
exit 1; \
fi
$(srcdir)/version2.texi: $(srcdir)/stamp-1
-$(srcdir)/stamp-1: cfengine-Tutorial.texinfo $(top_srcdir)/configure
+$(srcdir)/stamp-1: cfengine-Tutorial.texinfo
@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
@@ -434,7 +446,7 @@
exit 1; \
fi
$(srcdir)/version3.texi: $(srcdir)/stamp-2
-$(srcdir)/stamp-2: cfengine-Anomalies.texinfo $(top_srcdir)/configure
+$(srcdir)/stamp-2: cfengine-Anomalies.texinfo
@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
@@ -579,6 +591,7 @@
rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
done

1
sysutils/cfengine3-legacy/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 2.1.21
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
${MASTER_SITE_GNU}

20
sysutils/cfengine3-legacy/files/patch-configure Normal file
View File

@ -0,0 +1,20 @@
--- configure.orig Wed Sep 20 10:27:07 2006
+++ configure Thu Dec 14 18:00:21 2006
@@ -8539,7 +8539,7 @@
done
BERKELEY_DB_LIB="-ldb"
- for v in db4.4 db44 db41 db40 db4 db33 db32 db3 db; do
+ for v in db-4.4 db4.4 db44 db-4.3 db-4.2 db41 db40 db4 db33 db32 db3 db; do
if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
BERKELEY_DB_LIB="-l$v"
break
@@ -15998,7 +15998,7 @@
-LIBS="-L../pub -lpub $LIBS"
+LIBS="../pub/libpub.a $LIBS"
echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5

31
sysutils/cfengine3-legacy/files/patch-doc_Makefile.in
View File

@ -1,5 +1,5 @@
--- doc/Makefile.in.orig Sat Oct 1 16:32:08 2005
+++ doc/Makefile.in Fri Oct 7 10:07:40 2005
--- doc/Makefile.in.orig Wed Sep 20 10:27:06 2006
+++ doc/Makefile.in Fri Dec 15 12:24:05 2006
@@ -52,8 +52,12 @@
CONFIG_CLEAN_FILES =
SOURCES =
@ -39,6 +39,33 @@
# Make sure these get distributed with everything else.
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)
@@ -316,7 +328,7 @@
exit 1; \
fi
$(srcdir)/version1.texi: $(srcdir)/stamp-vti
-$(srcdir)/stamp-vti: cfengine-Reference.texinfo $(top_srcdir)/configure
+$(srcdir)/stamp-vti: cfengine-Reference.texinfo
@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
@@ -375,7 +387,7 @@
exit 1; \
fi
$(srcdir)/version2.texi: $(srcdir)/stamp-1
-$(srcdir)/stamp-1: cfengine-Tutorial.texinfo $(top_srcdir)/configure
+$(srcdir)/stamp-1: cfengine-Tutorial.texinfo
@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
@@ -434,7 +446,7 @@
exit 1; \
fi
$(srcdir)/version3.texi: $(srcdir)/stamp-2
-$(srcdir)/stamp-2: cfengine-Anomalies.texinfo $(top_srcdir)/configure
+$(srcdir)/stamp-2: cfengine-Anomalies.texinfo
@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
@@ -579,6 +591,7 @@
rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
done

1
sysutils/cfengine3/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 2.1.21
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
${MASTER_SITE_GNU}

20
sysutils/cfengine3/files/patch-configure Normal file
View File

@ -0,0 +1,20 @@
--- configure.orig Wed Sep 20 10:27:07 2006
+++ configure Thu Dec 14 18:00:21 2006
@@ -8539,7 +8539,7 @@
done
BERKELEY_DB_LIB="-ldb"
- for v in db4.4 db44 db41 db40 db4 db33 db32 db3 db; do
+ for v in db-4.4 db4.4 db44 db-4.3 db-4.2 db41 db40 db4 db33 db32 db3 db; do
if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then
BERKELEY_DB_LIB="-l$v"
break
@@ -15998,7 +15998,7 @@
-LIBS="-L../pub -lpub $LIBS"
+LIBS="../pub/libpub.a $LIBS"
echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5

31
sysutils/cfengine3/files/patch-doc_Makefile.in
View File

@ -1,5 +1,5 @@
--- doc/Makefile.in.orig Sat Oct 1 16:32:08 2005
+++ doc/Makefile.in Fri Oct 7 10:07:40 2005
--- doc/Makefile.in.orig Wed Sep 20 10:27:06 2006
+++ doc/Makefile.in Fri Dec 15 12:24:05 2006
@@ -52,8 +52,12 @@
CONFIG_CLEAN_FILES =
SOURCES =
@ -39,6 +39,33 @@
# Make sure these get distributed with everything else.
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)
@@ -316,7 +328,7 @@
exit 1; \
fi
$(srcdir)/version1.texi: $(srcdir)/stamp-vti
-$(srcdir)/stamp-vti: cfengine-Reference.texinfo $(top_srcdir)/configure
+$(srcdir)/stamp-vti: cfengine-Reference.texinfo
@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
@@ -375,7 +387,7 @@
exit 1; \
fi
$(srcdir)/version2.texi: $(srcdir)/stamp-1
-$(srcdir)/stamp-1: cfengine-Tutorial.texinfo $(top_srcdir)/configure
+$(srcdir)/stamp-1: cfengine-Tutorial.texinfo
@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
@@ -434,7 +446,7 @@
exit 1; \
fi
$(srcdir)/version3.texi: $(srcdir)/stamp-2
-$(srcdir)/stamp-2: cfengine-Anomalies.texinfo $(top_srcdir)/configure
+$(srcdir)/stamp-2: cfengine-Anomalies.texinfo
@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \
set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \
echo "@set UPDATED $$1 $$2 $$3"; \
@@ -579,6 +591,7 @@
rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
done