- Support staging

- Use pkg-plist

2 files changed, 16 insertions, 12 deletions

diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index 69e721a7584d..4525b6facd5c 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -14,27 +14,19 @@ ALL_TARGET=	astyle
 CFLAGS+=	-W -Wall -fno-rtti -fno-exceptions
 LDFLAGS+=	-s
 MAKE_ARGS+=	CFLAGS="${CFLAGS}"
-USE_GMAKE=	yes
+USES=		gmake
 USE_GCC=	yes
 
 WRKSRC=		${WRKDIR}/astyle/build/gcc
 
-NO_STAGE=	yes
 pre-patch:
 	@${REINPLACE_CMD} -e 's,^CFLAGS,#CFLAGS,; s,g++,${CXX},;' ${WRKSRC}/Makefile
 
 .include <bsd.port.options.mk>
 
-PLIST_FILES=	bin/astyle
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.endif
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/astyle ${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/astyle/doc/*.html ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/astyle ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/astyle/doc/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/astyle/pkg-plist b/devel/astyle/pkg-plist
new file mode 100644
index 000000000000..f597329154de
--- /dev/null
+++ b/devel/astyle/pkg-plist
@@ -0,0 +1,12 @@
+bin/astyle
+%%PORTDOCS%%%%DOCSDIR%%/astyle.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/links.html
+%%PORTDOCS%%%%DOCSDIR%%/news.html
+%%PORTDOCS%%%%DOCSDIR%%/notes.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts.html
+%%PORTDOCS%%%%DOCSDIR%%/subversion.html
+%%PORTDOCS%%%%DOCSDIR%%/vsinstall.html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%