Attachment #150430 for bug #195604

Lines 17-26 Link Here

(-)Mk/bsd.database.mk (-2 / +2 lines)
17	# If no version is given (by the maintainer via the port or	17	# If no version is given (by the maintainer via the port or
18	# by the user via defined variable), try to find the	18	# by the user via defined variable), try to find the
19	# currently installed version. Fall back to default if	19	# currently installed version. Fall back to default if
20	# necessary (MySQL-5.5 = 55).	20	# necessary (MySQL-5.6 = 56).
21	# DEFAULT_MYSQL_VER	21	# DEFAULT_MYSQL_VER
22	# - MySQL default version. Can be overridden within a port.	22	# - MySQL default version. Can be overridden within a port.
23	# Default: 55.	23	# Default: 56.
24	# WANT_MYSQL_VER	24	# WANT_MYSQL_VER
25	# - Maintainer can set an arbitrary version of MySQL to always	25	# - Maintainer can set an arbitrary version of MySQL to always
26	# build this port with (overrides WITH_MYSQL_VER).	26	# build this port with (overrides WITH_MYSQL_VER).

Lines 22-31 Link Here

(-)Mk/bsd.default-versions.mk (-2 / +2 lines)
22	FPC_DEFAULT?= 2.6.4	22	FPC_DEFAULT?= 2.6.4
23	GCC_DEFAULT?= 4.8	23	GCC_DEFAULT?= 4.8
24	LUA_DEFAULT?= 5.2	24	LUA_DEFAULT?= 5.2
25	MYSQL_DEFAULT?= 5.5	25	MYSQL_DEFAULT?= 5.6
26	PERL5_DEFAULT?= 5.18	26	PERL5_DEFAULT?= 5.18
27	PGSQL_DEFAULT?= 9.3	27	PGSQL_DEFAULT?= 9.3
28	PHP_DEFAULT?= 5.4	28	PHP_DEFAULT?= 5.6
29	PYTHON_DEFAULT?= 2.7	29	PYTHON_DEFAULT?= 2.7
30	PYTHON2_DEFAULT?= 2.7	30	PYTHON2_DEFAULT?= 2.7
31	PYTHON3_DEFAULT?= 3.3	31	PYTHON3_DEFAULT?= 3.3

Lines 29-38 Link Here

(-)archivers/php5-snappy/Makefile (-2 / +2 lines)
29		29
30	.if !empty(${PORT_OPTIONS:MTEST})	30	.if !empty(${PORT_OPTIONS:MTEST})
31	post-stage: test	31	post-stage: test
32	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/20100525/snappy.so	32	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/snappy.so
33	.else	33	.else
34	post-stage:	34	post-stage:
35	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/20100525/snappy.so	35	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/snappy.so
36	.endif	36	.endif
37		37
38	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 17-23 Link Here

(-)databases/adodb5/Makefile (-1 lines)
17		17
18	USES= zip	18	USES= zip
19	USE_PHP= pcre	19	USE_PHP= pcre
20	DEFAULT_VERSIONS=php=5
21		20
22	WRKSRC= ${WRKDIR}/${PORTNAME}5	21	WRKSRC= ${WRKDIR}/${PORTNAME}5
23	NO_BUILD= YES	22	NO_BUILD= YES

Lines 20-25 Link Here

(-)databases/apq-mysql/Makefile (+2 lines)
20		20
21	USES= ada tar:bzip2	21	USES= ada tar:bzip2
22	USE_MYSQL= yes	22	USE_MYSQL= yes
		23	MYSQL_DEFAULT= 55
		24	IGNORE_MYSQL_VER= 56
23	HAS_CONFIGURE= yes	25	HAS_CONFIGURE= yes
24	WRKPATH= ${WRKDIR}/build	26	WRKPATH= ${WRKDIR}/build
25	CONFIGURE_ARGS= --prefix=${PREFIX} \	27	CONFIGURE_ARGS= --prefix=${PREFIX} \

Lines 2-8 Link Here

(-)databases/mydumper/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mydumper	4	PORTNAME= mydumper
5	PORTVERSION= 0.6.1	5	PORTVERSION= 0.6.2
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= http://code.launchpad.net/mydumper/${PORTVERSION:R}/${PORTVERSION}/+download/	7	MASTER_SITES= http://code.launchpad.net/mydumper/${PORTVERSION:R}/${PORTVERSION}/+download/
8		8

Lines 1-2 Link Here

