From 26996d7063706ef640f551a421cb53f5d54baf1e Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Sat, 24 Jun 2023 07:27:38 -0700 Subject: [PATCH] devel/ticcutils: Use upstream release archive and minor fixes PR: 272175 --- devel/ticcutils/Makefile | 17 +++++++++-------- devel/ticcutils/distinfo | 6 +++--- devel/ticcutils/files/patch-src_Makefile.am | 10 ---------- 3 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 devel/ticcutils/files/patch-src_Makefile.am diff --git a/devel/ticcutils/Makefile b/devel/ticcutils/Makefile index c594cd39d839f..c27e5cf662106 100644 --- a/devel/ticcutils/Makefile +++ b/devel/ticcutils/Makefile @@ -1,8 +1,8 @@ PORTNAME= ticcutils -DISTVERSIONPREFIX= v DISTVERSION= 0.32 PORTREVISION= 3 CATEGORIES= devel textproc +MASTER_SITES= https://github.com/LanguageMachines/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= yuri@FreeBSD.org COMMENT= Generic utility library shared by the Tilburg University software @@ -11,27 +11,28 @@ WWW= https://github.com/LanguageMachines/ticcutils LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libicui18n.so:devel/icu \ libtar.so:devel/libtar -USES= autoreconf compiler:c++11-lib gmake gnome libtool localbase:ldflags pkgconfig -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-static +USES= compiler:c++11-lib gmake gnome libtool localbase:ldflags \ + pathfix pkgconfig USE_GNOME= libxml2 USE_LDCONFIG= yes -USE_GITHUB= yes -GH_ACCOUNT= LanguageMachines +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static INSTALL_TARGET= install-strip TEST_TARGET= check # 1 test fails, see https://github.com/LanguageMachines/ticcutils/issues/26 TEST_ENV= LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib -CFLAGS+= -D_THREAD_SAFE # configure on GCC-based architectures fails w/out this # Workaround for https://github.com/LanguageMachines/ticcutils/issues/18 (also see the patch files/patch-configure.ac) CXXFLAGS+= -DHAVE_BOOST_REGEX LDFLAGS+= -lboost_regex +post-patch: + @${REINPLACE_CMD} -e 's|-O3||g' \ + ${PATCH_WRKSRC}/src/Makefile.in + .include diff --git a/devel/ticcutils/distinfo b/devel/ticcutils/distinfo index c63e8e5dcd865..06398ece43025 100644 --- a/devel/ticcutils/distinfo +++ b/devel/ticcutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677079201 -SHA256 (LanguageMachines-ticcutils-v0.32_GH0.tar.gz) = 9a7b2c3e1cd9b2643727719b2bc515f4bfc5f0cddf9e48bfa5e4c92d1e47a40d -SIZE (LanguageMachines-ticcutils-v0.32_GH0.tar.gz) = 266079 +TIMESTAMP = 1687517598 +SHA256 (ticcutils-0.32.tar.gz) = 7aaf9b87cd7218891853b6267f402fd51c53078394120c3f9e7ec8c63de928b1 +SIZE (ticcutils-0.32.tar.gz) = 669107 diff --git a/devel/ticcutils/files/patch-src_Makefile.am b/devel/ticcutils/files/patch-src_Makefile.am deleted file mode 100644 index 1166bae0b6cba..0000000000000 --- a/devel/ticcutils/files/patch-src_Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile.am.orig 2018-12-07 23:02:14 UTC -+++ src/Makefile.am -@@ -1,5 +1,6 @@ - AM_CPPFLAGS = -I@top_srcdir@/include --AM_CXXFLAGS = -g -std=c++11 -O3 -W -Wall -pedantic -+AM_CXXFLAGS = -std=c++11 -W -Wall -pedantic -+AM_LDFLAGS = $(LDFLAGS) - - LDADD = libticcutils.la -