From owner-svn-ports-all@freebsd.org Mon Apr 11 15:28:26 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D980AB0BFF2; Mon, 11 Apr 2016 15:28:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E5E61712; Mon, 11 Apr 2016 15:28:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3BFSPkX092773; Mon, 11 Apr 2016 15:28:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3BFSP5m092771; Mon, 11 Apr 2016 15:28:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201604111528.u3BFSP5m092771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 11 Apr 2016 15:28:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413037 - in head/x11/sxhkd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2016 15:28:27 -0000 Author: amdmi3 Date: Mon Apr 11 15:28:25 2016 New Revision: 413037 URL: https://svnweb.freebsd.org/changeset/ports/413037 Log: - Add LICENSE_FILE - Fix PREFIX/LOCALBASE misuse Modified: head/x11/sxhkd/Makefile head/x11/sxhkd/files/patch-Makefile Modified: head/x11/sxhkd/Makefile ============================================================================== --- head/x11/sxhkd/Makefile Mon Apr 11 15:05:09 2016 (r413036) +++ head/x11/sxhkd/Makefile Mon Apr 11 15:28:25 2016 (r413037) @@ -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 Modified: head/x11/sxhkd/files/patch-Makefile ============================================================================== --- head/x11/sxhkd/files/patch-Makefile Mon Apr 11 15:05:09 2016 (r413036) +++ head/x11/sxhkd/files/patch-Makefile Mon Apr 11 15:28:25 2016 (r413037) @@ -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)