- Install stuff in pre-install target - this is needed for perl5.mk's fix-perl-things target to run correctly as it's run before post-install

- Fix strip
- Remove @dirrm* from pkg-plist

2 files changed, 3 insertions, 4 deletions

diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile
index 8eebfb0256e5..133d3368b2b3 100644
--- a/net-mgmt/flowd/Makefile
+++ b/net-mgmt/flowd/Makefile
@@ -58,7 +58,7 @@ post-build:
 	( cd ${WRKSRC} && ${PYTHON_CMD} setup.py build )
 .endif
 
-post-install:
+pre-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@@ -66,7 +66,9 @@ post-install:
 
 .if ${PORT_OPTIONS:MPERL}
 	( cd ${WRKSRC}/Flowd-perl && ${MAKE_CMD} install )
+	@${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Flowd/Flowd.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Flowd/Flowd.so
+	@${CHMOD} u-w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Flowd/Flowd.so
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
diff --git a/net-mgmt/flowd/pkg-plist b/net-mgmt/flowd/pkg-plist
index adbe58a6d254..d1eccf10b45e 100644
--- a/net-mgmt/flowd/pkg-plist
+++ b/net-mgmt/flowd/pkg-plist
@@ -28,6 +28,3 @@ sbin/flowd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sockclient.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wormsuspects.pl
-@dirrm include/flowd
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/flowrrd
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%