fix openssl check in configure to NOT try to use openssl when it has

been disabled by PKG_OPTIONS.

also fix doc install target on Solaris.

2 files changed, 34 insertions, 0 deletions

diff --git a/databases/freetds/patches/patch-ab b/databases/freetds/patches/patch-ab
new file mode 100644
index 00000000000..96488fb681e
--- /dev/null
+++ b/databases/freetds/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.5 2008/09/02 00:58:07 grant Exp $
+
+--- configure.orig	2008-05-08 08:59:26.000000000 +1000
++++ configure
+@@ -22585,11 +22585,11 @@ else
+ echo $ECHO_N "checking if openssl is wanted... $ECHO_C" >&6
+ 
+ # Check whether --with-openssl or --without-openssl was given.
+-if test "${with_openssl+set}" = set; then
++if test "${with_openssl+set}" = set -a x${with_openssl} != xno; then
+   withval="$with_openssl"
+    echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-    for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
++    for dir in $withval; do
+         ssldir="$dir"
+         if test -f "$dir/include/openssl/ssl.h"; then
+             found_ssl="yes"
diff --git a/databases/freetds/patches/patch-ac b/databases/freetds/patches/patch-ac
new file mode 100644
index 00000000000..5e58dc1bea7
--- /dev/null
+++ b/databases/freetds/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.6 2008/09/02 00:58:07 grant Exp $
+
+--- doc/Makefile.in.orig	2008-05-08 08:59:15.000000000 +1000
++++ doc/Makefile.in
+@@ -627,8 +627,9 @@ install-data-local: installdirs $(DOCDIR
+ 	if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \
+ 	find $$d/$(DOCDIR)/reference \( -type f -o -type l \) -exec \
+ 		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/reference ';'
+-	cd $(srcdir) && find images -name \*.gif -exec \
+-		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/{} ';'
++	cd $(srcdir) && for f in `find images -name \*.gif`; do \
++		$(INSTALL_DATA) $$f $(TARGET_DOCDIR)/$$f; \
++	done
+ 
+ uninstall-local:
+ 	rm -rf $(TARGET_DOCDIR)