Attachment 169409 Details for Bug 208871 – x11_sxhkd.diff

[patch] x11_sxhkd.diff

x11_sxhkd.diff (text/plain), 3.38 KB, created by tkato432 on 2016-04-17 18:34:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-04-17 18:34:09 UTC

Size: 3.38 KB

patch

obsolete

>diff -urN /usr/ports/x11/sxhkd/Makefile x11/sxhkd/Makefile
>--- /usr/ports/x11/sxhkd/Makefile	2016-04-12 04:28:20.614323000 +0900
>+++ x11/sxhkd/Makefile	2016-04-18 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/x11/sxhkd/Makefile 413037 2016-04-11 15:28:25Z amdmi3 $
> 
> PORTNAME=	sxhkd
>-PORTVERSION=	0.5.5
>-PORTREVISION=	1
>+PORTVERSION=	0.5.6
> CATEGORIES=	x11
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -17,9 +16,12 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	baskerville
> 
>-USES=		gmake
>+USES=		gmake pkgconfig
> 
>+PORTEXAMPLES=	*
> PLIST_FILES=	bin/sxhkd \
> 		man/man1/sxhkd.1.gz
> 
>+OPTIONS_DEFINE=	EXAMPLES
>+
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11/sxhkd/distinfo x11/sxhkd/distinfo
>--- /usr/ports/x11/sxhkd/distinfo	2015-08-24 03:58:41.906353000 +0900
>+++ x11/sxhkd/distinfo	2016-04-18 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (baskerville-sxhkd-0.5.5_GH0.tar.gz) = e6699f77564e34a890d27f6c251e1ed29b04f5177e48290e7f02948497f04313
>-SIZE (baskerville-sxhkd-0.5.5_GH0.tar.gz) = 34634
>+SHA256 (baskerville-sxhkd-0.5.6_GH0.tar.gz) = 72366eea4d7ed17a3a9eab5257e59edf9a7cd63b926af1dca2d895dfefaff995
>+SIZE (baskerville-sxhkd-0.5.6_GH0.tar.gz) = 35301
>diff -urN /usr/ports/x11/sxhkd/files/patch-Makefile x11/sxhkd/files/patch-Makefile
>--- /usr/ports/x11/sxhkd/files/patch-Makefile	2016-04-12 04:28:20.626988000 +0900
>+++ x11/sxhkd/files/patch-Makefile	2016-04-18 00:00:00.000000000 +0900
>@@ -1,31 +1,42 @@
>---- Makefile.orig	2015-03-20 21:31:37 UTC
>+--- Makefile.orig	2016-03-15 16:20:41 UTC
> +++ Makefile
>-@@ -3,13 +3,13 @@ VERSION = 0.5.5
>+@@ -1,14 +1,14 @@
>+ NAME     = sxhkd
>+ VERSION := $(shell git describe 2> /dev/null || cat VERSION)
>  
>- CC      ?= gcc
>- LIBS     = -lm -lxcb -lxcb-keysyms
>--CFLAGS  += -std=c99 -pedantic -Wall -Wextra -I$(PREFIX)/include
>-+CFLAGS  += -std=c99 -pedantic -Wall -Wextra -I$(LOCALBASE)/include
>- CFLAGS  += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
>--LDFLAGS += -L$(PREFIX)/lib
>-+LDFLAGS += -L$(LOCALBASE)/lib
>+-CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
>++CPPFLAGS += $(shell pkg-config --cflags xcb-keysyms) -DVERSION=\"$(VERSION)\"
>+ CFLAGS   += -std=c99 -pedantic -Wall -Wextra
>+-LDLIBS    = -lxcb -lxcb-keysyms
>++LDLIBS    = $(shell pkg-config --libs xcb-keysyms)
>  
>  PREFIX    ?= /usr/local
>- BINPREFIX  = $(PREFIX)/bin
>--MANPREFIX  = $(PREFIX)/share/man
>+-BINPREFIX ?= $(PREFIX)/bin
>+-MANPREFIX ?= $(PREFIX)/share/man
>+-DOCPREFIX ?= $(PREFIX)/share/doc/$(NAME)
>++BINPREFIX  = $(PREFIX)/bin
> +MANPREFIX  = $(PREFIX)/man
>++EXPREFIX  = $(PREFIX)/share/examples/$(NAME)
>  
>  SRC = $(wildcard *.c)
>  OBJ = $(SRC:.c=.o)
>-@@ -33,9 +33,9 @@ $(NAME): $(OBJ)
>+@@ -27,11 +27,15 @@ $(NAME): $(OBJ)
>  
>  install:
>  	mkdir -p "$(DESTDIR)$(BINPREFIX)"
>--	cp -p $(NAME) "$(DESTDIR)$(BINPREFIX)"
>+-	cp -pf $(NAME) "$(DESTDIR)$(BINPREFIX)"
> +	${BSD_INSTALL_PROGRAM} $(NAME) "$(DESTDIR)$(BINPREFIX)"
>  	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
> -	cp -p doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1
>+-	mkdir -p "$(DESTDIR)$(DOCPREFIX)"
>+-	cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
> +	${BSD_INSTALL_MAN} doc/$(NAME).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)"/$(NAME)

Actions: View | Diff

Attachments on bug 208871: 169409