Attachment #184589 for bug #220789




# Created by: Anton Tornqvist <antont@inbox.lv>
# $FreeBSD$

PORTNAME=	sxhkd
PORTVERSION=	0.5.8
CATEGORIES=	x11

MAINTAINER=	gor@clogic.com.ua


LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms

USES=		gmake pkgconfig

USE_XORG+=	xcb

USE_GITHUB=	yes
GH_ACCOUNT=	baskerville

USES=		gmake pkgconfig

PORTEXAMPLES=	*
PLIST_FILES=	bin/sxhkd \
		man/man1/sxhkd.1.gz

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1477912763	1	TIMESTAMP = 1500267066
2	SHA256 (baskerville-sxhkd-0.5.7_GH0.tar.gz) = 21b8bfea2a83f019062dfea53051e2bc61896595fc788c6c7b5e3fd9354b279f	2	SHA256 (baskerville-sxhkd-0.5.8_GH0.tar.gz) = d7df48d7d301d1cf06f45172bcfe712510e98dcdbdb896af662cf979f9666855
3	SIZE (baskerville-sxhkd-0.5.7_GH0.tar.gz) = 34472	3	SIZE (baskerville-sxhkd-0.5.8_GH0.tar.gz) = 34566




--- Makefile.orig	2017-07-14 18:57:47 UTC
+++ Makefile
@@ -2,14 +2,15 @@ OUT      = sxhkd
 VERCMD  ?= git describe 2> /dev/null
 VERSION := $(shell $(VERCMD) || cat VERSION)
 

 PREFIX    ?= /usr/local
-BINPREFIX ?= $(PREFIX)/bin
-MANPREFIX ?= $(PREFIX)/share/man
-DOCPREFIX ?= $(PREFIX)/share/doc/$(OUT)
+BINPREFIX  = $(PREFIX)/bin
+MANPREFIX  = $(PREFIX)/man
+DOCPREFIX  = $(PREFIX)/share/doc/$(OUT)
+EXPREFIX   = $(PREFIX)/share/examples/$(OUT)
 
 all: $(OUT)
 OBJ := $(SRC:.c=.o)
@@ -28,11 +28,15 @@ $(NAME): $(OBJ)
 
@@ -28,11 +29,15 @@ $(OUT): $(OBJ)
 
 install:
 	mkdir -p "$(DESTDIR)$(BINPREFIX)"
-	cp -pf $(OUT) "$(DESTDIR)$(BINPREFIX)"
+	${BSD_INSTALL_PROGRAM} $(OUT) "$(DESTDIR)$(BINPREFIX)"
 	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
