Attachment #250901 for bug #279253

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

Lines 76-82 MAKE_JOBS_UNSAFE= yes Link Here

(-)b/mail/dspam/Makefile (-2 lines)
76	USES= perl5 libtool pathfix shebangfix	76	USES= perl5 libtool pathfix shebangfix
77	USE_LDCONFIG= yes	77	USE_LDCONFIG= yes
78	GNU_CONFIGURE= yes	78	GNU_CONFIGURE= yes
79	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
80	CPPFLAGS+= -I${LOCALBASE}/include	79	CPPFLAGS+= -I${LOCALBASE}/include
81	LDFLAGS+= -L${LOCALBASE}/lib	80	LDFLAGS+= -L${LOCALBASE}/lib
82		81
Lines 272-278 CONFIGURE_ARGS+= --with-mysql-includes=${LOCALBASE}/include/mysql \ Link Here
272	--with-mysql-libraries=${LOCALBASE}/lib/mysql	271	--with-mysql-libraries=${LOCALBASE}/lib/mysql
273	PLIST_SUB+= MYSQL=""	272	PLIST_SUB+= MYSQL=""
274	_DBDRV_COUNT:= ${_DBDRV_COUNT}o	273	_DBDRV_COUNT:= ${_DBDRV_COUNT}o
275	IGNORE_WITH_MYSQL= 105m 106m 1011m
276	. if ${PORT_OPTIONS:MMYSQL_COMPRESS}	274	. if ${PORT_OPTIONS:MMYSQL_COMPRESS}
277	CONFIGURE_ARGS+= --enable-client-compression	275	CONFIGURE_ARGS+= --enable-client-compression
278	. endif	276	. endif




--- configure.orig	2012-04-23 17:53:49 UTC
+++ configure
@@ -13614,6 +13614,13 @@ main ()
 {
 
             int is_ok = 0;
+#if defined(MARIADB_PACKAGE_VERSION) && defined(MARIADB_PACKAGE_VERSION_ID) && MARIADB_PACKAGE_VERSION_ID >= 30000
+            size_t version;
+            if (mariadb_get_infov(NULL, MARIADB_CLIENT_VERSION_ID, &version) != 0)
+              version = mysql_get_client_version();
+            if (version >= 100000)
+              is_ok = 1;
+#else
             const char *info = mysql_get_client_info();
             char *i = strdup(info);
             char *m = strtok(i, ".");
@@ -13621,6 +13628,7 @@ main ()
               if (atoi(m) >= 5)
                 is_ok = 1;
             free (i);
+#endif
             return is_ok ? 0 : 1;
 
   ;

Lines 214-219 libdata/pkgconfig/dspam.pc Link Here

(-)b/mail/dspam/pkg-plist (+1 lines)
214	@(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/firstrun.txt.sample	214	@(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/firstrun.txt.sample
215	@(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/firstspam.txt.sample	215	@(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/firstspam.txt.sample
216	@(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/quarantinefull.txt.sample	216	@(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/quarantinefull.txt.sample
		217	@dir lib/%%DSPAM_OWNER%%
217	@dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%,%%DSPAM_HOME_MODE%%) %%DSPAM_HOME%%	218	@dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%,%%DSPAM_HOME_MODE%%) %%DSPAM_HOME%%
218	@dir(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%) %%LOG_DIR%%	219	@dir(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%) %%LOG_DIR%%
219	@dir(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%) %%RUN_DIR%%	220	@dir(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%) %%RUN_DIR%%

Return to bug 279253

Added Link Here

(-)b/mail/dspam/files/patch-configure (+24 lines)
1	--- configure.orig 2012-04-23 17:53:49 UTC
2	+++ configure
3	@@ -13614,6 +13614,13 @@ main ()
4	{
5
6	int is_ok = 0;
7	+#if defined(MARIADB_PACKAGE_VERSION) && defined(MARIADB_PACKAGE_VERSION_ID) && MARIADB_PACKAGE_VERSION_ID >= 30000
8	+ size_t version;
9	+ if (mariadb_get_infov(NULL, MARIADB_CLIENT_VERSION_ID, &version) != 0)
10	+ version = mysql_get_client_version();
11	+ if (version >= 100000)
12	+ is_ok = 1;
13	+#else
14	const char *info = mysql_get_client_info();
15	char *i = strdup(info);
16	char *m = strtok(i, ".");
17	@@ -13621,6 +13628,7 @@ main ()
18	if (atoi(m) >= 5)
19	is_ok = 1;
20	free (i);
21	+#endif
22	return is_ok ? 0 : 1;
23
24	;