diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-12-25 12:54:43 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2013-12-25 12:54:43 +0000 |
| commit | a9faa0a54344cd21e75895fcaf3242fd88fbd589 (patch) | |
| tree | a710ef562f415e52e66e8193a019d3b94c9da458 | |
| parent | - Fix build on -current (diff) | |
- Fix build on 10.x
- Support staging
- Respect CC, CFLAGS and PREFIX
PR: 185018
Submitted by: Eimar Koort <eimar.koort@gmail.com> (maintainer)
| -rw-r--r-- | x11/keyboardcast/Makefile | 8 | ||||
| -rw-r--r-- | x11/keyboardcast/files/patch-Makefile | 22 | ||||
| -rw-r--r-- | x11/keyboardcast/files/patch-keyboardcast.c | 11 |
3 files changed, 27 insertions, 14 deletions
diff --git a/x11/keyboardcast/Makefile b/x11/keyboardcast/Makefile index d203c397904e..f062764fcb54 100644 --- a/x11/keyboardcast/Makefile +++ b/x11/keyboardcast/Makefile @@ -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> diff --git a/x11/keyboardcast/files/patch-Makefile b/x11/keyboardcast/files/patch-Makefile index 49a264102389..89b89aa8b326 100644 --- a/x11/keyboardcast/files/patch-Makefile +++ b/x11/keyboardcast/files/patch-Makefile @@ -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 diff --git a/x11/keyboardcast/files/patch-keyboardcast.c b/x11/keyboardcast/files/patch-keyboardcast.c new file mode 100644 index 000000000000..9ef4131fd11f --- /dev/null +++ b/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", |