aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2018-12-26 21:00:40 +0000
committerSteve Wills <swills@FreeBSD.org>2018-12-26 21:00:40 +0000
commita13ba87a6a3283dd3f36a479ffcdd1a76918ab57 (patch)
treedf6e2424c377f734f611ec428866ca7e21b49c57 /misc
parent47fd29520d9987ced4760cdd2c3bed5e3c43a4ad (diff)
downloadports-a13ba87a6a3283dd3f36a479ffcdd1a76918ab57.tar.gz
ports-a13ba87a6a3283dd3f36a479ffcdd1a76918ab57.zip
Notes
Diffstat (limited to 'misc')
-rw-r--r--misc/unclutter-xfixes/Makefile3
-rw-r--r--misc/unclutter-xfixes/distinfo6
-rw-r--r--misc/unclutter-xfixes/files/patch-Makefile17
3 files changed, 10 insertions, 16 deletions
diff --git a/misc/unclutter-xfixes/Makefile b/misc/unclutter-xfixes/Makefile
index 028375d65d3c..a285114674c4 100644
--- a/misc/unclutter-xfixes/Makefile
+++ b/misc/unclutter-xfixes/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unclutter-xfixes
-PORTVERSION= 1.3
+PORTVERSION= 1.5
DISTVERSIONPREFIX= v
CATEGORIES= misc
@@ -27,7 +27,6 @@ CONFLICTS_INSTALL= unclutter-8*
PLIST_FILES= bin/unclutter \
man/man1/unclutter.1.gz
-MAKE_ENV+= UNCLUTTER_VERSION=${PORTVERSION}
MAKE_ARGS= CC=${CC}
CFLAGS+= -I${LOCALBASE}/include
diff --git a/misc/unclutter-xfixes/distinfo b/misc/unclutter-xfixes/distinfo
index c5989102e69b..85920530c617 100644
--- a/misc/unclutter-xfixes/distinfo
+++ b/misc/unclutter-xfixes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517137222
-SHA256 (Airblader-unclutter-xfixes-v1.3_GH0.tar.gz) = 8726b2e447de9d43bbd979ad6581c6fd34ad76ef82a6e1c7e1ad2ca3247565b2
-SIZE (Airblader-unclutter-xfixes-v1.3_GH0.tar.gz) = 6131
+TIMESTAMP = 1545470741
+SHA256 (Airblader-unclutter-xfixes-v1.5_GH0.tar.gz) = 35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11
+SIZE (Airblader-unclutter-xfixes-v1.5_GH0.tar.gz) = 7998
diff --git a/misc/unclutter-xfixes/files/patch-Makefile b/misc/unclutter-xfixes/files/patch-Makefile
index 4642e48f1395..dd52fcad38ab 100644
--- a/misc/unclutter-xfixes/files/patch-Makefile
+++ b/misc/unclutter-xfixes/files/patch-Makefile
@@ -1,8 +1,6 @@
-Index: Makefile
-===================================================================
---- Makefile.orig 2018-01-24 07:43:43 UTC
+--- Makefile.orig 2018-12-11 20:44:10 UTC
+++ Makefile
-@@ -4,15 +4,14 @@ IDIR = include
+@@ -5,11 +5,10 @@ IDIR = include
ODIR = obj
INSTALL = install
@@ -10,23 +8,20 @@ Index: Makefile
-BINDIR = $(PREFIX)/bin
-MANDIR = $(PREFIX)/share/man/man1
+-LICENSEDIR = $(PREFIX)/share/licenses/$(TARGET)
+BINDIR = /bin
+MANDIR = /man/man1
++LICENSEDIR = /share/licenses/$(TARGET)
CC = gcc
LD = $(CC)
-
--CPPFLAGS += -D'__VERSION="$(shell git describe --all --long --always)"' "-I$(IDIR)"
-+CPPFLAGS += -D'__VERSION="$(UNCLUTTER_VERSION)"' "-I$(IDIR)"
-
- CFLAGS += -std=gnu99
- CFLAGS += -Wall -Wundef -Wshadow -Wformat-security
-@@ -41,8 +40,8 @@ $(ODIR)/%.o: $(SDIR)/%.c $(INCS)
+@@ -44,9 +43,8 @@ $(ODIR)/%.o: $(SDIR)/%.c $(INCS)
.PHONY: install
install: $(TARGET) mans
- $(INSTALL) -Dm 0755 "$(TARGET)" "$(DESTDIR)$(BINDIR)/$(TARGET)"
- $(INSTALL) -Dm 0644 man/unclutter-xfixes.1 "$(DESTDIR)$(MANDIR)/unclutter.1"
+- $(INSTALL) -Dm 0644 -t "$(DESTDIR)$(LICENSEDIR)/" LICENSE
+ $(BSD_INSTALL_PROGRAM) "$(TARGET)" "$(DESTDIR)$(PREFIX)$(BINDIR)/$(TARGET)"
+ $(BSD_INSTALL_MAN) man/unclutter-xfixes.1 "$(DESTDIR)$(PREFIX)$(MANDIR)/$(TARGET).1"