git: 815db75caec9 - main - x11/cde: Make cde-25 default

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=815db75caec984b95977ccd12f8a2e384439dd11

commit 815db75caec984b95977ccd12f8a2e384439dd11
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-08-12 04:01:49 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-08-12 04:01:49 +0000

    x11/cde: Make cde-25 default
    
    Upstream commit 9af0993de added font aliases, specifically gb2312.1980,
    which may be incompatible with some legacy Xm and Xaw apps however there
    is a circumvention recommended by the cdesktopenv-code upstream. That is
    to add -xrm '*international: true' to the affected app's arguments. A more
    elegant approach is to create a ~/.Xdefaults file containing the following
    example:
    
    XPostit.*international: false
    *international: true
---
 x11/cde/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/x11/cde/Makefile b/x11/cde/Makefile
index 703f1c2d56f2..9d0bdc057a01 100644
--- a/x11/cde/Makefile
+++ b/x11/cde/Makefile
@@ -1,7 +1,5 @@
 VERSIONS=		24 25
-# The reason we will keep our main CDE metaport at 2.4.3 is to
-# avoid a POLA violation due to font differences.
-CDE_VERSION?=		24
+CDE_VERSION?=		25
 
 MASTERDIR=		${.CURDIR}/../cde-${CDE_VERSION}