Drop php -embed (which was done as a pseudo-flavour that turned on an

-embed subpackage and turned off -main as the two can't be built in one
configure run). It was only used by unit (now archived upstream). If
this comes back it needs doing differently (probably a separate port)
as this approach doesn't work well with dpb -R (now used for stable
builds).

lang/php/8.3/Makefile

@@ -1,6 +1,7 @@
 PHP_VERSION=	8.3.31
+REVISION=	1
+
 AUTOCONF_VERSION= 2.71
-REVISION=	0
 
 DEFAULT_PHP=	Yes
 
@@ -8,7 +9,5 @@ PHP_PKGSPEC=	>=8.3,<8.4
 PHP_EXTENSIONS=	-imap -pspell
 ZEND_EXTENSIONS= -opcache
 CONFIGURE_ARGS=	--enable-opcache
-# for -embed
-BUILD_DEPENDS=	devel/capstone/main
 
 .include <bsd.port.mk>

lang/php/8.3/pkg/PLIST-embed

@@ -1,8 +0,0 @@
-@option no-default-conflict
-@option is-branch
-@conflict php-embed-${PHP_PKGSPEC}
-@pkgpath lang/php/8.0,-embed
-@pkgpath lang/php/8.1,-embed
-@so lib/php-${PV}/libphp.so
-share/php-${PV}/include/sapi/embed/
-share/php-${PV}/include/sapi/embed/php_embed.h

lang/php/8.4/Makefile

@@ -1,4 +1,6 @@
 PHP_VERSION=	8.4.21
+REVISION=	0
+
 AUTOCONF_VERSION= 2.72
 
 PHP_PKGSPEC=	>=8.4,<8.5
@@ -6,7 +8,5 @@ ZEND_EXTENSIONS= -opcache
 CONFIGURE_ARGS=	--enable-opcache
 
 WANTLIB-pdo_odbc += iodbcinst
-# for -embed
-BUILD_DEPENDS=	devel/capstone/main
 
 .include <bsd.port.mk>

lang/php/8.4/pkg/PLIST-embed

@@ -1,6 +0,0 @@
-@option no-default-conflict
-@option is-branch
-@conflict php-embed-${PHP_PKGSPEC}
-@so lib/php-${PV}/libphp.so
-share/php-${PV}/include/sapi/embed/
-share/php-${PV}/include/sapi/embed/php_embed.h

lang/php/8.5/Makefile

@@ -1,4 +1,6 @@
 PHP_VERSION=	8.5.6
+REVISION=	0
+
 AUTOCONF_VERSION= 2.72
 
 # override PORTROACH from ../Makefile.inc; no marker wanted for the highest

lang/php/8.5/pkg/PLIST-embed

@@ -1,6 +0,0 @@
-@option no-default-conflict
-@option is-branch
-@conflict php-embed-${PHP_PKGSPEC}
-@so lib/php-${PV}/libphp.so
-share/php-${PV}/include/sapi/embed/
-share/php-${PV}/include/sapi/embed/php_embed.h

lang/php/Makefile

@@ -1,9 +1,6 @@
 SUBDIR =
 SUBDIR += 8.3
-SUBDIR += 8.3,embed
 SUBDIR += 8.4
-SUBDIR += 8.4,embed
 SUBDIR += 8.5
-SUBDIR += 8.5,embed
 
 .include <bsd.port.subdir.mk>

lang/php/Makefile.inc

@@ -111,15 +111,12 @@ PHP_EXTENSIONS+=	-bz2 -curl -dba -enchant -gd -gmp -intl \
 			-shmop -soap -snmp -sqlite3 -pdo_dblib \
 			-tidy -xsl -zip
 
-SAPI+=			-main -apache -cgi -dbg -embed
+SAPI+=			-main -apache -cgi -dbg
 
 # setup for no_* build options to allow disabling extensions with
 # larger dependencies;
 PSEUDO_FLAVORS=		${PHP_EXTENSIONS:C/-(pdo_)?mysqli?//:C/-(pcntl|shmop)//:C/-/no_/g}
 
-# cannot build two SAPIs producing libraries (e.g. apache and embed)
-# in a single build.
-PSEUDO_FLAVORS+=	embed
 FLAVOR ?=
 
 # xxhash is used as a header-only library here; the file is included in
@@ -131,32 +128,19 @@ CONFIGURE_ARGS+=	--with-capstone
 LIB_DEPENDS-main+=	devel/capstone/main
 WANTLIB-main=		capstone
 
-# where the main php module is stored (outside the chroot)
-.if ${FLAVOR:Membed}
-MULTI_PACKAGES=	-main -embed
-SAPI_DIR=	lib/php-${PV}
-.else
 MULTI_PACKAGES=	${SAPI} ${PHP_EXTENSIONS}
+# where the main php module is stored (outside the chroot)
 SAPI_DIR=	lib/apache2/php-${PV}
 APACHE_DIR=	${SAPI_DIR}
-.endif
 
 DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
-.include <bsd.port.arch.mk>
-.if ${FLAVOR:Membed}
-BUILD_PACKAGES:=	-embed
-.endif
-.if ${BUILD_PACKAGES:M-apache}
-BUILD_PACKAGES := ${BUILD_PACKAGES:N-embed}
-.endif
-
-.if ${BUILD_PACKAGES:M-main}
 CONFIGURE_ARGS+=	--enable-cli \
 			--enable-fpm \
 			--with-fpm-user=www \
 			--with-fpm-group=www
-.endif
+
+.include <bsd.port.arch.mk>
 
 # cgi
 COMMENT-cgi=		php CGI binary
@@ -183,12 +167,6 @@ CONFIGURE_ARGS+=	--with-apxs2=${LOCALBASE}/sbin/apxs
 BUILD_DEPENDS+=		www/apache-httpd
 .endif
 
-# embed
-COMMENT-embed=		embeddable php library
-.if ${BUILD_PACKAGES:M-embed}
-CONFIGURE_ARGS+=	--enable-embed
-.endif
-
 # default for SAPI subpackages
 WANTLIB +=		argon2 crypto curses iconv intl m onig
 WANTLIB +=		pcre2-8 pthread readline sodium ssl util xml2 z
@@ -204,7 +182,7 @@ LIB_DEPENDS +=		devel/gettext,-runtime \
 WANTLIB$i +=		${WANTLIB}
 LIB_DEPENDS$i +=	${LIB_DEPENDS}
 .endfor
-.for i in ${SAPI:N-apache:N-embed}
+.for i in ${SAPI:N-apache}
 WANTLIB$i +=		c
 .endfor
 
@@ -523,7 +501,7 @@ post-install:
 	rmdir ${PREFIX}/share/php
 .endif
 
-.if ${BUILD_PACKAGES:M-apache} || ${BUILD_PACKAGES:M-embed}
+.if ${BUILD_PACKAGES:M-apache}
 	${INSTALL_DATA_DIR} ${PREFIX}/${SAPI_DIR}
 	${INSTALL_DATA} ${WRKBUILD}/.libs/libphp.so ${PREFIX}/${SAPI_DIR}
 .endif

lang/php/files/DESCR-embed

@@ -1 +0,0 @@
-PHP module for embedded use

lang/php/files/README-main

@@ -91,7 +91,7 @@ Server APIs (SAPI)
 ==================
 The main php package includes the cli and php_fpm (FastCGI process
 manager) SAPIs. These cover many common use-cases. Others are packaged
-separately: php-apache, php-cgi, php-dbg, php-embed.
+separately: php-apache, php-cgi, php-dbg.
 
 Extension modules
 =================