2 files changed, 21 insertions, 50 deletions

diff --git a/devel/paexec/Makefile b/devel/paexec/Makefile
index b1378956a78c..d22f82691f89 100644
--- a/devel/paexec/Makefile
+++ b/devel/paexec/Makefile
@@ -7,41 +7,46 @@
 
 PORTNAME=	paexec
 PORTVERSION=	0.16.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Parallel executor, distributes tasks over network
 
+LICENSE=	MIT
+
 LIB_DEPENDS=	maa:${PORTSDIR}/devel/libmaa
 BUILD_DEPENDS=	mk-configure>=0.20:${PORTSDIR}/devel/mk-configure
 RUN_DEPENDS=	runawk:${PORTSDIR}/lang/runawk
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+MAKE_ENV+=	SUBPRJ_DFLT="${SUBPRJ_DFLT}"
 
-DOCS=		NEWS README TODO
-MAN1=		paexec.1 paexec_reorder.1
+SUBPRJ_DFLT=	${PORTNAME}
 
-USE_PERL5_BUILD=	yes
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+SUBPRJ_DFLT+=	doc
+.endif
 
-LICENSE=	MIT
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	*
+SUBPRJ_DFLT+=	examples
+MAKE_ENV+=	EGDIR="${EXAMPLESDIR}"
+.endif
+
+PLIST_FILES=	bin/${PORTNAME} \
+		bin/${PORTNAME}_reorder
+
+MAN1=		${PORTNAME}.1 \
+		${PORTNAME}_reorder.1
 
 do-build:
 	@${SETENV} ${MAKE_ENV} LDFLAGS="${LDFLAGS}" ${LOCALBASE}/bin/mkcmake -C ${WRKSRC}
 
 do-install:
-	@${SETENV} ${MAKE_ENV} LDFLAGS="${LDFLAGS}" ${LOCALBASE}/bin/mkcmake -C ${WRKSRC} install
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${DOCSDIR}
-.endfor
-.endif
+	@${SETENV} ${MAKE_ENV} LDFLAGS="${LDFLAGS}" ${LOCALBASE}/bin/mkcmake -C ${WRKSRC} ${INSTALL_TARGET}
 
 .include <bsd.port.mk>
diff --git a/devel/paexec/pkg-plist b/devel/paexec/pkg-plist
deleted file mode 100644
index 7b4a1651309a..000000000000
--- a/devel/paexec/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-bin/paexec
-bin/paexec_reorder
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/1_div_X/1_div_X_run
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/1_div_X/1_div_X_cmd.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/1_div_X/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/all_substr/all_substr_run
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/all_substr/all_substr_cmd.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/all_substr/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cc_wrapper/cc_wrapper_run
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cc_wrapper/cc_wrapper_cmd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cc_wrapper/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cc_wrapper/func1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cc_wrapper/func2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cc_wrapper/func3.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/make_package/make_package_tasks
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/make_package/make_package_tasks2
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/make_package/make_package_tasks_cycle
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/make_package/make_package_cmd__xxx_failed.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/make_package/make_package_cmd.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/make_package/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toupper/toupper_cmd.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toupper/toupper_run
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toupper/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/1_div_X
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/all_substr
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cc_wrapper
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/make_package
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/toupper
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%