diff options
| author | Beech Rintoul <beech@FreeBSD.org> | 2008-08-24 09:29:04 +0000 |
|---|---|---|
| committer | Beech Rintoul <beech@FreeBSD.org> | 2008-08-24 09:29:04 +0000 |
| commit | 2ca01168a1f5627c99ddc93cdff676df2807fcfb (patch) | |
| tree | 189f94f27558bc42893f5668d2acfe97568a4bbc | |
| parent | - Update to 0.0.5 (diff) | |
- Fix so port respects %localstatedir%
- Fix .conf file handling [1]
- Bump portrevision
PR: ports/126774
Submitted by: regisr <regisr@pobox.com> [1]
| -rw-r--r-- | www/cherokee-devel/Makefile | 6 | ||||
| -rw-r--r-- | www/cherokee-devel/pkg-plist | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile index f8de1b960c14..6e158e9a3b67 100644 --- a/www/cherokee-devel/Makefile +++ b/www/cherokee-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= cherokee PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.cherokee-project.com/download/0.8/${PORTVERSION}/ \ LOCAL/beech @@ -31,6 +31,7 @@ CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www/cherokee \ + --localstatedir=/var \ --enable-readdir_r \ --disable-static DEFCONFS= cherokee.conf @@ -70,6 +71,7 @@ post-patch: s:%datadir%:${PREFIX}/share:g; \ s:%wwwroot%:${PREFIX}/www/cherokee:g; \ s:%prefix%:${PREFIX}:g; \ + s:%localstatedir%:/var:g; \ s:#.*User.*nobody:User www:g; \ s:#.*Group.*nogroup:Group www:g; \ s:#.*PollMethod.*poll:PollMethod kqueue:g' \ @@ -81,6 +83,8 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ ${WRKSRC}/contrib/06to07.py @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ + ${WRKSRC}/contrib/07to08.py + @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ ${WRKSRC}/qa/fcgi.py @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ ${WRKSRC}/qa/run-tests.py diff --git a/www/cherokee-devel/pkg-plist b/www/cherokee-devel/pkg-plist index c6fe390eaf31..cdb5c964f604 100644 --- a/www/cherokee-devel/pkg-plist +++ b/www/cherokee-devel/pkg-plist @@ -538,8 +538,8 @@ www/cherokee/index.html @dirrm %%DATADIR%%/admin/static/images @dirrm %%DATADIR%%/admin/static/css @dirrm %%DATADIR%%/admin/static -@dirrm %%DATADIR%%/admin -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%%/admin +@dirrmtry %%DATADIR%% @dirrm lib/cherokee @dirrm include/cherokee @dirrmtry etc/cherokee/ssl |