diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-04-18 14:07:36 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-04-18 14:07:36 +0000 |
| commit | be3ed12f1c88d52e29c3f129659eed364f9ad0ed (patch) | |
| tree | 6308444ed49fdc5276a6341473e35736543547ef /x11 | |
| parent | Update to 0.11.5. (and unbreak.) (diff) | |
Update to 0.5.6.
PR: 208871
Submitted by: tkato432 yahoo com
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=413581
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/sxhkd/Makefile | 8 | ||||
| -rw-r--r-- | x11/sxhkd/distinfo | 4 | ||||
| -rw-r--r-- | x11/sxhkd/files/patch-Makefile | 37 |
3 files changed, 31 insertions, 18 deletions
diff --git a/x11/sxhkd/Makefile b/x11/sxhkd/Makefile index 1684718fde0e..b7f283b979c4 100644 --- a/x11/sxhkd/Makefile +++ b/x11/sxhkd/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sxhkd -PORTVERSION= 0.5.5 -PORTREVISION= 1 +PORTVERSION= 0.5.6 CATEGORIES= x11 MAINTAINER= ports@FreeBSD.org @@ -17,9 +16,12 @@ LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms 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 --git a/x11/sxhkd/distinfo b/x11/sxhkd/distinfo index 9220df5d1cb7..55f474dee6ba 100644 --- a/x11/sxhkd/distinfo +++ b/x11/sxhkd/distinfo @@ -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 --git a/x11/sxhkd/files/patch-Makefile b/x11/sxhkd/files/patch-Makefile index b8dec633d7d0..b2c4125f4480 100644 --- a/x11/sxhkd/files/patch-Makefile +++ b/x11/sxhkd/files/patch-Makefile @@ -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) |