Attachment #124971 for bug #168501

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




		xmlto:${PORTSDIR}/textproc/xmlto
.endif
LIB_DEPENDS=	gmime-2.4:${PORTSDIR}/mail/gmime24 \
		zdb:${PORTSDIR}/databases/libzdb \
		mhash:${PORTSDIR}/security/mhash \
		event:${PORTSDIR}/devel/libevent

CONFLICTS=	dbmail-*-2.0.* dbmail-2.*

OPTIONS_DEFINE=	LDAP SIEVE THREADS
OPTIONS_DEFAULT=	THREADS
SIEVE_DESC=	"Build with support for Sieve mail sorting language"

USE_AUTOTOOLS=	libtool
USE_GMAKE=	yes

USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
USE_OPENSSL=	yes

CFLAGS+=	-fPIC ${PTHREAD_CFLAGS}
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS+=	--with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
MAKE_ARGS+=	mandir=${MANPREFIX}/man


.if defined(WITH_SIEVE)
CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}
LIB_DEPENDS+=	sieve:${PORTSDIR}/mail/libsieve
PLIST_SUB+=	SIEVE=""
.else
PLIST_SUB+=	SIEVE="@comment "

PLIST_SUB+=	LDAP="@comment "
.endif

.if defined(WITH_THREADS)
EXTRA_PATCHES=	${FILESDIR}/extra-patch-acinclude.m4
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
.endif

.if !defined(NOPORTDOCS)
CONFIGURE_ARGS+=	--enable-manpages
.endif




--- acinclude.m4.orig	2012-05-30 16:42:44.000000000 +0100
+++ acinclude.m4	2012-05-30 16:44:28.000000000 +0100
@@ -235,7 +235,7 @@
         dnl See if we already have the paths we need in the environment.
 	dnl ...but only if --with-ldap was given without a specific path.
         if ( test [ "x$lookforldap" = "xyes" ] || test [ "x$lookforauthldap" = "xyes" ] ); then
-            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap"], [LDAPLIB="failed"])
+            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap_r"], [LDAPLIB="failed"])
             if test [ "x$LDAPLIB" != "xfailed" ]; then
                 break
             fi
@@ -247,7 +247,7 @@
             SAVE_CFLAGS=$CFLAGS
 	    dnl The headers might be in a funny place, so we need to use -Ipath
             CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
-            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap"], [LDAPLIB="failed"])
+            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap_r"], [LDAPLIB="failed"])
             CFLAGS=$SAVE_CFLAGS
             if test [ "x$LDAPLIB" != "xfailed" ]; then
                 break 2




+++ configure.orig	2012-03-11 08:02:30.000000000 +0000
--- configure	2012-05-31 12:47:22.000000000 +0100
@@ -4420,7 +4420,7 @@
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LDAP_H 1
 _ACEOF
- LDAPLIB="-lldap"
+ LDAPLIB="-lldap_r"
 else
   LDAPLIB="failed"
 fi
@@ -4443,7 +4443,7 @@
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LDAP_H 1
 _ACEOF
- LDAPLIB="-L$TEST_PATH -lldap"
+ LDAPLIB="-L$TEST_PATH -lldap_r"
 else
   LDAPLIB="failed"
 fi
@@ -4489,7 +4489,7 @@
   return 0;
 }
 _ACEOF
-for ac_lib in '' ldap; do
+for ac_lib in '' ldap_r; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else




--- src/dbmail.h.in.orig	2012-05-31 13:06:26.000000000 +0100
+++ src/dbmail.h.in	2012-05-31 13:07:01.000000000 +0100
@@ -150,6 +150,10 @@
 #include <endian.h>
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define GETCONFIGVALUE(key, sect, var) \
 	config_get_value(key, sect, var); \
 	if (strlen(var) > 0) \

Return to bug 168501

Lines 20-33 Link Here

(-)dbmail/Makefile (-7 / +14 lines)
20	xmlto:${PORTSDIR}/textproc/xmlto	20	xmlto:${PORTSDIR}/textproc/xmlto
21	.endif	21	.endif
22	LIB_DEPENDS= gmime-2.4:${PORTSDIR}/mail/gmime24 \	22	LIB_DEPENDS= gmime-2.4:${PORTSDIR}/mail/gmime24 \
23	zdb.8:${PORTSDIR}/databases/libzdb \	23	zdb:${PORTSDIR}/databases/libzdb \
24	mhash.2:${PORTSDIR}/security/mhash \	24	mhash:${PORTSDIR}/security/mhash \
25	event-1.4:${PORTSDIR}/devel/libevent	25	event:${PORTSDIR}/devel/libevent
26		26
27	CONFLICTS= dbmail--2.0. dbmail-2.*	27	CONFLICTS= dbmail--2.0. dbmail-2.*
28		28
29	OPTIONS= SIEVE "Build with support for Sieve mail sorting language" off \	29	OPTIONS_DEFINE= LDAP SIEVE THREADS
30	LDAP "Build with support for LDAP authentication" off	30	OPTIONS_DEFAULT= THREADS
		31	SIEVE_DESC= "Build with support for Sieve mail sorting language"
