- Switch to USES=localbase

- Switch to options helpers
- Simplify installation
- Switch to pkg-message

3 files changed, 40 insertions, 47 deletions

diff --git a/dns/dhisd/Makefile b/dns/dhisd/Makefile
index 8eeae9799a20..186ee584b0fa 100644
--- a/dns/dhisd/Makefile
+++ b/dns/dhisd/Makefile
@@ -15,60 +15,39 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
-CFLAGS+=	-I${PREFIX}/include
-LDFLAGS+=	-L${PREFIX}/lib
+USES=		localbase:ldflags
 
-PORTDOCS=	CONTRIBUTORS COPYRIGHT INSTALL MODULES README
+SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DOCS
+DOCS=		CONTRIBUTORS INSTALL MODULES README
+PORTDOCS=	*
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	${CP} ${FILESDIR}/dhisd.sh ${WRKSRC}/dhisd.sh
-	cd ${WRKSRC} && ${REINPLACE_CMD} -e "s^__PREFIX__^${PREFIX}^g" \
-		Makefile dhisd.h dhisd.sh ${PORTDOCS}
+	@${CP} ${FILESDIR}/dhisd.sh ${WRKSRC}/dhisd.sh
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e "s^__PREFIX__^${PREFIX}^g" \
+		Makefile dhisd.h dhisd.sh ${DOCS}
 
 do-install:
-
-post-install:
-	@${ECHO_MSG} "===>   Installing ${STAGEDIR}${PREFIX}/sbin/dhisd."
-	@${INSTALL_PROGRAM} ${WRKSRC}/dhisd ${STAGEDIR}${PREFIX}/sbin
-	@${ECHO_CMD} "sbin/dhisd" >> ${TMPPLIST}
-	@${ECHO_MSG} "===>   Installing ${STAGEDIR}${PREFIX}/sbin/sgenkeys."
-	@${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${STAGEDIR}${PREFIX}/sbin
-	@${ECHO_CMD} "sbin/genkeys" >> ${TMPPLIST}
-	@${ECHO_MSG} "===>   Creating ${STAGEDIR}${PREFIX}/etc/dhis and installing sample db."
+	${INSTALL_PROGRAM} ${WRKSRC}/dhisd ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dhis
-	@${CHMOD} 700 ${STAGEDIR}${PREFIX}/etc/dhis
-	@${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${STAGEDIR}${PREFIX}/etc/dhis/dhis.db.sample
-	@${ECHO_CMD} "etc/dhis/dhis.db.sample" >> ${TMPPLIST}
-	@${INSTALL_DATA} ${WRKSRC}/services.db.sample ${STAGEDIR}${PREFIX}/etc/dhis/services.db.sample
-	@${ECHO_CMD} "etc/dhis/services.db.sample" >> ${TMPPLIST}
-	@${CHMOD} 600 ${STAGEDIR}${PREFIX}/etc/dhis/*
-.if !exists(${STAGEDIR}${PREFIX}/etc/rc.d/dhisd.sh)
-	@${ECHO_MSG} "===>   Installing ${STAGEDIR}${PREFIX}/etc/rc.d/dhid.sh startup file."
-	@${INSTALL_SCRIPT} -m 751 ${WRKSRC}/dhisd.sh ${STAGEDIR}${PREFIX}/etc/rc.d/dhisd.sh
-	@${ECHO_CMD} "etc/rc.d/dhisd.sh" >> ${TMPPLIST}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${ECHO_MSG} "===>   Installing documentation in ${STAGEDIR}${DOCSDIR}"
+	${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${STAGEDIR}${PREFIX}/etc/dhis/dhis.db.sample
+	${INSTALL_DATA} ${WRKSRC}/services.db.sample ${STAGEDIR}${PREFIX}/etc/dhis/services.db.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/dhisd.sh ${STAGEDIR}${PREFIX}/etc/rc.d/dhisd.sh
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${CHMOD} 755 ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${FILESDIR}/INSTALL.bsd ${STAGEDIR}${DOCSDIR}
-	@${ECHO_CMD} "share/doc/${PORTNAME}/INSTALL.bsd" >> ${TMPPLIST}
-.endif
-	@${ECHO} "--------------------------------------------------------------------------"
-	@${ECHO} "Before dhisd can run, you will need configure BIND."
-	@${ECHO} ""
-	@${ECHO} "For more information, see the following site:"
-	@${ECHO} "http://www.dhis.org/dhis/r5/"
-.if ${PORT_OPTIONS:MDOCS}
-	@${ECHO} ""
-	@${ECHO} "or the documents in ${STAGEDIR}${DOCSDIR}"
-	@${ECHO} "Read INSTALL and INSTALL.bsd at least for the setup information of dhisd."
-.endif
-	@${ECHO} "--------------------------------------------------------------------------"
+.for f in ${DOCS}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
+	${INSTALL_DATA} ${FILESDIR}/INSTALL.bsd ${STAGEDIR}${DOCSDIR}
+
+post-install-DOCS-on:
+	@${REINPLACE_CMD} -e 's|^__DOCS__||' ${PKGMESSAGE}
+
+post-install-DOCS-off:
+	@${REINPLACE_CMD} -e '/^__DOCS__/ d' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/dns/dhisd/files/pkg-message.in b/dns/dhisd/files/pkg-message.in
new file mode 100644
index 000000000000..ce6eedb9150c
--- /dev/null
+++ b/dns/dhisd/files/pkg-message.in
@@ -0,0 +1,9 @@
+--------------------------------------------------------------------------
+Before dhisd can run, you will need configure BIND.
+
+For more information, see the following site:
+http://www.dhis.org/dhis/r5/
+__DOCS__
+__DOCS__or the documents in %%DOCSDIR%%
+__DOCS__Read INSTALL and INSTALL.bsd at least for the setup information of dhisd.
+--------------------------------------------------------------------------
diff --git a/dns/dhisd/pkg-plist b/dns/dhisd/pkg-plist
index b449049a5cdf..4af0b1a59b8f 100644
--- a/dns/dhisd/pkg-plist
+++ b/dns/dhisd/pkg-plist
@@ -1 +1,6 @@
-@comment Left empty, filled during post-install by Makefile
+sbin/dhisd
+sbin/genkeys
+@(,,600) etc/dhis/dhis.db.sample
+@(,,600) etc/dhis/services.db.sample
+etc/rc.d/dhisd.sh
+@dir(,,700) etc/dhis