Received: by mail.netbsd.org (Postfix, from userid 605) id 5BD2184E22; Fri, 16 Nov 2018 19:01:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6D8FF84E1F for ; Fri, 16 Nov 2018 19:01:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id R8VY9g2N0oC6 for ; Fri, 16 Nov 2018 19:01:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 490F384CD3 for ; Fri, 16 Nov 2018 19:01:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2DD08FB1F; Fri, 16 Nov 2018 19:01:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154239488682310" MIME-Version: 1.0 Date: Fri, 16 Nov 2018 19:01:26 +0000 From: "Benny Siegert" Subject: CVS commit: pkgsrc/editors/pluma To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20181116190126.2DD08FB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154239488682310 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Fri Nov 16 19:01:26 UTC 2018 Modified Files: pkgsrc/editors/pluma: Makefile distinfo options.mk Added Files: pkgsrc/editors/pluma/patches: patch-configure Log Message: Port pluma to use enchant2, bump revision. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/pluma/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/pluma/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/editors/pluma/options.mk cvs rdiff -u -r0 -r1.1 pkgsrc/editors/pluma/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154239488682310 Content-Disposition: inline Content-Length: 5795 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/pluma/Makefile diff -u pkgsrc/editors/pluma/Makefile:1.15 pkgsrc/editors/pluma/Makefile:1.16 --- pkgsrc/editors/pluma/Makefile:1.15 Wed Nov 14 22:21:24 2018 +++ pkgsrc/editors/pluma/Makefile Fri Nov 16 19:01:25 2018 @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.15 2018/11/14 22:21:24 kleink Exp $ +# $NetBSD: Makefile,v 1.16 2018/11/16 19:01:25 bsiegert Exp $ # XXX: meta-pkgs/mate/Makefile.common includes pyversion.mk which sets the # python version too early and clashes with PYTHON_VERSIONS_INCOMPATIBLE # from libpeas bl3, so we include it early to ensure a valid version is # chosen. This is not ideal, please fix it properly at some point. -PKGREVISION= 2 .include "../../devel/libpeas/buildlink3.mk" .include "../../meta-pkgs/mate/Makefile.common" DISTNAME= pluma-${VERSION:R}.1 CATEGORIES= editors +PKGREVISION= 3 COMMENT= Small and lightweight UTF-8 text editor for the MATE Index: pkgsrc/editors/pluma/distinfo diff -u pkgsrc/editors/pluma/distinfo:1.3 pkgsrc/editors/pluma/distinfo:1.4 --- pkgsrc/editors/pluma/distinfo:1.3 Mon May 14 13:23:50 2018 +++ pkgsrc/editors/pluma/distinfo Fri Nov 16 19:01:25 2018 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2018/05/14 13:23:50 youri Exp $ +$NetBSD: distinfo,v 1.4 2018/11/16 19:01:25 bsiegert Exp $ SHA1 (pluma-1.20.1.tar.xz) = 88bf75cff72fc99e179abd1c9e61b31e0ec44bfb RMD160 (pluma-1.20.1.tar.xz) = 85523e93007675c7e46bea5fd856b1ba43dd8b06 SHA512 (pluma-1.20.1.tar.xz) = 7782fd227524e524b4e97eb196f01085d5bd5dd0d3d91bae21742ba4da6496fe13c2669606265932c323a34ea007d0c0164f79783d5bb5dde049ce40fc1b2b1d Size (pluma-1.20.1.tar.xz) = 3414916 bytes +SHA1 (patch-configure) = 9fc23946abf5197603ce28bef2c0e54b5be96c86 Index: pkgsrc/editors/pluma/options.mk diff -u pkgsrc/editors/pluma/options.mk:1.7 pkgsrc/editors/pluma/options.mk:1.8 --- pkgsrc/editors/pluma/options.mk:1.7 Tue Jul 3 05:03:15 2018 +++ pkgsrc/editors/pluma/options.mk Fri Nov 16 19:01:25 2018 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2018/07/03 05:03:15 adam Exp $ +# $NetBSD: options.mk,v 1.8 2018/11/16 19:01:25 bsiegert Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pluma PKG_SUPPORTED_OPTIONS= enchant @@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS= enchant PLIST_VARS+= enchant python .if !empty(PKG_OPTIONS:Menchant) -.include "../../textproc/enchant/buildlink3.mk" +.include "../../textproc/enchant2/buildlink3.mk" .include "../../textproc/iso-codes/buildlink3.mk" CONFIGURE_ARGS+= --enable-spell PLIST.enchant= yes Added files: Index: pkgsrc/editors/pluma/patches/patch-configure diff -u /dev/null pkgsrc/editors/pluma/patches/patch-configure:1.1 --- /dev/null Fri Nov 16 19:01:26 2018 +++ pkgsrc/editors/pluma/patches/patch-configure Fri Nov 16 19:01:25 2018 @@ -0,0 +1,59 @@ +$NetBSD: patch-configure,v 1.1 2018/11/16 19:01:25 bsiegert Exp $ + +Allow use of enchant-2. + +--- configure.orig 2018-03-25 08:39:40.000000000 +0000 ++++ configure +@@ -14382,7 +14382,7 @@ $as_echo "#define ENABLE_GVFS_METADATA 1 + fi + + +-ENCHANT_REQUIRED=1.2.0 ++ENCHANT_REQUIRED=2.0.0 + ISO_CODES_REQUIRED=0.35 + + # Check whether --enable-spell was given. +@@ -14404,12 +14404,12 @@ if test -n "$ENCHANT_CFLAGS"; then + pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2 >= \$ENCHANT_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "enchant-2 >= $ENCHANT_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant >= $ENCHANT_REQUIRED" 2>/dev/null` ++ pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant-2 >= $ENCHANT_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -14421,12 +14421,12 @@ if test -n "$ENCHANT_LIBS"; then + pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2 >= \$ENCHANT_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "enchant-2 >= $ENCHANT_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant >= $ENCHANT_REQUIRED" 2>/dev/null` ++ pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant-2 >= $ENCHANT_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -14447,9 +14447,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant >= $ENCHANT_REQUIRED" 2>&1` ++ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant-2 >= $ENCHANT_REQUIRED" 2>&1` + else +- ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant >= $ENCHANT_REQUIRED" 2>&1` ++ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant-2 >= $ENCHANT_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ENCHANT_PKG_ERRORS" >&5 --_----------=_154239488682310--