kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net/openldap2[456]-server: Fix paths for argsfile and pidfile.

Browse source 
The Makefile patches the slapd.conf file with a changed path for
the argsfile and pidfile, but the slapd.ldif file remains unchanged.
Fix this by patching the paths in the slapd.ldif file as well.

PR:		ports/261734
This commit is contained in:
Tom Warnke 2022-02-06 16:35:16 -08:00 committed by Xin LI
parent 2fd022b994
commit f677d84c0f
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/openldap24-server/Makefile
View file

@ -50,7 +50,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
.endif
PORTREVISION_CLIENT= 4
PORTREVISION_SERVER= 7
PORTREVISION_SERVER= 8
OPENLDAP_SHLIB_MAJOR= 2
OPENLDAP_SHLIB_MINOR= 11.7
OPENLDAP_MAJOR= ${DISTVERSION:R}
@ -573,6 +573,8 @@ CONTRIB_CLEANFILES+= smbk5pwd.a
post-patch:
@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf
@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.ldif
@${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \
-e 's|^CC =.*|CC = ${CC}|g' \
${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \

4
net/openldap25-server/Makefile
View file

@ -46,7 +46,7 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server ${PORTNAME}-server
GNU_CONFIGURE= yes
PORTREVISION_CLIENT= 0
PORTREVISION_SERVER= 0
PORTREVISION_SERVER= 1
OPENLDAP_SHLIB_MAJOR= 0
OPENLDAP_SHLIB_MINOR= 1.6
OPENLDAP_MAJOR= ${DISTVERSION:R}
@ -376,6 +376,8 @@ CONTRIB_CLEANFILES+= smbk5pwd.a
post-patch:
@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf
@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.ldif
@${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \
-e 's|^CC =.*|CC = ${CC}|g' \
${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \

4
net/openldap26-server/Makefile
View file

@ -46,7 +46,7 @@ CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-server ${PORTNAME}-server
GNU_CONFIGURE= yes
PORTREVISION_CLIENT= 0
PORTREVISION_SERVER= 0
PORTREVISION_SERVER= 1
OPENLDAP_SHLIB_MAJOR= 2
OPENLDAP_SHLIB_MINOR= 0.200
@ -374,6 +374,8 @@ CONTRIB_CLEANFILES+= smbk5pwd.a
post-patch:
@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf
@${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.ldif
@${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \
-e 's|^CC =.*|CC = ${CC}|g' \
${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \