From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/lighttpd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/lighttpd/Makefile') diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index a479318f8..fc88b94c9 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -8,13 +8,13 @@ PKG_VERSION:= 1.4.35 PKG_RELEASE:= 1 PKG_MD5SUM:= c7ae774eab4cb7ac85e41b712f4ee9ba PKG_DESCR:= lightweight web server -PKG_SECTION:= www +PKG_SECTION:= net/http PKG_URL:= http://www.lighttpd.net/ PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ PKG_FLAVOURS_LIGHTTPD:= WITH_IPV6 WITH_SSL -PKGFD_WITH_IPV6:= enable IPv6 support -PKGFD_WITH_SSL:= enable SSL support +PKGFD_WITH_IPV6:= enable ipv6 support +PKGFD_WITH_SSL:= enable ssl support PKGFB_WITH_SSL:= openssl PKGFS_WITH_SSL:= libopenssl -- cgit v1.2.3