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: ports/141998: [PATCH] www/blogsum: Axe deprecated APACHE things Message-ID: <200912250728.nBP7STCj073584@frieza.p6m7g8.net> Resent-Message-ID: <200912250730.nBP7U1lI020983@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141998
>Category: ports
>Synopsis: [PATCH] www/blogsum: Axe deprecated APACHE things
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 25 07:30:00 UTC 2009
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912250728.nBP7STCj073584>