Attachment 250901 Details for Bug 279253 – fix configure with modern MariaDB

[patch] fix configure with modern MariaDB

dspam.diff (text/plain), 2.30 KB, created by Vladimir Druzenko on 2024-05-23 14:38:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-05-23 14:38:35 UTC

Size: 2.30 KB

patch

obsolete

>diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
>index 95b5e46d295f..c556d22cff05 100644
>--- a/mail/dspam/Makefile
>+++ b/mail/dspam/Makefile
>@@ -76,7 +76,6 @@ MAKE_JOBS_UNSAFE=	yes
> USES=		perl5 libtool pathfix shebangfix
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>@@ -272,7 +271,6 @@ CONFIGURE_ARGS+=	--with-mysql-includes=${LOCALBASE}/include/mysql \
> 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
> PLIST_SUB+=	MYSQL=""
> _DBDRV_COUNT:=	${_DBDRV_COUNT}o
>-IGNORE_WITH_MYSQL=	105m 106m 1011m
> .	if ${PORT_OPTIONS:MMYSQL_COMPRESS}
> CONFIGURE_ARGS+=	--enable-client-compression
> .	endif
>diff --git a/mail/dspam/files/patch-configure b/mail/dspam/files/patch-configure
>new file mode 100644
>index 000000000000..723a4801d900
>--- /dev/null
>+++ b/mail/dspam/files/patch-configure
>@@ -0,0 +1,24 @@
>+--- 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;
>+ 
>+   ;
>diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist
>index 6d193dc33166..3bf64907bcae 100644
>--- a/mail/dspam/pkg-plist
>+++ b/mail/dspam/pkg-plist
>@@ -214,6 +214,7 @@ libdata/pkgconfig/dspam.pc
> @(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/firstrun.txt.sample
> @(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/firstspam.txt.sample
> @(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%DSPAM_HOME%%/quarantinefull.txt.sample
>+@dir lib/%%DSPAM_OWNER%%
> @dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%,%%DSPAM_HOME_MODE%%) %%DSPAM_HOME%%
> @dir(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%) %%LOG_DIR%%
> @dir(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%) %%RUN_DIR%%

Actions: View | Diff

Attachments on bug 279253: 250901