diff options
| author | wxs <wxs@FreeBSD.org> | 2012-02-06 10:47:25 +0800 |
|---|---|---|
| committer | wxs <wxs@FreeBSD.org> | 2012-02-06 10:47:25 +0800 |
| commit | 88ad36e4a430640f4668865a9fee3ad4ce71f1d5 (patch) | |
| tree | ca6995edd1617fcd109addafda6adad83db401d4 | |
| parent | 58b02e6e2a36d650a652ff2fe75cc49ce8802a7a (diff) | |
| download | freebsd-ports-graphics-88ad36e4a430640f4668865a9fee3ad4ce71f1d5.tar.gz freebsd-ports-graphics-88ad36e4a430640f4668865a9fee3ad4ce71f1d5.tar.zst freebsd-ports-graphics-88ad36e4a430640f4668865a9fee3ad4ce71f1d5.zip | |
If you used LDAP and NOPORTDOCS then the documentation directory would be
left behind on install. The upstream Makefile would create the directory
and put sudoers2ldif there, but pkg-plist would not register it properly.
This fix moves sudoers2ldif to 'bin' since it isn't really documentation.
It's installation is still controlled by the LDAP knob though.
Spotted by: scheidell@
| -rw-r--r-- | security/sudo/Makefile | 1 | ||||
| -rw-r--r-- | security/sudo/pkg-plist | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/security/sudo/Makefile b/security/sudo/Makefile index 569f6b2fbab..9c1a0714280 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -94,6 +94,7 @@ post-patch: @${REINPLACE_CMD} -E '/install-(binaries|noexec):/,/^$$/ \ s/\$$\(INSTALL\)/& ${STRIP}/;s/-b\~/-b ~/' \ ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's,$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(docdir),$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(bindir),' ${WRKSRC}/plugins/sudoers/Makefile.in .if defined(NOPORTDOCS) @${REINPLACE_CMD} -e 's/mkinstalldirs $$(DESTDIR)$$(docdir)/mkinstalldirs/' \ ${WRKSRC}/doc/Makefile.in diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist index 05e58ddf0f1..1471274553b 100644 --- a/security/sudo/pkg-plist +++ b/security/sudo/pkg-plist @@ -11,6 +11,7 @@ include/sudo_plugin.h libexec/sudo_noexec.so libexec/sudoers.so sbin/visudo +%%LDAP%%bin/sudoers2ldif %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/HISTORY @@ -27,7 +28,6 @@ sbin/visudo %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.OpenLDAP %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.iPlanet %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.ActiveDirectory -%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/sudoers2ldif %%NLS%%share/locale/da/LC_MESSAGES/sudo.mo %%NLS%%share/locale/da/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/eo/LC_MESSAGES/sudo.mo |