aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2002-08-08 22:22:50 +0800
committerume <ume@FreeBSD.org>2002-08-08 22:22:50 +0800
commitfd3c6f3d0ab1e5578289a2b9db29e7b3837639db (patch)
tree8fa5cfe833aac917005c97405a04c07a801e9513
parent482b559e8855e72eb398520303253d0b8854d257 (diff)
downloadfreebsd-ports-gnome-fd3c6f3d0ab1e5578289a2b9db29e7b3837639db.tar.gz
freebsd-ports-gnome-fd3c6f3d0ab1e5578289a2b9db29e7b3837639db.tar.zst
freebsd-ports-gnome-fd3c6f3d0ab1e5578289a2b9db29e7b3837639db.zip
Correct installation of docs.
-rw-r--r--security/cyrus-sasl2/Makefile11
-rw-r--r--security/cyrus-sasl2/pkg-plist4
2 files changed, 9 insertions, 6 deletions
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index e812d37c448a..3938547f5562 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -135,13 +135,16 @@ post-install:
${INSTALL} -d -m 770 -o cyrus -g cyrus /var/state/saslauthd
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}/html
.for file in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
- (cd ${WRKSRC}/doc ; \
- for file in `make -V EXTRA_DIST` ; do \
- ${INSTALL_DATA} ${WRKSRC}/doc/$${file} ${DOCSDIR} ; \
- done)
+.for file in ${DOC2}
+ @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.endfor
+.for file in ${HTDOCS}
+ @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}/html
+.endfor
.endif
@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${CAT} ${PKGMESSAGE}
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index 74216f9896ab..a4f7b7087b0d 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -83,10 +83,10 @@ sbin/saslpasswd2
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/sasl2
@mode ug=rwx,o=
-@exec mkdir -p state/saslauthd
+@exec mkdir -p /var/state/saslauthd
@exec chown -R cyrus:cyrus state
@exec chmod -R o= state
@comment This file gets created by the state/saslauthd program
@unexec rm -fr /var/state/saslauthd
-@dirrm state
+@unexec rmdir /var/state
@cwd %%PREFIX%%