cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some manpages were in the wrong subpackage; move to the correct one

Browse Source 
and update @conflict.

This is an old bug, but only noticed after the switch to mandoc which
means that rather than rendering the manuals with groff (dereferencing
symlinks *before* packaging, so all files were present), the files
were installed directly, resulting in symlinks in the package. This
resulted in -client having symlinks to files which are in -main,
causing problems with pkg_add -u as reported by aja@.
This commit is contained in:
sthen 2017-06-19 09:12:04 +00:00
parent 4209be100c
commit 45533ce218
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/openldap/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.153 2017/06/17 00:42:37 schwarze Exp $
# $OpenBSD: Makefile,v 1.154 2017/06/19 09:12:04 sthen Exp $
DPB_PROPERTIES = parallel
@ -8,7 +8,7 @@ COMMENT-server = open-source LDAP software (server)
DISTNAME = openldap-2.4.45
PKGNAME-main = ${DISTNAME:S/-/-client-/}
PKGNAME-server = ${DISTNAME:S/-/-server-/}
REVISION = 0
REVISION = 1
# overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}

5
databases/openldap/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.9 2014/03/16 19:43:59 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.10 2017/06/19 09:12:04 sthen Exp $
bin/ldapadd
@bin bin/ldapcompare
@bin bin/ldapdelete
@ -224,9 +224,6 @@ lib/libldap_r.la
@man man/man3/ldap_value_free_len.3
@man man/man5/ldap.conf.5
@man man/man5/ldif.5
@man man/man5/slapd-mdb.5
@man man/man5/slapo-pbind.5
@man man/man5/slapo-sock.5
share/examples/openldap/
@sample ${SYSCONFDIR}/openldap/
share/examples/openldap/ldap.conf

7
databases/openldap/pkg/PLIST-server
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST-server,v 1.20 2016/06/29 16:14:38 espie Exp $
@comment $OpenBSD: PLIST-server,v 1.21 2017/06/19 09:12:04 sthen Exp $
@option is-branch
@conflict openldap-client->=2.3.11,<=2.3.11p3
@conflict openldap-client-<=2.4.45p0
@pkgpath databases/openldap,-server,bdb
@ask-update openldap-server-<2.4 Make sure your existing database is backed up
@newgroup _openldap:544
@ -13,6 +13,7 @@
@man man/man5/slapd-ldap.5
@man man/man5/slapd-ldbm.5
@man man/man5/slapd-ldif.5
@man man/man5/slapd-mdb.5
@man man/man5/slapd-meta.5
@man man/man5/slapd-monitor.5
@man man/man5/slapd-ndb.5
@ -37,11 +38,13 @@
@man man/man5/slapo-dyngroup.5
@man man/man5/slapo-dynlist.5
@man man/man5/slapo-memberof.5
@man man/man5/slapo-pbind.5
@man man/man5/slapo-pcache.5
@man man/man5/slapo-ppolicy.5
@man man/man5/slapo-refint.5
@man man/man5/slapo-retcode.5
@man man/man5/slapo-rwm.5
@man man/man5/slapo-sock.5
@man man/man5/slapo-sssvlv.5
@man man/man5/slapo-syncprov.5
@man man/man5/slapo-translucent.5