Page MenuHomeFreeBSD
Differential D9489

Unbreak multimedia/assimp on armv6 and aarch64
ClosedPublic
Actions

Authored by krion on Feb 8 2017, 2:04 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 18 2025, 11:26 PM
Unknown Object (File)
Feb 18 2025, 6:50 PM
Unknown Object (File)
Feb 5 2025, 7:21 AM
Unknown Object (File)
Dec 2 2024, 1:18 PM
Unknown Object (File)
Nov 26 2024, 7:31 AM
Unknown Object (File)
Nov 21 2024, 11:31 AM
Unknown Object (File)
Nov 21 2024, 11:31 AM
Unknown Object (File)
Nov 21 2024, 11:31 AM
View All 85 Files
Subscribers
None

Details

Reviewers
fjoe
mat
Commits
rP433750: Unbreak multimedia/assimp on armv6 and aarch64
Summary

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216815

Approved by maintainer.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 7277
Build 7445: arc lint + arc unit

Event Timeline

krion updated this revision to Diff 24874.Feb 8 2017, 2:04 PM
krion retitled this revision from to Unbreak multimedia/assimp on armv6 and aarch64.
krion updated this object.
krion edited the test plan for this revision. (Show Details)
krion added reviewers: mat, fjoe.
mat accepted this revision.Feb 9 2017, 4:56 PM
mat edited edge metadata.
This revision is now accepted and ready to land.Feb 9 2017, 4:56 PM
Closed by commit rP433750: Unbreak multimedia/assimp on armv6 and aarch64 (authored by krion). · Explain WhyFeb 9 2017, 5:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
multimedia/
assimp/
3 lines
files/
32 lines

Diff 24874

View Options

multimedia/assimp/Makefile

