svn commit: r346906 - in head/net/nss-pam-ldapd: . files
Ryan Steinmetz
zi at FreeBSD.org
Mon Mar 3 14:36:31 UTC 2014
Author: zi
Date: Mon Mar 3 14:36:30 2014
New Revision: 346906
URL: http://svnweb.freebsd.org/changeset/ports/346906
QAT: https://qat.redports.org/buildarchive/r346906/
Log:
- Fix service command always returning 0 [1]
- Add STAGE support
PR: ports/187073 [1]
Submitted by: Derek Kulinski <takeda at takeda.tk> [1]
Modified:
head/net/nss-pam-ldapd/Makefile
head/net/nss-pam-ldapd/files/nslcd.in
head/net/nss-pam-ldapd/files/pkg-message.in
head/net/nss-pam-ldapd/pkg-plist (contents, props changed)
Modified: head/net/nss-pam-ldapd/Makefile
==============================================================================
--- head/net/nss-pam-ldapd/Makefile Mon Mar 3 14:35:22 2014 (r346905)
+++ head/net/nss-pam-ldapd/Makefile Mon Mar 3 14:36:30 2014 (r346906)
@@ -3,7 +3,7 @@
PORTNAME= nss-pam-ldapd
PORTVERSION= 0.8.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \
http://mirrors.rit.edu/zi/
@@ -49,7 +49,6 @@ CONFLICTS+= nss-pam-ldapd-sasl-[0-9]*
USERS= nslcd
GROUPS= nslcd
-NO_STAGE= yes
.include <bsd.port.options.mk>
CPPFLAGS+= -I${LOCALBASE}/include
@@ -78,7 +77,6 @@ CONFIGURE_ARGS+= --disable-sasl
CONFIGURE_ARGS+= --enable-pam \
--with-pam-seclib-dir=${PREFIX}/lib \
--with-pam-ldap-soname=pam_ldap.so.${PAM_LDAP_SHMAJOR}
-MAN8+= pam_ldap.8
CONFLICTS+= pam_ldap-1.*
PLIST_SUB+= PAM=""
.else
@@ -106,8 +104,6 @@ PLIST_SUB+= NSLCD="@comment "
.else
CONFIGURE_ARGS+= --enable-nslcd
PLIST_SUB+= NSLCD=""
-MAN5+= nslcd.conf.5
-MAN8+= nslcd.8
.endif
post-extract:
@@ -122,12 +118,12 @@ show-pkgmessage::
# We take care of the sample file, upstream install target installs the actual
# file if it does not exist yet.
post-install: show-pkgmessage
- @${INSTALL_DATA} ${WRKSRC}/nslcd.conf ${PREFIX}/etc/nslcd.conf.sample
+ @${INSTALL_DATA} ${WRKSRC}/nslcd.conf ${STAGEDIR}${PREFIX}/etc/nslcd.conf.sample
.if ${PORT_OPTIONS:MNSS}
- @${LN} -fs nss_ldap.so.${NSS_LDAP_SHMAJOR} ${PREFIX}/lib/nss_ldap.so
+ @${LN} -fs nss_ldap.so.${NSS_LDAP_SHMAJOR} ${STAGEDIR}${PREFIX}/lib/nss_ldap.so
.endif
.if ${PORT_OPTIONS:MPAM}
- @${LN} -fs pam_ldap.so.${PAM_LDAP_SHMAJOR} ${PREFIX}/lib/pam_ldap.so
+ @${LN} -fs pam_ldap.so.${PAM_LDAP_SHMAJOR} ${STAGEDIR}${PREFIX}/lib/pam_ldap.so
.endif
.include <bsd.port.mk>
Modified: head/net/nss-pam-ldapd/files/nslcd.in
==============================================================================
--- head/net/nss-pam-ldapd/files/nslcd.in Mon Mar 3 14:35:22 2014 (r346905)
+++ head/net/nss-pam-ldapd/files/nslcd.in Mon Mar 3 14:36:30 2014 (r346906)
@@ -62,6 +62,7 @@ nslcd_status()
echo "${name} is running with PID ${mypid}.";
else
echo "${name} not running?";
+ return 1
fi
}
Modified: head/net/nss-pam-ldapd/files/pkg-message.in
==============================================================================
--- head/net/nss-pam-ldapd/files/pkg-message.in Mon Mar 3 14:35:22 2014 (r346905)
+++ head/net/nss-pam-ldapd/files/pkg-message.in Mon Mar 3 14:36:30 2014 (r346906)
@@ -1,6 +1,10 @@
=====================================================================
-LDAP and nslcd daemon parameters should be set in %%CONFIG_FILE%%. When upgrading review %%CONFIG_FILE%%.sample for additional or changed parameters.
+LDAP and nslcd daemon parameters should be set in:
+%%CONFIG_FILE%%.
+
+When upgrading review %%CONFIG_FILE%%.sample for
+additional or changed parameters.
%%NSS_MESSAGE%%
Modified: head/net/nss-pam-ldapd/pkg-plist
==============================================================================
--- head/net/nss-pam-ldapd/pkg-plist Mon Mar 3 14:35:22 2014 (r346905)
+++ head/net/nss-pam-ldapd/pkg-plist Mon Mar 3 14:36:30 2014 (r346906)
@@ -1,8 +1,12 @@
+ at comment $FreeBSD$
@unexec if cmp -s %D/etc/%%CONFIG%%.sample %D/etc/%%CONFIG%%; then rm -f %D/etc/%%CONFIG%%; fi
etc/%%CONFIG%%.sample
%%NSS%%lib/nss_ldap.so
%%NSS%%lib/nss_ldap.so.%%NSS_LDAP_SHMAJOR%%
%%NSLCD%%sbin/nslcd
+%%NSLCD%%man/man8/nslcd.8.gz
+%%NSLCD%%man/man5/nslcd.conf.5.gz
%%PAM%%lib/pam_ldap.so
%%PAM%%lib/pam_ldap.so.%%PAM_LDAP_SHMAJOR%%
+%%PAM%%man/man8/pam_ldap.8.gz
@exec if [ ! -f %D/etc/%%CONFIG%% ]; then cp -p %D/etc/%%CONFIG%%.sample %D/etc/%%CONFIG%%; fi
More information about the svn-ports-all
mailing list