Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Apr 2016 15:28:25 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413037 - in head/x11/sxhkd: . files
Message-ID:  <201604111528.u3BFSP5m092771@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604111528.u3BFSP5m092771>