View | Details | Raw Unified | Return to bug 208871
Collapse All | Expand All

(-)x11/sxhkd/Makefile (-3 / +5 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/x11/sxhkd/Makefile 413037 2016-04-11 15:28:25Z amdmi3 $
2
# $FreeBSD: head/x11/sxhkd/Makefile 413037 2016-04-11 15:28:25Z amdmi3 $
3
3
4
PORTNAME=	sxhkd
4
PORTNAME=	sxhkd
5
PORTVERSION=	0.5.5
5
PORTVERSION=	0.5.6
6
PORTREVISION=	1
7
CATEGORIES=	x11
6
CATEGORIES=	x11
8
7
9
MAINTAINER=	ports@FreeBSD.org
8
MAINTAINER=	ports@FreeBSD.org
Lines 17-25 Link Here
17
USE_GITHUB=	yes
16
USE_GITHUB=	yes
18
GH_ACCOUNT=	baskerville
17
GH_ACCOUNT=	baskerville
19
18
20
USES=		gmake
19
USES=		gmake pkgconfig
21
20
21
PORTEXAMPLES=	*
22
PLIST_FILES=	bin/sxhkd \
22
PLIST_FILES=	bin/sxhkd \
23
		man/man1/sxhkd.1.gz
23
		man/man1/sxhkd.1.gz
24
24
25
OPTIONS_DEFINE=	EXAMPLES
26
25
.include <bsd.port.mk>
27
.include <bsd.port.mk>
(-)x11/sxhkd/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (baskerville-sxhkd-0.5.5_GH0.tar.gz) = e6699f77564e34a890d27f6c251e1ed29b04f5177e48290e7f02948497f04313
1
SHA256 (baskerville-sxhkd-0.5.6_GH0.tar.gz) = 72366eea4d7ed17a3a9eab5257e59edf9a7cd63b926af1dca2d895dfefaff995
2
SIZE (baskerville-sxhkd-0.5.5_GH0.tar.gz) = 34634
2
SIZE (baskerville-sxhkd-0.5.6_GH0.tar.gz) = 35301
(-)x11/sxhkd/files/patch-Makefile (-13 / +24 lines)
Lines 1-31 Link Here
1
--- Makefile.orig	2015-03-20 21:31:37 UTC
1
--- Makefile.orig	2016-03-15 16:20:41 UTC
2
+++ Makefile
2
+++ Makefile
3
@@ -3,13 +3,13 @@ VERSION = 0.5.5
3
@@ -1,14 +1,14 @@
4
 NAME     = sxhkd
5
 VERSION := $(shell git describe 2> /dev/null || cat VERSION)
4
 
6
 
5
 CC      ?= gcc
7
-CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
6
 LIBS     = -lm -lxcb -lxcb-keysyms
8
+CPPFLAGS += $(shell pkg-config --cflags xcb-keysyms) -DVERSION=\"$(VERSION)\"
7
-CFLAGS  += -std=c99 -pedantic -Wall -Wextra -I$(PREFIX)/include
9
 CFLAGS   += -std=c99 -pedantic -Wall -Wextra
8
+CFLAGS  += -std=c99 -pedantic -Wall -Wextra -I$(LOCALBASE)/include
10
-LDLIBS    = -lxcb -lxcb-keysyms
9
 CFLAGS  += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
11
+LDLIBS    = $(shell pkg-config --libs xcb-keysyms)
10
-LDFLAGS += -L$(PREFIX)/lib
11
+LDFLAGS += -L$(LOCALBASE)/lib
12
 
12
 
13
 PREFIX    ?= /usr/local
13
 PREFIX    ?= /usr/local
14
 BINPREFIX  = $(PREFIX)/bin
14
-BINPREFIX ?= $(PREFIX)/bin
15
-MANPREFIX  = $(PREFIX)/share/man
15
-MANPREFIX ?= $(PREFIX)/share/man
16
-DOCPREFIX ?= $(PREFIX)/share/doc/$(NAME)
17
+BINPREFIX  = $(PREFIX)/bin
16
+MANPREFIX  = $(PREFIX)/man
18
+MANPREFIX  = $(PREFIX)/man
19
+EXPREFIX  = $(PREFIX)/share/examples/$(NAME)
17
 
20
 
18
 SRC = $(wildcard *.c)
21
 SRC = $(wildcard *.c)
19
 OBJ = $(SRC:.c=.o)
22
 OBJ = $(SRC:.c=.o)
20
@@ -33,9 +33,9 @@ $(NAME): $(OBJ)
23
@@ -27,11 +27,15 @@ $(NAME): $(OBJ)
21
 
24
 
22
 install:
25
 install:
23
 	mkdir -p "$(DESTDIR)$(BINPREFIX)"
26
 	mkdir -p "$(DESTDIR)$(BINPREFIX)"
24
-	cp -p $(NAME) "$(DESTDIR)$(BINPREFIX)"
27
-	cp -pf $(NAME) "$(DESTDIR)$(BINPREFIX)"
25
+	${BSD_INSTALL_PROGRAM} $(NAME) "$(DESTDIR)$(BINPREFIX)"
28
+	${BSD_INSTALL_PROGRAM} $(NAME) "$(DESTDIR)$(BINPREFIX)"
26
 	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
29
 	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
27
-	cp -p doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1
30
-	cp -p doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1
31
-	mkdir -p "$(DESTDIR)$(DOCPREFIX)"
32
-	cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
28
+	${BSD_INSTALL_MAN} doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1
33
+	${BSD_INSTALL_MAN} doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1
34
+	mkdir -p "$(DESTDIR)$(EXPREFIX)/background_shell"
35
+	${BSD_INSTALL_DATA} examples/background_shell/* \
36
+		"$(DESTDIR)$(EXPREFIX)/background_shell"
37
+	mkdir -p "$(DESTDIR)$(EXPREFIX)/notification"
38
+	${BSD_INSTALL_DATA} examples/notification/* \
39
+		"$(DESTDIR)$(EXPREFIX)/notification"
29
 
40
 
30
 uninstall:
41
 uninstall:
31
 	rm -f "$(DESTDIR)$(BINPREFIX)"/$(NAME)
42
 	rm -f "$(DESTDIR)$(BINPREFIX)"/$(NAME)

Return to bug 208871