From owner-svn-ports-all@freebsd.org Thu Dec 26 21:03:05 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 215201D9358; Thu, 26 Dec 2019 21:03:05 +0000 (UTC) (envelope-from bapt@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47kMqY06tGz4L27; Thu, 26 Dec 2019 21:03:05 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F39796803; Thu, 26 Dec 2019 21:03:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBQL34vE006494; Thu, 26 Dec 2019 21:03:04 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBQL34aQ006492; Thu, 26 Dec 2019 21:03:04 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201912262103.xBQL34aQ006492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 26 Dec 2019 21:03:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520952 - in head/graphics/gpaint: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/graphics/gpaint: . files X-SVN-Commit-Revision: 520952 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Dec 2019 21:03:05 -0000 Author: bapt Date: Thu Dec 26 21:03:04 2019 New Revision: 520952 URL: https://svnweb.freebsd.org/changeset/ports/520952 Log: drop gnomeprint dependency gnomeprint has been deprecated long ago, the port actually optionnaly depends on it, or can use directly gtkprint. Remove the dependency on gnomeprint, actually patch the configure script to ensure gtkprint is preferred over gnomeprint if gnomeprint is still installed on end user machines Added: head/graphics/gpaint/files/ head/graphics/gpaint/files/patch-configure (contents, props changed) Modified: head/graphics/gpaint/Makefile Modified: head/graphics/gpaint/Makefile ============================================================================== --- head/graphics/gpaint/Makefile Thu Dec 26 21:02:51 2019 (r520951) +++ head/graphics/gpaint/Makefile Thu Dec 26 21:03:04 2019 (r520952) @@ -4,15 +4,18 @@ PORTNAME= gpaint PORTVERSION= 0.3.3 DISTVERSIONPREFIX= 2- -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics gnome MASTER_SITES= GNU_ALPHA MAINTAINER= ports@FreeBSD.org COMMENT= Small-scale painting program for GNOME +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + USES= gnome libtool pkgconfig -USE_GNOME= libgnomeprint libgnomeprintui +USE_GNOME= gtk20 libglade2 GNU_CONFIGURE= yes LIBS+= -lm Added: head/graphics/gpaint/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gpaint/files/patch-configure Thu Dec 26 21:03:04 2019 (r520952) @@ -0,0 +1,75 @@ +--- configure.orig 2007-09-10 09:52:55 UTC ++++ configure +@@ -19584,72 +19584,6 @@ pkg_failed=no + echo "$as_me:$LINENO: checking for PRINT" >&5 + echo $ECHO_N "checking for PRINT... $ECHO_C" >&6 + +-if test -n "$PKG_CONFIG"; then +- if test -n "$PRINT_CFLAGS"; then +- pkg_cv_PRINT_CFLAGS="$PRINT_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 libgnomeprintui-2.2\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_PRINT_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprint-2.2 libgnomeprintui-2.2" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$PRINT_LIBS"; then +- pkg_cv_PRINT_LIBS="$PRINT_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprint-2.2 libgnomeprintui-2.2\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_PRINT_LIBS=`$PKG_CONFIG --libs "libgnomeprint-2.2 libgnomeprintui-2.2" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- PRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2"` +- else +- PRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprint-2.2 libgnomeprintui-2.2"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$PRINT_PKG_ERRORS" >&5 +- +- echo "gnomeprint libraries are not available." +-elif test $pkg_failed = untried; then +- echo "gnomeprint libraries are not available." +-else +- PRINT_CFLAGS=$pkg_cv_PRINT_CFLAGS +- PRINT_LIBS=$pkg_cv_PRINT_LIBS +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- gpaint_have_gnome_print=1 +-fi +- +- + pkg_failed=no + echo "$as_me:$LINENO: checking for GTKPRINT" >&5 + echo $ECHO_N "checking for GTKPRINT... $ECHO_C" >&6