MFH: r467286

Update to upstream version 0.5.9

Details
- New patchlevel release 0.5.9
- Cleanup ports
- USES localbase:ldflags

PR:		227061
Submitted by:	uzsolt@uzsolt.hu
Reviewed by:	gor@clogic.com.ua (maintainer)
Approved by:	gor@clogic.com.ua (maintainer)

Approved by:	ports-secteam (riggs)
This commit is contained in:
Thomas Zander 2018-04-14 06:28:34 +00:00
parent d9477a1ddf
commit 6502bfb6fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q2/; revision=467287
3 changed files with 14 additions and 48 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sxhkd
PORTVERSION= 0.5.8
PORTVERSION= 0.5.9
CATEGORIES= x11
MAINTAINER= gor@clogic.com.ua
@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms
USES= gmake pkgconfig
USES= gmake localbase:ldflags
USE_XORG= xcb
@ -26,4 +26,13 @@ PLIST_FILES= bin/sxhkd \
OPTIONS_DEFINE= EXAMPLES
do-install:
${MKDIR} ${STAGEDIR}${BINDIR} ${STAGEDIR}${MANPREFIX}/man/man1
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
post-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1500267066
SHA256 (baskerville-sxhkd-0.5.8_GH0.tar.gz) = d7df48d7d301d1cf06f45172bcfe712510e98dcdbdb896af662cf979f9666855
SIZE (baskerville-sxhkd-0.5.8_GH0.tar.gz) = 34566
TIMESTAMP = 1522227003
SHA256 (baskerville-sxhkd-0.5.9_GH0.tar.gz) = 457e0fdfe0a7dac24ca506c026a1e8cde5899073ba1d2ef1326bc68b931648bd
SIZE (baskerville-sxhkd-0.5.9_GH0.tar.gz) = 34649

View File

@ -1,43 +0,0 @@
--- 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)
-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
-DOCPREFIX ?= $(PREFIX)/share/doc/$(OUT)
+BINPREFIX = $(PREFIX)/bin
+MANPREFIX = $(PREFIX)/man
+DOCPREFIX = $(PREFIX)/share/doc/$(OUT)
+EXPREFIX = $(PREFIX)/share/examples/$(OUT)
all: $(OUT)
@@ -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)