31		32
32	USE_AUTOTOOLS= libtool	33	USE_AUTOTOOLS= libtool
33	USE_GMAKE= yes	34	USE_GMAKE= yes
Lines 35-41 Link Here
35	USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved	36	USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
36	USE_OPENSSL= yes	37	USE_OPENSSL= yes
37		38
38	CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	39	CFLAGS+= -fPIC ${PTHREAD_CFLAGS}
		40	CPPFLAGS+= -I${LOCALBASE}/include
39	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	41	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
40	CONFIGURE_ARGS+= --with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc	42	CONFIGURE_ARGS+= --with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
41	MAKE_ARGS+= mandir=${MANPREFIX}/man	43	MAKE_ARGS+= mandir=${MANPREFIX}/man
Lines 67-73 Link Here
67		69
68	.if defined(WITH_SIEVE)	70	.if defined(WITH_SIEVE)
69	CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}	71	CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}
70	LIB_DEPENDS+= sieve.1:${PORTSDIR}/mail/libsieve	72	LIB_DEPENDS+= sieve:${PORTSDIR}/mail/libsieve
71	PLIST_SUB+= SIEVE=""	73	PLIST_SUB+= SIEVE=""
72	.else	74	.else
73	PLIST_SUB+= SIEVE="@comment "	75	PLIST_SUB+= SIEVE="@comment "
Lines 81-86 Link Here
81	PLIST_SUB+= LDAP="@comment "	83	PLIST_SUB+= LDAP="@comment "
82	.endif	84	.endif
83		85
		86	.if defined(WITH_THREADS)
		87	EXTRA_PATCHES= ${FILESDIR}/extra-patch-acinclude.m4
		88	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure
		89	.endif
		90
84	.if !defined(NOPORTDOCS)	91	.if !defined(NOPORTDOCS)
85	CONFIGURE_ARGS+= --enable-manpages	92	CONFIGURE_ARGS+= --enable-manpages
86	.endif	93	.endif

Line 0 Link Here

(-)dbmail/files/extra-patch-acinclude.m4 (+20 lines)
	1	--- acinclude.m4.orig 2012-05-30 16:42:44.000000000 +0100
	2	+++ acinclude.m4 2012-05-30 16:44:28.000000000 +0100
	3	@@ -235,7 +235,7 @@
	4	dnl See if we already have the paths we need in the environment.
	5	dnl ...but only if --with-ldap was given without a specific path.
	6	if ( test [ "x$lookforldap" = "xyes" ] \|\| test [ "x$lookforauthldap" = "xyes" ] ); then
	7	- AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap"], [LDAPLIB="failed"])
	8	+ AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap_r"], [LDAPLIB="failed"])
	9	if test [ "x$LDAPLIB" != "xfailed" ]; then
	10	break
	11	fi
	12	@@ -247,7 +247,7 @@
	13	SAVE_CFLAGS=$CFLAGS
	14	dnl The headers might be in a funny place, so we need to use -Ipath
	15	CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
	16	- AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap"], [LDAPLIB="failed"])
	17	+ AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap_r"], [LDAPLIB="failed"])
	18	CFLAGS=$SAVE_CFLAGS
	19	if test [ "x$LDAPLIB" != "xfailed" ]; then
	20	break 2

Line 0 Link Here

(-)dbmail/files/extra-patch-configure (+29 lines)
	1	+++ configure.orig 2012-03-11 08:02:30.000000000 +0000
	2	--- configure 2012-05-31 12:47:22.000000000 +0100
	3	@@ -4420,7 +4420,7 @@
	4	cat >>confdefs.h <<_ACEOF
	5	#define HAVE_LDAP_H 1
	6	_ACEOF
	7	- LDAPLIB="-lldap"
	8	+ LDAPLIB="-lldap_r"
	9	else
	10	LDAPLIB="failed"
	11	fi
	12	@@ -4443,7 +4443,7 @@
	13	cat >>confdefs.h <<_ACEOF
	14	#define HAVE_LDAP_H 1
	15	_ACEOF
	16	- LDAPLIB="-L$TEST_PATH -lldap"
	17	+ LDAPLIB="-L$TEST_PATH -lldap_r"
	18	else
	19	LDAPLIB="failed"
	20	fi
	21	@@ -4489,7 +4489,7 @@
	22	return 0;
	23	}
	24	_ACEOF
	25	-for ac_lib in '' ldap; do
	26	+for ac_lib in '' ldap_r; do
	27	if test -z "$ac_lib"; then
	28	ac_res="none required"
	29	else

Line 0 Link Here

(-)dbmail/files/patch-src_dbmail.h.in (+13 lines)
	1	--- src/dbmail.h.in.orig 2012-05-31 13:06:26.000000000 +0100
	2	+++ src/dbmail.h.in 2012-05-31 13:07:01.000000000 +0100
	3	@@ -150,6 +150,10 @@
	4	#include <endian.h>
	5	#endif
	6
	7	+#ifdef HAVE_CONFIG_H
	8	+#include "config.h"
	9	+#endif
	10	+
	11	#define GETCONFIGVALUE(key, sect, var) \
	12	config_get_value(key, sect, var); \
	13	if (strlen(var) > 0) \