diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-04-11 15:28:25 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-04-11 15:28:25 +0000 |
| commit | 742b18231adaa871a25797f3624d53d30d0a4f89 (patch) | |
| tree | fe5c739b89250d297d758f2333d7a0b0bb7cb6a7 /x11 | |
| parent | Change the man.d file to one that should be less prone to conflict. (diff) | |
- Add LICENSE_FILE
- Fix PREFIX/LOCALBASE misuse
Notes
Notes:
svn path=/head/; revision=413037
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/sxhkd/Makefile | 1 | ||||
| -rw-r--r-- | x11/sxhkd/files/patch-Makefile | 24 |
2 files changed, 23 insertions, 2 deletions
diff --git a/x11/sxhkd/Makefile b/x11/sxhkd/Makefile index 0a4ed48c8d0b..1684718fde0e 100644 --- a/x11/sxhkd/Makefile +++ b/x11/sxhkd/Makefile @@ -10,6 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Simple X hotkey daemon LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms diff --git a/x11/sxhkd/files/patch-Makefile b/x11/sxhkd/files/patch-Makefile index 78b5873ffb21..b8dec633d7d0 100644 --- a/x11/sxhkd/files/patch-Makefile +++ b/x11/sxhkd/files/patch-Makefile @@ -1,6 +1,14 @@ ---- Makefile.orig 2014-12-15 21:21:15 UTC +--- Makefile.orig 2015-03-20 21:31:37 UTC +++ Makefile -@@ -9,7 +9,7 @@ LDFLAGS += -L$(PREFIX)/lib +@@ -3,13 +3,13 @@ VERSION = 0.5.5 + + 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 PREFIX ?= /usr/local BINPREFIX = $(PREFIX)/bin @@ -9,3 +17,15 @@ SRC = $(wildcard *.c) OBJ = $(SRC:.c=.o) +@@ -33,9 +33,9 @@ $(NAME): $(OBJ) + + install: + mkdir -p "$(DESTDIR)$(BINPREFIX)" +- cp -p $(NAME) "$(DESTDIR)$(BINPREFIX)" ++ ${BSD_INSTALL_PROGRAM} $(NAME) "$(DESTDIR)$(BINPREFIX)" + mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1 +- cp -p doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1 ++ ${BSD_INSTALL_MAN} doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1 + + uninstall: + rm -f "$(DESTDIR)$(BINPREFIX)"/$(NAME) |