From 086385718a45a19f27dceb98e1e3ba13393bc0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Mon, 6 Mar 2023 14:58:02 +0100
Subject: [PATCH] * Dotted filenames for package xforms

---
 packages/xforms/fpmake.pp                   | 2 +-
 packages/xforms/namespaced/Api.Fd2pascal.pp | 3 +++
 packages/xforms/namespaced/Api.Xforms.pp    | 3 +++
 packages/xforms/namespaces.lst              | 4 ++++
 packages/xforms/src/fd2pascal.pp            | 7 +++++++
 packages/xforms/src/xforms.pp               | 7 +++++++
 6 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 packages/xforms/namespaced/Api.Fd2pascal.pp
 create mode 100644 packages/xforms/namespaced/Api.Xforms.pp
 create mode 100644 packages/xforms/namespaces.lst

diff --git a/packages/xforms/fpmake.pp b/packages/xforms/fpmake.pp
index d6562c8c0a..6a60e145c5 100644
--- a/packages/xforms/fpmake.pp
+++ b/packages/xforms/fpmake.pp
@@ -32,7 +32,7 @@ begin
         begin
           AddInclude('cursorfont.inc');
         end;
-    T:=P.Targets.AddProgram('fd2pascal.pp');
+    // T:=P.Targets.AddProgram('fd2pascal.pp');
 
     P.Sources.AddSrc('README.txt');
 
diff --git a/packages/xforms/namespaced/Api.Fd2pascal.pp b/packages/xforms/namespaced/Api.Fd2pascal.pp
new file mode 100644
index 0000000000..dab74394d4
--- /dev/null
+++ b/packages/xforms/namespaced/Api.Fd2pascal.pp
@@ -0,0 +1,3 @@
+unit Api.Fd2pascal;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fd2pascal.pp}
diff --git a/packages/xforms/namespaced/Api.Xforms.pp b/packages/xforms/namespaced/Api.Xforms.pp
new file mode 100644
index 0000000000..8abd36305f
--- /dev/null
+++ b/packages/xforms/namespaced/Api.Xforms.pp
@@ -0,0 +1,3 @@
+unit Api.Xforms;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i xforms.pp}
diff --git a/packages/xforms/namespaces.lst b/packages/xforms/namespaces.lst
new file mode 100644
index 0000000000..d4d5612f59
--- /dev/null
+++ b/packages/xforms/namespaces.lst
@@ -0,0 +1,4 @@
+src/xforms.pp=namespaced/Api.Xforms.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/fd2pascal.pp=namespaced/Api.Fd2pascal.pp
diff --git a/packages/xforms/src/fd2pascal.pp b/packages/xforms/src/fd2pascal.pp
index b4715bedf4..a955c900c6 100644
--- a/packages/xforms/src/fd2pascal.pp
+++ b/packages/xforms/src/fd2pascal.pp
@@ -21,10 +21,17 @@ Program fd2pascal;
   --------------------------------------------------------------------------- }
 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  UnixApi.Base,
+  UnixApi.Unix,
+  System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   baseunix,
   Unix,
   sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const RevString = '$Revision: 1.5 $';
   NrOptions = 4;
diff --git a/packages/xforms/src/xforms.pp b/packages/xforms/src/xforms.pp
index 85b139ea9a..7818edee38 100644
--- a/packages/xforms/src/xforms.pp
+++ b/packages/xforms/src/xforms.pp
@@ -1,14 +1,21 @@
 {
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit xforms;
+{$ENDIF FPC_DOTTEDUNITS}
 Interface
 
 {$linklib forms}
 {$linklib c}
 {$linklib m}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Api.X11.X,Api.X11.Xlib,Api.X11.Xutil,Api.X11.Xresource;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   x,xlib,xutil,xresource;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   FL_VERSION=0;