aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo-Chuan Hsieh <sunpoet@FreeBSD.org>2023-03-21 18:41:06 +0000
committerPo-Chuan Hsieh <sunpoet@FreeBSD.org>2023-03-21 19:20:14 +0000
commitb43221135f1d732ecfb5ffeea70567119cb422a7 (patch)
tree8f5c946807bf861b2ea351eefe89a32113e1bbce
parentf0a8b54c9cdd662c20b1542d6bdecbe900aabcd4 (diff)
downloadports-b43221135f1d732ecfb5ffeea70567119cb422a7.tar.gz
ports-b43221135f1d732ecfb5ffeea70567119cb422a7.zip
www/xapian-omega: Update to 1.4.22
- Convert REINPLACE_CMD to patch file Changes: https://trac.xapian.org/wiki/ReleaseOverview
-rw-r--r--www/xapian-omega/Makefile10
-rw-r--r--www/xapian-omega/distinfo6
-rw-r--r--www/xapian-omega/files/patch-Makefile.in19
3 files changed, 23 insertions, 12 deletions
diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile
index 2b4cb7762d59..0cb4f26c808f 100644
--- a/www/xapian-omega/Makefile
+++ b/www/xapian-omega/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xapian-omega
-PORTVERSION= 1.4.21
+PORTVERSION= 1.4.22
CATEGORIES= www
MASTER_SITES= https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
LOCAL/sunpoet
@@ -19,8 +19,6 @@ USES= compiler:c++11-lang libtool localbase perl5 shebangfix tar:xz
CONFIGURE_ARGS= --datarootdir=${DATADIR} --docdir=${DOCSDIR} \
ac_cv_func_snprintf=snprintf
-#xCONFIGURE_ENV= PCRE2_CONFIG=${LOCALBASE}/bin/pcre2-config
-#xCONFIGURE_ENV= PCRE2_CONFIG=${LOCALBASE}/bin/pcre2-config
CONFIGURE_ENV= XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config
GNU_CONFIGURE= yes
USE_CXXSTD= c++11
@@ -40,12 +38,6 @@ ICONV_CONFIGURE_ON= ac_cv_search_iconv=${ICONV_LIB}
ICONV_CONFIGURE_WITH= iconv
ICONV_USES= iconv
-post-patch:
- @${REINPLACE_CMD} \
- -e '/^dist_sysconf_DATA = /d' \
- -e '/^pkglibbindir = / s| = .*$$| = ${WWWDIR}/cgi-bin|' \
- ${WRKSRC}/Makefile.in
-
post-install-DOCS-on:
cd ${WRKSRC}/ && ${INSTALL_DATA} AUTHORS ChangeLog NEWS README TODO ${STAGEDIR}${DOCSDIR}/
diff --git a/www/xapian-omega/distinfo b/www/xapian-omega/distinfo
index 8c8c502518ff..94a8105cb8cd 100644
--- a/www/xapian-omega/distinfo
+++ b/www/xapian-omega/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1664767860
-SHA256 (xapian-omega-1.4.21.tar.xz) = 88a113c5598fc95833e1212c70be463abb9d5601564d21b861636f737955aad5
-SIZE (xapian-omega-1.4.21.tar.xz) = 568440
+TIMESTAMP = 1677771079
+SHA256 (xapian-omega-1.4.22.tar.xz) = 674c979fb90f1f4990eb8a909edab88ca4a009417dfd5ab0cba19e02c7a95528
+SIZE (xapian-omega-1.4.22.tar.xz) = 570476
diff --git a/www/xapian-omega/files/patch-Makefile.in b/www/xapian-omega/files/patch-Makefile.in
new file mode 100644
index 000000000000..7c15c553211b
--- /dev/null
+++ b/www/xapian-omega/files/patch-Makefile.in
@@ -0,0 +1,19 @@
+--- Makefile.in.orig 2023-02-02 01:01:36 UTC
++++ Makefile.in
+@@ -841,7 +841,7 @@ AM_CPPFLAGS = \
+ -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \
+ -DPKGLIBBINDIR=\"$(pkglibbindir)\"
+
+-pkglibbindir = $(pkglibdir)/bin
++pkglibbindir = $(prefix)/www/xapian-omega/cgi-bin
+ dist_pkglibbin_SCRIPTS = mhtml2html outlookmsg2html rfc822tohtml vcard2text
+ dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega
+ dist_check_SCRIPTS = omegatest sourcetest
+@@ -857,7 +857,6 @@ TESTS = atomparsetest$(EXEEXT)\
+
+ omegadatadir = $(datadir)/omega
+ dist_omegadata_DATA = htdig2omega.script mbox2omega.script
+-dist_sysconf_DATA = omega.conf
+
+ # headers maintained in xapian-core
+ noinst_HEADERS = omega.h query.h cgiparam.h index_file.h mime.h \