diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2010-01-04 12:58:38 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2010-01-04 12:58:38 +0800 |
| commit | d0f240f92e6899e36f92fbbb44a074944997a469 (patch) | |
| tree | d32d826d5d5276f2d5007ad195623b3cdba1bb7e /www/blogsum | |
| parent | 6f6c2c434339a7038d3de043ecddd7160eeb3bb3 (diff) | |
| download | freebsd-ports-gnome-d0f240f92e6899e36f92fbbb44a074944997a469.tar.gz freebsd-ports-gnome-d0f240f92e6899e36f92fbbb44a074944997a469.tar.zst freebsd-ports-gnome-d0f240f92e6899e36f92fbbb44a074944997a469.zip | |
- 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)
Diffstat (limited to 'www/blogsum')
| -rw-r--r-- | www/blogsum/Makefile | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/www/blogsum/Makefile b/www/blogsum/Makefile index fd2c5645df14..760c05dc861d 100644 --- a/www/blogsum/Makefile +++ b/www/blogsum/Makefile @@ -13,8 +13,7 @@ MASTER_SITES= http://www.dixongroup.net/ 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,31 @@ PERL_MODULES= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ 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} "" |