2 files changed, 44 insertions, 43 deletions

diff --git a/security/bugs/Makefile b/security/bugs/Makefile
index 391f15ac9d87..c99208a7b035 100644
--- a/security/bugs/Makefile
+++ b/security/bugs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bugs
 PORTVERSION=	4.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.encryptsolutions.com/english/download/
 EXTRACT_SUFX=	.tgz
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Great cryptography library and sample programs
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+DOCSDIR=	${PREFIX}/${DISTNAME}/doc
 
 USE_GMAKE=	yes
 
@@ -40,7 +41,7 @@ pre-install:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${CP} -R ${WRKSRC}/doc ${PREFIX}/${DISTNAME}
+	${CP} -R ${WRKSRC}/doc ${DOCSDIR}
 .endif
 	${CP} -R ${WRKSRC}/include ${PREFIX}/${DISTNAME}
 	${STRIP_CMD} ${PREFIX}/${DISTNAME}/bchat \
diff --git a/security/bugs/pkg-plist b/security/bugs/pkg-plist
index a67d53d9b86d..ae2d837f0481 100644
--- a/security/bugs/pkg-plist
+++ b/security/bugs/pkg-plist
@@ -9,42 +9,42 @@ bugs-%%PORTVERSION%%/bpass
 bugs-%%PORTVERSION%%/bpassdel
 bugs-%%PORTVERSION%%/bunlock
 bugs-%%PORTVERSION%%/bugscrypt.a
-bugs-%%PORTVERSION%%/doc/CHANGES
-bugs-%%PORTVERSION%%/doc/HOWTO
-bugs-%%PORTVERSION%%/doc/README
-bugs-%%PORTVERSION%%/doc/index.html
-bugs-%%PORTVERSION%%/doc/cv/cv.html
-bugs-%%PORTVERSION%%/doc/cv/note.html
-bugs-%%PORTVERSION%%/doc/fulldoc/bssl.txt
-bugs-%%PORTVERSION%%/doc/fulldoc/bugs_intro.html
-bugs-%%PORTVERSION%%/doc/fulldoc/bugs_intro_main.html
-bugs-%%PORTVERSION%%/doc/fulldoc/bugs_intro_menu.html
-bugs-%%PORTVERSION%%/doc/fulldoc/bugs_tech.html
-bugs-%%PORTVERSION%%/doc/fulldoc/bugs_tech_main.html
-bugs-%%PORTVERSION%%/doc/fulldoc/bugs_tech_menu.html
-bugs-%%PORTVERSION%%/doc/fulldoc/contest2.txt
-bugs-%%PORTVERSION%%/doc/fulldoc/contest3.txt
-bugs-%%PORTVERSION%%/doc/fulldoc/dev_english.txt
-bugs-%%PORTVERSION%%/doc/fulldoc/dev_french.txt
-bugs-%%PORTVERSION%%/doc/fulldoc/history_unix.txt
-bugs-%%PORTVERSION%%/doc/fulldoc/history_win.txt
-bugs-%%PORTVERSION%%/doc/fulldoc/index.html
-bugs-%%PORTVERSION%%/doc/fulldoc/lib_hist.txt
-bugs-%%PORTVERSION%%/doc/fulldoc/images/2_1.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/2_2.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/2_3.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_1.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_10.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_11.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_2.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_3.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_4.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_5.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_6.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_7.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_8.gif
-bugs-%%PORTVERSION%%/doc/fulldoc/images/3_9.gif
-bugs-%%PORTVERSION%%/doc/history/old_french.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/HOWTO
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/cv/cv.html
+%%PORTDOCS%%%%DOCSDIR%%/cv/note.html
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/bssl.txt
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/bugs_intro.html
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/bugs_intro_main.html
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/bugs_intro_menu.html
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/bugs_tech.html
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/bugs_tech_main.html
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/bugs_tech_menu.html
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/contest2.txt
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/contest3.txt
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/dev_english.txt
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/dev_french.txt
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/history_unix.txt
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/history_win.txt
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/lib_hist.txt
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/2_1.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/2_2.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/2_3.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_1.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_10.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_11.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_2.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_3.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_4.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_5.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_6.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_7.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_8.gif
+%%PORTDOCS%%%%DOCSDIR%%/fulldoc/images/3_9.gif
+%%PORTDOCS%%%%DOCSDIR%%/history/old_french.txt
 bugs-%%PORTVERSION%%/include/bstandard.h
 bugs-%%PORTVERSION%%/include/extra.h
 bugs-%%PORTVERSION%%/include/fpos_t.h
@@ -55,10 +55,10 @@ bugs-%%PORTVERSION%%/include/seed.h
 bugs-%%PORTVERSION%%/include/shuffle.h
 bugs-%%PORTVERSION%%/include/utils.h
 bugs-%%PORTVERSION%%/include/wrapper.h
-@dirrm bugs-%%PORTVERSION%%/doc/fulldoc/images/
-@dirrm bugs-%%PORTVERSION%%/doc/fulldoc/
-@dirrm bugs-%%PORTVERSION%%/doc/cv
-@dirrm bugs-%%PORTVERSION%%/doc/history
-@dirrm bugs-%%PORTVERSION%%/doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fulldoc/images/
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fulldoc/
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/cv
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/history
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm bugs-%%PORTVERSION%%/include
 @dirrm bugs-%%PORTVERSION%%