o Add NOPORTDOCS support

o Be more graceful with install/deinstall: handle situation
  where man/ru_RU.KOI8-R exists prior to installation of this port,
  i.e., it cannot be a symlink
o Protect configuration file with perms 0400

This is a followup commit to the following PR

PR:		29024

3 files changed, 33 insertions, 18 deletions

diff --git a/sysutils/ipa/Makefile b/sysutils/ipa/Makefile
index 4c622a3c1815..f76c1ab9747a 100644
--- a/sysutils/ipa/Makefile
+++ b/sysutils/ipa/Makefile
@@ -14,6 +14,9 @@ MAINTAINER=	simon@simon.org.ua
 
 NO_PACKAGE=	"Needs to be built uniquely for each site"
 ALL_TARGET=	FreeBSD
+.ifdef(NOPORTDOCS)
+MAKE_ENV=	NOPORTDOCS="${NOPORTDOCS}"
+.endif
 
 MAN5=		ipa.5 ipa.conf.5
 MAN8=		ipa.8 ipastat.8
@@ -23,4 +26,7 @@ post-patch:
 	@${PERL} -pi -ne "s|/usr/local/|${PREFIX}/|" \
 		${WRKSRC}/Makefile
 
+post-install:
+	${CHMOD} 0400 ${PREFIX}/etc/ipa.conf.default
+
 .include <bsd.port.mk>
diff --git a/sysutils/ipa/files/patch-aa b/sysutils/ipa/files/patch-aa
index 27c91dcce5cd..d7314b7d5048 100644
--- a/sysutils/ipa/files/patch-aa
+++ b/sysutils/ipa/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Jul 16 15:15:34 2001
-+++ Makefile	Tue Jul 31 14:36:48 2001
+--- Makefile.orig	Tue Jul 31 15:20:30 2001
++++ Makefile	Tue Jul 31 15:29:30 2001
 @@ -38,7 +38,7 @@
  #	-O3   - optimize (it seems that -O3 also help to find out some errors);
  #	-g    - produce debugging information.
@@ -18,7 +18,7 @@
  
  #
  # IP6FW (FreeBSD only)
-@@ -204,25 +204,25 @@
+@@ -204,10 +204,10 @@
  	@${ECHO}
  .else
  	@${ECHO} ">> Installing binaries, manual pages and miscellaneous files"
@@ -27,37 +27,45 @@
  	${CHMOD} u+s ${DSTBINDIR}/ipastat
 -	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
 -	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
++	${BSD_INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
++	${BSD_INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
  .if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man5)
  	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_SU.KOI8-R/man5
  .endif
- .if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man8)
- 	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_SU.KOI8-R/man8
+@@ -216,13 +216,22 @@
  .endif
-+	${BSD_INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
-+	${BSD_INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
  .if !exists(${DSTMANDIR}/ru_RU.KOI8-R)
  	${LN} -s ${DSTMANDIR}/ru_SU.KOI8-R ${DSTMANDIR}/ru_RU.KOI8-R
++.else
++.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man5)
++	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_RU.KOI8-R/man5
++.endif
++.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man8)
++	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_RU.KOI8-R/man8
++.endif
++.endif
++	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
++	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
++.if !defined(NOPORTDOCS)
++	${INSTALL} -d -m 0555 ${DSTSHAREDIR}
++	${BSD_INSTALL_DATA} examples/* ${DSTSHAREDIR}
  .endif
 -	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
 -	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
 -	${INSTALL} -d -m 0555 ${DSTSHAREDIR}/examples
 -	${INSTALL} -c -g wheel -o root -m 0444 examples/* ${DSTSHAREDIR}/examples
-+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
-+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
-+	${INSTALL} -d -m 0555 ${DSTSHAREDIR}
-+	${BSD_INSTALL_DATA} examples/* ${DSTSHAREDIR}
  .if exists(${DSTRCDIR})
 -	${INSTALL} -c -g wheel -o root -m 0500 etc/ipa.sh.sample ${DSTRCDIR}
 +	${BSD_INSTALL_DATA} etc/ipa.sh.sample ${DSTRCDIR}
  .else
  	@${ECHO}
  	@${ECHO} ">> Can't find directory ${DSTRCDIR}, skip installing of ipa.sh.sample"
-@@ -230,7 +230,7 @@
+@@ -230,7 +239,7 @@
  	@${ECHO}
  .endif
  .if exists(${DSTETCDIR})
 -	${INSTALL} -c -g wheel -o root -m 0400 etc/ipa.conf.default ${DSTETCDIR}
-+	${BSD_INSTALL_DATA} -c -g wheel -o root -m 0400 etc/ipa.conf.default ${DSTETCDIR}
++	${BSD_INSTALL_DATA} etc/ipa.conf.default ${DSTETCDIR}
  .else
  	@${ECHO}
  	@${ECHO} ">> Can't find directory ${DSTETCDIR}, skip installing of ipa.conf.default"
diff --git a/sysutils/ipa/pkg-plist b/sysutils/ipa/pkg-plist
index 2ed139400494..cb05c2786afa 100644
--- a/sysutils/ipa/pkg-plist
+++ b/sysutils/ipa/pkg-plist
@@ -3,8 +3,9 @@ bin/ipastat
 etc/ipa.conf.default
 @unexec if [ -f %D/etc/rc.d/ipa.sh ]; then cmp -s %D/etc/rc.d/ipa.sh.sample %D/etc/rc.d/ipa.sh && rm -f %D/etc/rc.d/ipa.sh || echo "If you are permanently removing this port, you should do a ``rm ${PKG_PREFIX}/etc/rc.d/ipa.sh`` to remove startup files left." | fmt ; fi
 etc/rc.d/ipa.sh.sample
-share/examples/ipa/README
-share/examples/ipa/example-1
-share/examples/ipa/example-2
-@dirrm share/examples/ipa
-@unexec rmdir %D/man/ru_SU.KOI8-R/man8 %D/man/ru_SU.KOI8-R/man5 %D/man/ru_SU.KOI8-R && rm %D/man/ru_RU.KOI8-R || true
+%%PORTDOCS%%share/examples/ipa/README
+%%PORTDOCS%%share/examples/ipa/example-1
+%%PORTDOCS%%share/examples/ipa/example-2
+%%PORTDOCS%%@dirrm share/examples/ipa
+@unexec rmdir %D/man/ru_SU.KOI8-R/man8 %D/man/ru_SU.KOI8-R/man5 %D/man/ru_SU.KOI8-R 2>/dev/null || true
+@unexec if [ -L %D/man/ru_RU.KOI8-R ]; then rm %D/man/ru_RU.KOI8-R 2>/dev/null || true; else rmdir %D/man/ru_RU.KOI8-R/man8 %D/man/ru_RU.KOI8-R/man5 %D/man/ru_RU.KOI8-R && rm %D/man/ru_RU.KOI8-R 2>/dev/null || true ; fi