security/nss reduce the duplicated 'nss' in include and lib path
ClosedPublic
Actions

Authored by lwhsu on Jan 30 2020, 5:16 AM.

Details

Reviewers

jbeich

Group Reviewers

gecko

Commits

rP525484: Reduce the duplicated 'nss' in include and lib path

Summary

security/nss installs header and lib files to ${PREFIX}/include/nss/nss and
${PREFIX}/include/nss which add some difficulty of porting some softwares.

For example, recently I got some path issues when updating security/xmlsec1

Also the extra 'nss' in the path seems not very useful.

Test Plan

poudriere tested the ports directly depends on security/nss:

archivers/rpm4
databases/evolution-data-server
devel/apr1
devel/apr2
devel/electron4
devel/electron6
devel/kronosnet
editors/libreoffice
editors/openoffice-4
editors/openoffice-devel
editors/vscode
ftp/curl
graphics/poppler
irc/bitlbee
mail/evolution
mail/evolution-ews
mail/thunderbird
net-im/folks
net-im/libpurple
net-im/pidgin-sipe
net/ceph12
net/ceph13
net/ceph14
net/chrony
net/corosync2
security/ca_root_nss
security/libfprint
security/nss
security/nss_compat_ossl
security/pidgin-encryption
security/py-python-nss
security/sssd
security/suricata
security/suricata5
security/xmlsec1
sysutils/cinnamon-settings-daemon
sysutils/gnome-settings-daemon
sysutils/mate-settings-daemon
sysutils/nut
sysutils/pesign
www/chromium
www/cliqz
www/epiphany
www/firefox
www/firefox-esr
www/iridium
www/qt5-webengine

Diff Detail

Repository

rP FreeBSD ports repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

lwhsu created this revision.Jan 30 2020, 5:16 AM

Herald added a subscriber: mat. · View Herald TranscriptJan 30 2020, 5:17 AM

Harbormaster completed remote builds in B29033: Diff 67492.Jan 30 2020, 5:17 AM

Did you test non-default consumers? For example, devel/apr1, ftp/curl, etc. require enabling NSS option.

security/nss/files/nss-config.in
104 ↗	(On Diff #67492)	/usr/local/include/nss/nss no longer exists.
107 ↗	(On Diff #67492)	/usr/local/lib/nss no longer exists.
127 ↗	(On Diff #67492)	Drop `-I$includedir/nss` or adjust `includedir` value.
security/nss/pkg-descr
7 ↗	(On Diff #67492)	Can you land this under `portmgr blanket` as a separate commit? Also, that URL redirects to https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS but you probably want to drop `/en-US` part in case a translated version is available.

Address comments from @jbeich

Harbormaster completed remote builds in B29223: Diff 67914.Feb 7 2020, 10:08 AM

lwhsu marked 2 inline comments as done.Feb 7 2020, 10:13 AM

lwhsu added inline comments.

security/nss/files/nss-config.in
127 ↗	(On Diff #67492)	I tested drop `-I$includedir/nss` but it makes some software doesn't build. They directly write `#include` without `nss`. Also `pkgconf --cflags nss` has similar output.

In D23424#515733, @jbeich wrote:

Did you test non-default consumers? For example, devel/apr1, ftp/curl, etc. require enabling NSS option.

Yes they are in the list of the fist comment. I tested them with NSS option enabled. 3 of them need path adjustment (net-im/libpurple , security/pidgin-encryption , security/py-python-nss ) and 2 of them mark IGNORE or BROKEN with NSS before this change (sysutils/nut, net/chrony), others build fine.

lwhsu mentioned this in D23552: Followup patch for security/nss installation path modification in D23424.Feb 7 2020, 10:22 AM

The patch for 3 ports need path adjustment is at D23552

Thanks. include/nss/nss/ appeared after rP78824 which failed to adjust do-install. Arch, Debian, Gentoo, OpenBSD use include/nss/, Fedora uses include/nss3/, NetBSD/PkgSrc uses include/nss/nss/.