Re: UPDATE: lighttpd 1.4.68
On Sat, Jan 07, 2023 at 04:34:10AM -0500, Brad Smith wrote:
> On Fri, Jan 06, 2023 at 09:15:18PM +0100, Rafael Sadowski wrote:
> > > +.if ${FLAVOR:Mpgsql}
> > > +CONFIGURE_ARGS+= -DWITH_PGSQL=ON
> > > +LIB_DEPENDS+=databases/postgresql
> > > +WANTLIB+=pq
> > > +.endif
> > > +
> > > +CFLAGS+= -I${LOCALBASE}/include
> > > +LDFLAGS+=-L${LOCALBASE}/lib
> >
> > Is LDFLAGS needed? If yes MODCMAKE_LDFLAGS is the better solution.
>
> Yes, it is. Some of the dependencies use pkg-config files / foo-config
> and some do not.
Remove CONFIGURE_ENV after that.
Index: Makefile
===
RCS file: /home/cvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 Makefile
--- Makefile8 Nov 2022 11:17:18 - 1.172
+++ Makefile7 Jan 2023 10:32:45 -
@@ -1,10 +1,9 @@
COMMENT= secure, fast, compliant, and very flexible web-server
-DISTNAME= lighttpd-1.4.67
+DISTNAME= lighttpd-1.4.68
CATEGORIES=www net
MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
HOMEPAGE= https://www.lighttpd.net/
@@ -15,42 +14,44 @@ PERMIT_PACKAGE= Yes
WANTLIB= c crypto m pcre2-8 ssl z ${MODLUA_WANTLIB}
-COMPILER= base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc
-MODULES= lang/lua
+MODULES= devel/cmake \
+ lang/lua
MODLUA_SA= Yes
LIB_DEPENDS+= devel/pcre2 \
${MODLUA_LIB_DEPENDS}
RUN_DEPENDS+= www/spawn-fcgi
-LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \
---with-lua \
---with-openssl
-CONFIGURE_ENV+=CC_FOR_BUILD="${CC}" \
- CFLAGS_FOR_BUILD="${CFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
- LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
+CONFIGURE_ARGS+=-DWITH_LUA=ON \
+ -DWITH_LUA_VERSION=${MODLUA_DEP} \
+ -DWITH_OPENSSL=ON
-FLAVORS= ldap mysql
+FLAVORS= ldap mysql pgsql
FLAVOR?=
.if ${FLAVOR:Mldap}
-CONFIGURE_ARGS+= --with-ldap
+CONFIGURE_ARGS+= -DWITH_LDAP=ON
LIB_DEPENDS+= databases/openldap
-WANTLIB+= lber ldap sasl2
+WANTLIB+= lber ldap
.endif
.if ${FLAVOR:Mmysql}
-CONFIGURE_ARGS+= --with-mysql
+CONFIGURE_ARGS+= -DWITH_MYSQL=ON
LIB_DEPENDS+= databases/mariadb
-WANTLIB+= mariadb pthread
+WANTLIB+= mariadb
.endif
+.if ${FLAVOR:Mpgsql}
+CONFIGURE_ARGS+= -DWITH_PGSQL=ON
+LIB_DEPENDS+= databases/postgresql
+WANTLIB+= pq
+.endif
+
+CFLAGS+= -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS+= -L${LOCALBASE}/lib
+
post-extract:
@cp -f ${FILESDIR}/lighttpd.conf ${WRKSRC}/doc
@@ -70,6 +71,5 @@ post-install:
${PREFIX}/share/examples/lighttpd/access.log
${INSTALL_DATA} /dev/null \
${PREFIX}/share/examples/lighttpd/error.log
- rm -f ${PREFIX}/lib/lighttpd/*.la
.include
Index: distinfo
===
RCS file: /home/cvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 distinfo
--- distinfo4 Oct 2022 11:34:23 - 1.70
+++ distinfo4 Jan 2023 15:13:45 -
@@ -1,2 +1,2 @@
-SHA256 (lighttpd-1.4.67.tar.xz) = fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g=
-SIZE (lighttpd-1.4.67.tar.xz) = 1039872
+SHA256 (lighttpd-1.4.68.tar.xz) = 5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q=
+SIZE (lighttpd-1.4.68.tar.xz) = 1030612
Index: files/lighttpd.conf
===
RCS file: /home/cvs/ports/www/lighttpd/files/lighttpd.conf,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 lighttpd.conf
--- files/lighttpd.conf 18 Aug 2010 11:16:55 - 1.1
+++ files/lighttpd.conf 6 Jan 2023 01:01:10 -
@@ -22,11 +22,9 @@ server.modules = (
# "mod_evhost",
# "mod_userdir",
# "mod_cgi",
-# "mod_compress",
+# "mod_deflate",
# "mod_ssi",
-# "mod_usertrack",
# "mod_expire",
-# "mod_secdownload",
# "mod_rrdtool",
"mod_accesslog" )
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_CMakeLists_txt5 Jan 2023 20:10:31 -
@@ -0,0 +1,11 @@
+[cmake] add doc/CMakeLists.txt to dist tar
Re: UPDATE: lighttpd 1.4.68
On Fri, Jan 06, 2023 at 09:15:18PM +0100, Rafael Sadowski wrote:
> > +.if ${FLAVOR:Mpgsql}
> > +CONFIGURE_ARGS+= -DWITH_PGSQL=ON
> > +LIB_DEPENDS+= databases/postgresql
> > +WANTLIB+= pq
> > +.endif
> > +
> > +CFLAGS+= -I${LOCALBASE}/include
> > +LDFLAGS+= -L${LOCALBASE}/lib
>
> Is LDFLAGS needed? If yes MODCMAKE_LDFLAGS is the better solution.
Yes, it is. Some of the dependencies use pkg-config files / foo-config
and some do not.
Index: Makefile
===
RCS file: /home/cvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 Makefile
--- Makefile8 Nov 2022 11:17:18 - 1.172
+++ Makefile7 Jan 2023 09:28:53 -
@@ -1,10 +1,9 @@
COMMENT= secure, fast, compliant, and very flexible web-server
-DISTNAME= lighttpd-1.4.67
+DISTNAME= lighttpd-1.4.68
CATEGORIES=www net
MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
HOMEPAGE= https://www.lighttpd.net/
@@ -15,42 +14,45 @@ PERMIT_PACKAGE= Yes
WANTLIB= c crypto m pcre2-8 ssl z ${MODLUA_WANTLIB}
-COMPILER= base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc
-MODULES= lang/lua
+MODULES= devel/cmake \
+ lang/lua
MODLUA_SA= Yes
LIB_DEPENDS+= devel/pcre2 \
${MODLUA_LIB_DEPENDS}
RUN_DEPENDS+= www/spawn-fcgi
-LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \
---with-lua \
---with-openssl
-CONFIGURE_ENV+=CC_FOR_BUILD="${CC}" \
- CFLAGS_FOR_BUILD="${CFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
- LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
+CONFIGURE_ARGS+=-DWITH_LUA=ON \
+ -DWITH_LUA_VERSION=${MODLUA_DEP} \
+ -DWITH_OPENSSL=ON
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-FLAVORS= ldap mysql
+FLAVORS= ldap mysql pgsql
FLAVOR?=
.if ${FLAVOR:Mldap}
-CONFIGURE_ARGS+= --with-ldap
+CONFIGURE_ARGS+= -DWITH_LDAP=ON
LIB_DEPENDS+= databases/openldap
-WANTLIB+= lber ldap sasl2
+WANTLIB+= lber ldap
.endif
.if ${FLAVOR:Mmysql}
-CONFIGURE_ARGS+= --with-mysql
+CONFIGURE_ARGS+= -DWITH_MYSQL=ON
LIB_DEPENDS+= databases/mariadb
-WANTLIB+= mariadb pthread
+WANTLIB+= mariadb
.endif
+.if ${FLAVOR:Mpgsql}
+CONFIGURE_ARGS+= -DWITH_PGSQL=ON
+LIB_DEPENDS+= databases/postgresql
+WANTLIB+= pq
+.endif
+
+CFLAGS+= -I${LOCALBASE}/include
+MODCMAKE_LDFLAGS+= -L${LOCALBASE}/lib
+
post-extract:
@cp -f ${FILESDIR}/lighttpd.conf ${WRKSRC}/doc
@@ -70,6 +72,5 @@ post-install:
${PREFIX}/share/examples/lighttpd/access.log
${INSTALL_DATA} /dev/null \
${PREFIX}/share/examples/lighttpd/error.log
- rm -f ${PREFIX}/lib/lighttpd/*.la
.include
Index: distinfo
===
RCS file: /home/cvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 distinfo
--- distinfo4 Oct 2022 11:34:23 - 1.70
+++ distinfo4 Jan 2023 15:13:45 -
@@ -1,2 +1,2 @@
-SHA256 (lighttpd-1.4.67.tar.xz) = fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g=
-SIZE (lighttpd-1.4.67.tar.xz) = 1039872
+SHA256 (lighttpd-1.4.68.tar.xz) = 5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q=
+SIZE (lighttpd-1.4.68.tar.xz) = 1030612
Index: files/lighttpd.conf
===
RCS file: /home/cvs/ports/www/lighttpd/files/lighttpd.conf,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 lighttpd.conf
--- files/lighttpd.conf 18 Aug 2010 11:16:55 - 1.1
+++ files/lighttpd.conf 6 Jan 2023 01:01:10 -
@@ -22,11 +22,9 @@ server.modules = (
# "mod_evhost",
# "mod_userdir",
# "mod_cgi",
-# "mod_compress",
+# "mod_deflate",
# "mod_ssi",
-# "mod_usertrack",
# "mod_expire",
-# "mod_secdownload",
# "mod_rrdtool",
"mod_accesslog" )
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_CMakeLists_txt5 Jan 2023 20:10:31 -
@@ -0,0 +1,11 @@
+[cmake] add doc/CMakeLists.txt to dist tar ball (#3181)
+da8abbfad414f2f8078e0b50302d691f8b21bbe0
+
+Index: doc/CMakeLists.txt
+---
Re: UPDATE: lighttpd 1.4.68
On Thu Jan 05, 2023 at 08:03:56PM -0500, Brad Smith wrote:
> On Thu, Jan 05, 2023 at 03:24:05PM -0500, Brad Smith wrote:
> > Here is an update to lighttpd 1.4.68.
> >
> > Also a conversion to using CMake and I noticed there was PostgreSQL
> > support so added that as well.
> >
> > https://www.lighttpd.net/2023/1/3/1.4.68/
>
> Send proper up to date diff.
>
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/www/lighttpd/Makefile,v
> retrieving revision 1.172
> diff -u -p -u -p -r1.172 Makefile
> --- Makefile 8 Nov 2022 11:17:18 - 1.172
> +++ Makefile 5 Jan 2023 20:31:07 -
> @@ -1,10 +1,9 @@
> COMMENT= secure, fast, compliant, and very flexible web-server
>
> -DISTNAME=lighttpd-1.4.67
> +DISTNAME=lighttpd-1.4.68
> CATEGORIES= www net
> MASTER_SITES=https://download.lighttpd.net/lighttpd/releases-1.4.x/
> EXTRACT_SUFX=.tar.xz
> -REVISION=0
>
> HOMEPAGE=https://www.lighttpd.net/
>
> @@ -15,42 +14,45 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB= c crypto m pcre2-8 ssl z ${MODLUA_WANTLIB}
>
> -COMPILER=base-clang ports-gcc base-gcc
> +COMPILER=base-clang ports-gcc
>
> -MODULES= lang/lua
> +MODULES= devel/cmake \
> + lang/lua
> MODLUA_SA= Yes
>
> LIB_DEPENDS+=devel/pcre2 \
> ${MODLUA_LIB_DEPENDS}
> RUN_DEPENDS+=www/spawn-fcgi
>
> -LIBTOOL_FLAGS= --tag=disable-static
> -CONFIGURE_STYLE= gnu
> -CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \
> - --with-lua \
> - --with-openssl
> -CONFIGURE_ENV+= CC_FOR_BUILD="${CC}" \
> - CFLAGS_FOR_BUILD="${CFLAGS}" \
> - CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib" \
> - LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
> - LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
> +CONFIGURE_ARGS+=-DWITH_LUA=ON \
> + -DWITH_LUA_VERSION=${MODLUA_DEP} \
> + -DWITH_OPENSSL=ON
> +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
>
> -FLAVORS= ldap mysql
> +FLAVORS= ldap mysql pgsql
> FLAVOR?=
>
> .if ${FLAVOR:Mldap}
> -CONFIGURE_ARGS+= --with-ldap
> +CONFIGURE_ARGS+= -DWITH_LDAP=ON
> LIB_DEPENDS+=databases/openldap
> WANTLIB+=lber ldap sasl2
> .endif
>
> .if ${FLAVOR:Mmysql}
> -CONFIGURE_ARGS+= --with-mysql
> +CONFIGURE_ARGS+= -DWITH_MYSQL=ON
> LIB_DEPENDS+=databases/mariadb
> -WANTLIB+=mariadb pthread
> +WANTLIB+=mariadb
> .endif
>
> +.if ${FLAVOR:Mpgsql}
> +CONFIGURE_ARGS+= -DWITH_PGSQL=ON
> +LIB_DEPENDS+=databases/postgresql
> +WANTLIB+=pq
> +.endif
> +
> +CFLAGS+= -I${LOCALBASE}/include
> +LDFLAGS+=-L${LOCALBASE}/lib
Is LDFLAGS needed? If yes MODCMAKE_LDFLAGS is the better solution.
> +
> post-extract:
> @cp -f ${FILESDIR}/lighttpd.conf ${WRKSRC}/doc
>
> @@ -70,6 +72,5 @@ post-install:
> ${PREFIX}/share/examples/lighttpd/access.log
> ${INSTALL_DATA} /dev/null \
> ${PREFIX}/share/examples/lighttpd/error.log
> - rm -f ${PREFIX}/lib/lighttpd/*.la
>
> .include
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/www/lighttpd/distinfo,v
> retrieving revision 1.70
> diff -u -p -u -p -r1.70 distinfo
> --- distinfo 4 Oct 2022 11:34:23 - 1.70
> +++ distinfo 4 Jan 2023 15:13:45 -
> @@ -1,2 +1,2 @@
> -SHA256 (lighttpd-1.4.67.tar.xz) =
> fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g=
> -SIZE (lighttpd-1.4.67.tar.xz) = 1039872
> +SHA256 (lighttpd-1.4.68.tar.xz) =
> 5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q=
> +SIZE (lighttpd-1.4.68.tar.xz) = 1030612
> Index: files/lighttpd.conf
> ===
> RCS file: /home/cvs/ports/www/lighttpd/files/lighttpd.conf,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 lighttpd.conf
> --- files/lighttpd.conf 18 Aug 2010 11:16:55 - 1.1
> +++ files/lighttpd.conf 6 Jan 2023 01:01:10 -
> @@ -22,11 +22,9 @@ server.modules = (
> # "mod_evhost",
> # "mod_userdir",
> # "mod_cgi",
> -# "mod_compress",
> +# "mod_deflate",
> # "mod_ssi",
> -# "mod_usertrack",
> # "mod_expire",
> -# "mod_secdownload",
> # "mod_rrdtool",
> "mod_accesslog" )
>
> Index: patches/patch-doc_CMakeLists_txt
> ===
> RCS file: patches/patch-doc_CMakeLists_txt
> diff -N patches/patch-doc_CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-doc_CMakeLists_txt
Re: UPDATE: lighttpd 1.4.68
On Thu, Jan 05, 2023 at 03:24:05PM -0500, Brad Smith wrote:
> Here is an update to lighttpd 1.4.68.
>
> Also a conversion to using CMake and I noticed there was PostgreSQL
> support so added that as well.
>
> https://www.lighttpd.net/2023/1/3/1.4.68/
Send proper up to date diff.
Index: Makefile
===
RCS file: /home/cvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 Makefile
--- Makefile8 Nov 2022 11:17:18 - 1.172
+++ Makefile5 Jan 2023 20:31:07 -
@@ -1,10 +1,9 @@
COMMENT= secure, fast, compliant, and very flexible web-server
-DISTNAME= lighttpd-1.4.67
+DISTNAME= lighttpd-1.4.68
CATEGORIES=www net
MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
HOMEPAGE= https://www.lighttpd.net/
@@ -15,42 +14,45 @@ PERMIT_PACKAGE= Yes
WANTLIB= c crypto m pcre2-8 ssl z ${MODLUA_WANTLIB}
-COMPILER= base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc
-MODULES= lang/lua
+MODULES= devel/cmake \
+ lang/lua
MODLUA_SA= Yes
LIB_DEPENDS+= devel/pcre2 \
${MODLUA_LIB_DEPENDS}
RUN_DEPENDS+= www/spawn-fcgi
-LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \
---with-lua \
---with-openssl
-CONFIGURE_ENV+=CC_FOR_BUILD="${CC}" \
- CFLAGS_FOR_BUILD="${CFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
- LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
+CONFIGURE_ARGS+=-DWITH_LUA=ON \
+ -DWITH_LUA_VERSION=${MODLUA_DEP} \
+ -DWITH_OPENSSL=ON
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-FLAVORS= ldap mysql
+FLAVORS= ldap mysql pgsql
FLAVOR?=
.if ${FLAVOR:Mldap}
-CONFIGURE_ARGS+= --with-ldap
+CONFIGURE_ARGS+= -DWITH_LDAP=ON
LIB_DEPENDS+= databases/openldap
WANTLIB+= lber ldap sasl2
.endif
.if ${FLAVOR:Mmysql}
-CONFIGURE_ARGS+= --with-mysql
+CONFIGURE_ARGS+= -DWITH_MYSQL=ON
LIB_DEPENDS+= databases/mariadb
-WANTLIB+= mariadb pthread
+WANTLIB+= mariadb
.endif
+.if ${FLAVOR:Mpgsql}
+CONFIGURE_ARGS+= -DWITH_PGSQL=ON
+LIB_DEPENDS+= databases/postgresql
+WANTLIB+= pq
+.endif
+
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
post-extract:
@cp -f ${FILESDIR}/lighttpd.conf ${WRKSRC}/doc
@@ -70,6 +72,5 @@ post-install:
${PREFIX}/share/examples/lighttpd/access.log
${INSTALL_DATA} /dev/null \
${PREFIX}/share/examples/lighttpd/error.log
- rm -f ${PREFIX}/lib/lighttpd/*.la
.include
Index: distinfo
===
RCS file: /home/cvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 distinfo
--- distinfo4 Oct 2022 11:34:23 - 1.70
+++ distinfo4 Jan 2023 15:13:45 -
@@ -1,2 +1,2 @@
-SHA256 (lighttpd-1.4.67.tar.xz) = fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g=
-SIZE (lighttpd-1.4.67.tar.xz) = 1039872
+SHA256 (lighttpd-1.4.68.tar.xz) = 5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q=
+SIZE (lighttpd-1.4.68.tar.xz) = 1030612
Index: files/lighttpd.conf
===
RCS file: /home/cvs/ports/www/lighttpd/files/lighttpd.conf,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 lighttpd.conf
--- files/lighttpd.conf 18 Aug 2010 11:16:55 - 1.1
+++ files/lighttpd.conf 6 Jan 2023 01:01:10 -
@@ -22,11 +22,9 @@ server.modules = (
# "mod_evhost",
# "mod_userdir",
# "mod_cgi",
-# "mod_compress",
+# "mod_deflate",
# "mod_ssi",
-# "mod_usertrack",
# "mod_expire",
-# "mod_secdownload",
# "mod_rrdtool",
"mod_accesslog" )
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_CMakeLists_txt5 Jan 2023 20:10:31 -
@@ -0,0 +1,11 @@
+[cmake] add doc/CMakeLists.txt to dist tar ball (#3181)
+da8abbfad414f2f8078e0b50302d691f8b21bbe0
+
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
doc/CMakeLists.txt
+@@ -0,0 +1,4 @@
++install(FILES
++ lighttpd.8
++ lighttpd-angel.8
++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
Index:
UPDATE: lighttpd 1.4.68
Here is an update to lighttpd 1.4.68.
Also a conversion to using CMake and I noticed there was PostgreSQL
support so added that as well.
https://www.lighttpd.net/2023/1/3/1.4.68/
Index: Makefile
===
RCS file: /home/cvs/ports/www/lighttpd/Makefile,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 Makefile
--- Makefile8 Nov 2022 11:17:18 - 1.172
+++ Makefile5 Jan 2023 19:55:49 -
@@ -1,10 +1,9 @@
COMMENT= secure, fast, compliant, and very flexible web-server
-DISTNAME= lighttpd-1.4.67
+DISTNAME= lighttpd-1.4.68
CATEGORIES=www net
MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/
EXTRACT_SUFX= .tar.xz
-REVISION= 0
HOMEPAGE= https://www.lighttpd.net/
@@ -15,42 +14,45 @@ PERMIT_PACKAGE= Yes
WANTLIB= c crypto m pcre2-8 ssl z ${MODLUA_WANTLIB}
-COMPILER= base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc
-MODULES= lang/lua
+MODULES= devel/cmake \
+ lang/lua
MODLUA_SA= Yes
LIB_DEPENDS+= devel/pcre2 \
${MODLUA_LIB_DEPENDS}
RUN_DEPENDS+= www/spawn-fcgi
-LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \
---with-lua \
---with-openssl
-CONFIGURE_ENV+=CC_FOR_BUILD="${CC}" \
- CFLAGS_FOR_BUILD="${CFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
- LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
+CONFIGURE_ARGS+=-DWITH_LUA=ON \
+ -DWITH_LUA_VERSION=${MODLUA_DEP} \
+ -DWITH_OPENSSL=ON
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
-FLAVORS= ldap mysql
+FLAVORS= ldap mysql pgsql
FLAVOR?=
.if ${FLAVOR:Mldap}
-CONFIGURE_ARGS+= --with-ldap
+CONFIGURE_ARGS+= -DWITH_LDAP=ON
LIB_DEPENDS+= databases/openldap
WANTLIB+= lber ldap sasl2
.endif
.if ${FLAVOR:Mmysql}
-CONFIGURE_ARGS+= --with-mysql
+CONFIGURE_ARGS+= -DWITH_MYSQL=ON
LIB_DEPENDS+= databases/mariadb
-WANTLIB+= mariadb pthread
+WANTLIB+= mariadb
.endif
+.if ${FLAVOR:Mpgsql}
+CONFIGURE_ARGS+= -DWITH_PGSQL=ON
+LIB_DEPENDS+= databases/postgresql
+WANTLIB+= pq
+.endif
+
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
post-extract:
@cp -f ${FILESDIR}/lighttpd.conf ${WRKSRC}/doc
@@ -70,6 +72,5 @@ post-install:
${PREFIX}/share/examples/lighttpd/access.log
${INSTALL_DATA} /dev/null \
${PREFIX}/share/examples/lighttpd/error.log
- rm -f ${PREFIX}/lib/lighttpd/*.la
.include
Index: distinfo
===
RCS file: /home/cvs/ports/www/lighttpd/distinfo,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 distinfo
--- distinfo4 Oct 2022 11:34:23 - 1.70
+++ distinfo4 Jan 2023 15:13:45 -
@@ -1,2 +1,2 @@
-SHA256 (lighttpd-1.4.67.tar.xz) = fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g=
-SIZE (lighttpd-1.4.67.tar.xz) = 1039872
+SHA256 (lighttpd-1.4.68.tar.xz) = 5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q=
+SIZE (lighttpd-1.4.68.tar.xz) = 1030612
Index: patches/patch-doc_CMakeLists_txt
===
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_CMakeLists_txt4 Jan 2023 20:04:47 -
@@ -0,0 +1,11 @@
+[cmake] add doc/CMakeLists.txt to dist tar ball (#3181)
+da8abbfad414f2f8078e0b50302d691f8b21bbe0
+
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
doc/CMakeLists.txt
+@@ -0,0 +1,4 @@
++install(FILES
++ lighttpd.8
++ lighttpd-angel.8
++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
Index: patches/patch-src_CMakeLists_txt
===
RCS file: patches/patch-src_CMakeLists_txt
diff -N patches/patch-src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_CMakeLists_txt5 Jan 2023 19:41:54 -
@@ -0,0 +1,56 @@
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
src/CMakeLists.txt
+@@ -37,6 +37,7 @@ option(WITH_KRB5 "with Kerberos5-support for mod_auth
+ option(WITH_LDAP "with LDAP-support for mod_auth mod_vhostdb_ldap [default:
off]")
+ option(WITH_PAM "with PAM-support for mod_auth [default: off]")
+ option(WITH_LUA "with lua for mod_magnet [default: off]")
++option(WITH_LUA_VERSION "specify lua version for mod_magnet")
+ # option(WITH_VALGRIND "with internal support for valgrind [default: off]")
+ option(WITH_FAM "fam/gamin for reducing number of stat() calls [default:
off]")
+ option(WITH_LIBDEFLATE "with libdeflate-support for mod_deflate [default:
off]")
+@@ -333,15 +334,10 @@ endif()
+
+ if(WITH_MYSQL)
+
