[146024] trunk/dports/sysutils
ionic at macports.org
ionic at macports.org
Wed Feb 24 17:59:33 PST 2016
Revision: 146024
https://trac.macports.org/changeset/146024
Author: ionic at macports.org
Date: 2016-02-24 17:59:33 -0800 (Wed, 24 Feb 2016)
Log Message:
-----------
amttools: new port.
Includes amttool (for querying AMT properties), amtterm (for connecting
to SoL virtual adapters), gamt (GTK3-/vte-based SoL terminal) and the
famous amt-howto man page.
Added Paths:
-----------
trunk/dports/sysutils/amttools/
trunk/dports/sysutils/amttools/Portfile
trunk/dports/sysutils/amttools/files/
trunk/dports/sysutils/amttools/files/patch-GNUmakefile-check-for-GTK2-only.diff
trunk/dports/sysutils/amttools/files/patch-GNUmakefile-disable-gamt.diff
trunk/dports/sysutils/amttools/files/patch-GNUmakefile-use-GTK3.diff
trunk/dports/sysutils/amttools/files/patch-GNUmakefile-use-vte-2.91.diff
trunk/dports/sysutils/amttools/files/patch-amttool-prepare-hashbang-for-reinplace.diff
trunk/dports/sysutils/amttools/files/patch-gamt.c-switch-to-GTK3.diff
trunk/dports/sysutils/amttools/files/patch-gamt.c-switch-to-libvte-2.91.diff
trunk/dports/sysutils/amttools/files/patch-mk_Variables.mk-no-special-usr-local-treatment.diff
Added: trunk/dports/sysutils/amttools/Portfile
===================================================================
--- trunk/dports/sysutils/amttools/Portfile (rev 0)
+++ trunk/dports/sysutils/amttools/Portfile 2016-02-25 01:59:33 UTC (rev 146024)
@@ -0,0 +1,90 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name amttools
+set my_distname amtterm
+version 1.4
+revision 0
+categories sysutils
+license GPL-2+
+maintainers ionic openmaintainer
+platforms darwin
+
+installs_libs no
+
+description Intel AMT® Serial-over-LAN client and tools
+long_description AMT (included in Intel vPro and Centrino Pro) provides \
+ out-of-band (OOB) management for Desktops and Laptops, \
+ using an agent integrated in the network adapter and \
+ in the motherboard. \
+ Serial-over-lan provides a secure way to connect a \
+ remote computer, through a pseudo serial interface. \
+ amtterm and gamt are two terminal tools to connect to \
+ that pseudo serial interface from a remote computer. \
+ amttool is a perl script to gather information about \
+ and remotely control AMT managed computers.
+homepage https://www.kraxel.org/blog/linux/${my_distname}/
+
+master_sites https://www.kraxel.org/releases/${my_distname}/
+
+distname ${my_distname}-${version}
+
+checksums rmd160 fac39807990870f88884e541f4b062db8b8d1236 \
+ sha256 e10af2b02dbf66fb24abd292b9ddc6d86b31eea09887da5cb0eb8fb2ee900e21
+
+depends_build port:pkgconfig
+depends_run port:p5.22-soap-lite
+
+default_variants +gtk
+
+use_configure no
+variant universal {}
+
+# Sometimes people are trying to be just a little bit too smart.
+# Revert this.
+# In a perfect world, everyone would be using trace mode and
+# even if GTK+3 and libvte were installed, they couldn't be
+# picked up by the build system.
+# Sadly, our world is not perfect, so patch out gamt support.
+# (And drop this patch in the gtk variant...)
+patchfiles patch-amttool-prepare-hashbang-for-reinplace.diff \
+ patch-mk_Variables.mk-no-special-usr-local-treatment.diff \
+ patch-GNUmakefile-check-for-GTK2-only.diff \
+ patch-GNUmakefile-disable-gamt.diff
+
+build.type gnu
+build.env CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
+build.args CC=${configure.cc} \
+ LD=${configure.cc} \
+ verbose=yes
+
+destroot.args prefix="${prefix}"
+
+post-patch {
+ reinplace -W "${worksrcpath}" "s|@@PREFIX@@|${prefix}|" amttool
+}
+
+variant gtk description {Enable gamt (GTK2-based AMT terminal)} {
+ depends_lib-append path:lib/pkgconfig/gtk-2.0.pc:gtk2 \
+ port:vte
+
+ patchfiles-delete patch-GNUmakefile-disable-gamt.diff
+
+ # Our libvte is GTK3-only, we need to switch the check to
+ # that version explicitly. Also holds for the (newer) libvte
+ # version, which now appends its library version number.
+ patchfiles-append patch-GNUmakefile-use-GTK3.diff \
+ patch-GNUmakefile-use-vte-2.91.diff
+
+ # This is a "rebased" patch taken from upstream's git repository,
+ # c.f., https://www.kraxel.org/cgit/amtterm/patch/?id=f08799bee
+ patchfiles-append patch-gamt.c-switch-to-GTK3.diff
+
+ # (More or less) trivial fixups for libvte 2.91.
+ patchfiles-append patch-gamt.c-switch-to-libvte-2.91.diff
+}
+
+livecheck.name ${my_distname}
Property changes on: trunk/dports/sysutils/amttools/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/dports/sysutils/amttools/files/patch-GNUmakefile-check-for-GTK2-only.diff
===================================================================
--- trunk/dports/sysutils/amttools/files/patch-GNUmakefile-check-for-GTK2-only.diff (rev 0)
+++ trunk/dports/sysutils/amttools/files/patch-GNUmakefile-check-for-GTK2-only.diff 2016-02-25 01:59:33 UTC (rev 146024)
@@ -0,0 +1,20 @@
+--- GNUmakefile.old 2015-07-27 14:08:57.000000000 +0200
++++ GNUmakefile 2016-02-25 00:16:53.000000000 +0100
+@@ -19,7 +19,7 @@ include mk/Autoconf.mk
+
+ define make-config
+ LIB := $(LIB)
+-HAVE_GTK := $(call ac_pkg_config,gtk+-x11-2.0)
++HAVE_GTK := $(call ac_pkg_config,gtk+-2.0)
+ HAVE_VTE := $(call ac_pkg_config,vte)
+ endef
+
+@@ -29,7 +29,7 @@ endef
+ ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes)
+ TARGETS += gamt
+ gamt : CFLAGS += -Wno-strict-prototypes
+- gamt : pkglst += gtk+-x11-2.0 vte
++ gamt : pkglst += gtk+-2.0 vte
+ endif
+
+ CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst))
Added: trunk/dports/sysutils/amttools/files/patch-GNUmakefile-disable-gamt.diff
===================================================================
--- trunk/dports/sysutils/amttools/files/patch-GNUmakefile-disable-gamt.diff (rev 0)
+++ trunk/dports/sysutils/amttools/files/patch-GNUmakefile-disable-gamt.diff 2016-02-25 01:59:33 UTC (rev 146024)
@@ -0,0 +1,21 @@
+--- GNUmakefile.old 2016-02-25 00:16:53.000000000 +0100
++++ GNUmakefile 2016-02-25 00:29:38.000000000 +0100
+@@ -25,18 +25,6 @@ endef
+
+ #################################################################
+
+-# build gamt?
+-ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes)
+- TARGETS += gamt
+- gamt : CFLAGS += -Wno-strict-prototypes
+- gamt : pkglst += gtk+-2.0 vte
+-endif
+-
+-CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst))
+-LDLIBS += $(shell test "$(pkglst)" != "" && pkg-config --libs $(pkglst))
+-
+-#################################################################
+-
+ build: $(TARGETS)
+
+ install: build
Added: trunk/dports/sysutils/amttools/files/patch-GNUmakefile-use-GTK3.diff
===================================================================
--- trunk/dports/sysutils/amttools/files/patch-GNUmakefile-use-GTK3.diff (rev 0)
+++ trunk/dports/sysutils/amttools/files/patch-GNUmakefile-use-GTK3.diff 2016-02-25 01:59:33 UTC (rev 146024)
@@ -0,0 +1,20 @@
+--- GNUmakefile.old 2016-02-25 00:39:56.000000000 +0100
++++ GNUmakefile 2016-02-25 00:41:08.000000000 +0100
+@@ -19,7 +19,7 @@ include mk/Autoconf.mk
+
+ define make-config
+ LIB := $(LIB)
+-HAVE_GTK := $(call ac_pkg_config,gtk+-2.0)
++HAVE_GTK := $(call ac_pkg_config,gtk+-3.0)
+ HAVE_VTE := $(call ac_pkg_config,vte)
+ endef
+
+@@ -29,7 +29,7 @@ endef
+ ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes)
+ TARGETS += gamt
+ gamt : CFLAGS += -Wno-strict-prototypes
+- gamt : pkglst += gtk+-2.0 vte
++ gamt : pkglst += gtk+-3.0 vte
+ endif
+
+ CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst))
Added: trunk/dports/sysutils/amttools/files/patch-GNUmakefile-use-vte-2.91.diff
===================================================================
--- trunk/dports/sysutils/amttools/files/patch-GNUmakefile-use-vte-2.91.diff (rev 0)
+++ trunk/dports/sysutils/amttools/files/patch-GNUmakefile-use-vte-2.91.diff 2016-02-25 01:59:33 UTC (rev 146024)
@@ -0,0 +1,20 @@
+--- GNUmakefile.old 2016-02-25 01:54:06.000000000 +0100
++++ GNUmakefile 2016-02-25 01:55:35.000000000 +0100
+@@ -20,7 +20,7 @@ include mk/Autoconf.mk
+ define make-config
+ LIB := $(LIB)
+ HAVE_GTK := $(call ac_pkg_config,gtk+-3.0)
+-HAVE_VTE := $(call ac_pkg_config,vte)
++HAVE_VTE := $(call ac_pkg_config,vte-2.91)
+ endef
+
+ #################################################################
+@@ -29,7 +29,7 @@ endef
+ ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes)
+ TARGETS += gamt
+ gamt : CFLAGS += -Wno-strict-prototypes
+- gamt : pkglst += gtk+-3.0 vte
++ gamt : pkglst += gtk+-3.0 vte-2.91
+ endif
+
+ CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst))
Added: trunk/dports/sysutils/amttools/files/patch-amttool-prepare-hashbang-for-reinplace.diff
===================================================================
--- trunk/dports/sysutils/amttools/files/patch-amttool-prepare-hashbang-for-reinplace.diff (rev 0)
+++ trunk/dports/sysutils/amttools/files/patch-amttool-prepare-hashbang-for-reinplace.diff 2016-02-25 01:59:33 UTC (rev 146024)
@@ -0,0 +1,8 @@
+--- amttool.old 2015-07-27 14:08:57.000000000 +0200
++++ amttool 2016-02-25 00:45:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!@@PREFIX@@/bin/perl
+ use strict;
+ use warnings;
+ use SOAP::Lite;
Added: trunk/dports/sysutils/amttools/files/patch-gamt.c-switch-to-GTK3.diff
===================================================================
--- trunk/dports/sysutils/amttools/files/patch-gamt.c-switch-to-GTK3.diff (rev 0)
+++ trunk/dports/sysutils/amttools/files/patch-gamt.c-switch-to-GTK3.diff 2016-02-25 01:59:33 UTC (rev 146024)
@@ -0,0 +1,197 @@
+--- gamt.c.old 2015-07-27 14:08:57.000000000 +0200
++++ gamt.c 2016-02-25 02:08:15.000000000 +0100
+@@ -259,10 +259,9 @@ static void menu_cb_config_font(GtkActio
+ char *fontname;
+ int done = 0;
+
+- dialog = gtk_font_selection_dialog_new("Terminal font");
++ dialog = gtk_font_chooser_dialog_new("Terminal font", NULL);
+ fontname = cfg_get_str(CFG_FONT);
+- gtk_font_selection_dialog_set_font_name
+- (GTK_FONT_SELECTION_DIALOG(dialog), fontname);
++ gtk_font_chooser_set_font(GTK_FONT_CHOOSER(dialog), fontname);
+
+ gtk_widget_show_all(dialog);
+ while (!done) {
+@@ -271,8 +270,7 @@ static void menu_cb_config_font(GtkActio
+ done=1;
+ /* fall through */
+ case GTK_RESPONSE_APPLY:
+- fontname = gtk_font_selection_dialog_get_font_name
+- (GTK_FONT_SELECTION_DIALOG(dialog));
++ fontname = gtk_font_chooser_get_font(GTK_FONT_CHOOSER(dialog));
+ vte_terminal_set_font_from_string(VTE_TERMINAL(gamt->vte), fontname);
+ cfg_set_str(CFG_FONT, fontname);
+ break;
+@@ -284,22 +282,19 @@ static void menu_cb_config_font(GtkActio
+ gtk_widget_destroy(dialog);
+ }
+
+-static int pickcolor(char *title, GdkColor *color)
++static int pickcolor(char *title, GdkRGBA *color)
+ {
+ GtkWidget *dialog;
+- GtkColorSelection *csel;
+ int rc = -1;
+
+- dialog = gtk_color_selection_dialog_new(title);
+- csel = GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel);
+- gtk_color_selection_set_has_opacity_control(csel, FALSE);
+- gtk_color_selection_set_current_color(csel, color);
++ dialog = gtk_color_chooser_dialog_new(title, NULL);
++ gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(dialog), color);
+
+ gtk_widget_show_all(dialog);
+ switch (gtk_dialog_run(GTK_DIALOG(dialog))) {
+ case GTK_RESPONSE_OK:
+- gtk_color_selection_get_current_color(csel, color);
+- rc = 0;
++ gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(dialog), color);
++ rc = 0;
+ }
+ gtk_widget_destroy(dialog);
+ return rc;
+@@ -308,30 +303,34 @@ static int pickcolor(char *title, GdkCol
+ static void menu_cb_config_fg(GtkAction *action, void *data)
+ {
+ struct gamt_window *gamt = data;
+- GdkColor color = {0,0,0,0};
++ GdkRGBA color = {};
+ char name[16];
+
+- gdk_color_parse(cfg_get_str(CFG_FOREGROUND), &color);
++ gdk_rgba_parse(&color, cfg_get_str(CFG_FOREGROUND));
+ if (0 != pickcolor("Text color", &color))
+- return;
+- vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color);
++ return;
++ vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color);
+ snprintf(name, sizeof(name), "#%04x%04x%04x",
+- color.red, color.green, color.blue);
++ (int)(color.red * 65535),
++ (int)(color.green * 65535),
++ (int)(color.blue * 65535));
+ cfg_set_str(CFG_FOREGROUND, name);
+ }
+
+ static void menu_cb_config_bg(GtkAction *action, void *data)
+ {
+ struct gamt_window *gamt = data;
+- GdkColor color = {0,0,0,0};
++ GdkRGBA color = {};
+ char name[16];
+
+- gdk_color_parse(cfg_get_str(CFG_BACKGROUND), &color);
++ gdk_rgba_parse(&color, cfg_get_str(CFG_BACKGROUND));
+ if (0 != pickcolor("Background color", &color))
+ return;
+- vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color);
++ vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color);
+ snprintf(name, sizeof(name), "#%04x%04x%04x",
+- color.red, color.green, color.blue);
++ (int)(color.red * 65535),
++ (int)(color.green * 65535),
++ (int)(color.blue * 65535));
+ cfg_set_str(CFG_BACKGROUND, name);
+ }
+
+@@ -339,11 +338,13 @@ static void menu_cb_blink_cursor(GtkTogg
+ {
+ struct gamt_window *gamt = user_data;
+ gboolean state = gtk_toggle_action_get_active(action);
++ VteTerminalCursorBlinkMode blink;
+
+ if (amt_debug)
+ fprintf(stderr, "%s: %s\n", __FUNCTION__, state ? "on" : "off");
+ cfg_set_bool(CFG_BLINK, state);
+- vte_terminal_set_cursor_blinks(VTE_TERMINAL(gamt->vte), state);
++ blink = state ? VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF;
++ vte_terminal_set_cursor_blink_mode(VTE_TERMINAL(gamt->vte), blink);
+ }
+
+ static void menu_cb_quit(GtkAction *action, void *data)
+@@ -370,7 +371,7 @@ static void show_manpage(char *page, cha
+ /* ... fallback is an xterm with man */
+ snprintf(buf, sizeof(buf), "manual page: %s(%s)", page, section);
+ execlp("xterm", "xterm",
+- "-title", buf,
++ "-title", buf,
+ "-e", "man", section, page,
+ NULL);
+ perror("execlp(xterm)");
+@@ -624,7 +625,7 @@ static char hosts_xml_end[] =
+ static int gamt_getstring(GtkWidget *window, char *title, char *message,
+ char *dest, int dlen, int hide)
+ {
+- GtkWidget *dialog, *label, *entry;
++ GtkWidget *dialog, *label, *entry, *box;
+ const char *txt;
+ int retval;
+
+@@ -648,11 +649,12 @@ static int gamt_getstring(GtkWidget *win
+ if (hide)
+ gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+
+- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
+- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), entry);
+- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 10);
++ box = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
++ gtk_container_add(GTK_CONTAINER(box), label);
++ gtk_container_add(GTK_CONTAINER(box), entry);
+ #if 0 /* FIXME: doesn't work ... */
+- gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 10);
++ gtk_box_set_spacing(GTK_BOX(box), 10);
++ gtk_container_set_border_width(GTK_CONTAINER(box), 10);
+ #endif
+
+ /* show and wait for response */
+@@ -779,7 +781,8 @@ static int gamt_connect(struct gamt_wind
+ static struct gamt_window *gamt_window()
+ {
+ GtkWidget *vbox, *hbox, *frame, *item;
+- GdkColor color;
++ VteTerminalCursorBlinkMode blink;
++ GdkRGBA color;
+ GError *err;
+ gboolean state;
+ struct gamt_window *gamt;
+@@ -831,7 +834,8 @@ static struct gamt_window *gamt_window()
+ item = gtk_ui_manager_get_widget(gamt->ui, "/MainMenu/ConfigMenu/BlinkCursor");
+ state = cfg_get_bool(CFG_BLINK, 0);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), state);
+- vte_terminal_set_cursor_blinks(VTE_TERMINAL(gamt->vte), state);
++ blink = state ? VTE_CURSOR_BLINK_ON : VTE_CURSOR_BLINK_OFF;
++ vte_terminal_set_cursor_blink_mode(VTE_TERMINAL(gamt->vte), blink);
+
+ /* other widgets */
+ gamt->status = gtk_label_new("idle");
+@@ -841,8 +845,8 @@ static struct gamt_window *gamt_window()
+ GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+ /* Make a vbox and put stuff in */
+- vbox = gtk_vbox_new(FALSE, 1);
+- hbox = gtk_hbox_new(FALSE, 1);
++ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
++ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 1);
+ gtk_container_add(GTK_CONTAINER(gamt->win), vbox);
+ item = gtk_ui_manager_get_widget(gamt->ui, "/MainMenu");
+@@ -867,13 +871,13 @@ static struct gamt_window *gamt_window()
+
+ str = cfg_get_str(CFG_FOREGROUND);
+ if (str) {
+- gdk_color_parse(str, &color);
+- vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color);
++ gdk_rgba_parse(&color, str);
++ vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color);
+ }
+ str = cfg_get_str(CFG_BACKGROUND);
+ if (str) {
+- gdk_color_parse(str, &color);
+- vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color);
++ gdk_rgba_parse(&color, str);
++ vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color);
+ }
+
+ return gamt;
+Only in amtterm-1.4: index.html?id=f08799bee9ee53100360d86a47bb71591530158b
Added: trunk/dports/sysutils/amttools/files/patch-gamt.c-switch-to-libvte-2.91.diff
===================================================================
--- trunk/dports/sysutils/amttools/files/patch-gamt.c-switch-to-libvte-2.91.diff (rev 0)
+++ trunk/dports/sysutils/amttools/files/patch-gamt.c-switch-to-libvte-2.91.diff 2016-02-25 01:59:33 UTC (rev 146024)
@@ -0,0 +1,81 @@
+--- gamt.c.old 2016-02-25 02:24:15.000000000 +0100
++++ gamt.c 2016-02-25 02:32:12.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <vte/vte.h>
++#include <pango/pango-font.h>
+
+ #include "parseconfig.h"
+ #include "redir.h"
+@@ -271,7 +272,8 @@ static void menu_cb_config_font(GtkActio
+ /* fall through */
+ case GTK_RESPONSE_APPLY:
+ fontname = gtk_font_chooser_get_font(GTK_FONT_CHOOSER(dialog));
+- vte_terminal_set_font_from_string(VTE_TERMINAL(gamt->vte), fontname);
++ PangoFontDescription *font_desc = pango_font_description_from_string(fontname);
++ vte_terminal_set_font(VTE_TERMINAL(gamt->vte), font_desc);
+ cfg_set_str(CFG_FONT, fontname);
+ break;
+ default:
+@@ -309,7 +311,7 @@ static void menu_cb_config_fg(GtkAction
+ gdk_rgba_parse(&color, cfg_get_str(CFG_FOREGROUND));
+ if (0 != pickcolor("Text color", &color))
+ return;
+- vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color);
++ vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color);
+ snprintf(name, sizeof(name), "#%04x%04x%04x",
+ (int)(color.red * 65535),
+ (int)(color.green * 65535),
+@@ -326,7 +328,7 @@ static void menu_cb_config_bg(GtkAction
+ gdk_rgba_parse(&color, cfg_get_str(CFG_BACKGROUND));
+ if (0 != pickcolor("Background color", &color))
+ return;
+- vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color);
++ vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color);
+ snprintf(name, sizeof(name), "#%04x%04x%04x",
+ (int)(color.red * 65535),
+ (int)(color.green * 65535),
+@@ -338,7 +340,7 @@ static void menu_cb_blink_cursor(GtkTogg
+ {
+ struct gamt_window *gamt = user_data;
+ gboolean state = gtk_toggle_action_get_active(action);
+- VteTerminalCursorBlinkMode blink;
++ VteCursorBlinkMode blink;
+
+ if (amt_debug)
+ fprintf(stderr, "%s: %s\n", __FUNCTION__, state ? "on" : "off");
+@@ -781,7 +783,7 @@ static int gamt_connect(struct gamt_wind
+ static struct gamt_window *gamt_window()
+ {
+ GtkWidget *vbox, *hbox, *frame, *item;
+- VteTerminalCursorBlinkMode blink;
++ VteCursorBlinkMode blink;
+ GdkRGBA color;
+ GError *err;
+ gboolean state;
+@@ -823,7 +825,8 @@ static struct gamt_window *gamt_window()
+ g_signal_connect(gamt->vte, "commit", G_CALLBACK(user_input), gamt);
+ vte_terminal_set_scrollback_lines(VTE_TERMINAL(gamt->vte), 4096);
+ str = cfg_get_str(CFG_FONT);
+- vte_terminal_set_font_from_string(VTE_TERMINAL(gamt->vte), str);
++ PangoFontDescription *font_desc = pango_font_description_from_string(str);
++ vte_terminal_set_font(VTE_TERMINAL(gamt->vte), font_desc);
+
+ /* FIXME: make configurable */
+ vte_terminal_set_backspace_binding(VTE_TERMINAL(gamt->vte),
+@@ -872,12 +875,12 @@ static struct gamt_window *gamt_window()
+ str = cfg_get_str(CFG_FOREGROUND);
+ if (str) {
+ gdk_rgba_parse(&color, str);
+- vte_terminal_set_color_foreground_rgba(VTE_TERMINAL(gamt->vte), &color);
++ vte_terminal_set_color_foreground(VTE_TERMINAL(gamt->vte), &color);
+ }
+ str = cfg_get_str(CFG_BACKGROUND);
+ if (str) {
+ gdk_rgba_parse(&color, str);
+- vte_terminal_set_color_background_rgba(VTE_TERMINAL(gamt->vte), &color);
++ vte_terminal_set_color_background(VTE_TERMINAL(gamt->vte), &color);
+ }
+
+ return gamt;
Added: trunk/dports/sysutils/amttools/files/patch-mk_Variables.mk-no-special-usr-local-treatment.diff
===================================================================
--- trunk/dports/sysutils/amttools/files/patch-mk_Variables.mk-no-special-usr-local-treatment.diff (rev 0)
+++ trunk/dports/sysutils/amttools/files/patch-mk_Variables.mk-no-special-usr-local-treatment.diff 2016-02-25 01:59:33 UTC (rev 146024)
@@ -0,0 +1,15 @@
+--- mk/Variables.mk.old 2015-07-27 14:08:57.000000000 +0200
++++ mk/Variables.mk 2016-02-25 00:10:17.000000000 +0100
+@@ -42,12 +42,6 @@ CFLAGS += -Wall -Wmissing-prototypes -W
+ -Wpointer-arith -Wunused
+ CXXFLAGS += -Wall -Wpointer-arith -Wunused
+
+-# add /usr/local to the search path if something is in there ...
+-ifneq ($(wildcard /usr/local/include/*.h),)
+- CFLAGS += -I/usr/local/include
+- LDFLAGS += -L/usr/local/$(LIB)
+-endif
+-
+ # fixup include path for $(srcdir) != "."
+ ifneq ($(srcdir),.)
+ CFLAGS += -I. -I$(srcdir)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160224/1e6cc749/attachment-0001.html>
More information about the macports-changes
mailing list