Attachment #176337 for bug #213946

Lines 1-11 Link Here

(-)Makefile (-3 / +3 lines)
1	# Created by: Anton Törnqvist <antont@inbox.lv>	1	# Created by: Anton T?rnqvist <antont@inbox.lv>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sxhkd	4	PORTNAME= sxhkd
5	PORTVERSION= 0.5.6	5	PORTVERSION= 0.5.7
6	CATEGORIES= x11	6	CATEGORIES= x11
7		7
8	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= gor@clogic.com.ua
9	COMMENT= Simple X hotkey daemon	9	COMMENT= Simple X hotkey daemon
10		10
11	LICENSE= BSD2CLAUSE	11	LICENSE= BSD2CLAUSE

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (baskerville-sxhkd-0.5.6_GH0.tar.gz) = 72366eea4d7ed17a3a9eab5257e59edf9a7cd63b926af1dca2d895dfefaff995	1	TIMESTAMP = 1477912763
2	SIZE (baskerville-sxhkd-0.5.6_GH0.tar.gz) = 35301	2	SHA256 (baskerville-sxhkd-0.5.7_GH0.tar.gz) = 21b8bfea2a83f019062dfea53051e2bc61896595fc788c6c7b5e3fd9354b279f
		3	SIZE (baskerville-sxhkd-0.5.7_GH0.tar.gz) = 34472




--- Makefile.orig	2016-10-30 12:28:09 UTC
+++ Makefile
@@ -2,14 +2,14 @@ NAME     = sxhkd
 VERCMD  ?= git describe 2> /dev/null
 VERSION := $(shell $(VERCMD) || cat VERSION)
 
-CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
+CPPFLAGS += $(shell pkg-config --cflags xcb-keysyms) -DVERSION=\"$(VERSION)\"

-DOCPREFIX ?= $(PREFIX)/share/doc/$(NAME)
+BINPREFIX  = $(PREFIX)/bin
+MANPREFIX  = $(PREFIX)/man
+EXPREFIX   = $(PREFIX)/share/examples/$(NAME)
 
 SRC := $(wildcard *.c)
 OBJ := $(SRC:.c=.o)
@@ -28,11 +28,15 @@ $(NAME): $(OBJ)
 
 install:
 	mkdir -p "$(DESTDIR)$(BINPREFIX)"

Return to bug 213946

Lines 1-8 Link Here

(-)files/patch-Makefile (-8 / +8 lines)
1	--- Makefile.orig 2016-03-15 16:20:41 UTC	1	--- Makefile.orig 2016-10-30 12:28:09 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,14 +1,14 @@	3	@@ -2,14 +2,14 @@ NAME = sxhkd
4	NAME = sxhkd	4	VERCMD ?= git describe 2> /dev/null
5	VERSION := $(shell git describe 2> /dev/null \|\| cat VERSION)	5	VERSION := $(shell $(VERCMD) \|\| cat VERSION)
6		6
7	-CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"	7	-CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
8	+CPPFLAGS += $(shell pkg-config --cflags xcb-keysyms) -DVERSION=\"$(VERSION)\"	8	+CPPFLAGS += $(shell pkg-config --cflags xcb-keysyms) -DVERSION=\"$(VERSION)\"
Lines 16-26 Link Here
16	-DOCPREFIX ?= $(PREFIX)/share/doc/$(NAME)	16	-DOCPREFIX ?= $(PREFIX)/share/doc/$(NAME)
17	+BINPREFIX = $(PREFIX)/bin	17	+BINPREFIX = $(PREFIX)/bin
18	+MANPREFIX = $(PREFIX)/man	18	+MANPREFIX = $(PREFIX)/man
19	+EXPREFIX = $(PREFIX)/share/examples/$(NAME)	19	+EXPREFIX = $(PREFIX)/share/examples/$(NAME)
20		20
21	SRC = $(wildcard *.c)	21	SRC := $(wildcard *.c)
22	OBJ = $(SRC:.c=.o)	22	OBJ := $(SRC:.c=.o)
23	@@ -27,11 +27,15 @@ $(NAME): $(OBJ)	23	@@ -28,11 +28,15 @@ $(NAME): $(OBJ)
24		24
25	install:	25	install:
26	mkdir -p "$(DESTDIR)$(BINPREFIX)"	26	mkdir -p "$(DESTDIR)$(BINPREFIX)"