diff options
| -rw-r--r-- | www/lighttpd/Makefile | 19 | ||||
| -rw-r--r-- | www/lighttpd/distinfo | 4 | ||||
| -rw-r--r-- | www/lighttpd/pkg-plist | 2 |
3 files changed, 18 insertions, 7 deletions
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 1bfb6c2033d8..90c2743ed72f 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= lighttpd -PORTVERSION= 1.4.5 +PORTVERSION= 1.4.6 CATEGORIES= www MASTER_SITES= http://www.lighttpd.net/download/ \ http://dl.fkb.wormulon.net/lighttpd/ \ @@ -23,15 +23,15 @@ USE_RC_SUBR= lighttpd.sh USE_LIBTOOL_VER= 15 USE_GNOME= lthack CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd MAN1= lighttpd.1 spawn-fcgi.1 -OPTIONS= OPENSSL "Enable SSL support" on \ +OPTIONS= OPENSSL "Enable SSL support" on \ OPENLDAP "Enable LDAP support" off \ MYSQL "Enable MYSQL support" off \ - IPV6 "Disable IPV6 support" off + IPV6 "Disable IPV6 support" off \ + CML "Enable Cache Meta Language support" off .include <bsd.port.pre.mk> @@ -54,8 +54,17 @@ CONFIGURE_ARGS+= --with-mysql CONFIGURE_ARGS+= --disable-ipv6 .endif +.if defined(WITH_CML) +LIB_DEPENDS+= lua.5:${PORTSDIR}/lang/lua +CONFIGURE_ARGS+= --with-lua +CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L/${LOCALBASE}/lib +.endif + post-install: - @${INSTALL_DATA} ${FILESDIR}/lighttpd.conf.sample ${PREFIX}/etc/ + @${INSTALL_DATA} ${FILESDIR}/lighttpd.conf.sample ${PREFIX}/etc +.if !exists(${PREFIX}/etc/lighttpd.conf) + @${INSTALL_DATA} ${FILESDIR}/lighttpd.conf.sample ${PREFIX}/etc/lighttpd.conf +.endif @${LIBTOOL} --finish ${PREFIX}/lib .include <bsd.port.post.mk> diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo index 47a69c30a2b8..c9bc0f51ab5e 100644 --- a/www/lighttpd/distinfo +++ b/www/lighttpd/distinfo @@ -1,2 +1,2 @@ -MD5 (lighttpd-1.4.5.tar.gz) = f2e16caf782b9fc8df634b1ea65b7645 -SIZE (lighttpd-1.4.5.tar.gz) = 773963 +MD5 (lighttpd-1.4.6.tar.gz) = dec3ff6ff004868303407165d218bcdf +SIZE (lighttpd-1.4.6.tar.gz) = 774879 diff --git a/www/lighttpd/pkg-plist b/www/lighttpd/pkg-plist index 0e7484f2ec54..150eecbd0ce8 100644 --- a/www/lighttpd/pkg-plist +++ b/www/lighttpd/pkg-plist @@ -1,6 +1,8 @@ @comment $FreeBSD$ bin/spawn-fcgi +@unexec if cmp -s %D/etc/lighttpd.conf %D/etc/lighttpd.conf.sample; then rm -f %D/etc/lighttpd.conf; fi etc/lighttpd.conf.sample +@exec [ -f %B/lighttpd.conf ] || cp %B/%f %B/lighttpd.conf lib/lighttpd/mod_access.so lib/lighttpd/mod_accesslog.so lib/lighttpd/mod_alias.so |