head	1.7;
access;
symbols
	RELEASE_8_3_0:1.6
	RELEASE_9_0_0:1.6
	RELEASE_7_4_0:1.3
	RELEASE_8_2_0:1.3
	RELEASE_6_EOL:1.2
	RELEASE_8_1_0:1.1
	RELEASE_7_3_0:1.1
	RELEASE_8_0_0:1.1
	RELEASE_7_2_0:1.1
	RELEASE_7_1_0:1.1
	RELEASE_6_4_0:1.1
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1;
locks; strict;
comment	@# @;


1.7
date	2012.12.31.13.28.05;	author svnexp;	state Exp;
branches;
next	1.6;

1.6
date	2011.08.18.18.57.14;	author gabor;	state Exp;
branches;
next	1.5;

1.5
date	2011.06.11.18.34.03;	author miwi;	state Exp;
branches;
next	1.4;

1.4
date	2011.05.31.03.30.36;	author miwi;	state Exp;
branches;
next	1.3;

1.3
date	2010.12.27.20.32.24;	author pav;	state Exp;
branches;
next	1.2;

1.2
date	2010.11.08.18.45.02;	author pav;	state Exp;
branches;
next	1.1;

1.1
date	2006.11.21.21.56.25;	author pav;	state Exp;
branches;
next	;


desc
@@


