svn commit: r317596 - in head: graphics/claraocr irc/keitairc irc/keitairc2 mail/bayespam net-mgmt/check_multi sysutils/enteruser

Tue May 7 10:00:59 UTC 2013

Author: ehaupt
Date: Tue May  7 10:00:57 2013
New Revision: 317596
URL: http://svnweb.freebsd.org/changeset/ports/317596

Log:
  - Convert to use shebangfix USES flag
  - Trim header
  - Use new options framework for DOCS

Modified:
  head/graphics/claraocr/Makefile
  head/irc/keitairc/Makefile
  head/irc/keitairc2/Makefile
  head/mail/bayespam/Makefile
  head/net-mgmt/check_multi/Makefile
  head/sysutils/enteruser/Makefile

Modified: head/graphics/claraocr/Makefile
==============================================================================

--- head/graphics/claraocr/Makefile	Tue May  7 09:39:35 2013	(r317595)
+++ head/graphics/claraocr/Makefile	Tue May  7 10:00:57 2013	(r317596)
@@ -1,15 +1,11 @@
-# New ports collection makefile for:	claraocr
-# Date created:				5 November 2001
-# Whom:					petef
-#
+# Created by: petef
 # $FreeBSD$
-#
 
 PORTNAME=	claraocr
 PORTVERSION=	20031214
 PORTREVISION=	4
 CATEGORIES=	graphics accessibility
-MASTER_SITES=	${MASTER_SITE_GENTOO}
+MASTER_SITES=	GENTOO
 MASTER_SITE_SUBDIR=distfiles
 DISTNAME=	clara-${PORTVERSION}
 
