Attachment 150430 Details for Bug 195604 – Final patch

[patch] Final patch

def.diff (text/plain), 10.89 KB, created by Alex Dupre on 2014-12-10 12:33:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Dupre

Created: 2014-12-10 12:33:08 UTC

Size: 10.89 KB

patch

obsolete

>Index: Mk/bsd.database.mk
>===================================================================
>--- Mk/bsd.database.mk	(revision 374445)
>+++ Mk/bsd.database.mk	(working copy)
>@@ -17,10 +17,10 @@
> #			  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).
>+#			  necessary (MySQL-5.6 = 56).
> # DEFAULT_MYSQL_VER
> #			- MySQL default version.  Can be overridden within a port.
>-#			  Default: 55.
>+#			  Default: 56.
> # WANT_MYSQL_VER
> #			- Maintainer can set an arbitrary version of MySQL to always
> #			  build this port with (overrides WITH_MYSQL_VER).
>Index: Mk/bsd.default-versions.mk
>===================================================================
>--- Mk/bsd.default-versions.mk	(revision 374445)
>+++ Mk/bsd.default-versions.mk	(working copy)
>@@ -22,10 +22,10 @@
> FPC_DEFAULT?=		2.6.4
> GCC_DEFAULT?=		4.8
> LUA_DEFAULT?=		5.2
>-MYSQL_DEFAULT?=		5.5
>+MYSQL_DEFAULT?=		5.6
> PERL5_DEFAULT?=		5.18
> PGSQL_DEFAULT?=		9.3
>-PHP_DEFAULT?=		5.4
>+PHP_DEFAULT?=		5.6
> PYTHON_DEFAULT?=	2.7
> PYTHON2_DEFAULT?=	2.7
> PYTHON3_DEFAULT?=	3.3
>Index: archivers/php5-snappy/Makefile
>===================================================================
>--- archivers/php5-snappy/Makefile	(revision 374445)
>+++ archivers/php5-snappy/Makefile	(working copy)
>@@ -29,10 +29,10 @@
> 
> .if !empty(${PORT_OPTIONS:MTEST})
> post-stage: test
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/20100525/snappy.so
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/snappy.so
> .else
> post-stage:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/20100525/snappy.so
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/snappy.so
> .endif
> 
> .include <bsd.port.mk>
>Index: databases/adodb5/Makefile
>===================================================================
>--- databases/adodb5/Makefile	(revision 374445)
>+++ databases/adodb5/Makefile	(working copy)
>@@ -17,7 +17,6 @@
> 
> USES=		zip
> USE_PHP=	pcre
>-DEFAULT_VERSIONS=php=5
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}5
> NO_BUILD=	YES
>Index: databases/apq-mysql/Makefile
>===================================================================
>--- databases/apq-mysql/Makefile	(revision 374445)
>+++ databases/apq-mysql/Makefile	(working copy)
>@@ -20,6 +20,8 @@
> 
> USES=		ada tar:bzip2
> USE_MYSQL=	yes
>+MYSQL_DEFAULT=	55
>+IGNORE_MYSQL_VER=	56
> HAS_CONFIGURE=	yes
> WRKPATH=	${WRKDIR}/build
> CONFIGURE_ARGS= --prefix=${PREFIX} \
>Index: databases/mydumper/Makefile
>===================================================================
>--- databases/mydumper/Makefile	(revision 374445)
>+++ databases/mydumper/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mydumper
>-PORTVERSION=	0.6.1
>+PORTVERSION=	0.6.2
> CATEGORIES=	databases
> MASTER_SITES=	http://code.launchpad.net/mydumper/${PORTVERSION:R}/${PORTVERSION}/+download/
> 
>Index: databases/mydumper/distinfo
>===================================================================
>--- databases/mydumper/distinfo	(revision 374445)
>+++ databases/mydumper/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mydumper-0.6.1.tar.gz) = 819fdfef1df7cfae05e693687f60df4a2048c20175fe401d50e38e8da32a0f2d
>-SIZE (mydumper-0.6.1.tar.gz) = 38599
>+SHA256 (mydumper-0.6.2.tar.gz) = fa28563e8967752828954c5d81e26ef50aad9083d50a977bf5733833b23e3330
>+SIZE (mydumper-0.6.2.tar.gz) = 40165
>Index: databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
>===================================================================
>--- databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake	(revision 0)
>+++ databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake	(working copy)
>@@ -0,0 +1,20 @@
>+--- cmake/build_configurations/compiler_options.cmake.orig	2014-12-05 10:49:17.394216277 +0000
>++++ cmake/build_configurations/compiler_options.cmake	2014-12-05 10:50:58.144209859 +0000
>+@@ -25,7 +25,7 @@
>+ 
>+   # Default GCC flags
>+   IF(CMAKE_COMPILER_IS_GNUCC)
>+-    SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
>++    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
>+     # Disable inline optimizations for valgrind testing to avoid false positives
>+     IF(WITH_VALGRIND)
>+       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
>+@@ -34,7 +34,7 @@
>+     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
>+   ENDIF()
>+   IF(CMAKE_COMPILER_IS_GNUCXX)
>+-    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
>++    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
>+     # Disable inline optimizations for valgrind testing to avoid false positives
>+     IF(WITH_VALGRIND)
>+       SET(COMMON_CXX_FLAGS             "-fno-inline ${COMMON_CXX_FLAGS}")
>
>Property changes on: databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: databases/php-adodb-ext/Makefile
>===================================================================
>--- databases/php-adodb-ext/Makefile	(revision 374445)
>+++ databases/php-adodb-ext/Makefile	(working copy)
>@@ -18,6 +18,8 @@
> USE_PHP=	yes
> USE_PHPEXT=	yes
> PHP_MODNAME=	adodb
>+PHP_DEFAULT=	55
>+IGNORE_WITH_PHP=56
> 
> SUB_FILES=	pkg-message
> 
>Index: devel/pecl-qb/Makefile
>===================================================================
>--- devel/pecl-qb/Makefile	(revision 374445)
>+++ devel/pecl-qb/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	qb
>-PORTVERSION=	2.2.0
>+PORTVERSION=	2.4.0
> CATEGORIES=	devel
> MASTER_SITES=	http://pecl.php.net/get/
> PKGNAMEPREFIX=	pecl-
>@@ -19,4 +19,12 @@
> USES=		tar:tgz
> USE_GCC=	any
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 1000034
>+LIB_DEPENDS+=	libmissing.so:${PORTSDIR}/math/libmissing
>+CONFIGURE_ARGS=	--with-libmissing=${LOCALBASE}
>+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libmissing
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: devel/pecl-qb/distinfo
>===================================================================
>--- devel/pecl-qb/distinfo	(revision 374445)
>+++ devel/pecl-qb/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (PECL/qb-2.2.0.tgz) = fa3c626506e6d7df46429afd3b4828b7b90bc479c0ab3b4c3b89c736c0bcfa19
>-SIZE (PECL/qb-2.2.0.tgz) = 1090431
>+SHA256 (PECL/qb-2.4.0.tgz) = c85aed6cffefa054b0f0e06a56df367e224139c5d8ad377c33ebea457f03b5b6
>+SIZE (PECL/qb-2.4.0.tgz) = 930521
>Index: devel/pecl-qb/files/extra-patch-libmissing
>===================================================================
>--- devel/pecl-qb/files/extra-patch-libmissing	(revision 0)
>+++ devel/pecl-qb/files/extra-patch-libmissing	(working copy)
>@@ -0,0 +1,11 @@
>+--- qb_interpreter_functions.h.orig	2014-12-10 10:54:35.485422703 +0000
>++++ qb_interpreter_functions.h	2014-12-10 10:54:54.694421330 +0000
>+@@ -22,6 +22,8 @@
>+ #ifndef QB_INTERPRETER_FUNCTIONS_H_
>+ #define QB_INTERPRETER_FUNCTIONS_H_
>+ 
>++#include <missing_complex.h>
>++
>+ int qb_compare_ascending_F32(const void *p1, const void *p2);
>+ int qb_compare_ascending_F32_array(const void *p1, const void *p2, const void *p3);
>+ int qb_compare_ascending_F64(const void *p1, const void *p2);
>
>Property changes on: devel/pecl-qb/files/extra-patch-libmissing
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: devel/pecl-qb/files/patch-config.m4
>===================================================================
>--- devel/pecl-qb/files/patch-config.m4	(revision 0)
>+++ devel/pecl-qb/files/patch-config.m4	(working copy)
>@@ -0,0 +1,26 @@
>+--- config.m4.orig	2014-07-21 00:45:49.000000000 +0000
>++++ config.m4	2014-12-10 10:26:17.724992764 +0000
>+@@ -13,6 +13,9 @@
>+ PHP_ARG_WITH(cpu, whether to enable CPU-specific optimization,
>+ [  --with-cpu[=arch]         Enable optimization specific to CPU archecture], no, no)
>+ 
>++PHP_ARG_WITH(libmissing, whether to link libmissing,
>++[  --with-libmissing[=prefix]         Link libmissing], no, no)
>++
>+ if test "$PHP_QB" != "no"; then
>+   qb_cflags=""
>+ 
>+@@ -37,6 +40,13 @@
>+     	qb_cflags="$qb_cflags -march=$PHP_CPU"
>+     fi
>+   fi
>++
>++  if test "$PHP_LIBMISSING" != "no"; then
>++    LIBMISSING_INCDIR="$PHP_LIBMISSING/include"
>++    LIBMISSING_LIBDIR="$PHP_LIBMISSING/lib"
>++    PHP_ADD_LIBRARY_WITH_PATH("missing", $LIBMISSING_LIBDIR, QB_SHARED_LIBADD)
>++    PHP_ADD_INCLUDE($LIBMISSING_INCDIR)
>++  fi
>+   
>+   AC_MSG_CHECKING([whether CC supports -march=native])
>+   ac_saved_cflags="$CFLAGS"
>
>Property changes on: devel/pecl-qb/files/patch-config.m4
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: devel/pecl-yac/Makefile
>===================================================================
>--- devel/pecl-yac/Makefile	(revision 374445)
>+++ devel/pecl-yac/Makefile	(working copy)
>@@ -2,11 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	yac
>-PORTVERSION=	0.1.1.r20140114
>+PORTVERSION=	0.9.2
> PORTEPOCH=	1
> CATEGORIES=	devel
>-MASTER_SITES=	${MASTER_SITE_LOCAL}
>-MASTER_SITE_SUBDIR=	oliver
>+MASTER_SITES=	http://pecl.php.net/get/
> PKGNAMEPREFIX=	pecl-
> DIST_SUBDIR=	PECL
> 
>@@ -16,13 +15,9 @@
> LICENSE=	PHP301
> 
> USE_PHP=	yes
>-USE_PHP_BUILD=	yes
>-USE_PHPIZE=	yes
> USE_PHPEXT=	yes
>-USE_PHP_BUILD=	yes
>+USES=		tar:tgz
> 
>-CONFIGURE_ARGS=	--with-php-config=${PREFIX}/bin/php-config
>-
> OPTIONS_DEFINE=	MSGPACK
> MSGPACK_DESC=	Enable MSGPACK module
> MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:${PORTSDIR}/devel/pecl-msgpack
>Index: devel/pecl-yac/distinfo
>===================================================================
>--- devel/pecl-yac/distinfo	(revision 374445)
>+++ devel/pecl-yac/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (PECL/yac-0.1.1.r20140114.tar.gz) = 87c5f3e0b5b28dc1e4c641add8a233d15a305ec7563a405a178b7b14ea1ea581
>-SIZE (PECL/yac-0.1.1.r20140114.tar.gz) = 32526
>+SHA256 (PECL/yac-0.9.2.tgz) = f57d7dc18520f2114194fa44eb8e77b4cc8142bf0bd1314b9445dd99bc53dd99
>+SIZE (PECL/yac-0.9.2.tgz) = 34822
>Index: finance/frontaccounting/Makefile
>===================================================================
>--- finance/frontaccounting/Makefile	(revision 374445)
>+++ finance/frontaccounting/Makefile	(working copy)
>@@ -38,7 +38,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MMYSQL}
>-RUN_DEPENDS+=	mysqld_safe:${PORTSDIR}/databases/mysql55-server
>+USE_MYSQL=	server
> .endif
> 
> .if ${PORT_OPTIONS:MDOCS}

Actions: View | Diff

Attachments on bug 195604: 150138 | 150219 | 150430