From nobody Tue Jan 28 19:02:27 2025 X-Original-To: dev-commits-ports-all@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 4YjF5w0r35z5lyRv; Tue, 28 Jan 2025 19:02:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjF5w0Gj9z3ZdF; Tue, 28 Jan 2025 19:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738090948; 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=53DKsn6u+Gyo5dX1b80BNJTCkbMQGlbDNw0bl1fcOI8=; b=OY2LOYthwLCFiVbpM65KAwza8WZsuJ2pDrUfXzPjZSdBIawem1EPsFq0UZ6LxNYoMCna66 3IINg/YYx23irvRgKfdLGQEE7fVIloGOqgb2Q5qNz4hQTIPW00nTRxVK6HrdRgQSJ6QKF8 Fe07ssDBLeV9B1pobjO+q2DQd8Wi0QtDbKolOSJdjPTvCt1ices4Tz9PyF5Fy8drKG4p0y hNe5eD+u7IwUNMi32WVKjd4xW/+JdSWedByM/RMsLy6nc66ea14ABfgZW8uTA9oRhJoeLX GnT8Wscai8M3rIptL/wmgofrZ9LPHsz3y9WnxVLOquIMcUetFoSFxJD/qGG2Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738090948; 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=53DKsn6u+Gyo5dX1b80BNJTCkbMQGlbDNw0bl1fcOI8=; b=FZDxspG9wCjwYYB5TiU+S8wxHNcNuSBOaO351upB0a53ld+zN7y10yBAwFPLmSKtO0kndP YGIBzmsP5DgxUtGu5F4QHlEcGPMZrHpsUCxQk+HaI6UTAGWiVd68QlcQGNcu4lKD8vCNZy KD7tMbvkmeyDEBndQ3Zdgc0W9APcK8YAn2AYOjby9wrntDjswBqI1dfxy9WWk8wByFN/AK eDBT+dRjRmY9zD2Z1ucJdjrUOkBPLkumgen0nXJGEffAGwiatUoRM3kqCMawas7GSJLwCF yYekORuxoyvqbOBHexyW4o3pTPShf0dURvfE8Jvl5fnA203RZDCxlbTau9KEHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738090948; a=rsa-sha256; cv=none; b=JpOzBSMh1daWlTxPd4POUJTnAYdt0VQTHdOxairjsG1YNWmKlW1hzqgh3d8sE6tidJqdAo 6vWg9O5INp5ugeCyQXmkMK94Hp/qviRNCPT/iz5fiLLlLfJBWqn0avweMHTcyjyEYQY9Sq JztX0vPBv5B+0CHu2kJzHS22/VaKw2NDJEmWjPOoOw0SEs1qc5w3sGExAUQK0BT5SywTNh CNhD16TVewkHoVAlRYCGsAy2pHRifbIr4uS9mieZZQRr2h7cyxzYgT9HHaUBS/JZjU3ZsE KZPw+89rItM8daecTEOL+eDjlVi0Jh/NwIMXoktT/leX3G5gkLCZTk0SiZFvyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YjF5v6zjnzBr3; Tue, 28 Jan 2025 19:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50SJ2Rkm089271; Tue, 28 Jan 2025 19:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SJ2Rfe089268; Tue, 28 Jan 2025 19:02:27 GMT (envelope-from git) Date: Tue, 28 Jan 2025 19:02:27 GMT Message-Id: <202501281902.50SJ2Rfe089268@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 8e5fbc751355 - main - print/libmspub01: Mostly revert ca315094f93a92aed537fab6a0efba9c4330ec77 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e5fbc751355d0cca4f79a7e3ce8edd5d0a0abf8 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e5fbc751355d0cca4f79a7e3ce8edd5d0a0abf8 commit 8e5fbc751355d0cca4f79a7e3ce8edd5d0a0abf8 Author: Daniel Engberg AuthorDate: 2025-01-28 18:59:21 +0000 Commit: Daniel Engberg CommitDate: 2025-01-28 19:02:10 +0000 print/libmspub01: Mostly revert ca315094f93a92aed537fab6a0efba9c4330ec77 Commit introduces several regressions and did undocumented changes. Revert to previous version and keep LICENSE_FILE definition. Approved by: portmgr (blanket, just fix it) --- print/libmspub01/Makefile | 10 +++--- print/libmspub01/files/patch-configure | 52 ------------------------------- print/libmspub01/files/patch-configure.ac | 11 +++++++ 3 files changed, 17 insertions(+), 56 deletions(-) diff --git a/print/libmspub01/Makefile b/print/libmspub01/Makefile index 58e96a114189..06a94e986534 100644 --- a/print/libmspub01/Makefile +++ b/print/libmspub01/Makefile @@ -1,5 +1,5 @@ PORTNAME= libmspub -PORTVERSION= 0.1.4 +DISTVERSION= 0.1.4 PORTREVISION= 24 CATEGORIES= print graphics devel MASTER_SITES= LODEV/${PORTNAME} @@ -16,11 +16,13 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs LIB_DEPENDS= libicui18n.so:devel/icu \ librevenge-0.0.so:textproc/librevenge -USES= compiler:c++11-lib libtool localbase pathfix pkgconfig tar:xz +USES= autoreconf compiler:c++11-lib libtool localbase pathfix \ + pkgconfig tar:xz +USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-werror --without-docs GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USE_LDCONFIG= yes + +CONFIGURE_ARGS= --disable-werror --without-docs .include diff --git a/print/libmspub01/files/patch-configure b/print/libmspub01/files/patch-configure deleted file mode 100644 index 44c9a1679326..000000000000 --- a/print/libmspub01/files/patch-configure +++ /dev/null @@ -1,52 +0,0 @@ ---- configure.orig 2018-02-28 12:02:05 UTC -+++ configure -@@ -18856,12 +18856,12 @@ if test -n "$ICU_CFLAGS"; then - pkg_cv_ICU_CFLAGS="$ICU_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n icu-uc\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "icu-i18n icu-uc") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n" 2>/dev/null` -+ pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n icu-uc" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -18873,12 +18873,12 @@ if test -n "$ICU_LIBS"; then - pkg_cv_ICU_LIBS="$ICU_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n icu-uc\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "icu-i18n icu-uc") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n" 2>/dev/null` -+ pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n icu-uc" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -18899,14 +18899,14 @@ fi - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n" 2>&1` -+ ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n icu-uc" 2>&1` - else -- ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n" 2>&1` -+ ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n icu-uc" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$ICU_PKG_ERRORS" >&5 - -- as_fn_error $? "Package requirements (icu-i18n) were not met: -+ as_fn_error $? "Package requirements (icu-i18n icu-uc) were not met: - - $ICU_PKG_ERRORS - diff --git a/print/libmspub01/files/patch-configure.ac b/print/libmspub01/files/patch-configure.ac new file mode 100644 index 000000000000..c2316cbe73e6 --- /dev/null +++ b/print/libmspub01/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2025-01-04 20:17:51 UTC ++++ configure.ac +@@ -104,7 +104,7 @@ AC_CHECK_HEADERS( + # ======== + # Find icu + # ======== +-PKG_CHECK_MODULES([ICU], [icu-i18n]) ++PKG_CHECK_MODULES([ICU], [icu-i18n icu-uc]) + AC_SUBST(ICU_CFLAGS) + AC_SUBST(ICU_LIBS) +