Page MenuHomeFreeBSD

Use pkg_install.awk to support dirrmtry for pkg_install
ClosedPublic

Authored by antoine on Jun 12 2014, 10:31 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Sep 19, 5:00 AM
Unknown Object (File)
Tue, Sep 16, 6:08 PM
Unknown Object (File)
Mon, Sep 15, 11:56 AM
Unknown Object (File)
Aug 18 2025, 12:40 PM
Unknown Object (File)
Aug 4 2025, 6:48 AM
Unknown Object (File)
Jul 25 2025, 12:57 AM
Unknown Object (File)
Jul 21 2025, 12:08 PM
Unknown Object (File)
Jun 6 2025, 6:22 PM
Subscribers

Details

Reviewers
antoine
bapt
Group Reviewers
portmgr
Summary

this makes dirrmtry handling quite close to the pkg(8) support and will simplify tons of makefiles

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

bapt retitled this revision from to Use pkg_install.awk to support dirrmtry for pkg_install.
bapt updated this object.
bapt edited the test plan for this revision. (Show Details)

This is intrusive and would need an exp-run on pkg_install

mat added inline comments.
Mk/bsd.port.mk
1594

You can remove that line too, no ?

bapt edited edge metadata.

Remove now unnecessary line

Would be nice if someone could take that one for a pkg_install exp-run

ok i will baseline and exp-run pkg_install..

Keywords/pkg_install.awk
90

check-stagedir.sh expects some double quotes around the directory removed:

199                          awk_script=$(cat <<'EOF'
200                                  /Deinstall directory remove:/ {print $4}
201                                  /UNEXEC 'rmdir "[^"]*" 2>\/dev\/null \|\| true'/ {
202                                          gsub(/"%D\//, "\"", $0)
antoine added a reviewer: bapt.

take it

Put quotes around the removed dirs to preserve what was done previously

I will exp run with this new change tonight

  • @fontsdir was not getting directory
  • handle spaces in directories in @dirrmtry
  • Fix when PREFIX!=LOCALBASE, rmdir %D/%D was put in plist
  • Do not put some dirs belonging to python ports when PREFIX=LOCALBASE

Note: the patch will have to be exp-run with pkgng too because of the @unexec rmdir -> @dirrmtry changes
(it broke databases/py-sqlite3 for instance, but the python workaround fixes it when PREFIX=LOCALBASE)

This revision is now accepted and ready to land.Jun 20 2014, 8:58 PM