- Support staging

- Define EXAMPLES option
- Define DOCS option
- Convert USE_BZIP2=yes to USES=tar:bzip2

2 files changed, 12 insertions, 22 deletions

diff --git a/sysutils/mountsmb2/Makefile b/sysutils/mountsmb2/Makefile
index 6eac689dfe71..43a6bfff2d80 100644
--- a/sysutils/mountsmb2/Makefile
+++ b/sysutils/mountsmb2/Makefile
@@ -13,24 +13,24 @@ COMMENT=	SMB/CIFS shares mounting scripts to do it at login
 RUN_DEPENDS=	nbtscan:${PORTSDIR}/net-mgmt/nbtscan \
 		sudo:${PORTSDIR}/security/sudo
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 NO_BUILD=	yes
 
-EXAMPLES=	sudoers .login .nsmbrc .mssmbrc nsmb.conf
 SCRIPTS=	smb2nsmbrc mountsmb2
 
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+PLIST_FILES=	bin/mountsmb2 bin/smb2nsmbrc
+PORTDOCS=	README.FreeBSD
+PORTEXAMPLES=	sudoers .login .nsmbrc .mssmbrc nsmb.conf
+
 do-install:
-	@${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/,} ${PREFIX}/bin
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README.FreeBSD ${DOCSDIR}
-.endif
+	${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/mountsmb2/pkg-plist b/sysutils/mountsmb2/pkg-plist
deleted file mode 100644
index 0eceeab306f3..000000000000
--- a/sysutils/mountsmb2/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/mountsmb2
-bin/smb2nsmbrc
-%%PORTDOCS%%%%EXAMPLESDIR%%/sudoers
-%%PORTDOCS%%%%EXAMPLESDIR%%/.login
-%%PORTDOCS%%%%EXAMPLESDIR%%/.nsmbrc
-%%PORTDOCS%%%%EXAMPLESDIR%%/.mssmbrc
-%%PORTDOCS%%%%EXAMPLESDIR%%/nsmb.conf
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%