Attachment 109454 Details for Bug 150488 – file.diff

[patch] file.diff

file.diff (text/plain), 4.38 KB, created by Rui Paulo on 2010-09-11 12:00:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rui Paulo

Created: 2010-09-11 12:00:07 UTC

Size: 4.38 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-server/Makefile,v
>retrieving revision 1.262
>diff -u -p -r1.262 Makefile
>--- Makefile	27 Jul 2010 15:10:54 -0000	1.262
>+++ Makefile	11 Sep 2010 10:49:33 -0000
>@@ -45,6 +45,10 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CH
> .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
> CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
> .endif
>+.if defined(WITH_DTRACE)
>+CONFIGURE_ARGS+=--enable-dtrace
>+LDFLAGS+=-lelf
>+.endif
> .if defined(WITH_OPENSSL)
> .if !defined(WITHOUT_YASSL)
> CONFIGURE_ARGS+=--with-ssl=bundled
>@@ -123,6 +127,7 @@ pre-fetch:
> 	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
> 	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
> 	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
>+	@${ECHO} "	WITH_DTRACE=yes		Enable DTrace probes."
> 	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections"
> 	@${ECHO} "				(define WITHOUT_YASSL for backward compatibility)."
> 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
>Index: files/patch-configure.am
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-server/files/patch-configure.am,v
>retrieving revision 1.2
>diff -u -p -r1.2 patch-configure.am
>--- files/patch-configure.am	16 Jul 2010 10:24:46 -0000	1.2
>+++ files/patch-configure.am	11 Sep 2010 10:49:33 -0000
>@@ -1,5 +1,5 @@
>---- configure.am.orig	2010-07-06 20:37:18.000000000 +0200
>-+++ configure.am	2010-07-16 11:11:48.000000000 +0200
>+--- configure.am.orig	2010-07-06 19:37:18.000000000 +0100
>++++ configure.am	2010-09-09 13:06:42.000000000 +0100
> @@ -990,6 +990,8 @@
>  MYSQL_BASE_VERSION
>  MYSQL_NO_DASH_VERSION
>@@ -9,6 +9,15 @@
>  TEST_NDBCLUSTER
>  MAKEINDEX
>  PDFLATEX
>+@@ -12651,7 +12653,7 @@
>+ _ACEOF
>+ 
>+     case "$target_os" in
>+-      *solaris*)
>++      *solaris*|*freebsd*)
>+         HAVE_DTRACE_DASH_G="yes"
>+         ;;
>+       *)
> @@ -12684,6 +12686,8 @@
>  NDB_VERSION_MINOR=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f2`
>  NDB_VERSION_BUILD=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f3`
>rpaulo@freebsd-vm1 ports/databases/mysql55-server % cvs diff
>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-server/Makefile,v
>retrieving revision 1.262
>diff -u -p -r1.262 Makefile
>--- Makefile	27 Jul 2010 15:10:54 -0000	1.262
>+++ Makefile	11 Sep 2010 10:50:10 -0000
>@@ -45,6 +45,10 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CH
> .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
> CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
> .endif
>+.if defined(WITH_DTRACE)
>+CONFIGURE_ARGS+=--enable-dtrace
>+LDFLAGS+=-lelf
>+.endif
> .if defined(WITH_OPENSSL)
> .if !defined(WITHOUT_YASSL)
> CONFIGURE_ARGS+=--with-ssl=bundled
>@@ -123,6 +127,7 @@ pre-fetch:
> 	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
> 	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
> 	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
>+	@${ECHO} "	WITH_DTRACE=yes		Enable DTrace probes."
> 	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections"
> 	@${ECHO} "				(define WITHOUT_YASSL for backward compatibility)."
> 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
>Index: files/patch-configure.am
>===================================================================
>RCS file: /home/pcvs/ports/databases/mysql55-server/files/patch-configure.am,v
>retrieving revision 1.2
>diff -u -p -r1.2 patch-configure.am
>--- files/patch-configure.am	16 Jul 2010 10:24:46 -0000	1.2
>+++ files/patch-configure.am	11 Sep 2010 10:50:10 -0000
>@@ -1,5 +1,5 @@
>---- configure.am.orig	2010-07-06 20:37:18.000000000 +0200
>-+++ configure.am	2010-07-16 11:11:48.000000000 +0200
>+--- configure.am.orig	2010-07-06 19:37:18.000000000 +0100
>++++ configure.am	2010-09-09 13:06:42.000000000 +0100
> @@ -990,6 +990,8 @@
>  MYSQL_BASE_VERSION
>  MYSQL_NO_DASH_VERSION
>@@ -9,6 +9,15 @@
>  TEST_NDBCLUSTER
>  MAKEINDEX
>  PDFLATEX
>+@@ -12651,7 +12653,7 @@
>+ _ACEOF
>+ 
>+     case "$target_os" in
>+-      *solaris*)
>++      *solaris*|*freebsd*)
>+         HAVE_DTRACE_DASH_G="yes"
>+         ;;
>+       *)
> @@ -12684,6 +12686,8 @@
>  NDB_VERSION_MINOR=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f2`
>  NDB_VERSION_BUILD=`echo $MYSQL_NUMERIC_VERSION | cut -d. -f3`

Actions: View | Diff

Attachments on bug 150488: 109454 | 109455