Date: Wed, 29 Dec 2021 13:42:17 GMT From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 27132d3fdab4 - main - comms/xastir: Update to 2.1.8 Message-ID: <202112291342.1BTDgHkd039843@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=27132d3fdab4de9ef9f976a24f14200e567028ef commit 27132d3fdab4de9ef9f976a24f14200e567028ef Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2021-12-29 11:41:25 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2021-12-29 13:38:16 +0000 comms/xastir: Update to 2.1.8 ChangeLog: https://github.com/Xastir/Xastir/releases/tag/Release-2.1.8 While here: * Remove gettext and python from USES. The port doesn't used them anymore. * Remove comment * Move patch to .am file instead of generated .in file * Remove sparc64 patch (architecture is UNSUPPORTED in 13 and above) * Add USES=autoreconf This last item allows us to bypass bootstrap.sh. The language preprocessing is already done in the config directory so there is no need to do it as a bootstrap step. PR: 259669 Reported by: russo@bogodyn.org (xastir developer) Approved by: carl@stagecraft.cx (maintainer, timeout > 1 month) --- comms/xastir/Makefile | 9 ++++++--- comms/xastir/distinfo | 6 +++--- comms/xastir/files/patch-Makefile.am | 11 +++++++++++ comms/xastir/files/patch-Makefile.in | 11 ----------- comms/xastir/files/patch-src_Makefile.in | 15 --------------- 5 files changed, 20 insertions(+), 32 deletions(-) diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 2a38e0cef473..7535b2aee4ae 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -2,7 +2,7 @@ PORTNAME= xastir DISTVERSIONPREFIX= Release- -DISTVERSION= 2.1.6 +DISTVERSION= 2.1.8 CATEGORIES= comms hamradio MAINTAINER= carl@stagecraft.cx @@ -25,7 +25,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libwmflite.so:graphics/libwmf \ libpcre.so:devel/pcre -USES= gettext gmake gnome jpeg motif python:run shebangfix xorg +USES= autoreconf gmake gnome jpeg motif shebangfix xorg USE_XORG= ice sm x11 xext xt USE_GNOME+= libxml2 @@ -37,7 +37,6 @@ SHEBANG_REGEX= ./scripts/.*\.(sh|pl|py) USE_GITHUB= yes GH_ACCOUNT= Xastir GH_PROJECT= Xastir -#CFLAGS+= -fcommon SUB_FILES= pkg-message @@ -86,4 +85,8 @@ BDB_USES= bdb BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \ --with-bdb-libdir=${BDB_LIB_DIR} +post-extract: + @${REINPLACE_CMD} -e 's|2>&1||g' ${WRKSRC}/acinclude.m4 + .include <bsd.port.mk> + diff --git a/comms/xastir/distinfo b/comms/xastir/distinfo index ba86a2720b84..973b4c0e855f 100644 --- a/comms/xastir/distinfo +++ b/comms/xastir/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600663254 -SHA256 (Xastir-Xastir-Release-2.1.6_GH0.tar.gz) = 5a71af2936d4d237c779b1c3a519211f8e3cd03b9873a260c849ddc8950e1a3e -SIZE (Xastir-Xastir-Release-2.1.6_GH0.tar.gz) = 2687180 +TIMESTAMP = 1636154486 +SHA256 (Xastir-Xastir-Release-2.1.8_GH0.tar.gz) = aa88069f149dbe720276d0134282bc491e7993d8a88380c8fe2a4735ee6444fc +SIZE (Xastir-Xastir-Release-2.1.8_GH0.tar.gz) = 2222586 diff --git a/comms/xastir/files/patch-Makefile.am b/comms/xastir/files/patch-Makefile.am new file mode 100644 index 000000000000..6b06e9b70d78 --- /dev/null +++ b/comms/xastir/files/patch-Makefile.am @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2021-12-29 11:33:10 UTC ++++ Makefile.am +@@ -76,7 +76,7 @@ install-data-hook: + rm -f CC_OpenStreetMap.png && \ + $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png + +-mandir=${prefix}/share/man ++mandir=@mandir@ + man_MANS=xastir.1 callpass.1 xastir_udp_client.1 testdbfawk.1 + + # Use tiles for these maps diff --git a/comms/xastir/files/patch-Makefile.in b/comms/xastir/files/patch-Makefile.in deleted file mode 100644 index 3254ccec7886..000000000000 --- a/comms/xastir/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2016-07-01 18:52:47 UTC -+++ Makefile.in -@@ -284,7 +284,7 @@ libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ - lpr = @lpr@ --mandir = ${prefix}/share/man -+mandir = @mandir@ - mkdir_p = @mkdir_p@ - mv = @mv@ - oldincludedir = @oldincludedir@ diff --git a/comms/xastir/files/patch-src_Makefile.in b/comms/xastir/files/patch-src_Makefile.in deleted file mode 100644 index 1866382287cc..000000000000 --- a/comms/xastir/files/patch-src_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- src/Makefile.in.orig 2014-09-12 19:05:57 UTC -+++ src/Makefile.in -@@ -522,6 +522,12 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xa_config.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xastir_udp_client.Po@am__quote@ - -+ifeq ($(host_cpu),sparc64) -+draw_symbols.o: draw_symbols.c -+@am__fastdepCC_TRUE@ $(patsubst -O%,-O0,$(COMPILE)) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+endif -+ - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112291342.1BTDgHkd039843>