From owner-svn-ports-head@FreeBSD.ORG  Thu Nov  1 07:38:13 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4F6F2101;
 Thu,  1 Nov 2012 07:38:13 +0000 (UTC)
 (envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 1EF328FC12;
 Thu,  1 Nov 2012 07:38:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA17cC3D041226;
 Thu, 1 Nov 2012 07:38:12 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA17cCFw041223;
 Thu, 1 Nov 2012 07:38:12 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <201211010738.qA17cCFw041223@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 1 Nov 2012 07:38:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306781 - head/sysutils/p5-Sys-Gamin
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Nov 2012 07:38:13 -0000

Author: n_hibma (src committer)
Date: Thu Nov  1 07:38:12 2012
New Revision: 306781
URL: http://svn.freebsd.org/changeset/ports/306781

Log:
  Rename `monitor' to `gamin-monitor' to prevent conflicts with LPRng and
  dmucs, as noted by ketas' ports conflicts checker.
  Also sign maintainership of this port over to ports.
  
  PR:		168695
  Submitted by:	n_hibma
  Feature safe:	yes

Modified:
  head/sysutils/p5-Sys-Gamin/Makefile
  head/sysutils/p5-Sys-Gamin/pkg-plist

Modified: head/sysutils/p5-Sys-Gamin/Makefile
==============================================================================
--- head/sysutils/p5-Sys-Gamin/Makefile	Thu Nov  1 06:52:53 2012	(r306780)
+++ head/sysutils/p5-Sys-Gamin/Makefile	Thu Nov  1 07:38:12 2012	(r306781)
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	p5-Sys-Gamin
 # Date created:		03 May 2007
-# Whom: 	Nick Hibma <n_hibma@freebsd.org>
+# Whom: 	Nick Hibma <n_hibma@FreeBSD.org>
 #
 # $FreeBSD$
 #
@@ -12,15 +12,20 @@ CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	n_hibma@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl interface to Gamin (File Access Monitor implementation)
 
 PERL_CONFIGURE=	yes
 USE_FAM=	yes
-MAN1=	monitor.1
+MAN1=	gamin-monitor.1
 MAN3=	Sys::Gamin.3
 
 pre-configure:
-	${PERL} -pi -e 'm/LIBS =>/ && print " INC => \"-I${LOCALBASE}/include\",\n"' ${WRKSRC}/Makefile.PL
+	# Pass in include in LOCALBASE
+	${PERL} -pi -e 'm/LIBS =>/ && print "  INC => \"-I${LOCALBASE}/include\",\n"' ${WRKSRC}/Makefile.PL
+	# Rename a tool with a generic name (monitor)
+	${PERL} -pi -e 's/qw.monitor./qw(gamin-monitor)/' ${WRKSRC}/Makefile.PL
+	${PERL} -pi -e 's/^monitor$$/gamin-monitor/' ${WRKSRC}/MANIFEST
+	${MV} ${WRKSRC}/monitor ${WRKSRC}/gamin-monitor
 
 .include <bsd.port.mk>

Modified: head/sysutils/p5-Sys-Gamin/pkg-plist
==============================================================================
--- head/sysutils/p5-Sys-Gamin/pkg-plist	Thu Nov  1 06:52:53 2012	(r306780)
+++ head/sysutils/p5-Sys-Gamin/pkg-plist	Thu Nov  1 07:38:12 2012	(r306781)
@@ -1,4 +1,5 @@
-bin/monitor
+bin/gamin-monitor
+man/man1/gamin-monitor.1
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/Gamin.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Gamin/Gamin.bs