Attachment #10715 for bug #21411

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




		--enable-static \
		--enable-login \
		--with-pwcheck=/var/pwcheck \
		--with-dblib=ndbm \
		--with-rc4=openssl

SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
		PREFIX="${PREFIX}" \
		TOUCH="${TOUCH}" \
		MKDIR="${MKDIR}" \
		ENABLE_DB3="${ENABLE_DB3}" \
		ENABLE_MYSQL="${ENABLE_MYSQL}" \
		ENABLE_LDAP="${ENABLE_LDAP}"

# ENABLE_* variables can be used by depending ports to enable options.

# JavaSASL needs someone to look at to get it to build
#JAVADIR=        jdk1.1.8




--- configure.in.orig	Thu Jul 20 21:35:01 2000
+++ configure.in	Tue Sep 19 21:51:11 2000
@@ -66,8 +66,9 @@
 dnl check for -R, etc. switch
 CMU_GUESS_RUNPATH_SWITCH

 
 AM_DISABLE_STATIC
 
@@ -232,6 +233,13 @@
     SASL_DB_BACKEND="db_${dblib}.lo"
     AC_DEFINE(SASL_BERKELEYDB)
     SASL_DB_LIB="-ldb"
+    for db3loc in ${prefix} /usr/local /usr
+    do
+      if test -d ${db3loc}/include/db3; then
+	CPPFLAGS="-I${db3loc}/include/db3 $CPPFLAGS"
+	break
+      fi
+    done
     ;;
   *)
     AC_MSG_WARN([Disabling SASL authentication database support])
@@ -310,6 +318,88 @@
 fi
 AM_CONDITIONAL(PWCHECK, test "$with_pwcheck" != no)
 

 dnl CRAM-MD5
 AC_ARG_ENABLE(cram, [  --enable-cram           enable CRAM-MD5 authentication [yes] ],
   cram=$enableval,
@@ -434,11 +524,15 @@
   fi
 
   if test "$with_des" != no; then




fi

if [ "${BATCH}" ]; then
	if [ "x${ENABLE_DB3}" = "xYES" ]; then
		OPTIONS=\"DB3\"
	fi
	if [ "x${ENABLE_MYSQL}" = "xYES" ]; then
		OPTIONS="${OPTIONS} \"MySQL\""
	fi
	if [ "x${ENABLE_LDAP}" = "xYES" ]; then
		OPTIONS="${OPTIONS} \"OpenLDAP\""
	fi
	if [ "x${OPTIONS}" != "x" ]; then
		set ${OPTIONS}
	fi
else

	if [ "x${ENABLE_DB3}" = "xYES" -o -f ${PREFIX}/lib/libdb3.so ] ; then
		SET_DB3="ON"
	else
		SET_DB3="OFF"
	fi
	if [ "x${ENABLE_MYSQL}" = "xYES" -o -f ${PREFIX}/lib/libmysqlclient.so ] ; then
		SET_MYSQL="ON"
	else
		SET_MYSQL="OFF"
	fi
	if [ "x${ENABLE_LDAP}" = "xYES" -o \
	     -f ${PREFIX}/lib/libldap.so -a -f ${PREFIX}/lib/liblber.so ] ; then
		SET_LDAP="ON"
	else
		SET_LDAP="OFF"
	fi

	/usr/bin/dialog --title "Additional SASL options" --clear \
		--checklist "\n\
Please select desired options:" -1 -1 16 \
DB3		"Berkeley DB package, revision 3" ${SET_DB3} \
MySQL		"MySQL password Authentication" ${SET_MYSQL} \
OpenLDAP	"OpenLDAP password Authentication" ${SET_LDAP} \
2> /tmp/checklist.tmp.$$

	retval=$?


while [ "$1" ]; do
	case $1 in
		\"DB3\")
			#Can't use LIB_DEPENDS - no libdb3.so.1 in db3 port
			#echo "LIB_DEPENDS+=	db3.1:\${PORTSDIR}/databases/db3"
			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libdb3.1.so:\${PORTSDIR}/databases/db3"
			echo "RUN_DEPENDS+=	\${LOCALBASE}/lib/libdb3.1.so:\${PORTSDIR}/databases/db3"
			echo "CONFIGURE_ARGS+=--with-dblib=berkeley"
			;;
		\"MySQL\")
			echo "LIB_DEPENDS+=	mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
			echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"

Return to bug 21411

Lines 43-54 Link Here

(-)cyrus-sasl/Makefile (-1 / +7 lines)
43	--enable-static \	43	--enable-static \
44	--enable-login \	44	--enable-login \
45	--with-pwcheck=/var/pwcheck \	45	--with-pwcheck=/var/pwcheck \
		46	--with-dblib=ndbm \
46	--with-rc4=openssl	47	--with-rc4=openssl
47		48
48	SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \	49	SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
49	PREFIX="${PREFIX}" \	50	PREFIX="${PREFIX}" \
50	TOUCH="${TOUCH}" \	51	TOUCH="${TOUCH}" \
51	MKDIR="${MKDIR}"	52	MKDIR="${MKDIR}" \
		53	ENABLE_DB3="${ENABLE_DB3}" \
		54	ENABLE_MYSQL="${ENABLE_MYSQL}" \
		55	ENABLE_LDAP="${ENABLE_LDAP}"
		56
		57	# ENABLE_* variables can be used by depending ports to enable options.
52		58
53	# JavaSASL needs someone to look at to get it to build	59	# JavaSASL needs someone to look at to get it to build
54	#JAVADIR= jdk1.1.8	60	#JAVADIR= jdk1.1.8

Lines 1-5 Link Here

(-)cyrus-sasl/patches/patch-ab (-3 / +17 lines)
1	--- configure.in.orig Thu Jul 20 21:35:01 2000	1	--- configure.in.orig Thu Jul 20 21:35:01 2000
2	+++ configure.in Sat Sep 16 13:58:02 2000	2	+++ configure.in Tue Sep 19 21:51:11 2000
3	@@ -66,8 +66,9 @@	3	@@ -66,8 +66,9 @@
4	dnl check for -R, etc. switch	4	dnl check for -R, etc. switch
5	CMU_GUESS_RUNPATH_SWITCH	5	CMU_GUESS_RUNPATH_SWITCH
Lines 12-18 Link Here
12		12
13	AM_DISABLE_STATIC	13	AM_DISABLE_STATIC
14		14
15	@@ -310,6 +311,88 @@	15	@@ -232,6 +233,13 @@
		16	SASL_DB_BACKEND="db_${dblib}.lo"
		17	AC_DEFINE(SASL_BERKELEYDB)
		18	SASL_DB_LIB="-ldb"
		19	+ for db3loc in ${prefix} /usr/local /usr
		20	+ do
		21	+ if test -d ${db3loc}/include/db3; then
		22	+ CPPFLAGS="-I${db3loc}/include/db3 $CPPFLAGS"
		23	+ break
		24	+ fi
		25	+ done
		26	;;
		27	*)
		28	AC_MSG_WARN([Disabling SASL authentication database support])
		29	@@ -310,6 +318,88 @@
