svn commit: r322873 - head/sysutils/daemontools

[Bryan Drewery]

Author: bdrewery
Date: Fri Jul 12 22:58:31 2013
New Revision: 322873
URL: http://svnweb.freebsd.org/changeset/ports/322873

Log:
  - Take maintainership
  - Add mirrors
  - Pet portlint
  -- Move CONFLICTS
  -- Replace space with tab in S_NORMAL_DESC
  - Remove bsd.port.pre.mk
  - Trim header
  
  Approved by:	jgh (maintainer)

Modified:
  head/sysutils/daemontools/Makefile

Modified: head/sysutils/daemontools/Makefile
==============================================================================
--- head/sysutils/daemontools/Makefile	Fri Jul 12 22:55:44 2013	(r322872)
+++ head/sysutils/daemontools/Makefile	Fri Jul 12 22:58:31 2013	(r322873)
@@ -1,31 +1,28 @@
-# New ports collection makefile for:	daemontools
-# Date created:		09 June 1998
-# Whom:			Dom Mitchell <dom at myrddin.demon.co.uk>
-#
+# Created by: Dom Mitchell <dom at myrddin.demon.co.uk>
 # $FreeBSD$
-#
 
 PORTNAME=	daemontools
 PORTVERSION=	0.76
 PORTREVISION=	16
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cr.yp.to/daemontools/
+MASTER_SITES=	http://cr.yp.to/daemontools/ \
+		http://mirror.shatow.net/freebsd/${PORTNAME}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	jgh at FreeBSD.org
+MAINTAINER=	bdrewery at FreeBSD.org
 COMMENT=	Service monitoring and logging utilities by djb
 
-CONFLICTS=	freedt-[0-9]* serialmail-[0-9]*
-
 LICENSE=	PD
 LICENSE_NAME=	public domain
 LICENSE_TEXT=	The daemontools-0.76.tar.gz archive is in the public domain as of 2007.12.28.
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+CONFLICTS=	freedt-[0-9]* serialmail-[0-9]*
+
 OPTIONS_DEFINE=	MAN SIGQ12 TESTS
 MAN_DESC=	Install Gerrit Pape's manual pages
 S_EARLY_DESC=	Start early, before the normal daemons
-S_NORMAL_DESC= Start normally in the usual boot sequence
+S_NORMAL_DESC=	Start normally in the usual boot sequence
 SIGQ12_DESC=	Add svc support for QUIT, USR1, and USR2 signals
 TESTS_DESC=	Run the test suite, fails on NFS-mounted workdir
 
@@ -34,7 +31,7 @@ OPTIONS_SINGLE_SEQ=	S_EARLY S_NORMAL
 
 OPTIONS_DEFAULT=	MAN S_NORMAL TESTS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 . if ${PORT_OPTIONS:MS_EARLY}
 SVSCAN_REQUIRE?=	SERVERS
@@ -50,7 +47,8 @@ SUB_LIST+=	SVSCAN_REQUIRE=${SVSCAN_REQUI
 
 .if ${PORT_OPTIONS:MMAN}
 MANDATE=	-20010714
-MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
+MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1 \
+  		http://mirror.shatow.net/freebsd/${PORTNAME}/:1
 DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:1
 
 MAN8=		envdir.8 envuidgid.8 fghack.8 multilog.8 pgrphack.8 \
@@ -97,4 +95,4 @@ post-install:
 	${INSTALL_MAN} ${WRKDIR}/daemontools-man/*.8 ${MAN8PREFIX}/man/man8/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>