diff options
| -rw-r--r-- | net/nss-pam-ldapd/Makefile | 4 | ||||
| -rw-r--r-- | net/nss-pam-ldapd/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | net/nss-pam-ldapd/files/pkg-message.in | 2 | ||||
| -rw-r--r-- | net/nss-pam-ldapd/pkg-plist | 10 |
4 files changed, 17 insertions, 10 deletions
diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile index 883f1d1e1360..03ec62797809 100644 --- a/net/nss-pam-ldapd/Makefile +++ b/net/nss-pam-ldapd/Makefile @@ -3,6 +3,7 @@ PORTNAME= nss-pam-ldapd PORTVERSION= 0.8.14 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \ http://mirrors.rit.edu/zi/ @@ -111,10 +112,7 @@ post-configure: show-pkgmessage:: @${ECHO_CMD}; ${CAT} ${PKGMESSAGE} | ${FMT} 75 79; ${ECHO_CMD} -# 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 ${STAGEDIR}${PREFIX}/etc/nslcd.conf.sample .if ${PORT_OPTIONS:MNSS} @${LN} -fs nss_ldap.so.${NSS_LDAP_SHMAJOR} ${STAGEDIR}${PREFIX}/lib/nss_ldap.so .endif diff --git a/net/nss-pam-ldapd/files/patch-Makefile.in b/net/nss-pam-ldapd/files/patch-Makefile.in new file mode 100644 index 000000000000..aca8f7a983fc --- /dev/null +++ b/net/nss-pam-ldapd/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- ./Makefile.in.orig 2014-06-09 14:12:14.000000000 +0200 ++++ ./Makefile.in 2014-06-09 14:12:30.000000000 +0200 +@@ -849,7 +849,7 @@ + echo "$(DESTDIR)$(NSLCD_CONF_PATH) already exists, install will not overwrite"; \ + else \ + $(mkinstalldirs) `dirname $(DESTDIR)$(NSLCD_CONF_PATH)`; \ +- $(INSTALL) -m 600 $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH); \ ++ $(INSTALL) -m 600 $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH).sample; \ + fi + uninstall-nslcd_conf: + -rm -f $(DESTDIR)$(NSLCD_CONF_PATH) diff --git a/net/nss-pam-ldapd/files/pkg-message.in b/net/nss-pam-ldapd/files/pkg-message.in index 613dda8ea2b7..68e00e60f396 100644 --- a/net/nss-pam-ldapd/files/pkg-message.in +++ b/net/nss-pam-ldapd/files/pkg-message.in @@ -15,7 +15,7 @@ To start nslcd add nslcd_enable="YES" to /etc/rc.conf and run: If you also want to supervise the nslcd daemon add nslcd_supervisor="YES" to rc.conf as well. -NOTE: supervision requires FreeBSD 9.1 or greater. +NOTE: supervision requires FreeBSD 8.4, 9.1 or greater. See the comments in %%PREFIX%%/etc/rc.d/nslcd for additional tunables. ===================================================================== diff --git a/net/nss-pam-ldapd/pkg-plist b/net/nss-pam-ldapd/pkg-plist index 3f427ba1e74b..8e6435bfcad6 100644 --- a/net/nss-pam-ldapd/pkg-plist +++ b/net/nss-pam-ldapd/pkg-plist @@ -1,11 +1,9 @@ -@unexec if cmp -s %D/etc/%%CONFIG%%.sample %D/etc/%%CONFIG%%; then rm -f %D/etc/%%CONFIG%%; fi -etc/%%CONFIG%%.sample +@sample 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%% +%%NSLCD%%man/man5/nslcd.conf.5.gz +%%NSLCD%%man/man8/nslcd.8.gz %%PAM%%man/man8/pam_ldap.8.gz -@exec if [ ! -f %D/etc/%%CONFIG%% ]; then cp -p %D/etc/%%CONFIG%%.sample %D/etc/%%CONFIG%%; fi +%%NSLCD%%sbin/nslcd |