Attachment 235991 Details for Bug 265904 – www/wt 4.7.2 to 4.8.0 with simplified DEBUG option

[patch] www/wt 4.7.2 to 4.8.0 with simplified DEBUG option

wt-4.7.2-to-4.8.0.diff (text/plain), 6.80 KB, created by Mamadou Babaei on 2022-08-18 11:53:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mamadou Babaei

Created: 2022-08-18 11:53:25 UTC

Size: 6.80 KB

patch

obsolete

>diff -urN www/wt-orig/Makefile www/wt/Makefile
>--- www/wt-orig/Makefile	2022-08-17 16:27:29.265066000 +0200
>+++ www/wt/Makefile	2022-08-18 13:33:17.257017000 +0200
>@@ -1,6 +1,5 @@
> PORTNAME=	wt
>-DISTVERSION=	4.7.2
>-PORTREVISION=	2
>+DISTVERSION=	4.8.0
> CATEGORIES=	www
> 
> MAINTAINER=	info@babaei.net
>@@ -33,6 +32,7 @@
> 		-DDESTDIR:STRING=${STAGEDIR}
> 
> OPTIONS_DEFINE=	\
>+	DEBUG \
> 	EXAMPLES \
> 	TESTS \
> 	RESOURCES \
>@@ -141,6 +141,15 @@
> PLIST_SUB=	VERSION=${DISTVERSION}
> 
> .include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MDEBUG}
>+WITH_DEBUG=	yes
>+PLIST_SUB+=	DEBUG_BUILD=""
>+PLIST_SUB+=	RELEASE_BUILD="@comment "
>+.else
>+PLIST_SUB+=	DEBUG_BUILD="@comment "
>+PLIST_SUB+=	RELEASE_BUILD=""
>+.endif
> 
> .if ${PORT_OPTIONS:MSQLITE3} || \
>     ${PORT_OPTIONS:MPOSTGRES} || \
>diff -urN www/wt-orig/distinfo www/wt/distinfo
>--- www/wt-orig/distinfo	2022-08-17 16:27:29.265116000 +0200
>+++ www/wt/distinfo	2022-08-17 16:31:00.355110000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1652688856
>-SHA256 (emweb-wt-4.7.2_GH0.tar.gz) = 38b074f32383f43d9f8d4c0f7b1a29ea4fd3faaf9cc983d2d0277ac7a5c6a4cf
>-SIZE (emweb-wt-4.7.2_GH0.tar.gz) = 10601008
>+TIMESTAMP = 1660746660
>+SHA256 (emweb-wt-4.8.0_GH0.tar.gz) = e4030d8f530ec7bdd6b341a2bf31a608fb9ebcedb905155f83ec7f300a7d420d
>+SIZE (emweb-wt-4.8.0_GH0.tar.gz) = 10604286
>diff -urN www/wt-orig/files/patch-CMakeLists.txt www/wt/files/patch-CMakeLists.txt
>--- www/wt-orig/files/patch-CMakeLists.txt	2022-08-17 16:27:29.265044000 +0200
>+++ www/wt/files/patch-CMakeLists.txt	2022-08-17 16:42:17.186025000 +0200
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2021-12-14 18:54:00 UTC
>+--- CMakeLists.txt.orig	2022-08-17 14:32:16 UTC
> +++ CMakeLists.txt
>-@@ -25,27 +25,27 @@ ENDIF(NOT SHARED_LIBS)
>+@@ -25,28 +25,28 @@ ENDIF(NOT SHARED_LIBS)
>  #
>  # Various things that must be configured by the user or packager ...
>  #
>@@ -29,6 +29,8 @@
> +OPTION(ENABLE_MSSQLSERVER "Build Microsoft SQL Server backend for Wt::Dbo" OFF) # Microsoft Windows only option
> +OPTION(ENABLE_QT4 "Build Qt4 interworking library (libwtwithqt)" OFF) # QT4 is no longer available in FreeBSD Ports
>  OPTION(ENABLE_QT5 "Build Qt5 interworking library (libwtwithqt5)" ON)
>+-OPTION(ENABLE_QT6 "Build Qt6 interworking library (libwtwithqt6)" ON)
>++OPTION(ENABLE_QT6 "Build Qt6 interworking library (libwtwithqt6)" OFF) # QT6 is not yet available in FreeBSD Ports
>  OPTION(ENABLE_SAML "Build built-in SAML service provider for Wt::Auth" OFF)
> -OPTION(ENABLE_LIBWTTEST "Build Wt::Test" ON)
> -OPTION(ENABLE_LIBWTDBO "Build Wt::Dbo" ON)
>diff -urN www/wt-orig/pkg-plist www/wt/pkg-plist
>--- www/wt-orig/pkg-plist	2022-08-17 16:27:29.265158000 +0200
>+++ www/wt/pkg-plist	2022-08-18 12:32:17.927772000 +0200
>@@ -385,42 +385,60 @@
> include/Wt/WWidgetItemImpl.h
> lib/cmake/wt/wt-config-version.cmake
> lib/cmake/wt/wt-config.cmake
>-%%DBO%%lib/cmake/wt/wt-target-dbo-release.cmake
>+%%DBO%%lib/cmake/wt/wt-target-dbo-%%CMAKE_BUILD_TYPE%%.cmake
> %%DBO%%lib/cmake/wt/wt-target-dbo.cmake
>-%%FIREBIRD%%lib/cmake/wt/wt-target-dbofirebird-release.cmake
>+%%FIREBIRD%%lib/cmake/wt/wt-target-dbofirebird-%%CMAKE_BUILD_TYPE%%.cmake
> %%FIREBIRD%%lib/cmake/wt/wt-target-dbofirebird.cmake
>-%%MYSQL%%lib/cmake/wt/wt-target-dbomysql-release.cmake
>+%%MYSQL%%lib/cmake/wt/wt-target-dbomysql-%%CMAKE_BUILD_TYPE%%.cmake
> %%MYSQL%%lib/cmake/wt/wt-target-dbomysql.cmake
>-%%POSTGRES%%lib/cmake/wt/wt-target-dbopostgres-release.cmake
>+%%POSTGRES%%lib/cmake/wt/wt-target-dbopostgres-%%CMAKE_BUILD_TYPE%%.cmake
> %%POSTGRES%%lib/cmake/wt/wt-target-dbopostgres.cmake
>-%%SQLITE3%%lib/cmake/wt/wt-target-dbosqlite3-release.cmake
>+%%SQLITE3%%lib/cmake/wt/wt-target-dbosqlite3-%%CMAKE_BUILD_TYPE%%.cmake
> %%SQLITE3%%lib/cmake/wt/wt-target-dbosqlite3.cmake
>-%%FCGI%%lib/cmake/wt/wt-target-fcgi-release.cmake
>+%%FCGI%%lib/cmake/wt/wt-target-fcgi-%%CMAKE_BUILD_TYPE%%.cmake
> %%FCGI%%lib/cmake/wt/wt-target-fcgi.cmake
>-%%WTHTTP%%lib/cmake/wt/wt-target-http-release.cmake
>+%%WTHTTP%%lib/cmake/wt/wt-target-http-%%CMAKE_BUILD_TYPE%%.cmake
> %%WTHTTP%%lib/cmake/wt/wt-target-http.cmake
>-%%LIBWTTEST%%lib/cmake/wt/wt-target-test-release.cmake
>+%%LIBWTTEST%%lib/cmake/wt/wt-target-test-%%CMAKE_BUILD_TYPE%%.cmake
> %%LIBWTTEST%%lib/cmake/wt/wt-target-test.cmake
>-lib/cmake/wt/wt-target-wt-release.cmake
>+lib/cmake/wt/wt-target-wt-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/wt/wt-target-wt.cmake
>-lib/libwt.so
>-lib/libwt.so.%%VERSION%%
>-%%DBO%%lib/libwtdbo.so
>-%%DBO%%lib/libwtdbo.so.%%VERSION%%
>-%%FIREBIRD%%lib/libwtdbofirebird.so
>-%%FIREBIRD%%lib/libwtdbofirebird.so.%%VERSION%%
>-%%MYSQL%%lib/libwtdbomysql.so
>-%%MYSQL%%lib/libwtdbomysql.so.%%VERSION%%
>-%%POSTGRES%%lib/libwtdbopostgres.so
>-%%POSTGRES%%lib/libwtdbopostgres.so.%%VERSION%%
>-%%SQLITE3%%lib/libwtdbosqlite3.so
>-%%SQLITE3%%lib/libwtdbosqlite3.so.%%VERSION%%
>-%%FCGI%%lib/libwtfcgi.so
>-%%FCGI%%lib/libwtfcgi.so.%%VERSION%%
>-%%WTHTTP%%lib/libwthttp.so
>-%%WTHTTP%%lib/libwthttp.so.%%VERSION%%
>-%%LIBWTTEST%%lib/libwttest.so
>-%%LIBWTTEST%%lib/libwttest.so.%%VERSION%%
>+%%RELEASE_BUILD%%lib/libwt.so
>+%%RELEASE_BUILD%%lib/libwt.so.%%VERSION%%
>+%%RELEASE_BUILD%%%%DBO%%lib/libwtdbo.so
>+%%RELEASE_BUILD%%%%DBO%%lib/libwtdbo.so.%%VERSION%%
>+%%RELEASE_BUILD%%%%FIREBIRD%%lib/libwtdbofirebird.so
>+%%RELEASE_BUILD%%%%FIREBIRD%%lib/libwtdbofirebird.so.%%VERSION%%
>+%%RELEASE_BUILD%%%%MYSQL%%lib/libwtdbomysql.so
>+%%RELEASE_BUILD%%%%MYSQL%%lib/libwtdbomysql.so.%%VERSION%%
>+%%RELEASE_BUILD%%%%POSTGRES%%lib/libwtdbopostgres.so
>+%%RELEASE_BUILD%%%%POSTGRES%%lib/libwtdbopostgres.so.%%VERSION%%
>+%%RELEASE_BUILD%%%%SQLITE3%%lib/libwtdbosqlite3.so
>+%%RELEASE_BUILD%%%%SQLITE3%%lib/libwtdbosqlite3.so.%%VERSION%%
>+%%RELEASE_BUILD%%%%FCGI%%lib/libwtfcgi.so
>+%%RELEASE_BUILD%%%%FCGI%%lib/libwtfcgi.so.%%VERSION%%
>+%%RELEASE_BUILD%%%%WTHTTP%%lib/libwthttp.so
>+%%RELEASE_BUILD%%%%WTHTTP%%lib/libwthttp.so.%%VERSION%%
>+%%RELEASE_BUILD%%%%LIBWTTEST%%lib/libwttest.so
>+%%RELEASE_BUILD%%%%LIBWTTEST%%lib/libwttest.so.%%VERSION%%
>+%%DEBUG_BUILD%%lib/libwtd.so
>+%%DEBUG_BUILD%%lib/libwtd.so.%%VERSION%%
>+%%DEBUG_BUILD%%%%DBO%%lib/libwtdbod.so
>+%%DEBUG_BUILD%%%%DBO%%lib/libwtdbod.so.%%VERSION%%
>+%%DEBUG_BUILD%%%%FIREBIRD%%lib/libwtdbofirebirdd.so
>+%%DEBUG_BUILD%%%%FIREBIRD%%lib/libwtdbofirebirdd.so.%%VERSION%%
>+%%DEBUG_BUILD%%%%MYSQL%%lib/libwtdbomysqld.so
>+%%DEBUG_BUILD%%%%MYSQL%%lib/libwtdbomysqld.so.%%VERSION%%
>+%%DEBUG_BUILD%%%%POSTGRES%%lib/libwtdbopostgresd.so
>+%%DEBUG_BUILD%%%%POSTGRES%%lib/libwtdbopostgresd.so.%%VERSION%%
>+%%DEBUG_BUILD%%%%SQLITE3%%lib/libwtdbosqlite3d.so
>+%%DEBUG_BUILD%%%%SQLITE3%%lib/libwtdbosqlite3d.so.%%VERSION%%
>+%%DEBUG_BUILD%%%%FCGI%%lib/libwtfcgid.so
>+%%DEBUG_BUILD%%%%FCGI%%lib/libwtfcgid.so.%%VERSION%%
>+%%DEBUG_BUILD%%%%WTHTTP%%lib/libwthttpd.so
>+%%DEBUG_BUILD%%%%WTHTTP%%lib/libwthttpd.so.%%VERSION%%
>+%%DEBUG_BUILD%%%%LIBWTTEST%%lib/libwttestd.so
>+%%DEBUG_BUILD%%%%LIBWTTEST%%lib/libwttestd.so.%%VERSION%%
> %%RESOURCES%%share/Wt/resources/ajax-loading.gif
> %%RESOURCES%%share/Wt/resources/collapse-rtl.gif
> %%RESOURCES%%share/Wt/resources/collapse.gif

Flags:

info: maintainer-approval+

Actions: View | Diff

Attachments on bug 265904: 235968 | 235990 | 235991 | 235994 | 235995