From owner-svn-ports-all@FreeBSD.ORG Wed Dec 25 12:54:44 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D446993; Wed, 25 Dec 2013 12:54:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3DCDA13B8; Wed, 25 Dec 2013 12:54:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPCsiQd024075; Wed, 25 Dec 2013 12:54:44 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPCshdF024072; Wed, 25 Dec 2013 12:54:43 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312251254.rBPCshdF024072@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 25 Dec 2013 12:54:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337411 - in head/x11/keyboardcast: . files X-SVN-Group: ports-head 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.17 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: Wed, 25 Dec 2013 12:54:44 -0000 Author: amdmi3 Date: Wed Dec 25 12:54:43 2013 New Revision: 337411 URL: http://svnweb.freebsd.org/changeset/ports/337411 Log: - Fix build on 10.x - Support staging - Respect CC, CFLAGS and PREFIX PR: 185018 Submitted by: Eimar Koort (maintainer) Added: head/x11/keyboardcast/files/patch-keyboardcast.c (contents, props changed) Modified: head/x11/keyboardcast/Makefile head/x11/keyboardcast/files/patch-Makefile Modified: head/x11/keyboardcast/Makefile ============================================================================== --- head/x11/keyboardcast/Makefile Wed Dec 25 12:45:39 2013 (r337410) +++ head/x11/keyboardcast/Makefile Wed Dec 25 12:54:43 2013 (r337411) @@ -3,7 +3,7 @@ PORTNAME= keyboardcast PORTVERSION= 0.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= GOOGLE_CODE \ http://desrt.mcmaster.ca/code/keyboardcast/ @@ -11,13 +11,9 @@ MASTER_SITES= GOOGLE_CODE \ MAINTAINER= eimar.koort@gmail.com COMMENT= Broadcast keystrokes to multiple X windows for Gnome2 -USE_XORG= xmu +USE_XORG= xmu x11 USE_GNOME= libwnck libglade2 gtk20 USES= pkgconfig INSTALLS_ICONS= yes -NO_STAGE= yes -post-install: - @${CAT} ${PKGMESSAGE} - .include Modified: head/x11/keyboardcast/files/patch-Makefile ============================================================================== --- head/x11/keyboardcast/files/patch-Makefile Wed Dec 25 12:45:39 2013 (r337410) +++ head/x11/keyboardcast/files/patch-Makefile Wed Dec 25 12:54:43 2013 (r337411) @@ -1,13 +1,19 @@ ---- Makefile.orig 2005-12-06 19:29:22.000000000 +0200 -+++ Makefile 2010-01-12 12:17:24.000000000 +0200 -@@ -1,3 +1,4 @@ -+CC = cc - PREFIX = /usr/local +--- Makefile.orig 2005-12-06 20:29:22.000000000 +0300 ++++ Makefile 2013-12-25 05:28:09.226755504 +0400 +@@ -1,15 +1,17 @@ +-PREFIX = /usr/local SHAREDIR = $(PREFIX)/share/keyboardcast APPSDIR = $(PREFIX)/share/applications -@@ -9,7 +10,10 @@ - LDLIBS += -lXmu - CFLAGS += -Wall -O2 -DPREFIX=\"$(PREFIX)\" + BINDIR = $(PREFIX)/bin + + PKGS = gtk+-2.0 libwnck-1.0 libglade-2.0 +-CFLAGS = `pkg-config --cflags $(PKGS)` ++CFLAGS += `pkg-config --cflags $(PKGS)` + LDLIBS = `pkg-config --libs $(PKGS)` +-LDLIBS += -lXmu +-CFLAGS += -Wall -O2 -DPREFIX=\"$(PREFIX)\" ++LDLIBS += -lXmu -lX11 ++CFLAGS += -Wall -DPREFIX=\"$(PREFIX)\" -keyboardcast: keyboardcast.o window-list.o grab-window.o +all: keyboardcast Added: head/x11/keyboardcast/files/patch-keyboardcast.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/keyboardcast/files/patch-keyboardcast.c Wed Dec 25 12:54:43 2013 (r337411) @@ -0,0 +1,11 @@ +--- keyboardcast.orig 2013-12-20 10:06:27.000000000 +0200 ++++ keyboardcast.c 2013-12-20 10:07:10.000000000 +0200 +@@ -242,7 +242,7 @@ + "text", 2, NULL ); + + glade_xml_signal_connect( xml, "key_event", G_CALLBACK( key_event ) ); +- glade_xml_signal_connect( xml, "gtk_exit", G_CALLBACK( gtk_exit ) ); ++ glade_xml_signal_connect( xml, "gtk_main_quit", G_CALLBACK( gtk_main_quit ) ); + glade_xml_signal_connect_data( xml, "expanded", + G_CALLBACK( expanded ), window ); + glade_xml_signal_connect_data( xml, "button_clicked",