(-)databases/mydumper/distinfo (-2 / +2 lines)
1	SHA256 (mydumper-0.6.1.tar.gz) = 819fdfef1df7cfae05e693687f60df4a2048c20175fe401d50e38e8da32a0f2d	1	SHA256 (mydumper-0.6.2.tar.gz) = fa28563e8967752828954c5d81e26ef50aad9083d50a977bf5733833b23e3330
2	SIZE (mydumper-0.6.1.tar.gz) = 38599	2	SIZE (mydumper-0.6.2.tar.gz) = 40165




--- 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}")

Lines 18-23 Link Here

(-)databases/php-adodb-ext/Makefile (+2 lines)
18	USE_PHP= yes	18	USE_PHP= yes
19	USE_PHPEXT= yes	19	USE_PHPEXT= yes
20	PHP_MODNAME= adodb	20	PHP_MODNAME= adodb
		21	PHP_DEFAULT= 55
		22	IGNORE_WITH_PHP=56
21		23
22	SUB_FILES= pkg-message	24	SUB_FILES= pkg-message
23		25




# $FreeBSD$

PORTNAME=	qb
PORTVERSION=	2.4.0
CATEGORIES=	devel
MASTER_SITES=	http://pecl.php.net/get/
PKGNAMEPREFIX=	pecl-

USES=		tar:tgz
USE_GCC=	any

.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>

Lines 1-2 Link Here

(-)devel/pecl-qb/distinfo (-2 / +2 lines)
1	SHA256 (PECL/qb-2.2.0.tgz) = fa3c626506e6d7df46429afd3b4828b7b90bc479c0ab3b4c3b89c736c0bcfa19	1	SHA256 (PECL/qb-2.4.0.tgz) = c85aed6cffefa054b0f0e06a56df367e224139c5d8ad377c33ebea457f03b5b6
2	SIZE (PECL/qb-2.2.0.tgz) = 1090431	2	SIZE (PECL/qb-2.4.0.tgz) = 930521

Line 0 Link Here

(-)devel/pecl-qb/files/extra-patch-libmissing (+11 lines)
	1	--- qb_interpreter_functions.h.orig 2014-12-10 10:54:35.485422703 +0000
	2	+++ qb_interpreter_functions.h 2014-12-10 10:54:54.694421330 +0000
	3	@@ -22,6 +22,8 @@
	4	#ifndef QB_INTERPRETER_FUNCTIONS_H_
	5	#define QB_INTERPRETER_FUNCTIONS_H_
	6
	7	+#include <missing_complex.h>
	8	+
	9	int qb_compare_ascending_F32(const void p1, const void p2);
	10	int qb_compare_ascending_F32_array(const void p1, const void p2, const void *p3);
	11	int qb_compare_ascending_F64(const void p1, const void p2);




--- 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"




# $FreeBSD$

PORTNAME=	yac
PORTVERSION=	0.9.2
PORTEPOCH=	1
CATEGORIES=	devel
MASTER_SITES=	http://pecl.php.net/get/
MASTER_SITE_SUBDIR=	oliver
PKGNAMEPREFIX=	pecl-
DIST_SUBDIR=	PECL


LICENSE=	PHP301

USE_PHP=	yes
USE_PHP_BUILD=	yes
USE_PHPIZE=	yes
USE_PHPEXT=	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

Lines 1-2 Link Here

(-)devel/pecl-yac/distinfo (-2 / +2 lines)
1	SHA256 (PECL/yac-0.1.1.r20140114.tar.gz) = 87c5f3e0b5b28dc1e4c641add8a233d15a305ec7563a405a178b7b14ea1ea581	1	SHA256 (PECL/yac-0.9.2.tgz) = f57d7dc18520f2114194fa44eb8e77b4cc8142bf0bd1314b9445dd99bc53dd99
2	SIZE (PECL/yac-0.1.1.r20140114.tar.gz) = 32526	2	SIZE (PECL/yac-0.9.2.tgz) = 34822

Lines 38-44 Link Here

(-)finance/frontaccounting/Makefile (-1 / +1 lines)
38	.endif	38	.endif
39		39
40	.if ${PORT_OPTIONS:MMYSQL}	40	.if ${PORT_OPTIONS:MMYSQL}
41	RUN_DEPENDS+= mysqld_safe:${PORTSDIR}/databases/mysql55-server	41	USE_MYSQL= server
42	.endif	42	.endif
43		43
44	.if ${PORT_OPTIONS:MDOCS}	44	.if ${PORT_OPTIONS:MDOCS}

Return to bug 195604

Line 0 Link Here

