Bug 248921 - textproc/2bsd-diff: Update to 2.11.1
Summary: textproc/2bsd-diff: Update to 2.11.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords: buildisok, needs-qa
Depends on:
Blocks: 248756
  Show dependency tree / graph
 
Reported: 2020-08-26 01:28 UTC by risner
Modified: 2020-09-04 02:43 UTC (History)
1 user (show)

See Also:

Attachments
adds a patch file, modifies two others. (4.07 KB, patch)
2020-08-26 01:28 UTC, risner 		fernape: maintainer-approval+
Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description risner 2020-08-26 01:28:54 UTC 
Created attachment 217531 [details]
adds a patch file, modifies two others.

Patch created to make a clean compile with newest clang:
root@freebsd:/usr/ports/textproc/2bsd-diff # uname -a
FreeBSD freebsd 13.0-CURRENT FreeBSD 13.0-CURRENT #1 r364750: Tue Aug 25 08:16:41 UTC 2020     root@freebsd:/usr/obj/usr/src/amd64.amd64/sys/GENERIC  amd64

I also test on arm:
FreeBSD dns.d20hobbies.com 12.1-STABLE FreeBSD 12.1-STABLE r363676 GENERIC  arm64


root@freebsd:/usr/ports/textproc/2bsd-diff # make clean
===>  Cleaning for 2bsd-diff-2.11.1_1
root@freebsd:/usr/ports/textproc/2bsd-diff # make
===>   2bsd-diff-2.11.1_1 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by 2bsd-diff-2.11.1_1 for building
===>  Extracting for 2bsd-diff-2.11.1_1
=> SHA256 Checksum OK for file8.tar.gz.
===>  Patching for 2bsd-diff-2.11.1_1
===>  Applying FreeBSD patches for 2bsd-diff-2.11.1_1 from /usr/ports/textproc/2bsd-diff/files
===>  Configuring for 2bsd-diff-2.11.1_1
===>  Building for 2bsd-diff-2.11.1_1
--- diff.o ---
--- diffdir.o ---
--- diffreg.o ---
--- diffh.o ---
--- diffdir.o ---
cc  -O2 -pipe  -Wno-error=return-type -fstack-protector-strong -fno-strict-aliasing  -DDIFF='"/usr/local/bin/2diff"' -DDIFFH='"/usr/local/libexec/2diffh"' -DPR='"/usr/bin/pr"' -c diffdir.c -o diffdir.o
--- diff.o ---
cc  -O2 -pipe  -Wno-error=return-type -fstack-protector-strong -fno-strict-aliasing  -DDIFF='"/usr/local/bin/2diff"' -DDIFFH='"/usr/local/libexec/2diffh"' -DPR='"/usr/bin/pr"' -c diff.c -o diff.o
--- diffreg.o ---
cc  -O2 -pipe  -Wno-error=return-type -fstack-protector-strong -fno-strict-aliasing  -DDIFF='"/usr/local/bin/2diff"' -DDIFFH='"/usr/local/libexec/2diffh"' -DPR='"/usr/bin/pr"' -c diffreg.c -o diffreg.o
--- diffh.o ---
cc  -O2 -pipe  -Wno-error=return-type -fstack-protector-strong -fno-strict-aliasing  -DDIFF='"/usr/local/bin/2diff"' -DDIFFH='"/usr/local/libexec/2diffh"' -DPR='"/usr/bin/pr"' -c diffh.c -o diffh.o
--- diffh ---
cc -O2 -pipe  -Wno-error=return-type -fstack-protector-strong -fno-strict-aliasing  -DDIFF='"/usr/local/bin/2diff"' -DDIFFH='"/usr/local/libexec/2diffh"' -DPR='"/usr/bin/pr"' -o diffh diffh.o   -fstack-protector-strong
--- diff ---
cc -O2 -pipe  -Wno-error=return-type -fstack-protector-strong -fno-strict-aliasing  -DDIFF='"/usr/local/bin/2diff"' -DDIFFH='"/usr/local/libexec/2diffh"' -DPR='"/usr/bin/pr"' -o diff diff.o diffdir.o diffreg.o   -fstack-protector-strong
===>  Staging for 2bsd-diff-2.11.1_1
===>   Generating temporary packing list
install  -s -m 555 diff  /usr/ports/textproc/2bsd-diff/work/stage/usr/local/bin/2diff
install  -s -m 555 diffh /usr/ports/textproc/2bsd-diff/work/stage/usr/local/libexec/2diffh
install  -m 444     ../../man/man1/diff.1 /usr/ports/textproc/2bsd-diff/work/stage/usr/local/man/man1/2diff.1
====> Compressing man pages (compress-man)
root@freebsd:/usr/ports/textproc/2bsd-diff # md5 files/*
MD5 (files/kk) = bb33944647f4644c0ebc198eeeba613c
MD5 (files/patch-Makefile) = 2817cec02267ecd52bdcd746d89477f4
MD5 (files/patch-diff.1) = 2c56623747a29308e9284b69d34912e0
MD5 (files/patch-diff.c) = b90d516c7d1a615c5fd2b43b8da8ed09
MD5 (files/patch-diff.h) = 728c7ed14f83a53a9f35a39b6bbf7c06
MD5 (files/patch-diffdir.c) = 8ad9eae675d71a63dcb881e0f4ef5e89
MD5 (files/patch-diffextern.h) = fe55e0dec1872c923af3ad8d254b467a
MD5 (files/patch-diffh.c) = 4f3a7c28f1085d2cd659122706a76cda
MD5 (files/patch-diffreg.c) = 5ec3de4524a00ff904a24e72307f84b8
Comment 1 Automation User 2020-08-26 01:38:15 UTC 
Build info is available at https://gitlab.com/swills/freebsd-ports/pipelines/181989884
Comment 2 Fernando Apesteguía freebsd_committer freebsd_triage 2020-08-26 07:37:09 UTC 
^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field.
^Triage: Please set the maintainer-approval attachment flag (to +) on patches for ports you maintain to signify approval.
--
Attachment -> Details -> maintainer-approval [+]

Q/A: PORTREVISION should be removed

Thanks!
Comment 3 commit-hook freebsd_committer freebsd_triage 2020-09-04 02:43:02 UTC 
A commit references this bug:

Author: swills
Date: Fri Sep  4 02:42:29 UTC 2020
New revision: 547506
URL: https://svnweb.freebsd.org/changeset/ports/547506

Log:
  textproc/2bsd-diff: Update to 2.11.1

  PR:		248921
  Submitted by:	risner <risner@stdio.com> (maintainer)

Changes:
  head/textproc/2bsd-diff/Makefile
  head/textproc/2bsd-diff/files/patch-diffdir.c
  head/textproc/2bsd-diff/files/patch-diffextern.h
  head/textproc/2bsd-diff/files/patch-diffreg.c
Comment 4 Steve Wills freebsd_committer freebsd_triage 2020-09-04 02:43:38 UTC 
Committed, thanks!