1.7
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/309711
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r309711 | rm | 2012-12-31 08:17:19 +0000 (Mon, 31 Dec 2012) | 2 lines
## SVN ##
## SVN ## - update to 7.4.1
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@--- ./configure.orig	2012-12-23 01:34:25.000000000 +0400
+++ ./configure	2012-12-31 11:58:51.000000000 +0400
@@@@ -801,7 +801,7 @@@@
 XIPATHS=""
 
 if [ -n "$FIREBIRD_PATH" -o -n "$PCRE_PATH" -o -n "$IDN_PATH" -o -n "$SSL_PATH" -o -n "$CRYPTO_PATH" -o -n "$NSL_PATH" -o -n "$SOCKET_PATH" -o -n "$RESOLV_PATH" -o -n "$SAPR3_PATH" -o -n "$SSH_PATH" -o -n "$POSTGRES_PATH" -o -n "$SVN_PATH" -o -n "$NCP_PATH" -o -n "$CURSES_PATH" -o -n "$ORACLE_PATH" -o -n "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then
-    XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"
+    XLIBPATHS="-L/usr/local/lib -L/usr/lib -L/lib"
 fi
 if [ -n "$SSL_PATH" ]; then
     XDEFINES="$XDEFINES -DLIBOPENSSL"
@@@@ -857,6 +857,9 @@@@
 if [ -n "$SSL_IPATH" ]; then
     XIPATHS="-I$SSL_IPATH"
 fi
+if [ -d $PREFIX/include ];then
+   XIPATHS="$XIPATHS -I$PREFIX/include"
+fi
 if [ -n "$CURSES_PATH" ]; then
     XLIBS="$XLIBS -lcurses"
 fi
@


1.6
log
@- Unbreak the build when libssh is not enabled but libidn is
- Add some LIB_DEPENDS

PR:		ports/159124
Submitted by:	Michael Scheidell <scheidell@@secnap.net>
Reviewed by:	Helmut Schneider <jumper99@@gmx.de>
Approved by:	Ruslan Mahmatkhanov <cvs-src@@yandex.ru> (maintainer)
@
text
@d1 3
a3 3
--- configure.orig 2011-07-15 14:17:01.000000000 +0400
+++ configure      2011-08-15 22:22:22.000000000 +0400
@@@@ -653,7 +653,7 @@@@
d6 1
a6 1
 if [ -n "$FIREBIRD_PATH" -o -n "$PCRE_PATH" -o -n "$IDN_PATH" -o -n "$SSL_PATH" -o -n "$CRYPTO_PATH" -o -n "$NSL_PATH" -o -n "$SOCKET_PATH" -o -n "$RESOLV_PATH" -o -n "$SAPR3_PATH" -o -n "$SSH_PATH" -o -n "$POSTGRES_PATH" -o -n "$SVN_PATH" -o -n "$NCP_PATH" -o -n "$ORACLE_PATH" -o -n "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then
d12 1
a12 1
@@@@ -706,6 +706,9 @@@@
d19 2
a20 2
 if [ -n "$SAPR3_IPATH" ]; then
     XIPATHS="$XIPATHS -I$SAPR3_IPATH"
@


1.5
log
@- update to 6.3
- add pkgconfig dependency explicitly when building xhydra
- align local patches for new version

PR:		157468
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- configure.orig	2011-04-30 22:28:12.000000000 +0400
+++ configure	2011-05-31 20:22:25.000000000 +0400
d12 10
@


1.4
log
@- Update to 6.2

PR:		6.2
Submitted by:	Ruslan Mahmatkhanov <cvs-src@@yandex.ru>
Approved by:	maintainer
@
text
@d1 3
a3 3
--- configure.orig	2011-04-07 12:54:49.000000000 +0400
+++ configure	2011-04-15 02:18:31.000000000 +0400
@@@@ -561,7 +561,7 @@@@
d6 1
a6 1
 if [ -n "$FIREBIRD_PATH" -o -n "$PCRE_PATH" -o -n "$IDN_PATH" -o -n "$SSL_PATH" -o -n "$CRYPTO_PATH" -o -n "$NSL_PATH" -o -n "$SOCKET_PATH" -o -n "$RESOLV_PATH" -o -n "$SAPR3_PATH" -o -n "$SSH_PATH" -o -n "$POSTGRES_PATH" -o -n "$SVN_PATH" -o -n "$NCP_PATH" -o -n "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then
@


1.3
log
@- Update to 5.9
- Add options for db backends

PR:		ports/152683
Submitted by:	Ruslan Mahmatkhanov <cvs-src@@yandex.ru>
Approved by:	maintainer
@
text
@d1 4
a4 15
--- configure.orig	2010-11-19 12:52:07.000000000 +0300
+++ configure	2010-11-30 00:06:09.000000000 +0300
@@@@ -152,8 +152,8 @@@@
         fi
     fi  
     if [ "X" = "X$APR_IPATH" ]; then
-        if [ -d "$i/apr-1.0" ]; then
-            APR_IPATH="$i/apr-1.0"
+        if [ -d "$i/apr-1" ]; then
+            APR_IPATH="$i/apr-1"
         fi
     fi  
 done
@@@@ -473,7 +473,7 @@@@
 fi
d6 1
a6 1
 if [ -n "$FIREBIRD_PATH" -o -n "$SSL_PATH" -o -n "$CRYPTO_PATH" -o -n "$NSL_PATH" -o -n "$SOCKET_PATH" -o -n "$RESOLV_PATH" -o -n "$SAPR3_PATH" -o -n "$SSH_PATH" -o -n "$POSTGRES_PATH" -o -n "$SVN_PATH" -o -n "$NCP_PATH" -o -n "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then
@


1.2
log
@- Update to 5.8

PR:		ports/151699
Submitted by:	Ruslan Mahmatkhanov <cvs-src@@yandex.ru>
Approved by:	Laurent LEVIER <llevier@@argosnet.com> (maintainer)
@
text
@d1 3
a3 17
--- configure.orig	2010-09-29 15:19:43.000000000 +0400
+++ configure	2010-10-24 22:49:10.000000000 +0400
@@@@ -125,11 +125,11 @@@@
     echo "                                 ... NOT found, module postgres disabled"
 fi
 
-echo "Checking for SVN (libsvn_client-1 libapr-0.so libaprutil-0.so) ..."
+echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..."
 for i in  $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib .
 do
     if [ "X" = "X$SVN_PATH" ]; then
-        if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-0.so" ]&&[ -f "$i/libaprutil-0.so" ]; then
+        if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-1.so" ]&&[ -f "$i/libaprutil-1.so" ]; then
             SVN_PATH="$i"
         fi
     fi
@@@@ -303,8 +303,8 @@@@
d7 2
a8 2
-        if [ -d "$i/apr-0" ]; then
-            APR_IPATH="$i/apr-0"
d14 1
a14 13
@@@@ -321,8 +321,8 @@@@
         fi
     fi  
     if [ "X" = "X$APR_IPATH" ]; then
-        if [ -d "$i/apr-0" ]; then
-            APR_IPATH="$i/apr-0"
+        if [ -d "$i/apr-1" ]; then
+            APR_IPATH="$i/apr-1"
         fi
     fi  
 done
@@@@ -528,10 +528,10 @@@@
     XLIBS="$XLIBS -lpq"
d16 4
a19 7
 if [ -n "$SVN_PATH" ]; then
-    XLIBS="$XLIBS -lsvn_client-1 -lapr-0 -laprutil-0"
+    XLIBS="$XLIBS -lsvn_client-1 -lapr-1 -laprutil-1"
 fi
 if [ -n "$SVN_PATH" ]; then
-    XLIBS="$XLIBS -lsvn_client-1 -lapr-0 -laprutil-0"
+    XLIBS="$XLIBS -lsvn_client-1 -lapr-1 -laprutil-1"
d21 2
a22 2
 if [ -n "$SSH_PATH" ]; then
     XLIBS="$XLIBS -lssh"
@


1.1
log
@- Update to 5.3
- Fix detection for optional subversion module

PR:		ports/104891
Submitted by:	Nicolas Blais <nb_root@@videotron.ca>
Approved by:	maintainer timeout (3 weeks)
@
text
@d1 4
a4 4
--- configure.orig	Sat Oct 28 19:51:24 2006
+++ configure	Sat Oct 28 19:42:03 2006
@@@@ -118,11 +118,11 @@@@
     echo "                              ... NOT found, module postgres disabled"
d7 2
a8 2
-echo "Checking for SVN (ibsvn_client-1 libapr-0.so libaprutil-0.so) ..."
+echo "Checking for SVN (ibsvn_client-1 libapr-1.so libaprutil-1.so) ..."
d17 1
a17 1
@@@@ -202,8 +202,8 @@@@
d28 1
a28 1
@@@@ -220,8 +220,8 @@@@
d39 1
a39 1
@@@@ -379,10 +379,10 @@@@
@