-	cp -p doc/$(OUT).1 "$(DESTDIR)$(MANPREFIX)"/man1
-	mkdir -p "$(DESTDIR)$(DOCPREFIX)"
-	cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
+	${BSD_INSTALL_MAN} doc/$(OUT).1 "$(DESTDIR)$(MANPREFIX)"/man1
+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/background_shell
+	${BSD_INSTALL_DATA} examples/background_shell/* \
+		"$(DESTDIR)$(EXPREFIX)"/background_shell
+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/notification
+	${BSD_INSTALL_DATA} examples/notification/* \
+		"$(DESTDIR)$(EXPREFIX)"/notification
 
 uninstall:
 	rm -f "$(DESTDIR)$(BINPREFIX)"/$(OUT)

Return to bug 220789

Lines 1-8 Link Here

(-)Makefile (-4 / +6 lines)
1	# Created by: Anton Törnqvist <antont@inbox.lv>	1	# Created by: Anton Tornqvist <antont@inbox.lv>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sxhkd	4	PORTNAME= sxhkd
5	PORTVERSION= 0.5.7	5	PORTVERSION= 0.5.8
6	CATEGORIES= x11	6	CATEGORIES= x11
7		7
8	MAINTAINER= gor@clogic.com.ua	8	MAINTAINER= gor@clogic.com.ua
Lines 13-23 Link Here
13		13
14	LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms	14	LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms
15		15
		16	USES= gmake pkgconfig
		17
		18	USE_XORG+= xcb
		19
16	USE_GITHUB= yes	20	USE_GITHUB= yes
17	GH_ACCOUNT= baskerville	21	GH_ACCOUNT= baskerville
18		22
19	USES= gmake pkgconfig
20
21	PORTEXAMPLES= *	23	PORTEXAMPLES= *
22	PLIST_FILES= bin/sxhkd \	24	PLIST_FILES= bin/sxhkd \
23	man/man1/sxhkd.1.gz	25	man/man1/sxhkd.1.gz

Lines 1-6 Link Here

(-)files/patch-Makefile (-16 / +17 lines)
1	--- Makefile.orig 2016-10-30 12:28:09 UTC	1	--- Makefile.orig 2017-07-14 18:57:47 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -2,14 +2,14 @@ NAME = sxhkd	3	@@ -2,14 +2,15 @@ OUT = sxhkd
4	VERCMD ?= git describe 2> /dev/null	4	VERCMD ?= git describe 2> /dev/null
5	VERSION := $(shell $(VERCMD) \|\| cat VERSION)	5	VERSION := $(shell $(VERCMD) \|\| cat VERSION)
6		6
Lines 13-42 Link Here
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)	16	-DOCPREFIX ?= $(PREFIX)/share/doc/$(OUT)
17	+BINPREFIX = $(PREFIX)/bin	17	+BINPREFIX = $(PREFIX)/bin
18	+MANPREFIX = $(PREFIX)/man	18	+MANPREFIX = $(PREFIX)/man
19	+EXPREFIX = $(PREFIX)/share/examples/$(NAME)	19	+DOCPREFIX = $(PREFIX)/share/doc/$(OUT)
		20	+EXPREFIX = $(PREFIX)/share/examples/$(OUT)
20		21
21	SRC := $(wildcard *.c)	22	all: $(OUT)
22	OBJ := $(SRC:.c=.o)
23	@@ -28,11 +28,15 @@ $(NAME): $(OBJ)
24		23
		24	@@ -28,11 +29,15 @@ $(OUT): $(OBJ)
		25
25	install:	26	install:
26	mkdir -p "$(DESTDIR)$(BINPREFIX)"	27	mkdir -p "$(DESTDIR)$(BINPREFIX)"
27	- cp -pf $(NAME) "$(DESTDIR)$(BINPREFIX)"	28	- cp -pf $(OUT) "$(DESTDIR)$(BINPREFIX)"
28	+ ${BSD_INSTALL_PROGRAM} $(NAME) "$(DESTDIR)$(BINPREFIX)"	29	+ ${BSD_INSTALL_PROGRAM} $(OUT) "$(DESTDIR)$(BINPREFIX)"
29	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1	30	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
30	- cp -p doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1	31	- cp -p doc/$(OUT).1 "$(DESTDIR)$(MANPREFIX)"/man1
31	- mkdir -p "$(DESTDIR)$(DOCPREFIX)"	32	- mkdir -p "$(DESTDIR)$(DOCPREFIX)"
32	- cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples	33	- cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
33	+ ${BSD_INSTALL_MAN} doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1	34	+ ${BSD_INSTALL_MAN} doc/$(OUT).1 "$(DESTDIR)$(MANPREFIX)"/man1
34	+ mkdir -p "$(DESTDIR)$(EXPREFIX)/background_shell"	35	+ mkdir -p "$(DESTDIR)$(EXPREFIX)"/background_shell
35	+ ${BSD_INSTALL_DATA} examples/background_shell/* \	36	+ ${BSD_INSTALL_DATA} examples/background_shell/* \
36	+ "$(DESTDIR)$(EXPREFIX)/background_shell"	37	+ "$(DESTDIR)$(EXPREFIX)"/background_shell
37	+ mkdir -p "$(DESTDIR)$(EXPREFIX)/notification"	38	+ mkdir -p "$(DESTDIR)$(EXPREFIX)"/notification
38	+ ${BSD_INSTALL_DATA} examples/notification/* \	39	+ ${BSD_INSTALL_DATA} examples/notification/* \
39	+ "$(DESTDIR)$(EXPREFIX)/notification"	40	+ "$(DESTDIR)$(EXPREFIX)"/notification
40		41
41	uninstall:	42	uninstall:
42	rm -f "$(DESTDIR)$(BINPREFIX)"/$(NAME)	43	rm -f "$(DESTDIR)$(BINPREFIX)"/$(OUT)