Date: Mon, 30 Oct 2023 11:23:07 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 668e3088a22d - main - net-p2p/microdc2: unbreak the build and undeprecate this useful port Message-ID: <202310301123.39UBN7iY078266@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=668e3088a22df54931e4d9cca1a9dbd6b65966ec commit 668e3088a22df54931e4d9cca1a9dbd6b65966ec Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-10-30 11:21:44 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> 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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310301123.39UBN7iY078266>