cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use the USE_MYSQL var instead of manually seting DEPENDS to mysql323 [1]

Browse Source 
update courier-imap to 2.1.2

PR:		ports/56676
Submitted by:	YazzY <yazzy@yazzy.org> [1]
		Clement Laforet <sheepkiller@cultdeadsheep.org> [1]
This commit is contained in:
Oliver Lehmann 2003-09-24 14:27:17 +00:00
parent 31eaf5e258
commit 268ce96a86
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=89232
3 changed files with 152 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/courier-imap/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= courier-imap
PORTVERSION= 2.1.1
PORTVERSION= 2.1.2
PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= mail ipv6
@ -105,11 +105,11 @@ LIB_DEPENDS= ldap.1:${PORTSDIR}/net/openldap12 \
CONFIGURE_ARGS+=--without-authmysql
PLIST_SUB+= MYSQLFLAG="@comment "
.else
USE_MYSQL= YES
PLIST_SUB+= MYSQLFLAG=""
CONFIGURE_ARGS+=--with-authmysql \
--with-mysql-libs=${LOCALBASE}/lib/mysql \
--with-mysql-includes=${LOCALBASE}/include/mysql
LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
PLIST_SUB+= MYSQLFLAG=""
.endif
.if !defined(WITH_POSTGRESQL)

2
mail/courier-imap/distinfo
View File

@ -1 +1 @@
MD5 (courier-imap-2.1.1.tar.bz2) = 71d9e88053351dbf7df04943189ec1cd
MD5 (courier-imap-2.1.2.tar.bz2) = d77ef5d3c90fd0a70b333a44e0ead0a2

148
mail/courier-imap/files/patch-mysql Normal file
View File

@ -0,0 +1,148 @@
--- authlib/configure.orig Wed Sep 10 00:51:36 2003
+++ authlib/configure Wed Sep 10 01:04:27 2003
@@ -6766,9 +6766,9 @@
if test "$doauthmysql" = ""
then
LIBS="$MYSQL_LIBS $LIBS"
- echo "$as_me:$LINENO: checking for mysql_connect" >&5
-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
-if test "${ac_cv_func_mysql_connect+set}" = set; then
+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -6779,7 +6779,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char mysql_connect (); below.
+ which can conflict with char mysql_real_connect (); below. */
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
@@ -6794,14 +6794,14 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char mysql_connect ();
+char mysql_real_connect ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
choke me
#else
-char (*f) () = mysql_connect;
+char (*f) () = mysql_real_connect;
#endif
#ifdef __cplusplus
}
@@ -6810,7 +6810,7 @@
int
main ()
{
-return f != mysql_connect;
+return f != mysql_real_connect;
;
return 0;
}
@@ -6827,18 +6827,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_func_mysql_connect=yes
+ ac_cv_func_mysql_real_connect=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_mysql_connect=no
+ac_cv_func_mysql_real_connect=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
-if test $ac_cv_func_mysql_connect = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
+if test $ac_cv_func_mysql_real_connect = yes; then
doauthmysql="yes"
fi
@@ -6930,9 +6930,9 @@
else
saveLIBS="$LIBS"
LIBS="$MYSQL_LIBS $LIBS"
- echo "$as_me:$LINENO: checking for mysql_connect" >&5
-echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
-if test "${ac_cv_func_mysql_connect+set}" = set; then
+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -6943,7 +6943,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char mysql_connect (); below.
+ which can conflict with char mysql_real_connect (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
@@ -6958,14 +6958,14 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char mysql_connect ();
+char mysql_real_connect ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
choke me
#else
-char (*f) () = mysql_connect;
+char (*f) () = mysql_real_connect;
#endif
#ifdef __cplusplus
}
@@ -6974,7 +6974,7 @@
int
main ()
{
-return f != mysql_connect;
+return f != mysql_real_connect;
;
return 0;
}
@@ -6991,18 +6991,18 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_func_mysql_connect=yes
+ ac_cv_func_mysql_real_connect=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_mysql_connect=no
+ac_cv_func_mysql_real_connect=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
-echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
-if test $ac_cv_func_mysql_connect = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
+if test $ac_cv_func_mysql_real_connect = yes; then
AUTHMYSQL="authmysql"
HAVE_AUTHMYSQL=1
else