From nobody Mon Oct 30 11:23:07 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SJrVM6QqMz4xnPN; Mon, 30 Oct 2023 11:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SJrVM5NWRz4XMD; Mon, 30 Oct 2023 11:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698664987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t1Fqz7ycdF0aqLc9TMsmF6GxGqa73T6UHl1wmPgV1t4=; b=QvNBqQAijYpPwYuIDsiPhka+examq7AW/JDtCjjRwHOFiznGeeFywtob/dZhz+BVL5SWE8 pClN0+Lh1Q5s5Ub6ChqInt7E7VdlI0n2OIA/CTgHDQ4eO41zBoQd6Z2tZVcz5ord09hktT 9+rlIOYDgvOULH6+S8g4Lz1mnrA1Ou0J4VHTVAQ+uW7wZm8iah19jT2JjHalfck2OE2nnY 2Q9uqzlQ3hGA6TsjFOI2KVWJEjewcuMPovc1pm0naQzdW/h8G17gd2yapd+Aul0dA3c5JB Mw8rbfYF6wMvAWjloh6rp2v942RUIg6v9qZm+mXv0P2ww3rG/z3IhYE3iUxRdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698664987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t1Fqz7ycdF0aqLc9TMsmF6GxGqa73T6UHl1wmPgV1t4=; b=PLxUdg479FE38GGImOeoPmaJMLHPYJ9DC3IOWy+Usd2xRJjVFj9XFvqtUZxXi1XsR6Nx2m YQs2+SMXH2xJ9uwiZ4lxoRgupJp8K/h51mshU16aoViyLwEoNbKvOfgxT1x7A4GsQV/qgz S/bzR6lB/z5NiME59pd1VLoFmV+YCBEMJbQaOkYcD0zf8OxFHxu4haXNwA6JaopEIFp4+Q 6qpC7asl6G5YS8CWhfiIb7hXX8sWSyjJTssgA43wOeJ4v8Vsobce2sTVM4LvmdzQJlYkdY JXZdedigPMUN1UarXegenbsjyyOnZSe5h0+V8C4PHLy3EjSuxD963Vng49XMww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698664987; a=rsa-sha256; cv=none; b=r1MXKKCvRkJlBJD1zPa3jKkufE0luSZVrhGa2K0NsO23d0sHxt7jSmVTfHMUyC0qOEmxuP agTdoDDx2lOEVZ4L9wfICeTwm8KQVvQY9rqUIatIzu3ViGAP23oFkVLufkBiNNZg/l5U0B aML5hb6w8ymORrKcZLjGx36lgWyUYCISfcMgilZAdrtC1IMLYD3qVVFI3BYpXkheDQsrI6 NF6C6U64EjzwbegkBgzOQ0HN41uvTIykdlHE5bSBL0KQFV8oWepkEJFm3Gbt3b64Gk8bRY dkuu4CJdpy6GzkEUff+kUZeJzLkqmxUZjAwo2p8mqKtLzvRNESXkC0R16chIbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SJrVM4RDBz4Ht; Mon, 30 Oct 2023 11:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39UBN7GU078269; Mon, 30 Oct 2023 11:23:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UBN7iY078266; Mon, 30 Oct 2023 11:23:07 GMT (envelope-from git) Date: Mon, 30 Oct 2023 11:23:07 GMT Message-Id: <202310301123.39UBN7iY078266@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 668e3088a22d - main - net-p2p/microdc2: unbreak the build and undeprecate this useful port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 668e3088a22df54931e4d9cca1a9dbd6b65966ec Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=668e3088a22df54931e4d9cca1a9dbd6b65966ec commit 668e3088a22df54931e4d9cca1a9dbd6b65966ec Author: Alexey Dokuchaev AuthorDate: 2023-10-30 11:21:44 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-10-30 11:21:44 +0000 net-p2p/microdc2: unbreak the build and undeprecate this useful port - Hardcode results of libxml2 version checks so it won't break again - Do not inhibit manpage installation, but adjust translation's path --- net-p2p/microdc2/Makefile | 11 ++++++----- net-p2p/microdc2/files/patch-configure | 14 +++++++++++--- net-p2p/microdc2/files/patch-no-man | 11 ----------- net-p2p/microdc2/pkg-plist | 2 ++ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile index c9f2a1d3d7b6..935f5b0e916c 100644 --- a/net-p2p/microdc2/Makefile +++ b/net-p2p/microdc2/Makefile @@ -2,7 +2,7 @@ PORTNAME= microdc2 PORTVERSION= 0.15.6 PORTREVISION= 10 CATEGORIES= net-p2p -MASTER_SITES= http://corsair626.no-ip.org/microdc/ +MASTER_SITES= http://corsair626.no-ip.org/microdc/ LOCAL/danfe MAINTAINER= pankov_p@mail.ru COMMENT= Command-line based Direct Connect client @@ -10,10 +10,6 @@ WWW= http://corsair626.no-ip.org/microdc/ LICENSE= GPLv2 -DEPRECATED= BROKEN for more than an year -EXPIRATION_DATE= 2023-11-30 -BROKEN= does not build: undefined symbol: main_to_utf8_string - CONFLICTS= tthsum USES= gnome iconv readline @@ -26,4 +22,9 @@ OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls +post-stage: + @${MKDIR} ${STAGEDIR}${MANPREFIX}/man/pl/man1 + cd ${STAGEDIR}${MANPREFIX}/man && \ + ${MV} man1/microdc.pl.1 pl/man1/microdc.1 + .include diff --git a/net-p2p/microdc2/files/patch-configure b/net-p2p/microdc2/files/patch-configure index 0af2171c7f84..d6572457cdca 100644 --- a/net-p2p/microdc2/files/patch-configure +++ b/net-p2p/microdc2/files/patch-configure @@ -1,11 +1,19 @@ ---- configure.orig 2006-12-25 02:45:07 +0800 +--- configure.orig 2006-12-24 18:45:07 UTC +++ configure -@@ -21508,7 +21508,7 @@ cat >>confdefs.h <<\_ACEOF +@@ -21501,14 +21501,14 @@ fi + + if test -n "$XML_CONFIG" && test -n "$TR"; then + LIBXML2_VERSION=`$XML_CONFIG --version | $TR -d "."` +- if test $LIBXML2_VERSION -eq 2616; then ++ if false; then + + cat >>confdefs.h <<\_ACEOF + #define XML_SAVE_FORMAT 1 _ACEOF fi - if test $LIBXML2_VERSION -ge 2616; then -+ if test $LIBXML2_VERSION \> 2615; then ++ if true; then cat >>confdefs.h <<\_ACEOF #define HAVE_LIBXML2 1 _ACEOF diff --git a/net-p2p/microdc2/files/patch-no-man b/net-p2p/microdc2/files/patch-no-man deleted file mode 100644 index 8e0a31327f94..000000000000 --- a/net-p2p/microdc2/files/patch-no-man +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Wed Nov 29 21:15:24 2006 -+++ src/Makefile.in Sun Dec 3 14:11:19 2006 -@@ -695,7 +695,7 @@ - - install-info: install-info-recursive - --install-man: install-man1 -+install-man: - - installcheck-am: - diff --git a/net-p2p/microdc2/pkg-plist b/net-p2p/microdc2/pkg-plist index 0294f1d3ca2b..4327334f7790 100644 --- a/net-p2p/microdc2/pkg-plist +++ b/net-p2p/microdc2/pkg-plist @@ -1,4 +1,6 @@ bin/microdc2 bin/tthsum +man/man1/microdc.1.gz +man/pl/man1/microdc.1.gz %%NLS%%share/locale/pl/LC_MESSAGES/microdc2.mo %%NLS%%share/locale/sv/LC_MESSAGES/microdc2.mo