pkgsrc-WIP-changes archive

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

nyancat: Try to use original Makefile for install target



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Jul 26 19:51:40 2016 +0200
Changeset:	046c5099f9076484cb6c59305d9e005da35b8c82

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

Log Message:
nyancat: Try to use original Makefile for install target

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

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

diffstat:
 nyancat/Makefile               |  6 ++----
 nyancat/distinfo               |  1 +
 nyancat/patches/patch-Makefile | 28 ++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

diffs:
diff --git a/nyancat/Makefile b/nyancat/Makefile
index 90e0aad..a69e06b 100644
--- a/nyancat/Makefile
+++ b/nyancat/Makefile
@@ -9,10 +9,8 @@ HOMEPAGE=	http://nyancat.dakko.us/
 COMMENT=	Nyancat in your terminal
 LICENSE=	modified-bsd
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALL_MAKE_FLAGS+=	MANDIR=${PKGMANDIR}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/nyancat ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/nyancat.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+MANCOMPRESSED=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/nyancat/distinfo b/nyancat/distinfo
index ae9e091..260e109 100644
--- a/nyancat/distinfo
+++ b/nyancat/distinfo
@@ -4,3 +4,4 @@ SHA1 (nyancat-1.5.1.tar.gz) = fd59f53f29a7164246c6fe3c29657b65493b7e0c
 RMD160 (nyancat-1.5.1.tar.gz) = d6cef020e4dd7aeed727ed6d95da29b7abaf7e7f
 SHA512 (nyancat-1.5.1.tar.gz) = 0a45bd0b1a9b9f85650a986c7f9f8120441f6b0bd346281fb44a5470382484738e660dffe17b95088332c50b6aed3feb4b2f949f15f37dd9c1b1885f345e157d
 Size (nyancat-1.5.1.tar.gz) = 15124 bytes
+SHA1 (patch-Makefile) = 81ff0d28036fcd24351dffd68e97610d26b17c01
diff --git a/nyancat/patches/patch-Makefile b/nyancat/patches/patch-Makefile
new file mode 100644
index 0000000..917b2a8
--- /dev/null
+++ b/nyancat/patches/patch-Makefile
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Adapt install target for pkgsrc.
+
+--- Makefile.orig	2015-11-24 05:05:00.000000000 +0000
++++ Makefile
+@@ -3,6 +3,9 @@ version = 1.5.1
+ tarname = $(package)
+ distdir = $(tarname)-$(version)
+ 
++DESTDIR?=
++MANDIR?=share/man
++
+ all clean check nyancat:
+ 	cd src && $(MAKE) $@
+ 
+@@ -33,7 +36,9 @@ distcheck: $(distdir).tar.gz
+ 	@echo "*** Package $(distdir).tar.gz is ready for distribution."
+ 
+ install: all
+-	install src/nyancat /usr/bin/${package}
+-	gzip -9 -c < nyancat.1 > /usr/share/man/man1/nyancat.1.gz
++	install -d $(DESTDIR)$(PREFIX)/bin/
++	install src/nyancat $(DESTDIR)$(PREFIX)/bin/${package}
++	install -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
++	gzip -9 -c < nyancat.1 > $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/nyancat.1.gz
+ 
+ .PHONY: FORCE all clean check dist distcheck install


Home | Main Index | Thread Index | Old Index