Show All 14 Lines
# #
# This replaces the old pattern: # This replaces the old pattern:
# @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi # @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
# etc/pkgtools.conf.sample # etc/pkgtools.conf.sample
# @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf # @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
actions: [file(1)] actions: [file(1)]
arguments: true arguments: true
post-install: <<EOD post-install-lua: <<EOS
case "%1" in sample_file = pkg.prefixed_path("%1", "%D")
/*) sample_file="%1" ;; _,n = string.gsub("%@", "%S+","")
*) sample_file="%D/%1" ;; if n == 2 then
esac target_file = pkg.prefixed_path("%1", "%D")
target_file="${sample_file%.sample}"
set -- %@
if [ $# -eq 2 ]; then
target_file=${2}
fi
case "${target_file}" in
/*) target_file="${target_file}" ;;
*) target_file="%D/${target_file}" ;;
esac
if ! [ -f "${target_file}" ]; then
/bin/cp -p "${sample_file}" "${target_file}"
fi
EOD
pre-deinstall: <<EOD
case "%1" in
/*) sample_file="%1" ;;
*) sample_file="%D/%1" ;;
esac
target_file="${sample_file%.sample}"
set -- %@
if [ $# -eq 2 ]; then
set -- %@
target_file=${2}
fi
case "${target_file}" in
/*) target_file="${target_file}" ;;
*) target_file="%D/${target_file}" ;;
esac
if cmp -s "${target_file}" "${sample_file}"; then
rm -f "${target_file}"
else else
echo "You may need to manually remove ${target_file} if it is no longer needed." target_file = string.gsub(sample_file,'%.sample$', "")
fi end
EOD outh = io.open(target_file, "r")
matUnsubmitted
Done
Inline Actions

There is so much magic going on here.

What is %@ ? What is %S+ ? I looked at pkg-lua-script(5) and it does not appear in it.

mat: There is so much magic going on here. What is `%@` ? What is `%S+` ? I looked at pkg-lua…
manuUnsubmitted
Done
Inline Actions

I copied the gsub from the old review but a simple test on %# will be enough. I'll update the code.

manu: I copied the gsub from the old review but a simple test on %# will be enough. I'll update the…
if outh ~= nil then
io.close(outh)
return
end
outh = io.open(target_file, "w+")
for line in io.lines(sample_file) do
outh:write(line, "\n")
end
matUnsubmitted
Done
Inline Actions

This is not what the script was doing before.

The script copies the .sample to the destination file if the destination file does not exist. There is absolutely no comparison involved. There should be a pkg.fileexists or something.

mat: This is not what the script was doing before. The script copies the .sample to the destination…
manuUnsubmitted
Done
Inline Actions

This is exactly what it does too.
Sure there is a "useless" cmp, I can see to add a fileexist (or use of the lua os. function maybe)

manu: This is exactly what it does too. Sure there is a "useless" cmp, I can see to add a fileexist…
io.close(outh)
EOS
pre-deinstall-lua: <<EOS
sample_file = pkg.prefixed_path("%1")
_,n = string.gsub("%@", "%S+","")
if n == 2 then
target_file = pkg.prefixed_path("%1")
else
target_file = string.gsub(sample_file, '%.sample$', "")
end
outh = io.open(target_file, "r")
inh = io.open(sample_file, "r")
sizeout = outh:seek("end")
sizein = inh:seek("end")
if sizeout ~= sizein then
pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
return
end
inh:seek("set", 0)
outh:seek("set", 0)
linein = inh:read("l")
lineout = outh:read("l")
while (linein == lineout and linein ~= nil and lineout ~= nil) do
linein = inh:read("l")
lineout = outh:read("l")
end
io.close(inh)
io.close(outh)
if linein == lineout then
os.remove(target_file)
else
pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
end
EOS
View Options

multimedia/assimp/files/patch-code_BlenderDNA.cpp

Show All 14 Lines
# #
# This replaces the old pattern: # This replaces the old pattern:
# @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi # @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
# etc/pkgtools.conf.sample # etc/pkgtools.conf.sample
# @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf # @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf
actions: [file(1)] actions: [file(1)]
arguments: true arguments: true
post-install: <<EOD post-install-lua: <<EOS
case "%1" in sample_file = pkg.prefixed_path("%1", "%D")
/*) sample_file="%1" ;; _,n = string.gsub("%@", "%S+","")
*) sample_file="%D/%1" ;; if n == 2 then
esac target_file = pkg.prefixed_path("%1", "%D")
target_file="${sample_file%.sample}"
set -- %@
if [ $# -eq 2 ]; then
target_file=${2}
fi
case "${target_file}" in
/*) target_file="${target_file}" ;;
*) target_file="%D/${target_file}" ;;
esac
if ! [ -f "${target_file}" ]; then
/bin/cp -p "${sample_file}" "${target_file}"
fi
EOD
pre-deinstall: <<EOD
case "%1" in
/*) sample_file="%1" ;;
*) sample_file="%D/%1" ;;
esac
target_file="${sample_file%.sample}"
set -- %@
if [ $# -eq 2 ]; then
set -- %@
target_file=${2}
fi
case "${target_file}" in
/*) target_file="${target_file}" ;;
*) target_file="%D/${target_file}" ;;
esac
if cmp -s "${target_file}" "${sample_file}"; then
rm -f "${target_file}"
else else
echo "You may need to manually remove ${target_file} if it is no longer needed." target_file = string.gsub(sample_file,'%.sample$', "")
fi end
EOD outh = io.open(target_file, "r")
matUnsubmitted
Done
Inline Actions

There is so much magic going on here.

What is %@ ? What is %S+ ? I looked at pkg-lua-script(5) and it does not appear in it.

mat: There is so much magic going on here. What is `%@` ? What is `%S+` ? I looked at pkg-lua…
manuUnsubmitted
Done
Inline Actions

I copied the gsub from the old review but a simple test on %# will be enough. I'll update the code.

manu: I copied the gsub from the old review but a simple test on %# will be enough. I'll update the…
if outh ~= nil then
io.close(outh)
return
end
outh = io.open(target_file, "w+")
for line in io.lines(sample_file) do
outh:write(line, "\n")
end
matUnsubmitted
Done
Inline Actions

This is not what the script was doing before.

The script copies the .sample to the destination file if the destination file does not exist. There is absolutely no comparison involved. There should be a pkg.fileexists or something.

mat: This is not what the script was doing before. The script copies the .sample to the destination…
manuUnsubmitted
Done
Inline Actions

This is exactly what it does too.
Sure there is a "useless" cmp, I can see to add a fileexist (or use of the lua os. function maybe)

manu: This is exactly what it does too. Sure there is a "useless" cmp, I can see to add a fileexist…
io.close(outh)
EOS
pre-deinstall-lua: <<EOS
sample_file = pkg.prefixed_path("%1")
_,n = string.gsub("%@", "%S+","")
if n == 2 then
target_file = pkg.prefixed_path("%1")
else
target_file = string.gsub(sample_file, '%.sample$', "")
end
outh = io.open(target_file, "r")
inh = io.open(sample_file, "r")
sizeout = outh:seek("end")
sizein = inh:seek("end")
if sizeout ~= sizein then
pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
return
end
inh:seek("set", 0)
outh:seek("set", 0)
linein = inh:read("l")
lineout = outh:read("l")
while (linein == lineout and linein ~= nil and lineout ~= nil) do
linein = inh:read("l")
lineout = outh:read("l")
end
io.close(inh)
io.close(outh)
if linein == lineout then
os.remove(target_file)
else
pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
end
EOS