@@ -18,16 +14,15 @@ COMMENT=	Optical character recognition (
 
 RUN_DEPENDS=	pnmenlarge:${PORTSDIR}/graphics/netpbm
 
+USES=		shebangfix
 USE_XORG=	x11
 USE_PERL5=	yes
 MAKE_ENV=	MKDIR="${MKDIR}"
 MAKE_JOBS_SAFE=	yes
 
-MAN1=	clara-adv.1 clara-dev.1 clara.1 selthresh.1
+SHEBANG_FILES=	clara.pl mkdoc.pl selthresh
 
-post-patch:
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|g' \
-		clara.pl mkdoc.pl selthresh
+MAN1=	clara-adv.1 clara-dev.1 clara.1 selthresh.1
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/selthresh.1 ${MAN1PREFIX}/man/man1/

Modified: head/irc/keitairc/Makefile
==============================================================================
--- head/irc/keitairc/Makefile	Tue May  7 09:39:35 2013	(r317595)
+++ head/irc/keitairc/Makefile	Tue May  7 10:00:57 2013	(r317596)
@@ -1,16 +1,12 @@
-# New ports collection makefile for:	keitairc
-# Date created:		11 Nov 2005
-# Whom:			Makoto Matsushita <matusita at FreeBSD.ORG>
-#
+# Created by: Makoto Matsushita <matusita at FreeBSD.ORG>
 # $FreeBSD$
-#
 
 PORTNAME=	keitairc
 PORTVERSION=	1.33
 PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= ${PORTNAME}/27571
+MASTER_SITE_SUBDIR=	${PORTNAME}/27571
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	#empty
 
@@ -25,9 +21,8 @@ RUN_DEPENDS=	ja-p5-Unicode-Japanese>=0:$
 		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
 		p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig
 
-PLIST_FILES=	bin/keitairc
-
 CONFLICTS=	keitairc-2.*
+
 NO_BUILD=	YES
 NO_LATEST_LINK=	YES
 NO_WRKSUBDIR=	YES
@@ -35,10 +30,12 @@ EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=	-p
 EXTRACT_AFTER_ARGS=	${WRKDIR}
 
+USES=		shebangfix
 USE_PERL5=	yes
 
-post-patch:
-	${REINPLACE_CMD} -e "s,^#!/usr/bin/perl$$,#!${PERL}," ${WRKSRC}/keitairc
+SHEBANG_FILES=	keitairc
+
+PLIST_FILES=	bin/keitairc
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/keitairc ${PREFIX}/bin

Modified: head/irc/keitairc2/Makefile
==============================================================================
--- head/irc/keitairc2/Makefile	Tue May  7 09:39:35 2013	(r317595)
+++ head/irc/keitairc2/Makefile	Tue May  7 10:00:57 2013	(r317596)
@@ -1,19 +1,11 @@
-# New ports collection makefile for:	keitairc2
-# Date created:		18 Jan 2008
-# Whom:			Makoto Matsushita <matusita at FreeBSD.ORG>
-#
+# Created by: Makoto Matsushita <matusita at FreeBSD.ORG>
 # $FreeBSD$
-#
 
 PORTNAME=		keitairc
 PORTVERSION=		2.0
-#PORTREVISION=		1
 CATEGORIES=		irc
 MASTER_SITES=		SFJP
 MASTER_SITE_SUBDIR=	${PORTNAME}/47485
-#DISTNAME=		keitairc-2.0
-
-#PATCH_SITES=		http://home.jp.FreeBSD.org/~matusita/keitairc2/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	IRC proxy for mobilephone that have a web interface
@@ -27,17 +19,22 @@ RUN_DEPENDS=	p5-POE-Component-IRC>=0:${P
 		p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig
 
 CONFLICTS=	keitairc-1.*
-NO_BUILD=	yes
+
+USES=		shebangfix
 USE_PERL5=	yes
+NO_BUILD=	yes
+
+SHEBANG_FILES=	keitairc
 
 post-extract:
 	${FIND} ${WRKSRC} -name .cvsignore | ${XARGS} ${RM} -rf
 
 post-patch:
 	${FIND} ${WRKSRC} -name '*.orig' | ${XARGS} ${RM} -rf
-	${REINPLACE_CMD} -i '' -e "s,^#!/usr/bin/perl$$,#!${PERL}," ${WRKSRC}/keitairc
-	${REINPLACE_CMD} -i '' -e "s,/usr/share/keitairc/lib,${DATADIR}/lib,"  ${WRKSRC}/keitairc
-	${REINPLACE_CMD} -i '' -e "s,__KEITAIRC_DATA_DIR__,${DATADIR}/lib,"  ${WRKSRC}/lib/Keitairc/Config.pm
+	${REINPLACE_CMD} -i '' -e "s,/usr/share/keitairc/lib,${DATADIR}/lib,"  \
+		${WRKSRC}/keitairc
+	${REINPLACE_CMD} -i '' -e "s,__KEITAIRC_DATA_DIR__,${DATADIR}/lib,"  \
+		${WRKSRC}/lib/Keitairc/Config.pm
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/keitairc ${PREFIX}/bin

Modified: head/mail/bayespam/Makefile
==============================================================================
--- head/mail/bayespam/Makefile	Tue May  7 09:39:35 2013	(r317595)
+++ head/mail/bayespam/Makefile	Tue May  7 10:00:57 2013	(r317596)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	bayespam
-# Date created:				Sun Sep  8 16:15:26 UTC 2002
-# Whom:                 Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	bayespam
 PORTVERSION=	0.9.2
@@ -16,13 +12,18 @@ COMMENT=	qmail spam filter written in Pe
 
 RUN_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
 
+USES=		shebangfix
 USE_PERL5=	yes
 NO_BUILD=	yes
 
+SHEBANG_FILES=	*.pl
+
 FILES_DOCS=	AUTHORS COPYING Changelog INSTALL README TODO \
 		qmail.sample
 FILES_SCRIPTS=	bayes_process_email.pl bayes_spam_check.pl bayestest.pl
 
+.include <bsd.port.options.mk>
+
 post-patch:
 # fix location of Bayesian filter
 	@${REINPLACE_CMD} -e 's|/user/|${PREFIX}/|' ${WRKSRC}/README
@@ -31,11 +32,9 @@ post-patch:
 	@${REINPLACE_CMD} -E -e \
 		's|/usr/bin/(bayes_spam_check.pl)|${PREFIX}/bin/\1|' \
 		${WRKSRC}/bayestest.pl
-# fix location of PERL
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl
 
 do-install:
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${FILES_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}

Modified: head/net-mgmt/check_multi/Makefile
==============================================================================
--- head/net-mgmt/check_multi/Makefile	Tue May  7 09:39:35 2013	(r317595)
+++ head/net-mgmt/check_multi/Makefile	Tue May  7 10:00:57 2013	(r317596)
@@ -14,15 +14,14 @@ COMMENT=	A multi purpose wrapper plugin 
 
 LICENSE=	GPLv2
 
+USES=		shebangfix
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLUGIN_DIR=	libexec/nagios
 
-do-configure:
-	${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL5}|" \
-		${WRKSRC}/check_multi
+SHEBANG_FILES=	check_multi
 
 do-install:
 	-${MKDIR} ${PREFIX}/${PLUGIN_DIR}

Modified: head/sysutils/enteruser/Makefile
==============================================================================
--- head/sysutils/enteruser/Makefile	Tue May  7 09:39:35 2013	(r317595)
+++ head/sysutils/enteruser/Makefile	Tue May  7 10:00:57 2013	(r317596)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  enteruser
-# Date created:         19 Feb 2002
-# Whom:                 Danny Howard <dannyman at toldme.com>
-#
+# Created by: Danny Howard <dannyman at toldme.com>
 # $FreeBSD$
-#
 
 PORTNAME=	enteruser
 PORTVERSION=	1.0
@@ -16,17 +12,17 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Extensible script for adding new users
 
+USES=		shebangfix
 USE_PERL5=	yes
-NO_WRKSUBDIR=	true
-NO_BUILD=	true
+NO_WRKSUBDIR=	yes
+NO_BUILD=	yes
+
+SHEBANG_FILES=	enteruser
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
 
-do-patch:
-	@${REINPLACE_CMD} -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/enteruser
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/enteruser ${PREFIX}/sbin
 	${LN} -f ${PREFIX}/sbin/enteruser ${PREFIX}/sbin/queueuser