(-)databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake (+20 lines)
	1	--- cmake/build_configurations/compiler_options.cmake.orig 2014-12-05 10:49:17.394216277 +0000
	2	+++ cmake/build_configurations/compiler_options.cmake 2014-12-05 10:50:58.144209859 +0000
	3	@@ -25,7 +25,7 @@
	4
	5	# Default GCC flags
	6	IF(CMAKE_COMPILER_IS_GNUCC)
	7	- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
	8	+ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
	9	# Disable inline optimizations for valgrind testing to avoid false positives
	10	IF(WITH_VALGRIND)
	11	SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
	12	@@ -34,7 +34,7 @@
	13	SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
	14	ENDIF()
	15	IF(CMAKE_COMPILER_IS_GNUCXX)
	16	- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
	17	+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
	18	# Disable inline optimizations for valgrind testing to avoid false positives
	19	IF(WITH_VALGRIND)
	20	SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")

Lines 2-8 Link Here

(-)devel/pecl-qb/Makefile (-2 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qb	4	PORTNAME= qb
5	PORTVERSION= 2.2.0	5	PORTVERSION= 2.4.0
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= http://pecl.php.net/get/	7	MASTER_SITES= http://pecl.php.net/get/
8	PKGNAMEPREFIX= pecl-	8	PKGNAMEPREFIX= pecl-
Lines 19-22 Link Here
19	USES= tar:tgz	19	USES= tar:tgz
20	USE_GCC= any	20	USE_GCC= any
21		21
22	.include <bsd.port.mk>	22	.include <bsd.port.pre.mk>
		23
		24	.if ${OSVERSION} < 1000034
		25	LIB_DEPENDS+= libmissing.so:${PORTSDIR}/math/libmissing
		26	CONFIGURE_ARGS= --with-libmissing=${LOCALBASE}
		27	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libmissing
		28	.endif
		29
		30	.include <bsd.port.post.mk>

Line 0 Link Here

(-)devel/pecl-qb/files/patch-config.m4 (+26 lines)
	1	--- config.m4.orig 2014-07-21 00:45:49.000000000 +0000
	2	+++ config.m4 2014-12-10 10:26:17.724992764 +0000
	3	@@ -13,6 +13,9 @@
	4	PHP_ARG_WITH(cpu, whether to enable CPU-specific optimization,
	5	[ --with-cpu[=arch] Enable optimization specific to CPU archecture], no, no)
	6
	7	+PHP_ARG_WITH(libmissing, whether to link libmissing,
	8	+[ --with-libmissing[=prefix] Link libmissing], no, no)
	9	+
	10	if test "$PHP_QB" != "no"; then
	11	qb_cflags=""
	12
	13	@@ -37,6 +40,13 @@
	14	qb_cflags="$qb_cflags -march=$PHP_CPU"
	15	fi
	16	fi
	17	+
	18	+ if test "$PHP_LIBMISSING" != "no"; then
	19	+ LIBMISSING_INCDIR="$PHP_LIBMISSING/include"
	20	+ LIBMISSING_LIBDIR="$PHP_LIBMISSING/lib"
	21	+ PHP_ADD_LIBRARY_WITH_PATH("missing", $LIBMISSING_LIBDIR, QB_SHARED_LIBADD)
	22	+ PHP_ADD_INCLUDE($LIBMISSING_INCDIR)
	23	+ fi
	24
	25	AC_MSG_CHECKING([whether CC supports -march=native])
	26	ac_saved_cflags="$CFLAGS"

Lines 2-12 Link Here

(-)devel/pecl-yac/Makefile (-8 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= yac	4	PORTNAME= yac
5	PORTVERSION= 0.1.1.r20140114	5	PORTVERSION= 0.9.2
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= ${MASTER_SITE_LOCAL}	8	MASTER_SITES= http://pecl.php.net/get/
9	MASTER_SITE_SUBDIR= oliver
10	PKGNAMEPREFIX= pecl-	9	PKGNAMEPREFIX= pecl-
11	DIST_SUBDIR= PECL	10	DIST_SUBDIR= PECL
12		11
Lines 16-28 Link Here
16	LICENSE= PHP301	15	LICENSE= PHP301
17		16
18	USE_PHP= yes	17	USE_PHP= yes
19	USE_PHP_BUILD= yes
20	USE_PHPIZE= yes
21	USE_PHPEXT= yes	18	USE_PHPEXT= yes
22	USE_PHP_BUILD= yes	19	USES= tar:tgz
23		20
24	CONFIGURE_ARGS= --with-php-config=${PREFIX}/bin/php-config
25
26	OPTIONS_DEFINE= MSGPACK	21	OPTIONS_DEFINE= MSGPACK
27	MSGPACK_DESC= Enable MSGPACK module	22	MSGPACK_DESC= Enable MSGPACK module
28	MSGPACK_BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:${PORTSDIR}/devel/pecl-msgpack	23	MSGPACK_BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:${PORTSDIR}/devel/pecl-msgpack