pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

i3status: Use modified install target in the original makefile



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Tue Jun 14 02:05:03 2016 +0200
Changeset:	a422d844bee278cabe0fd005864987d612d44c57

Modified Files:
	i3status/Makefile
	i3status/distinfo
Added Files:
	i3status/patches/patch-Makefile

Log Message:
i3status: Use modified install target in the original makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a422d844bee278cabe0fd005864987d612d44c57

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 i3status/Makefile               |  7 -------
 i3status/distinfo               |  1 +
 i3status/patches/patch-Makefile | 26 ++++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diffs:
diff --git a/i3status/Makefile b/i3status/Makefile
index bda4619..5e38d35 100644
--- a/i3status/Makefile
+++ b/i3status/Makefile
@@ -13,18 +13,11 @@ LICENSE=	modified-bsd
 
 USE_TOOLS+=	gmake
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/${PKGBASE} share/examples/${PKGBASE}
 CONF_FILES=	${PREFIX}/share/examples/${PKGBASE}/i3status.conf ${PKG_SYSCONFDIR}/i3status.conf
 
 MAKE_ENV+=	SYSCONFDIR=${PKG_SYSCONFDIR}
 MAKE_ENV+=	DEBUG=0
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/i3status ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/man/i3status.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_DATA} ${WRKSRC}/i3status.conf ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/
-
 .include "../../devel/confuse/buildlink3.mk"
 .include "../../devel/yajl/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
diff --git a/i3status/distinfo b/i3status/distinfo
index 99f7a89..21a1bad 100644
--- a/i3status/distinfo
+++ b/i3status/distinfo
@@ -4,5 +4,6 @@ SHA1 (i3status-2.10.tar.bz2) = b0bfcac24c9e57958eefd9c3b00aed4b73b2c708
 RMD160 (i3status-2.10.tar.bz2) = 78a2d26aea8d59e8b8e9f7a302e28688bd9ae516
 SHA512 (i3status-2.10.tar.bz2) = a514331d83458de15b548686d423b38a7a9198a7a31ca3001f3f136e4b873617c397a0073bb10b44fa8613bc12ed4fa4e384d099d31122a8afbd0df5de2e9c85
 Size (i3status-2.10.tar.bz2) = 53684 bytes
+SHA1 (patch-Makefile) = 606d4bb7a0b67ae8e225c606bd44299745dd33f8
 SHA1 (patch-src_print__disk__info.c) = e0662f65b21402e60a643374898707f5807077f2
 SHA1 (patch-src_print__wireless__info.c) = 4632c9eabd5b5d73bc67e541bf7dc93e883339d1
diff --git a/i3status/patches/patch-Makefile b/i3status/patches/patch-Makefile
new file mode 100644
index 0000000..21820c9
--- /dev/null
+++ b/i3status/patches/patch-Makefile
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Adjust paths and install LICENSE.
+
+--- Makefile.orig	2016-01-01 18:51:19.000000000 +0000
++++ Makefile
+@@ -100,13 +100,15 @@ manpage:
+ 
+ install:
+ 	install -m 755 -d $(DESTDIR)$(PREFIX)/bin
+-	install -m 755 -d $(DESTDIR)$(SYSCONFDIR)
+-	install -m 755 -d $(DESTDIR)$(MANPREFIX)/share/man/man1
++	install -m 755 -d $(DESTDIR)$(PREFIX)/share/examples/i3status
++	install -m 755 -d $(DESTDIR)$(PREFIX)/share/doc/i3status
++	install -m 755 -d $(DESTDIR)$(MANPREFIX)/man/man1
+ 	install -m 755 i3status $(DESTDIR)$(PREFIX)/bin/i3status
+ 	# Allow network configuration for getting the link speed
+ 	(which setcap && setcap cap_net_admin=ep $(DESTDIR)$(PREFIX)/bin/i3status) || true
+-	install -m 644 i3status.conf $(DESTDIR)$(SYSCONFDIR)/i3status.conf
+-	install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/share/man/man1
++	install -m 644 i3status.conf $(DESTDIR)$(PREFIX)/share/examples/i3status/i3status.conf
++	install -m 644 LICENSE $(DESTDIR)$(PREFIX)/share/doc/i3status
++	install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/man/man1
+ 
+ release:
+ 	[ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}


Home | Main Index | Thread Index | Old Index