From owner-svn-ports-head@freebsd.org Thu Dec 26 21:33:44 2019 Return-Path: Delivered-To: svn-ports-head@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 4430A1D9A2B; Thu, 26 Dec 2019 21:33:44 +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 47kNVw13pCz4MNq; Thu, 26 Dec 2019 21:33:44 +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 1FA386D7B; Thu, 26 Dec 2019 21:33:44 +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 xBQLXi7A024605; Thu, 26 Dec 2019 21:33:44 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBQLXhYZ024603; Thu, 26 Dec 2019 21:33:43 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201912262133.xBQLXhYZ024603@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:33:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520955 - in head/cad/linuxcnc-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/cad/linuxcnc-devel: . files X-SVN-Commit-Revision: 520955 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Dec 2019 21:33:44 -0000 Author: bapt Date: Thu Dec 26 21:33:43 2019 New Revision: 520955 URL: https://svnweb.freebsd.org/changeset/ports/520955 Log: Remove gnomeprint support, which is deprecated in gnome for a while now. Modified: head/cad/linuxcnc-devel/Makefile head/cad/linuxcnc-devel/files/patch-src_configure.in Modified: head/cad/linuxcnc-devel/Makefile ============================================================================== --- head/cad/linuxcnc-devel/Makefile Thu Dec 26 21:16:20 2019 (r520954) +++ head/cad/linuxcnc-devel/Makefile Thu Dec 26 21:33:43 2019 (r520955) @@ -3,7 +3,7 @@ PORTNAME= linuxcnc PORTVERSION= 20170708 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= cad PKGNAMESUFFIX= -devel @@ -45,7 +45,7 @@ MAKE_ENV= BUILD_VERBOSE=1 USES= autoreconf gettext gl gmake gnome ncurses pkgconfig python:2.7 \ readline shebangfix tk xorg USE_GL= gl glu -USE_GNOME= cairo gdkpixbuf2 libgnomeprintui pygtksourceview +USE_GNOME= cairo gdkpixbuf2 pygtksourceview USE_XORG= ice sm x11 xext xft xinerama xmu xrender xscrnsaver xt USE_LDCONFIG= yes USE_GITHUB= yes Modified: head/cad/linuxcnc-devel/files/patch-src_configure.in ============================================================================== --- head/cad/linuxcnc-devel/files/patch-src_configure.in Thu Dec 26 21:16:20 2019 (r520954) +++ head/cad/linuxcnc-devel/files/patch-src_configure.in Thu Dec 26 21:33:43 2019 (r520955) @@ -1,6 +1,6 @@ ---- src/configure.in.orig 2016-06-25 02:19:12 UTC +--- src/configure.in.orig 2019-12-26 21:08:10 UTC +++ src/configure.in -@@ -665,7 +665,7 @@ else +@@ -711,7 +711,7 @@ else esac LINUXCNC_CONFIG_PATH="~/linuxcnc/configs:/usr/local/etc/linuxcnc/configs:"$(eval echo $EMC2_HELP_DIR)"/examples/sample-configs" EMC2_NCFILES_DIR=${prefix}/share/linuxcnc/ncfiles @@ -9,7 +9,24 @@ EMC2_IMAGE_DIR=$(fe "$datadir")/linuxcnc HALLIB_DIR=${prefix}/share/linuxcnc/hallib fi -@@ -807,25 +807,25 @@ then +@@ -787,16 +787,6 @@ if test "$BUILD_GTK" = "yes"; then + AC_MSG_RESULT(yes - $GTK_VER) + GTK_CFLAGS=`pkg-config gtk+-2.0 --cflags` + GTK_LIBS=`pkg-config gtk+-2.0 --libs` +- AC_MSG_CHECKING(for libgnomeprintui-2.2) +- if pkg-config --exists libgnomeprintui-2.2; then +- AC_MSG_RESULT(yes) +- GTK_CFLAGS="$GTK_CFLAGS `pkg-config --cflags libgnomeprintui-2.2`" +- GTK_LIBS="$GTK_LIBS `pkg-config --libs libgnomeprintui-2.2`" +- HAVE_GNOMEPRINT=yes +- else +- AC_MSG_RESULT(no -- printing from classicladder will not be possible) +- HAVE_GNOMEPRINT= +- fi + else + AC_MSG_RESULT(no) + AC_MSG_ERROR([GTK2 missing. Install it or specify --disable-gtk to skip the parts of LinuxCNC that depend on GTK]) +@@ -853,25 +843,25 @@ then AC_MSG_ERROR([awk not found]) fi @@ -39,11 +56,11 @@ if test $PIDOF = "none" then AC_MSG_ERROR([pidof not found]) -@@ -1180,7 +1180,6 @@ AC_MSG_RESULT($HAVE_OPTRESET) +@@ -1211,7 +1201,6 @@ extern int optreset; + [HAVE_OPTRESET=no]) + AC_MSG_RESULT($HAVE_OPTRESET) AC_SUBST([HAVE_OPTRESET]) +- -- LIBS_hold=$LIBS - LIBS= - AC_SEARCH_LIBS(dlopen, [c dl], [