- Update to 5.0-REL

- Use PORTDOCS macro
- Respect CFLAGS

3 files changed, 25 insertions, 22 deletions

diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index bdbb5a01861e..dbfaac547ee5 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	diablo
-PORTVERSION=	4.2
+PORTVERSION=	5.0
 CATEGORIES=	news
 MASTER_SITES=	http://www.openusenet.org/diablo/download/
 DISTNAME=	${PKGNAME}-REL
@@ -24,32 +24,35 @@ MAN8=		dicmd.8 didump.8 dexpireover.8 dfeedinfo.8 dgrpctl.8 \
 		dilookup.8 diloadfromspool.8 doutq.8 dreadart.8 \
 		dreaderd.8 dpath.8 drcmd.8 dsyncgroups.8 dreadover.8 \
 		dkp.8 diablo.8 dexpire.8 dspoolout.8 dnewslink.8 \
-		doverctl.8 drequeue.8
-
-DOCDIR=		${PREFIX}/share/doc/diablo
+		doverctl.8 drequeue.8 dhisexpire.8
+PORTDOCS=	COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
 
 post-extract:
-	${CP} ${SCRIPTDIR}/diablo.sh-sample ${WRKDIR}
+	@${CP} ${SCRIPTDIR}/diablo.sh-sample ${WRKDIR}
 
 do-configure:
-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g;\
+		s|-g -O2|${CFLAGS}|' \
 		${WRKDIR}/diablo.sh-sample ${WRKSRC}/XMakefile.inc
 .ifndef WITH_DES
-	${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc
+	@${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc
 .endif
 
 do-build:
-	cd ${WRKSRC} && xmake all
+	@cd ${WRKSRC} && xmake all
 
 pre-install:
-	${INSTALL} -d ${DOCDIR} ${PREFIX}/news ${PREFIX}/news/dbin
+	@${INSTALL} -d ${DOCDIR} ${PREFIX}/news ${PREFIX}/news/dbin
 
 do-install:
-	cd ${WRKSRC} && xmake install
-.for file in COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}
+	@cd ${WRKSRC} && xmake install
+	@${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh-sample ${PREFIX}/etc/rc.d
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh-sample ${PREFIX}/etc/rc.d
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/news/diablo/distinfo b/news/diablo/distinfo
index badf5452c1b5..d98a38687193 100644
--- a/news/diablo/distinfo
+++ b/news/diablo/distinfo
@@ -1,2 +1,2 @@
-MD5 (diablo-4.2-REL.tgz) = d948dd6fc7b63ad806c0541daf12a898
-SIZE (diablo-4.2-REL.tgz) = 611859
+MD5 (diablo-5.0-REL.tgz) = 87eabc16fba8bc37a39566e8f456a244
+SIZE (diablo-5.0-REL.tgz) = 666052
diff --git a/news/diablo/pkg-plist b/news/diablo/pkg-plist
index ed1c0ff4185d..5259e5b68d7a 100644
--- a/news/diablo/pkg-plist
+++ b/news/diablo/pkg-plist
@@ -2,9 +2,12 @@ etc/rc.d/diablo.sh-sample
 news/dactive.kp
 news/dbin/.cvsignore
 news/dbin/.empty
+news/dbin/dcancel
 news/dbin/dclient
 news/dbin/dexpire
+news/dbin/dexpirecache
 news/dbin/dexpireover
+news/dbin/dexpirescoring
 news/dbin/dfeedinfo
 news/dbin/dgrpctl
 news/dbin/diablo
@@ -15,6 +18,8 @@ news/dbin/didump
 news/dbin/diload
 news/dbin/diloadfromspool
 news/dbin/dilookup
+news/dbin/dhisctl
+news/dbin/dhisexpire
 news/dbin/dkp
 news/dbin/dlockhistory
 news/dbin/dnewslink
@@ -50,7 +55,7 @@ news/samples/adm/crontab.sample
 news/samples/adm/daily.atrim
 news/samples/adm/daily.reader
 news/samples/adm/hourly.expire
-news/samples/adm/quadhr.expire
+news/samples/adm/old.biweekly.atrim.dexpire
 news/samples/adm/rc.news
 news/samples/adm/rot
 news/samples/adm/weekly.reader
@@ -89,12 +94,7 @@ news/samples/reader/distrib.pats
 news/samples/reader/dreader.access
 news/samples/reader/dserver.hosts
 news/samples/reader/moderators
-share/doc/diablo/COPYRIGHT
-share/doc/diablo/INSTALL
-share/doc/diablo/README.READER
-share/doc/diablo/README.SERVER
-share/doc/diablo/RELEASE_NOTES
-@dirrm share/doc/diablo
+@dirrm news/log
 @dirrm news/spool/postq
 @dirrm news/spool/news
 @dirrm news/spool/group