pkgsrc-WIP-changes archive

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

FLIF: Correct manual installation directory



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Thu Jul 13 00:05:53 2017 +0200
Changeset:	b35b3db23ed2a161054697a0ee506eb1ba4addfc

Modified Files:
	FLIF/Makefile
	FLIF/PLIST
	FLIF/distinfo
Added Files:
	FLIF/patches/patch-src_Makefile

Log Message:
FLIF: Correct manual installation directory

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

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

diffstat:
 FLIF/Makefile                   |  1 +
 FLIF/PLIST                      |  2 +-
 FLIF/distinfo                   |  1 +
 FLIF/patches/patch-src_Makefile | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)

diffs:
diff --git a/FLIF/Makefile b/FLIF/Makefile
index 69d6c3a9a1..85dc6ee45e 100644
--- a/FLIF/Makefile
+++ b/FLIF/Makefile
@@ -14,6 +14,7 @@ WRKSRC=		${WRKDIR}/FLIF-0.3
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake pkg-config
 
+INSTALL_MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
 
 .include "../../graphics/png/buildlink3.mk"
diff --git a/FLIF/PLIST b/FLIF/PLIST
index ce1f21bc5a..fe102197d1 100644
--- a/FLIF/PLIST
+++ b/FLIF/PLIST
@@ -4,4 +4,4 @@ bin/flif
 bin/gif2flif
 lib/libflif.so
 lib/libflif.so.0
-share/man/man1/flif.1
+man/man1/flif.1
diff --git a/FLIF/distinfo b/FLIF/distinfo
index 8aaf3116ea..018fe9604f 100644
--- a/FLIF/distinfo
+++ b/FLIF/distinfo
@@ -4,3 +4,4 @@ SHA1 (FLIF-0.3.tar.gz) = 10918ea2695fdc97ad70d2e4cde021fcaa22838c
 RMD160 (FLIF-0.3.tar.gz) = c8f9baace842e976ae36653e26144f5546793f58
 SHA512 (FLIF-0.3.tar.gz) = 226f98829db90bda68669a7f00c4bee36a82003ebbc369aa7529b28d5f0dd41d8c0484c39f34a765f03f4d0e9af52a7abe2c673befe8f6961171d327428acf5e
 Size (FLIF-0.3.tar.gz) = 2791479 bytes
+SHA1 (patch-src_Makefile) = ea7dc1a7bf8a9c5d632db37e87a7db8a9a4c9ed5
diff --git a/FLIF/patches/patch-src_Makefile b/FLIF/patches/patch-src_Makefile
new file mode 100644
index 0000000000..05c7373920
--- /dev/null
+++ b/FLIF/patches/patch-src_Makefile
@@ -0,0 +1,38 @@
+$NetBSD$
+
+Make use of DESTDIR and MANDIR.
+
+--- src/Makefile.orig	2017-04-28 15:46:54.000000000 +0000
++++ src/Makefile
+@@ -1,4 +1,5 @@
+-PREFIX := $(DESTDIR)/usr/local
++PREFIX := $(DESTDIR)/usr
++MANDIR := $(PREFIX)/share/man
+ CXXFLAGS := $(shell pkg-config --cflags zlib libpng) -DLODEPNG_NO_COMPILE_PNG -DLODEPNG_NO_COMPILE_DISK
+ LDFLAGS := $(shell pkg-config --libs libpng)
+ 
+@@ -63,13 +64,13 @@ viewflif: libflif$(LIBEXT) viewflif.c
+ 
+ 
+ install: flif libflif$(LIBEXT)
+-	install -d $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/share/man/man1
++	install -d $(PREFIX)/bin $(PREFIX)/lib $(MANDIR)/man1
+ 	install -m 755 flif $(PREFIX)/bin
+ 	strip -x $(PREFIX)/bin/flif
+ 	install -m 755 libflif$(LIBEXT) libflif$(LIBEXTV) $(PREFIX)/lib
+ 	strip -x $(PREFIX)/lib/libflif$(LIBEXT) \
+ 	  $(PREFIX)/lib/libflif$(LIBEXTV)
+-	install -m 644 ../doc/flif.1 $(PREFIX)/share/man/man1
++	install -m 644 ../doc/flif.1 $(MANDIR)/man1
+ 	install -m 755 ../tools/gif2flif $(PREFIX)/bin
+ 	install -m 755 ../tools/apng2flif $(PREFIX)/bin
+ 
+@@ -104,7 +105,7 @@ uninstall:
+ 	rm -f $(PREFIX)/lib/libflif_dec$(LIBEXT)
+ 	rm -f $(PREFIX)/lib/libflif$(LIBEXTV)
+ 	rm -f $(PREFIX)/lib/libflif_dec$(LIBEXTV)
+-	rm -f $(PREFIX)/share/man/man1/flif.1
++	rm -f $(MANDIR)/man1/flif.1
+ 
+ clean:
+ 	rm -f flif dflif libflif*$(LIBEXT)* viewflif flif.asan flif.dbg flif.prof flif.stats test-interface


Home | Main Index | Thread Index | Old Index