From pgollucci@frieza.p6m7g8.net  Mon May 24 01:11:56 2010
Return-Path: <pgollucci@frieza.p6m7g8.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 10D5F106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 May 2010 01:11:56 +0000 (UTC)
	(envelope-from pgollucci@frieza.p6m7g8.net)
Received: from frieza.p6m7g8.net (wsip-174-79-184-239.dc.dc.cox.net [174.79.184.239])
	by mx1.freebsd.org (Postfix) with ESMTP id C55AB8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 May 2010 01:11:54 +0000 (UTC)
Received: from frieza.p6m7g8.net (localhost [127.0.0.1])
	by frieza.p6m7g8.net (8.14.4/8.14.4) with ESMTP id o4O1Br4n041428;
	Sun, 23 May 2010 21:11:53 -0400 (EDT)
	(envelope-from pgollucci@frieza.p6m7g8.net)
Received: (from pgollucci@localhost)
	by frieza.p6m7g8.net (8.14.4/8.14.4/Submit) id o4O1BrHZ041427;
	Sun, 23 May 2010 21:11:53 -0400 (EDT)
	(envelope-from pgollucci)
Message-Id: <201005240111.o4O1BrHZ041427@frieza.p6m7g8.net>
Date: Sun, 23 May 2010 21:11:53 -0400 (EDT)
From: "Philip M. Gollucci" <pgollucci@frieza.p6m7g8.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: corsmith@gmail.com
Subject: [PATCH] net-mgmt/ap13-torrus: use KNOBS and std pkg names
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         146898
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/torrus: use KNOBS and std pkg names
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 24 01:20:02 UTC 2010
>Closed-Date:    Thu May 27 04:23:37 UTC 2010
>Last-Modified:  Thu May 27 04:30:02 UTC 2010
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Mon Apr 26 16:20:00 EDT 2010
>Description:
- also, p5-libapreq2 pulls in mod_perl2

Port maintainer (corsmith@gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- ap13-torrus-1.0.8_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/torrus/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- Makefile	28 Mar 2010 06:41:58 -0000	1.8
+++ Makefile	24 May 2010 01:11:06 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	torrus
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
@@ -26,20 +26,12 @@
 LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
 		db-4.3.0:${PORTSDIR}/databases/db43
 
-.if !defined(WITH_MOD_PERL)
-.if defined(WITH_APACHE2)
-WITH_MOD_PERL=	2
+.if defined(WITH_MODPERL2)
+USE_APACHE= 2.0+
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/APR/Request.pm:${PORTSDIR}/www/p5-libapreq2
 .else
-WITH_MOD_PERL=	1
-.endif
-.endif
-.if ${WITH_MOD_PERL} == 1
-PKGNAMESUFFIX=	-mod_perl
+USE_APACHE= 1.3
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
-.elif ${WITH_MOD_PERL} == 2
-PKGNAMESUFFIX=	-mod_perl2
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 \
-		${SITE_PERL}/${PERL_ARCH}/APR/Request.pm:${PORTSDIR}/www/p5-libapreq2
 .endif
 
 USE_PERL5_RUN=	5.8.1+
@@ -78,12 +70,12 @@
 	@${ECHO_CMD}
 	@${ECHO_CMD} "This port supports either mod_perl 1 or mod_perl 2"
 	@${ECHO_CMD}
-	@${ECHO_CMD} "  WITH_MOD_PERL=1  Enables mod_perl 1.x support (DEFAULT)"
-	@${ECHO_CMD} "  WITH_MOD_PERL=2  Enables mod_perl 2.x support"
+	@${ECHO_CMD} "  mod_perl 1.x support (DEFAULT)"
+	@${ECHO_CMD} "  WITH_MODPERL2=yes  Enables mod_perl 2.x support"
 	@${ECHO_CMD}
-.if ${WITH_MOD_PERL} == 1
+.if !defined(WITH_MODPERL2)
 	@${ECHO_CMD} "Enabling mod_perl 1.x support."
-.elif ${WITH_MOD_PERL} == 2
+.else
 	@${ECHO_CMD} "Enabling mod_perl 2.x support."
 .endif
 	@${ECHO_CMD}
--- ap13-torrus-1.0.8_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Mon May 24 20:06:48 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146898 
State-Changed-From-To: open->feedback 
State-Changed-By: pgollucci 
State-Changed-When: Mon May 24 22:02:13 UTC 2010 
State-Changed-Why:  
Ask for maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146898 
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Thu May 27 04:18:31 UTC 2010 
State-Changed-Why:  
Maintainer approved in misfiled PR ports/146982. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146898 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Thu May 27 04:23:36 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146898 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146898: commit references a PR
Date: Thu, 27 May 2010 04:27:28 +0000 (UTC)

 pgollucci    2010-05-27 04:23:30 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/torrus      Makefile 
   Log:
   - Use KNOBS
   - Use Std pkg names
   - p5-libapreq2 pulls in mod_perl2
   
   PR:             ports/146898
   Submitted by:   pgollucci@ (myself)
   Approved by:    maintainer (corsmith@gmail.com)
   
   Revision  Changes    Path
   1.9       +9 -17     ports/net-mgmt/torrus/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
