diff options
author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-03-21 18:41:02 +0000 |
---|---|---|
committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-03-21 19:20:13 +0000 |
commit | b9d1a3fe43a22f01f36ecba2e99c0befa3b5dbc7 (patch) | |
tree | 67892707ee128fdf66034f7b7c80107a91ad94dc | |
parent | 163e6d8df2e4bb16515c0d4041c4a590fc4e5065 (diff) | |
download | ports-b9d1a3fe43a22f01f36ecba2e99c0befa3b5dbc7.tar.gz ports-b9d1a3fe43a22f01f36ecba2e99c0befa3b5dbc7.zip |
databases/php-xapian: Update to 1.4.22
- Unmark DEPRECATED and remove EXPIRATION_DATE
- Remove IGNORE_WITH_PHP
- Convert REINPLACE_CMD to patch file
Changes: https://trac.xapian.org/wiki/ReleaseOverview
-rw-r--r-- | databases/php-xapian/Makefile | 13 | ||||
-rw-r--r-- | databases/php-xapian/distinfo | 6 | ||||
-rw-r--r-- | databases/php-xapian/files/patch-configure | 11 | ||||
-rw-r--r-- | databases/php-xapian/pkg-plist | 9 |
4 files changed, 20 insertions, 19 deletions
diff --git a/databases/php-xapian/Makefile b/databases/php-xapian/Makefile index 23b33fa291cb..408f118e25b6 100644 --- a/databases/php-xapian/Makefile +++ b/databases/php-xapian/Makefile @@ -1,5 +1,5 @@ PORTNAME= xapian -PORTVERSION= 1.4.21 +PORTVERSION= 1.4.22 DISTVERSIONPREFIX= bindings- CATEGORIES= databases MASTER_SITES= https://oligarchy.co.uk/xapian/${PORTVERSION}/ \ @@ -13,10 +13,6 @@ WWW= https://xapian.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Requires php 7 -EXPIRATION_DATE=2023-03-31 -BROKEN= Requires php 7 which has expired but php 8 support is WIP - BUILD_DEPENDS= xapian-core>=${PORTVERSION}:databases/xapian-core LIB_DEPENDS= libxapian.so:databases/xapian-core @@ -26,19 +22,17 @@ CONFIGURE_ARGS= --datarootdir=${DATADIR} \ --docdir=${DOCSDIR} \ --enable-shared \ --enable-static \ - --with-php7 \ + --with-php \ --without-csharp \ --without-java \ --without-lua \ --without-perl \ - --without-php \ --without-python \ --without-python3 \ --without-ruby \ --without-tcl CONFIGURE_ENV= PHP_CONFIG=${LOCALBASE}/bin/php-config GNU_CONFIGURE= yes -IGNORE_WITH_PHP=81 82 # https://trac.xapian.org/ticket/817 INSTALL_TARGET= install-strip USE_CXXSTD= c++11 @@ -50,7 +44,4 @@ PORTSCOUT= limitw:1,even OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/databases/php-xapian/distinfo b/databases/php-xapian/distinfo index 8427779ddbc7..7dcbd14c467f 100644 --- a/databases/php-xapian/distinfo +++ b/databases/php-xapian/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664767852 -SHA256 (xapian-bindings-1.4.21.tar.xz) = e7bf1e4982b91f841289d19214021d88371ca2a6c7304df59049d7da78b83ced -SIZE (xapian-bindings-1.4.21.tar.xz) = 1151620 +TIMESTAMP = 1677771073 +SHA256 (xapian-bindings-1.4.22.tar.xz) = 6b5454833ac52a3e32c0bb3a7290a5a2b50488d8918f2a45269557e4de9a31e5 +SIZE (xapian-bindings-1.4.22.tar.xz) = 1074840 diff --git a/databases/php-xapian/files/patch-configure b/databases/php-xapian/files/patch-configure new file mode 100644 index 000000000000..6b9dce2bb21b --- /dev/null +++ b/databases/php-xapian/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2023-02-02 01:01:44 UTC ++++ configure +@@ -21048,7 +21048,7 @@ SWIG_CXXFLAGS= + if test yes = "$GXX" ; then + SWIG_CXXFLAGS="-fno-strict-aliasing" + +- XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++" ++ XAPIAN_LIBS="$XAPIAN_LIBS " + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/databases/php-xapian/pkg-plist b/databases/php-xapian/pkg-plist index eddd492272ee..5a843ffc5d35 100644 --- a/databases/php-xapian/pkg-plist +++ b/databases/php-xapian/pkg-plist @@ -1,8 +1,7 @@ lib/php/%%PHP_EXT_DIR%%/xapian.a lib/php/%%PHP_EXT_DIR%%/xapian.so -%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php7 -%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php7 -%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php7 -%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php7 +%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php8 +%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php8 +%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php8 +%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php8 %%PORTDOCS%%%%DOCSDIR%%/php/index.html -%%DATADIR%%/php/xapian.php |