Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Dec 2013 13:11:45 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r337496 - in branches/2014Q1/x11/keyboardcast: . files
Message-ID:  <201312261311.rBQDBj8D088957@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Dec 26 13:11:44 2013
New Revision: 337496
URL: http://svnweb.freebsd.org/changeset/ports/337496

Log:
  MFH: r337411
  
  - Fix build on 10.x
  - Support staging
  - Respect CC, CFLAGS and PREFIX
  
  PR:		185018
  Submitted by:	Eimar Koort <eimar.koort@gmail.com> (maintainer)
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/x11/keyboardcast/files/patch-keyboardcast.c
     - copied unchanged from r337411, head/x11/keyboardcast/files/patch-keyboardcast.c
Modified:
  branches/2014Q1/x11/keyboardcast/Makefile
  branches/2014Q1/x11/keyboardcast/files/patch-Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/x11/keyboardcast/Makefile
==============================================================================
--- branches/2014Q1/x11/keyboardcast/Makefile	Thu Dec 26 13:10:49 2013	(r337495)
+++ branches/2014Q1/x11/keyboardcast/Makefile	Thu Dec 26 13:11:44 2013	(r337496)
@@ -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 <bsd.port.mk>

Modified: branches/2014Q1/x11/keyboardcast/files/patch-Makefile
==============================================================================
--- branches/2014Q1/x11/keyboardcast/files/patch-Makefile	Thu Dec 26 13:10:49 2013	(r337495)
+++ branches/2014Q1/x11/keyboardcast/files/patch-Makefile	Thu Dec 26 13:11:44 2013	(r337496)
@@ -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

Copied: branches/2014Q1/x11/keyboardcast/files/patch-keyboardcast.c (from r337411, head/x11/keyboardcast/files/patch-keyboardcast.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/x11/keyboardcast/files/patch-keyboardcast.c	Thu Dec 26 13:11:44 2013	(r337496, copy of r337411, head/x11/keyboardcast/files/patch-keyboardcast.c)
@@ -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",



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312261311.rBQDBj8D088957>