- Switch to options helpers

2 files changed, 8 insertions, 9 deletions

diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
index c4a0eabae962..01289dbe9019 100644
--- a/mail/pymsgauth/Makefile
+++ b/mail/pymsgauth/Makefile
@@ -21,8 +21,8 @@ NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 
-DOCS=		BUGS CHANGELOG pymsgauth.txt pymsgauth.html
-EXAMPLES=	pymsgauthrc-example
+PORTDOCS=	BUGS CHANGELOG pymsgauth.txt pymsgauth.html
+PORTEXAMPLES=	pymsgauthrc-example
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
@@ -33,9 +33,13 @@ do-install:
 .for f in clean confirm mail
 	${LN} -sf ${DATADIR}/pymsgauth-${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/pymsgauth/pkg-plist b/mail/pymsgauth/pkg-plist
index 9f4cf571c066..020a52237a54 100644
--- a/mail/pymsgauth/pkg-plist
+++ b/mail/pymsgauth/pkg-plist
@@ -6,8 +6,3 @@ bin/pymsgauth-mail
 %%DATADIR%%/pymsgauth-clean
 %%DATADIR%%/pymsgauth-confirm
 %%DATADIR%%/pymsgauth-mail
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/pymsgauth.html
-%%PORTDOCS%%%%DOCSDIR%%/pymsgauth.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pymsgauthrc-example