Attachment 114072 Details for Bug 155703 – bsd.database.mk.diff

[patch] bsd.database.mk.diff

bsd.database.mk.diff (text/plain), 1.57 KB, created by Matthew Seaman on 2011-03-19 19:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Seaman

Created: 2011-03-19 19:10:02 UTC

Size: 1.57 KB

patch

obsolete

>Index: bsd.database.mk
>===================================================================
>RCS file: /home/ncvs/ports/Mk/bsd.database.mk,v
>retrieving revision 1.54
>diff -u -u -r1.54 bsd.database.mk
>--- bsd.database.mk	19 Mar 2011 13:13:46 -0000	1.54
>+++ bsd.database.mk	19 Mar 2011 16:15:21 -0000
>@@ -15,12 +15,14 @@
> # USE_[DATABASE]_VER or WANT_[DATABASE]_VER will include this file as well.
> #
> ##
>-# USE_MYSQL		- Add MySQL (client/server/embedded) dependency (default:
>-#				  client).
>+# USE_MYSQL		- Add MySQL (client/server/embedded/compat) dependency
>+#				  (default: client).
> #				  If no version is given (by the maintainer via the port or
> #				  by the user via defined variable), try to find the
>-#				  currently installed version.  Fall back to default if
>-#				  necessary (MySQL-5.5 = 55).
>+#				  currently installed version.	Fall back to default if
>+#				  necessary (MySQL-5.5 = 55). 'compat' allows the
>+#				  IGNORE_WITH_MYSQL functionality, but doesn't add any
>+#				  LIB_DEPENDS 
> # DEFAULT_MYSQL_VER
> #				- MySQL default version.  Can be overridden within a port.
> #				  Default: 55.
>@@ -161,6 +163,7 @@
> .		endif
> .	endfor
> .endif # IGNORE_WITH_MYSQL
>+.if (${USE_MYSQL} != "compat")
> .if (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded")
> RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER}
> .if (${USE_MYSQL} == "embedded")
>@@ -169,6 +172,7 @@
> .else
> LIB_DEPENDS+=	mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/${_MYSQL_CLIENT}
> .endif
>+.endif
> .else
> IGNORE=		cannot install: unknown MySQL version: ${MYSQL_VER}
> .endif # Check for correct libs

Actions: View | Diff

Attachments on bug 155703: 114072