mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-01 01:17:02 +00:00
Code Issues Releases Activity

misc/unclutter-xfixes: Update to 1.3

Browse Source 
Also reorder Makefile.

Changes:	https://github.com/Airblader/unclutter-xfixes/releases/tag/v1.3

PR:		225661
Submitted by:	Oleh Hushchenkov <gor@clogic.com.ua> (maintainer)
This commit is contained in:
Danilo G. Baio 2018-02-06 20:29:33 +00:00
parent 3f8d5518c0
commit 8c692fd027
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=461100
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/unclutter-xfixes/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unclutter-xfixes
PORTVERSION= 1.2
PORTVERSION= 1.3
DISTVERSIONPREFIX= v
CATEGORIES= misc
@ -15,16 +15,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= a2x:textproc/asciidoc
LIB_DEPENDS= libev.so:devel/libev
CONFLICTS_INSTALL= unclutter-8*
CFLAGS+= -I${LOCALBASE}/include
USES= gmake pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= Airblader
USE_XORG= x11 xi xfixes
USES= gmake pkgconfig
CONFLICTS_INSTALL= unclutter-8*
PLIST_FILES= bin/unclutter \
man/man1/unclutter.1.gz
@ -32,4 +30,6 @@ PLIST_FILES= bin/unclutter \
MAKE_ENV+= UNCLUTTER_VERSION=${PORTVERSION}
MAKE_ARGS= CC=${CC}
CFLAGS+= -I${LOCALBASE}/include
.include <bsd.port.mk>

6
misc/unclutter-xfixes/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1500506028
SHA256 (Airblader-unclutter-xfixes-v1.2_GH0.tar.gz) = addaf8fa4e7381a95ea2279eb47be675b52eb43efb83f7a78ac9044e53121d4a
SIZE (Airblader-unclutter-xfixes-v1.2_GH0.tar.gz) = 6000
TIMESTAMP = 1517137222
SHA256 (Airblader-unclutter-xfixes-v1.3_GH0.tar.gz) = 8726b2e447de9d43bbd979ad6581c6fd34ad76ef82a6e1c7e1ad2ca3247565b2
SIZE (Airblader-unclutter-xfixes-v1.3_GH0.tar.gz) = 6131

32
misc/unclutter-xfixes/files/patch-Makefile
View File

@ -1,32 +1,34 @@
Index: Makefile
===================================================================
--- Makefile.orig 2016-05-16 09:27:55 UTC
--- Makefile.orig 2018-01-24 07:43:43 UTC
+++ Makefile
@@ -4,9 +4,9 @@ IDIR = include
@@ -4,15 +4,14 @@ IDIR = include
ODIR = obj
INSTALL = install
-PREFIX = /usr/bin
-PREFIX = /usr
-MANDIR = /usr/share/man/man1
-BINDIR = $(PREFIX)/bin
-MANDIR = $(PREFIX)/share/man/man1
+BINDIR = /bin
+MANDIR = /man/man1
CC = gcc
CFLAGS += -I$(IDIR)
@@ -32,12 +32,12 @@ $(TARGET): $(OBJS)
$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
LD = $(CC)
$(ODIR)/%.o: $(SDIR)/%.c $(INCS)
- $(CC) -D'__VERSION="$(shell git describe --all --long --always)"' $(CFLAGS) -o $@ -c $<
+ $(CC) -D'__VERSION="$(UNCLUTTER_VERSION)"' $(CFLAGS) -o $@ -c $<
-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)
.PHONY: install
install: $(TARGET)
- $(INSTALL) -Dm 0755 $(TARGET) $(DESTDIR)$(PREFIX)/$(TARGET)
- $(INSTALL) -Dm 0644 man/unclutter-xfixes.1 $(DESTDIR)$(MANDIR)/unclutter.1
+ $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(PREFIX)$(BINDIR)/$(TARGET)
+ $(BSD_INSTALL_MAN) man/unclutter-xfixes.1 $(DESTDIR)$(PREFIX)$(MANDIR)/$(TARGET).1
install: $(TARGET) mans
- $(INSTALL) -Dm 0755 "$(TARGET)" "$(DESTDIR)$(BINDIR)/$(TARGET)"
- $(INSTALL) -Dm 0644 man/unclutter-xfixes.1 "$(DESTDIR)$(MANDIR)/unclutter.1"
+ $(BSD_INSTALL_PROGRAM) "$(TARGET)" "$(DESTDIR)$(PREFIX)$(BINDIR)/$(TARGET)"
+ $(BSD_INSTALL_MAN) man/unclutter-xfixes.1 "$(DESTDIR)$(PREFIX)$(MANDIR)/$(TARGET).1"
.PHONY: uninstall
uninstall: