pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/databases
Module Name: pkgsrc
Committed By: taca
Date: Sat Feb 8 03:34:38 UTC 2025
Modified Files:
pkgsrc/databases/php-sqlrelay: Makefile
pkgsrc/databases/sqlrelay: distinfo
pkgsrc/databases/sqlrelay/patches: patch-configure
Log Message:
databases/php-sqlrelay: multiple PHP support
Use PHP_BASE_VERS in DEPENDS.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/php-sqlrelay/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/sqlrelay/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/sqlrelay/patches/patch-configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/databases/php-sqlrelay/Makefile
diff -u pkgsrc/databases/php-sqlrelay/Makefile:1.45 pkgsrc/databases/php-sqlrelay/Makefile:1.46
--- pkgsrc/databases/php-sqlrelay/Makefile:1.45 Thu Nov 14 22:19:05 2024
+++ pkgsrc/databases/php-sqlrelay/Makefile Sat Feb 8 03:34:38 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2024/11/14 22:19:05 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2025/02/08 03:34:38 taca Exp $
PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME}
-PKGREVISION= 8
+PKGREVISION= 9
COMMENT= PHP extension for SQL Relay
EXTRACT_SUFX= .tar.gz
@@ -12,15 +12,18 @@ LICENSE= gnu-gpl-v2 AND php
PHP_VERSIONS_ACCEPTED= 56 74
TOOLS_BROKEN+= perl
-CONFIGURE_ARGS+= --with-php-prefix=${BUILDLINK_PREFIX.php}
MAKE_FLAGS+= PHPCONFSTYLE="bogus" # do not install .ini
BUILD_DIRS= src/api/php
BUILD_DIRS+= src/api/phppdo
+.include "../../lang/php/phpversion.mk"
+
+CONFIGURE_ARGS+= --with-php-prefix=${BUILDLINK_PREFIX.php${PHP_VER}}
+CONFIGURE_ENV+= PHP_VER=${PHP_VER}
+
.include "../../databases/php-pdo/buildlink3.mk"
.include "../../databases/sqlrelay/buildlink3.mk"
-.include "../../lang/php/phpversion.mk"
.include "${PHPPKGSRCDIR}/Makefile.common"
.include "${PHPPKGSRCDIR}/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/sqlrelay/distinfo
diff -u pkgsrc/databases/sqlrelay/distinfo:1.30 pkgsrc/databases/sqlrelay/distinfo:1.31
--- pkgsrc/databases/sqlrelay/distinfo:1.30 Sat Dec 3 15:53:40 2022
+++ pkgsrc/databases/sqlrelay/distinfo Sat Feb 8 03:34:38 2025
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.30 2022/12/03 15:53:40 adam Exp $
+$NetBSD: distinfo,v 1.31 2025/02/08 03:34:38 taca Exp $
BLAKE2s (sqlrelay-1.9.3.tar.gz) = 59f17e57399d0324b09c9c2dc3affa0ee19e286abd2bb77f18019d72aa41925f
SHA512 (sqlrelay-1.9.3.tar.gz) = ad80a7be56ed5ca6eaa2ac97986c2e64ab61ad3ec895d76a3fee2d865e856877a319e16cf996ff92072249b170f2611295d9f8777c8d10c80d6eb6ab7add97e3
Size (sqlrelay-1.9.3.tar.gz) = 4903142 bytes
SHA1 (patch-Makefile) = 4005ca28daec0180fe298f711b22b3d8dcf02a9a
SHA1 (patch-config.mk.in) = 172f04e655d31705b107f0889d86c48db9e0919a
-SHA1 (patch-configure) = b00b596b6c0a8353c0aaff8503bc80e3f17febb0
+SHA1 (patch-configure) = 2fabdd5410ec9043e9f069b7bb425755abc782df
SHA1 (patch-etc_Makefile) = 5c768f50a97489ea06ca586b131ef0324878f8d0
SHA1 (patch-src_api_nodejs_Makefile) = 6f0e569f25fd1e78e088b8e0cd8eb541c2c5d417
SHA1 (patch-src_api_nodejs_package__in.json) = 76e2ebc4e47d5ef38d0c96059b62460fef687d1e
Index: pkgsrc/databases/sqlrelay/patches/patch-configure
diff -u pkgsrc/databases/sqlrelay/patches/patch-configure:1.10 pkgsrc/databases/sqlrelay/patches/patch-configure:1.11
--- pkgsrc/databases/sqlrelay/patches/patch-configure:1.10 Sat Dec 3 15:53:40 2022
+++ pkgsrc/databases/sqlrelay/patches/patch-configure Sat Feb 8 03:34:38 2025
@@ -1,13 +1,22 @@
-$NetBSD: patch-configure,v 1.10 2022/12/03 15:53:40 adam Exp $
+$NetBSD: patch-configure,v 1.11 2025/02/08 03:34:38 taca Exp $
Cripple iODBC check, we're using UnixODBC and it was getting in the way.
+Fix PHP lookup.
Fix Perl lookup.
Fix Python lookup.
Fix Ruby support.
--- configure.orig 2022-08-09 14:57:21.000000000 +0000
+++ configure
-@@ -28286,7 +28286,7 @@ fi
+@@ -1055,6 +1055,7 @@ CCC
+ CPP
+ LT_SYS_LIBRARY_PATH
+ CXXCPP
++PHP_VER
+ ERLC
+ ERLCFLAGS
+ ERL'
+@@ -28286,7 +28287,7 @@ fi
@@ -16,7 +25,7 @@ Fix Ruby support.
NAME=iodbc
HEADER=sql.h
LIBNAME=iodbc
-@@ -34112,7 +34112,7 @@ fi
+@@ -34112,7 +34113,7 @@ fi
if ( test -z "$PERL" )
then
@@ -25,7 +34,7 @@ Fix Ruby support.
do
if ( test -d "$i" )
then
-@@ -34300,52 +34300,10 @@ then
+@@ -34300,52 +34301,10 @@ then
pyext=""
@@ -80,7 +89,7 @@ Fix Ruby support.
do
if ( test -n "$pyprefix" )
-@@ -34570,7 +34528,7 @@ echo "******************************"
+@@ -34570,7 +34529,7 @@ echo "******************************"
echo
echo "***** Ruby *******************"
@@ -89,3 +98,167 @@ Fix Ruby support.
then
HAVE_RUBY=""
+@@ -35410,51 +35369,38 @@ then
+ echo "cross compiling..."
+
+ else
+-
+- PHPCONFIG=""
+- for file in "php-config" "php-config-5" "php-config-5.1" "php-config-5.2" "php-config-5.3" "php-config-5.3" "php-config-5.4" "php-config-5.5" "php-config-5.6" "php-config-5.7"
"php-config-5.8" "php-config-7.0" "php-config-7.1" "php-config-7.2" "php-config-7.3" "php-config-7.4" "php-config-8.0" "php-config-8.1" "php-config-8.2" "php-config-8.3" "php-config-8.4"
+- do
+- if ( test -n "$PHPPATH" )
+- then
+-
+-if ( test -r ""$PHPPATH/bin/$file"" )
+-then
+- eval "PHPCONFIG=\"$PHPPATH/bin/$file\""
+-fi
+-
+- else
+- for i in "/usr/local/php/bin" "/usr/bin" "/usr/local/bin" "/usr/pkg/bin" "/opt/sfw/bin" "/usr/sfw/bin" "/opt/csw/bin" "/opt/csw/php4/bin" "/opt/csw/php5/bin" "/sw/bin"
"/boot/common/bin" "/resources/index/bin"
+- do
+-
+-if ( test -r ""$i/$file"" )
+-then
+- eval "PHPCONFIG=\"$i/$file\""
+-fi
+-
+- if ( test -n "$PHPCONFIG" )
+- then
+- break
+- fi
+- done
+- fi
+- done
+-
++ file="php-config${PHP_VER}"
++ if ( test -n "$PHPPATH" )
++ then
++ if ( test -r ""$PHPPATH/bin/$file"" )
++ then
++ eval "PHPCONFIG=\"$PHPPATH/bin/$file\""
++ fi
++ else
++ i="${prefix}/bin"
++ if ( test -r ""$i/$file"" )
++ then
++ eval "PHPCONFIG=\"$i/$file\""
++ fi
+ if ( test -n "$PHPCONFIG" )
+ then
+- HAVE_PHP="yes"
+- PHPPREFIX=`$PHPCONFIG --prefix`
+- PHPINCLUDES=`$PHPCONFIG --includes | sed -e "s|\\${prefix}|$PHPPREFIX|" | sed
-e "s|\\${prefix}|$PHPPREFIX|" | sed -e "s|\\${prefix}|$PHPPREFIX|" | sed -e "s|\\${prefix}|$PHPPREFIX|"`
+- PHPEXTDIR=`$PHPCONFIG --extension-dir`
+- PHPVERSION=`$PHPCONFIG --version`
+- PHPMAJORVERSION=`echo "$PHPVERSION" | cut -d'.' -f1`
+- else
+- HAVE_PHP=""
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The PHP API will not be built." >&5
+-$as_echo "$as_me: WARNING: The PHP API will not be built." >&2;}
++ break
+ fi
+-
+- fi
+-
++ fi
++ if ( test -n "$PHPCONFIG" )
++ then
++ HAVE_PHP="yes"
++ PHPPREFIX=`$PHPCONFIG --prefix`
++ PHPINCLUDES=`$PHPCONFIG --includes | sed -e "s|\\${prefix}|$PHPPREFIX|" | sed -e "s|\\${prefix}|$PHPPREFIX|" | sed -e "s|\\${prefix}|$PHPPREFIX|" | sed -e "s|\\${prefix}|$PHPPREFIX|"`
++ PHPEXTDIR=`$PHPCONFIG --extension-dir`
++ PHPVERSION=`$PHPCONFIG --version`
++ PHPMAJORVERSION=`echo "$PHPVERSION" | cut -d'.' -f1`
++ else
++ HAVE_PHP=""
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The PHP API will not be built." >&5
++ $as_echo "$as_me: WARNING: The PHP API will not be built." >&2;}
++ fi
++ fi
+
+ if ( test -n "$PHPINCLUDES" )
+ then
+@@ -35469,80 +35415,8 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PHP config directory" >&5
+ $as_echo_n "checking for PHP config directory... " >&6; }
+- PHPCONFDIR="none"
+- PHPCONFSTYLE="unknown"
+- if ( test -d "/etc/php.d" )
+- then
+- PHPCONFDIR="/etc/php.d"
+- PHPCONFSTYLE="fedora"
+- fi
+- if ( test -d "/etc/php5/conf.d" )
+- then
+- PHPCONFDIR="/etc/php5/conf.d"
+- PHPCONFSTYLE="suse"
+- fi
+- if ( test -d "/etc/php7/conf.d" )
+- then
+- PHPCONFDIR="/etc/php7/conf.d"
+- PHPCONFSTYLE="suse"
+- fi
+- if ( test -d "/etc/php5/mods-available" )
+- then
+- PHPCONFDIR="/etc/php5/mods-available"
+- if ( test -d "/etc/php5/conf.d" )
+- then
+- PHPCONFSTYLE="debian"
+- else
+- PHPCONFSTYLE="ubuntu"
+- fi
+- fi
+- if ( test -d "/etc/php7/mods-available" )
+- then
+- PHPCONFDIR="/etc/php7/mods-available"
+- if ( test -d "/etc/php7/conf.d" )
+- then
+- PHPCONFSTYLE="debian"
+- else
+- PHPCONFSTYLE="ubuntu"
+- fi
+- fi
+- if ( test -d "`ls -d /etc/php/*/mods-available 2> /dev/null | sort | head -1`" )
+- then
+- PHPCONFDIR="`ls -d /etc/php/*/mods-available 2> /dev/null | sort | head -1`"
+- if ( test -d "`ls -d /etc/php/*/conf.d 2> /dev/null | sort | head -1`" )
+- then
+- PHPCONFSTYLE="debian"
+- else
+- PHPCONFSTYLE="ubuntu"
+- fi
+- fi
+- if ( test "$PHPCONFSTYLE" = "unknown" )
+- then
+- for dir in `ls -d /etc/php/* 2> /dev/null`
+- do
+- if ( test -d "$dir/conf.d" )
+- then
+- PHPCONFDIR="$dir/conf.d"
+- PHPCONFSTYLE="solaris"
+- fi
+- done
+- fi
+- if ( test "$PHPCONFSTYLE" = "unknown" )
+- then
+- if ( test -d "/usr/local/etc/php" )
+- then
+- PHPCONFDIR="/usr/local/etc/php"
+- PHPCONFSTYLE="freebsd"
+- fi
+- fi
+- if ( test "$PHPCONFSTYLE" = "unknown" )
+- then
+- if ( test -d "/usr/pkg/etc/php.d" )
+- then
+- PHPCONFDIR="/usr/pkg/etc/php.d"
+- PHPCONFSTYLE="netbsd"
+- fi
+- fi
++ PHPCONFDIR="/usr/pkg/etc/php/${PHP_VER}/php.d"
++ PHPCONFSTYLE="pkgsrc"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHPCONFDIR - $PHPCONFSTYLE style" >&5
+ $as_echo "$PHPCONFDIR - $PHPCONFSTYLE style" >&6; }
+
Home |
Main Index |
Thread Index |
Old Index