From pgollucci@frieza.p6m7g8.net  Fri Dec 25 07:28:30 2009
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 F318D1065694
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 25 Dec 2009 07:28:30 +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 B24718FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 25 Dec 2009 07:28:30 +0000 (UTC)
Received: from frieza.p6m7g8.net (localhost [127.0.0.1])
	by frieza.p6m7g8.net (8.14.3/8.14.3) with ESMTP id nBP7STVN073620;
	Fri, 25 Dec 2009 07:28:29 GMT
	(envelope-from pgollucci@frieza.p6m7g8.net)
Received: (from pgollucci@localhost)
	by frieza.p6m7g8.net (8.14.3/8.14.3/Submit) id nBP7STCj073584;
	Fri, 25 Dec 2009 07:28:29 GMT
	(envelope-from pgollucci)
Message-Id: <200912250728.nBP7STCj073584@frieza.p6m7g8.net>
Date: Fri, 25 Dec 2009 07:28:29 GMT
From: "Philip M. Gollucci" <pgollucci@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jhuldtgren@gmail.com
Subject: [PATCH] www/blogsum: Axe deprecated APACHE things
X-Send-Pr-Version: 3.113
X-GNATS-Notify: jhuldtgren@gmail.com

>Number:         141998
>Category:       ports
>Synopsis:       [PATCH] www/blogsum: Axe deprecated APACHE things
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 25 07:30:00 UTC 2009
>Closed-Date:    Mon Jan 04 04:58:53 UTC 2010
>Last-Modified:  Mon Jan  4 05:00:13 UTC 2010
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
RideCharge Inc.
>Environment:
System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Tue Dec  8 02:25:55 UTC
>Description:
- USE_APACHE=x instead of _DEPENDS
- WITH_APACHE2 is deprecated
- DEPENDS_ARGS doesn't work with packages, and isn't needed
- p5-libapreq pulls in mod_perl
- USE_APACHE gives us these SUB_LIST vars
- / ify dirs

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

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

--- blogsum-1.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/blogsum/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- Makefile	4 Dec 2009 15:48:10 -0000	1.2
+++ Makefile	25 Dec 2009 06:32:48 -0000
@@ -13,8 +13,7 @@
 MAINTAINER=	jhuldtgren@gmail.com
 COMMENT=	Simple weblog
 
-PERL_MODULES=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+PERL_MODULES=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
 		${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS \
 		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
@@ -24,40 +23,30 @@
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 
-.if defined(WITH_APACHE2)
-USE_APACHE=	2.0+
-.else
-USE_APACHE=	1.3+
-.endif
+USE_APACHE=	1.3
 
-.if defined(WITH_APACHE2)
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.apache.mk"
+.if ${APACHE_VERSION} != 13
 PERL_MODULES+=	${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2
-DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
-DEPENDS_ARGS+=	WITH_MODPERL2=yes
 .else
-# XXX - probe for static mod_perl using `httpd -l | grep perl`
-PERL_MODULES+=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl \
-		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
+PERL_MODULES+=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
 .endif
 
-RUN_DEPENDS+=	${PERL_MODULES}
+RUN_DEPENDS=	${PERL_MODULES}
 
 SUB_FILES=	pkg-message
-SUB_LIST+=	APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR} WWWOWN=${WWWOWN}
-
-.include <bsd.port.pre.mk>
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may set following options:"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "WITH_APACHE2=yes			Use apache2+ instead of apache 1.3"
 	@${ECHO_MSG} "WWWDIR=${WWWDIR}	Where do you put httpd's document root?"
 	@${ECHO_MSG} ""
 
 do-install:
-	@${MKDIR} ${WWWDIR}
-	@ cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
+	@${MKDIR} ${WWWDIR}/
+	@ cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}/
 
 post-install:
 	@${ECHO_MSG} ""
--- blogsum-1.1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Dec 25 07:30:12 UTC 2009 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141998 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Dec 25 07:30:22 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jhuldtgren@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/141998: [PATCH] www/blogsum: Axe deprecated APACHE things
Date: Fri, 25 Dec 2009 07:30:17 UT

 Maintainer of www/blogsum,
 
 Please note that PR ports/141998 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/141998
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->open 
State-Changed-By: pgollucci 
State-Changed-When: Mon Jan 4 04:52:22 UTC 2010 
State-Changed-Why:  
feedback received (via e-email)( 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141998 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Mon Jan 4 04:58:52 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/141998: commit references a PR
Date: Mon,  4 Jan 2010 04:58:46 +0000 (UTC)

 pgollucci    2010-01-04 04:58:38 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/blogsum          Makefile 
   Log:
   - USE_APACHE=x instead of _DEPENDS
   - WITH_APACHE2 is deprecated
   - DEPENDS_ARGS doesn't work with packages, and isn't needed
   - p5-libapreq pulls in mod_perl
   - / ify dirs
   
   PR:             ports/141998
   Approved by:    maintainer (via e-mail)
   
   Revision  Changes    Path
   1.3       +9 -19     ports/www/blogsum/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:
