triforce-afl: Patch to install afl-qemu-system-trace

[akulpillai <vishnu%akulpillai.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	akulpillai <vishnu%akulpillai.com@localhost>
Pushed By:	akulpillai
Date:		Sun Jun 2 18:10:41 2019 +0000
Changeset:	cf7673b049ec4b536ee1ea71361b68543fe9a908

Modified Files:
	triforce-afl/PLIST
	triforce-afl/distinfo
	triforce-afl/patches/patch-Makefile

Log Message:
triforce-afl: Patch to install afl-qemu-system-trace

Patch to install afl-qemu-system-trace
Fix to install using PREFIX

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

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

diffstat:
 triforce-afl/PLIST                  | 153 ++++++++++++++++++------------------
 triforce-afl/distinfo               |   2 +-
 triforce-afl/patches/patch-Makefile |  31 ++++----
 3 files changed, 94 insertions(+), 92 deletions(-)

diffs:
diff --git a/triforce-afl/PLIST b/triforce-afl/PLIST
index cab350c9d9..5da7cec376 100644
--- a/triforce-afl/PLIST
+++ b/triforce-afl/PLIST
@@ -1,77 +1,78 @@
 @comment $NetBSD$
-lib/triforce-afl/afl-as
-lib/triforce-afl/as
-share/doc/triforce-afl/ChangeLog
-share/doc/triforce-afl/QuickStartGuide.txt
-share/doc/triforce-afl/README
-share/doc/triforce-afl/env_variables.txt
-share/doc/triforce-afl/historical_notes.txt
-share/doc/triforce-afl/notes_for_asan.txt
-share/doc/triforce-afl/parallel_fuzzing.txt
-share/doc/triforce-afl/perf_tips.txt
-share/doc/triforce-afl/sister_projects.txt
-share/doc/triforce-afl/status_screen.txt
-share/doc/triforce-afl/technical_details.txt
-share/doc/triforce-afl/triforce_internals.txt
-share/triforce-afl/testcases/README.testcases
-share/triforce-afl/testcases/_extras/gif.dict
-share/triforce-afl/testcases/_extras/html_tags.dict
-share/triforce-afl/testcases/_extras/jpeg.dict
-share/triforce-afl/testcases/_extras/js.dict
-share/triforce-afl/testcases/_extras/pdf.dict
-share/triforce-afl/testcases/_extras/png.dict
-share/triforce-afl/testcases/_extras/sql.dict
-share/triforce-afl/testcases/_extras/tiff.dict
-share/triforce-afl/testcases/_extras/webp.dict
-share/triforce-afl/testcases/_extras/xml.dict
-share/triforce-afl/testcases/archives/common/ar/small_archive.a
-share/triforce-afl/testcases/archives/common/bzip2/small_archive.bz2
-share/triforce-afl/testcases/archives/common/cab/small_archive.cab
-share/triforce-afl/testcases/archives/common/compress/small_archive.Z
-share/triforce-afl/testcases/archives/common/cpio/small_archive.cpio
-share/triforce-afl/testcases/archives/common/gzip/small_archive.gz
-share/triforce-afl/testcases/archives/common/lzo/small_archive.lzo
-share/triforce-afl/testcases/archives/common/rar/small_archive.rar
-share/triforce-afl/testcases/archives/common/tar/small_archive.tar
-share/triforce-afl/testcases/archives/common/xz/small_archive.xz
-share/triforce-afl/testcases/archives/common/zip/small_archive.zip
-share/triforce-afl/testcases/archives/exotic/arj/small_archive.arj
-share/triforce-afl/testcases/archives/exotic/lha/small_archive.lha
-share/triforce-afl/testcases/archives/exotic/lrzip/small_archive.lrz
-share/triforce-afl/testcases/archives/exotic/lzip/small_archive.lz
-share/triforce-afl/testcases/archives/exotic/lzma/small_archive.lzma
-share/triforce-afl/testcases/archives/exotic/rzip/small_archive.rz
-share/triforce-afl/testcases/archives/exotic/zoo/small_archive.zoo
-share/triforce-afl/testcases/images/bmp/not_kitty.bmp
-share/triforce-afl/testcases/images/gif/not_kitty.gif
-share/triforce-afl/testcases/images/ico/not_kitty.ico
-share/triforce-afl/testcases/images/jp2/not_kitty.jp2
-share/triforce-afl/testcases/images/jpeg/not_kitty.jpg
-share/triforce-afl/testcases/images/jxr/not_kitty.jxr
-share/triforce-afl/testcases/images/png/not_kitty.png
-share/triforce-afl/testcases/images/png/not_kitty_alpha.png
-share/triforce-afl/testcases/images/png/not_kitty_gamma.png
-share/triforce-afl/testcases/images/png/not_kitty_icc.png
-share/triforce-afl/testcases/images/tiff/not_kitty.tiff
-share/triforce-afl/testcases/images/webp/not_kitty.webp
-share/triforce-afl/testcases/multimedia/h264/small_movie.mp4
-share/triforce-afl/testcases/others/elf/small_exec.elf
-share/triforce-afl/testcases/others/js/small_script.js
-share/triforce-afl/testcases/others/pcap/small_capture.pcap
-share/triforce-afl/testcases/others/pdf/small.pdf
-share/triforce-afl/testcases/others/rtf/small_document.rtf
-share/triforce-afl/testcases/others/sql/simple_queries.sql
-share/triforce-afl/testcases/others/text/hello_world.txt
-share/triforce-afl/testcases/others/xml/small_document.xml
-triforce-afl/afl-analyze
-triforce-afl/afl-clang
-triforce-afl/afl-clang++
-triforce-afl/afl-cmin
-triforce-afl/afl-fuzz
-triforce-afl/afl-g++
-triforce-afl/afl-gcc
-triforce-afl/afl-gotcpu
-triforce-afl/afl-plot
-triforce-afl/afl-showmap
-triforce-afl/afl-tmin
-triforce-afl/afl-whatsup
+triforce-afl/bin/afl-analyze
+triforce-afl/bin/afl-clang
+triforce-afl/bin/afl-clang++
+triforce-afl/bin/afl-cmin
+triforce-afl/bin/afl-fuzz
+triforce-afl/bin/afl-g++
+triforce-afl/bin/afl-gcc
+triforce-afl/bin/afl-gotcpu
+triforce-afl/bin/afl-plot
+triforce-afl/bin/afl-qemu-system-trace
+triforce-afl/bin/afl-showmap
+triforce-afl/bin/afl-tmin
+triforce-afl/bin/afl-whatsup
+triforce-afl/lib/afl/afl-as
+triforce-afl/lib/afl/as
+triforce-afl/share/afl/testcases/README.testcases
+triforce-afl/share/afl/testcases/_extras/gif.dict
+triforce-afl/share/afl/testcases/_extras/html_tags.dict
+triforce-afl/share/afl/testcases/_extras/jpeg.dict
+triforce-afl/share/afl/testcases/_extras/js.dict
+triforce-afl/share/afl/testcases/_extras/pdf.dict
+triforce-afl/share/afl/testcases/_extras/png.dict
+triforce-afl/share/afl/testcases/_extras/sql.dict
+triforce-afl/share/afl/testcases/_extras/tiff.dict
+triforce-afl/share/afl/testcases/_extras/webp.dict
+triforce-afl/share/afl/testcases/_extras/xml.dict
+triforce-afl/share/afl/testcases/archives/common/ar/small_archive.a
+triforce-afl/share/afl/testcases/archives/common/bzip2/small_archive.bz2
+triforce-afl/share/afl/testcases/archives/common/cab/small_archive.cab
+triforce-afl/share/afl/testcases/archives/common/compress/small_archive.Z
+triforce-afl/share/afl/testcases/archives/common/cpio/small_archive.cpio
+triforce-afl/share/afl/testcases/archives/common/gzip/small_archive.gz
+triforce-afl/share/afl/testcases/archives/common/lzo/small_archive.lzo
+triforce-afl/share/afl/testcases/archives/common/rar/small_archive.rar
+triforce-afl/share/afl/testcases/archives/common/tar/small_archive.tar
+triforce-afl/share/afl/testcases/archives/common/xz/small_archive.xz
+triforce-afl/share/afl/testcases/archives/common/zip/small_archive.zip
+triforce-afl/share/afl/testcases/archives/exotic/arj/small_archive.arj
+triforce-afl/share/afl/testcases/archives/exotic/lha/small_archive.lha
+triforce-afl/share/afl/testcases/archives/exotic/lrzip/small_archive.lrz
+triforce-afl/share/afl/testcases/archives/exotic/lzip/small_archive.lz
+triforce-afl/share/afl/testcases/archives/exotic/lzma/small_archive.lzma
+triforce-afl/share/afl/testcases/archives/exotic/rzip/small_archive.rz
+triforce-afl/share/afl/testcases/archives/exotic/zoo/small_archive.zoo
+triforce-afl/share/afl/testcases/images/bmp/not_kitty.bmp
+triforce-afl/share/afl/testcases/images/gif/not_kitty.gif
+triforce-afl/share/afl/testcases/images/ico/not_kitty.ico
+triforce-afl/share/afl/testcases/images/jp2/not_kitty.jp2
+triforce-afl/share/afl/testcases/images/jpeg/not_kitty.jpg
+triforce-afl/share/afl/testcases/images/jxr/not_kitty.jxr
+triforce-afl/share/afl/testcases/images/png/not_kitty.png
+triforce-afl/share/afl/testcases/images/png/not_kitty_alpha.png
+triforce-afl/share/afl/testcases/images/png/not_kitty_gamma.png
+triforce-afl/share/afl/testcases/images/png/not_kitty_icc.png
+triforce-afl/share/afl/testcases/images/tiff/not_kitty.tiff
+triforce-afl/share/afl/testcases/images/webp/not_kitty.webp
+triforce-afl/share/afl/testcases/multimedia/h264/small_movie.mp4
+triforce-afl/share/afl/testcases/others/elf/small_exec.elf
+triforce-afl/share/afl/testcases/others/js/small_script.js
+triforce-afl/share/afl/testcases/others/pcap/small_capture.pcap
+triforce-afl/share/afl/testcases/others/pdf/small.pdf
+triforce-afl/share/afl/testcases/others/rtf/small_document.rtf
+triforce-afl/share/afl/testcases/others/sql/simple_queries.sql
+triforce-afl/share/afl/testcases/others/text/hello_world.txt
+triforce-afl/share/afl/testcases/others/xml/small_document.xml
+triforce-afl/share/doc/afl/ChangeLog
+triforce-afl/share/doc/afl/QuickStartGuide.txt
+triforce-afl/share/doc/afl/README
+triforce-afl/share/doc/afl/env_variables.txt
+triforce-afl/share/doc/afl/historical_notes.txt
+triforce-afl/share/doc/afl/notes_for_asan.txt
+triforce-afl/share/doc/afl/parallel_fuzzing.txt
+triforce-afl/share/doc/afl/perf_tips.txt
+triforce-afl/share/doc/afl/sister_projects.txt
+triforce-afl/share/doc/afl/status_screen.txt
+triforce-afl/share/doc/afl/technical_details.txt
+triforce-afl/share/doc/afl/triforce_internals.txt
diff --git a/triforce-afl/distinfo b/triforce-afl/distinfo
index ff56ae9d49..fc18500c0e 100644
--- a/triforce-afl/distinfo
+++ b/triforce-afl/distinfo
@@ -4,7 +4,7 @@ SHA1 (TriforceAFL-0.0-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = 9ab1432
 RMD160 (TriforceAFL-0.0-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = e4c34a542de1e6a5f6cad204fcea17858e7b6a34
 SHA512 (TriforceAFL-0.0-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = aac1abb5e9d334923a4d6dab159e518bce1944573884e1012620aff139d4d0abcdbca41104c1c2eed9006fc277321f1f13212a698a7b7c49c6b0f1f98078d2e0
 Size (TriforceAFL-0.0-2a8ed329233a921044c903222fc3aa029ef68c69.tar.gz) = 32045053 bytes
-SHA1 (patch-Makefile) = 091a1410a2cdf1ac32ae889c03c813a891131a62
+SHA1 (patch-Makefile) = 7d4325ffc5e58d5a591b8a7d64b95a7c5fa353a9
 SHA1 (patch-qemu__mode_build__qemu__support.sh) = 76fdbbbb93971e0ce55579b90c183a90b9a80e8f
 SHA1 (patch-qemu__mode_qemu_Makefile) = 8d8baa55e4f93ba635f9399c8e0a29f6f59d2292
 SHA1 (patch-qemu__mode_qemu_audio_audio.c) = aaa82ac3208ef605cb6f5b0fabd38a0d223f21f2
diff --git a/triforce-afl/patches/patch-Makefile b/triforce-afl/patches/patch-Makefile
index cb1f9fd29b..f1e38ce742 100644
--- a/triforce-afl/patches/patch-Makefile
+++ b/triforce-afl/patches/patch-Makefile
@@ -1,21 +1,22 @@
 $NetBSD$
 
-Install into subdirectory
-
 --- Makefile.orig	2017-05-31 22:53:05.000000000 +0000
 +++ Makefile
-@@ -17,10 +17,10 @@ PROGNAME    = afl
+@@ -16,7 +16,7 @@
+ PROGNAME    = afl
  VERSION     = 2.06b
  
- PREFIX     ?= /usr/local
--BIN_PATH    = $(PREFIX)/bin
--HELPER_PATH = $(PREFIX)/lib/afl
--DOC_PATH    = $(PREFIX)/share/doc/afl
--MISC_PATH   = $(PREFIX)/share/afl
-+BIN_PATH    = $(PREFIX)/triforce-afl
-+HELPER_PATH = $(PREFIX)/lib/triforce-afl
-+DOC_PATH    = $(PREFIX)/share/doc/triforce-afl
-+MISC_PATH   = $(PREFIX)/share/triforce-afl
- 
- # PROGS intentionally omit afl-as, which gets installed to its own dir.
- 
+-PREFIX     ?= /usr/local
++PREFIX      = /usr/pkg/triforce-afl
+ BIN_PATH    = $(PREFIX)/bin
+ HELPER_PATH = $(PREFIX)/lib/afl
+ DOC_PATH    = $(PREFIX)/share/doc/afl
+@@ -122,7 +122,7 @@ install: all
+ 	rm -f $${DESTDIR}$(BIN_PATH)/afl-plot.sh
+ 	install -m 755 $(PROGS) $(SH_PROGS) $${DESTDIR}$(BIN_PATH)
+ 	rm -f $${DESTDIR}$(BIN_PATH)/afl-as
+-	if [ -f afl-qemu-trace ]; then install -m 755 afl-qemu-trace $${DESTDIR}$(BIN_PATH); fi
++	if [ -f afl-qemu-system-trace ]; then install -m 755 afl-qemu-system-trace $${DESTDIR}$(BIN_PATH); fi
+ 	if [ -f afl-clang-fast -a -f afl-llvm-pass.so -a -f afl-llvm-rt.o ]; then set -e; install -m 755 afl-clang-fast $${DESTDIR}$(BIN_PATH); ln -sf afl-clang-fast $${DESTDIR}$(BIN_PATH)/afl-clang-fast++; install -m 755 afl-llvm-pass.so afl-llvm-rt.o $${DESTDIR}$(HELPER_PATH); fi
+ 	set -e; for i in afl-g++ afl-clang afl-clang++; do ln -sf afl-gcc $${DESTDIR}$(BIN_PATH)/$$i; done
+ 	install -m 755 afl-as $${DESTDIR}$(HELPER_PATH)