16	fi	30	fi
17	AM_CONDITIONAL(PWCHECK, test "$with_pwcheck" != no)	31	AM_CONDITIONAL(PWCHECK, test "$with_pwcheck" != no)
18		32
Lines 101-107 Link Here
101	dnl CRAM-MD5	115	dnl CRAM-MD5
102	AC_ARG_ENABLE(cram, [ --enable-cram enable CRAM-MD5 authentication [yes] ],	116	AC_ARG_ENABLE(cram, [ --enable-cram enable CRAM-MD5 authentication [yes] ],
103	cram=$enableval,	117	cram=$enableval,
104	@@ -434,11 +517,15 @@	118	@@ -434,11 +524,15 @@
105	fi	119	fi
106		120
107	if test "$with_des" != no; then	121	if test "$with_des" != no; then

Lines 6-18 Link Here

(-)cyrus-sasl/scripts/configure.sasl (-4 / +41 lines)
6	fi	6	fi
7		7
8	if [ "${BATCH}" ]; then	8	if [ "${BATCH}" ]; then
9	exit	9	if [ "x${ENABLE_DB3}" = "xYES" ]; then
		10	OPTIONS=\"DB3\"
		11	fi
		12	if [ "x${ENABLE_MYSQL}" = "xYES" ]; then
		13	OPTIONS="${OPTIONS} \"MySQL\""
		14	fi
		15	if [ "x${ENABLE_LDAP}" = "xYES" ]; then
		16	OPTIONS="${OPTIONS} \"OpenLDAP\""
		17	fi
		18	if [ "x${OPTIONS}" != "x" ]; then
		19	set ${OPTIONS}
		20	fi
10	else	21	else
11	/usr/bin/dialog --title "Additional pwcheck methods" --clear \	22
		23	if [ "x${ENABLE_DB3}" = "xYES" -o -f ${PREFIX}/lib/libdb3.so ] ; then
		24	SET_DB3="ON"
		25	else
		26	SET_DB3="OFF"
		27	fi
		28	if [ "x${ENABLE_MYSQL}" = "xYES" -o -f ${PREFIX}/lib/libmysqlclient.so ] ; then
		29	SET_MYSQL="ON"
		30	else
		31	SET_MYSQL="OFF"
		32	fi
		33	if [ "x${ENABLE_LDAP}" = "xYES" -o \
		34	-f ${PREFIX}/lib/libldap.so -a -f ${PREFIX}/lib/liblber.so ] ; then
		35	SET_LDAP="ON"
		36	else
		37	SET_LDAP="OFF"
		38	fi
		39
		40	/usr/bin/dialog --title "Additional SASL options" --clear \
12	--checklist "\n\	41	--checklist "\n\
13	Please select desired options:" -1 -1 16 \	42	Please select desired options:" -1 -1 16 \
14	MySQL "MySQL password Authentication" OFF \	43	DB3 "Berkeley DB package, revision 3" ${SET_DB3} \
15	OpenLDAP "OpenLDAP password Authentication" OFF \	44	MySQL "MySQL password Authentication" ${SET_MYSQL} \
		45	OpenLDAP "OpenLDAP password Authentication" ${SET_LDAP} \
16	2> /tmp/checklist.tmp.$$	46	2> /tmp/checklist.tmp.$$
17		47
18	retval=$?	48	retval=$?
Lines 40-45 Link Here
40		70
41	while [ "$1" ]; do	71	while [ "$1" ]; do
42	case $1 in	72	case $1 in
		73	\"DB3\")
		74	#Can't use LIB_DEPENDS - no libdb3.so.1 in db3 port
		75	#echo "LIB_DEPENDS+= db3.1:\${PORTSDIR}/databases/db3"
		76	echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libdb3.1.so:\${PORTSDIR}/databases/db3"
		77	echo "RUN_DEPENDS+= \${LOCALBASE}/lib/libdb3.1.so:\${PORTSDIR}/databases/db3"
		78	echo "CONFIGURE_ARGS+=--with-dblib=berkeley"
		79	;;
43	\"MySQL\")	80	\"MySQL\")
44	echo "LIB_DEPENDS+= mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"	81	echo "LIB_DEPENDS+= mysqlclient.6:\${PORTSDIR}/databases/mysql322-client"
45	echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"	82	echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}"