svn commit: r367491 - in head: . news news/diablo news/diablo/files news/diablo/scripts
Thomas Zander
riggs at FreeBSD.org
Sun Sep 7 07:23:58 UTC 2014
Author: riggs
Date: Sun Sep 7 07:23:56 2014
New Revision: 367491
URL: http://svnweb.freebsd.org/changeset/ports/367491
QAT: https://qat.redports.org/buildarchive/r367491/
Log:
Resurrect news/diablo
- Stagify
- Assign maintainership to Nikolai Lifanov <lifanov at mail.lifanov.com>
- General cleanup of diablo port
- Add LICENSE
- Bump PORTREVISION
PR: 193239
Submitted by: lifanov at mail.lifanov.com
Added:
head/news/diablo/
- copied from r366966, head/news/diablo/
head/news/diablo/files/diablo.sh-sample
- copied unchanged from r366966, head/news/diablo/scripts/diablo.sh-sample
head/news/diablo/files/patch-XMakefile.inst (contents, props changed)
Deleted:
head/news/diablo/scripts/
Modified:
head/MOVED
head/news/Makefile
head/news/diablo/Makefile
head/news/diablo/pkg-message
head/news/diablo/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Sun Sep 7 07:17:30 2014 (r367490)
+++ head/MOVED Sun Sep 7 07:23:56 2014 (r367491)
@@ -6836,7 +6836,6 @@ net/wired||2014-09-01|Not staged
net/xbone||2014-09-01|Not staged
net/xipdump||2014-09-01|Not staged
net/xorp-devel||2014-09-01|Not staged
-news/diablo||2014-09-01|Not staged
palm/iSiloXC||2014-09-01|Not staged
palm/py-synce-librapi2||2014-09-01|Not staged
palm/py-synce-librra||2014-09-01|Not staged
Modified: head/news/Makefile
==============================================================================
--- head/news/Makefile Sun Sep 7 07:17:30 2014 (r367490)
+++ head/news/Makefile Sun Sep 7 07:23:56 2014 (r367491)
@@ -11,6 +11,7 @@
SUBDIR += cleanfeed
SUBDIR += cnews
SUBDIR += crashmail
+ SUBDIR += diablo
SUBDIR += fidogate
SUBDIR += fidogate-ds
SUBDIR += golded+
Modified: head/news/diablo/Makefile
==============================================================================
--- head/news/diablo/Makefile Mon Sep 1 22:01:24 2014 (r366966)
+++ head/news/diablo/Makefile Sun Sep 7 07:23:56 2014 (r367491)
@@ -3,36 +3,34 @@
PORTNAME= diablo
PORTVERSION= 5.1
+PORTREVISION= 1
CATEGORIES= news
MASTER_SITES= http://www.openusenet.org/diablo/download/
-DISTNAME= ${PKGNAME}-REL
-EXTRACT_SUFX= .tgz
+DISTNAME= ${PORTNAME}-${PORTVERSION}-REL
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= lifanov at mail.lifanov.com
COMMENT= Comprehensive newsfeeding and newsreading software package
+LICENSE= BSD3CLAUSE
+
BUILD_DEPENDS= xmake:${PORTSDIR}/devel/xmake
-MAN5= diablo-kp.5 diablo-files.5
-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 dhisexpire.8
PORTDOCS= COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
-NO_STAGE= yes
-
OPTIONS_DEFINE= DES DOCS
DES_DESC= DES encryption support
+USES= tar:tgz
+
.include <bsd.port.options.mk>
post-patch:
- ${CP} ${SCRIPTDIR}/diablo.sh-sample ${WRKDIR}
- ${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g ;\
+ ${CP} ${FILESDIR}/diablo.sh-sample ${WRKDIR}
+ ${REINPLACE_CMD} -E 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g ;\
s|-g -O.?|${CFLAGS}| ; s|g?cc|${CC}|' \
- ${WRKDIR}/diablo.sh-sample ${WRKSRC}/XMakefile.inc
+ ${WRKSRC}/XMakefile.inc
+ ${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g' \
+ ${WRKDIR}/diablo.sh-sample ${WRKSRC}/XMakefile.inst
# Fix for GCC 4.2
${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \
${WRKSRC}/dreaderd/main.c
@@ -45,19 +43,19 @@ do-build:
(cd ${WRKSRC} && xmake all)
do-install:
- ${MKDIR} ${PREFIX}/news/dbin
+ ${MKDIR} ${STAGEDIR}${PREFIX}/news/dbin
+ ${MKDIR} ${STAGEDIR}${PREFIX}/news/dqueue
+ ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool
+ ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/news
+ ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/cache
+ ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/group
+ ${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/postq
(cd ${WRKSRC} && xmake install)
- ${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh-sample ${PREFIX}/etc/rc.d
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/news/dbin/*
+ ${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh-sample ${STAGEDIR}${PREFIX}/etc/rc.d
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
.for file in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
.endfor
-.endif
-
-post-install:
- @${CAT} ${PKGMESSAGE}
- @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${RM} -rf ${PREFIX}/news/man
.include <bsd.port.mk>
Copied: head/news/diablo/files/diablo.sh-sample (from r366966, head/news/diablo/scripts/diablo.sh-sample)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/diablo/files/diablo.sh-sample Sun Sep 7 07:23:56 2014 (r367491, copy of r366966, head/news/diablo/scripts/diablo.sh-sample)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+case $1 in
+start)
+ if [ -x %%PREFIX%%/news/rc.news ] ; then
+ %%PREFIX%%/news/rc.news && echo -n ' diablo'
+ fi
+ ;;
+stop)
+ ;;
+*)
+ echo "Usage: `basename $0` {start|stop}" >&2
+ exit 64
+ ;;
+esac
+
+exit 0
Added: head/news/diablo/files/patch-XMakefile.inst
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/diablo/files/patch-XMakefile.inst Sun Sep 7 07:23:56 2014 (r367491)
@@ -0,0 +1,44 @@
+--- XMakefile.inst.orig 2002-06-07 23:14:13 UTC
++++ XMakefile.inst
+@@ -29,23 +29,13 @@
+
+ $(DDIRS) : $(DDIRS)
+ test -d %(left) || mkdir %(left)
+- chown news %(left)
+- chgrp news %(left)
+- chmod 755 %(left)
+
+ $(DMDIRS) : $(DMDIRS)
+ test -d %(left) || mkdir %(left)
+- chmod 755 %(left)
+- chown news %(left)
+- chgrp news %(left)
+- @echo "%(left): WARNING!!!! directory may require its own mount point"
+ @sleep 2
+
+ $(OTDIRS) : $(OTDIRS)
+ test -d %(left) || mkdir %(left)
+- chown news %(left)
+- chgrp news %(left)
+- chmod 755 %(left)
+
+ /*
+ * note: modes 444 so user is reminded to break the link
+@@ -54,15 +44,11 @@
+
+ $(DFILES) : $(IFILES)
+ cp %(right) %(left).new
+- chmod 444 %(left).new
+- chown news %(left).new
+- chgrp news %(left).new
+- if [ -x %(right) ]; then chmod 755 %(left).new; else chmod 444 %(left).new; fi
+ mv -f %(left).new %(left)
+
+ $(DTFILES) : $(TFILES)
+- if [ ! -f %(left) ]; then ln -s $(IDIR)/%(right) %(left); fi
++ if [ ! -f %(left) ]; then ln -s %%PREFIX%%/%(right) %(left); fi
+
+ $(DMAN) : $(IMAN)
+- $(INSTALL) -c -g news -o news -m 644 %(right) %(left)
++ $(INSTALL) -c %(right) %(left)
+
Modified: head/news/diablo/pkg-message
==============================================================================
--- head/news/diablo/pkg-message Mon Sep 1 22:01:24 2014 (r366966)
+++ head/news/diablo/pkg-message Sun Sep 7 07:23:56 2014 (r367491)
@@ -6,4 +6,3 @@ This port installs a very basic Diablo s
want to change paths and partitions before you start using diablo in a
production environment. Please refer to the documentation located at
http://www.openusenet.org/diablo/ for further information.
-
Modified: head/news/diablo/pkg-plist
==============================================================================
--- head/news/diablo/pkg-plist Mon Sep 1 22:01:24 2014 (r366966)
+++ head/news/diablo/pkg-plist Sun Sep 7 07:23:56 2014 (r367491)
@@ -1,5 +1,32 @@
etc/rc.d/diablo.sh-sample
+man/man5/diablo-files.5.gz
+man/man5/diablo-kp.5.gz
+man/man8/dexpire.8.gz
+man/man8/dexpireover.8.gz
+man/man8/dfeedinfo.8.gz
+man/man8/dgrpctl.8.gz
+man/man8/dhisexpire.8.gz
+man/man8/diablo.8.gz
+man/man8/dicmd.8.gz
+man/man8/didump.8.gz
+man/man8/diloadfromspool.8.gz
+man/man8/dilookup.8.gz
+man/man8/dkp.8.gz
+man/man8/dnewslink.8.gz
+man/man8/doutq.8.gz
+man/man8/doverctl.8.gz
+man/man8/dpath.8.gz
+man/man8/drcmd.8.gz
+man/man8/dreadart.8.gz
+man/man8/dreaderd.8.gz
+man/man8/dreadover.8.gz
+man/man8/drequeue.8.gz
+man/man8/dspoolout.8.gz
+man/man8/dsyncgroups.8.gz
+ at owner news
+ at group news
news/dactive.kp
+ at mode 755
news/dbin/.cvsignore
news/dbin/.empty
news/dbin/dcancel
@@ -9,7 +36,11 @@ news/dbin/dexpirecache
news/dbin/dexpireover
news/dbin/dexpirescoring
news/dbin/dfeedinfo
+news/dbin/dfeedtest
news/dbin/dgrpctl
+news/dbin/dhisbench
+news/dbin/dhisctl
+news/dbin/dhisexpire
news/dbin/diablo
news/dbin/dicmd
news/dbin/diconvhist
@@ -18,12 +49,11 @@ 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
news/dbin/doutq
+news/dbin/doverctl
news/dbin/dpath
news/dbin/dprimehostcache
news/dbin/drcmd
@@ -38,9 +68,7 @@ news/dbin/dsyncgroups
news/dbin/pgpverify
news/dbin/plock
news/dbin/showlocks
-news/dbin/dfeedtest
-news/dbin/dhisbench
-news/dbin/doverctl
+ at mode
news/dcontrol.ctl
news/dexpire.ctl
news/diablo.config
@@ -70,6 +98,7 @@ news/samples/dnntpspool.ctl
news/samples/dreader.access
news/samples/dserver.hosts
news/samples/dspool.ctl
+news/samples/feeder+reader/README
news/samples/feeder+reader/dactive.kp
news/samples/feeder+reader/dcontrol.ctl
news/samples/feeder+reader/dexpire.ctl
@@ -80,7 +109,6 @@ news/samples/feeder+reader/dreader.acces
news/samples/feeder+reader/dserver.hosts
news/samples/feeder+reader/dspool.ctl
news/samples/feeder+reader/moderators
-news/samples/feeder+reader/README
news/samples/feeder/diablo.config
news/samples/feeder/dnewsfeeds
news/samples/feeder/dspool.ctl
@@ -94,18 +122,23 @@ news/samples/reader/distrib.pats
news/samples/reader/dreader.access
news/samples/reader/dserver.hosts
news/samples/reader/moderators
- at dirrm news/log
- at dirrm news/spool/postq
- at dirrm news/spool/news
- at dirrm news/spool/group
- at dirrm news/spool/cache
- at dirrm news/spool
- at dirrm news/samples/reader
- at dirrm news/samples/feeder+reader
- at dirrm news/samples/feeder
- at dirrm news/samples/adm
- at dirrm news/samples
- at dirrm news/dqueue
- at dirrm news/dbin
- at dirrm news/run
- at dirrm news
+ at owner
+ at group
+ at dirrmtry news/dbin
+ at dirrmtry news/dqueue
+ at dirrmtry news/log
+ at dirrmtry news/man/man5
+ at dirrmtry news/man/man8
+ at dirrmtry news/man
+ at dirrmtry news/run
+ at dirrmtry news/samples/adm
+ at dirrmtry news/samples/feeder
+ at dirrmtry news/samples/feeder+reader
+ at dirrmtry news/samples/reader
+ at dirrmtry news/samples
+ at dirrmtry news/spool/cache
+ at dirrmtry news/spool/group
+ at dirrmtry news/spool/news
+ at dirrmtry news/spool/postq
+ at dirrmtry news/spool
+ at dirrmtry news
More information about the svn-ports-head
mailing list