From e42a11fbfea9d54fd84a11d03e71af92ddea311a 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:57:54 +0100
Subject: [PATCH] * Dotted filenames for package uuid

---
 packages/uuid/namespaced/System.Libuuid.pp |  3 +++
 packages/uuid/namespaced/System.Macuuid.pp |  3 +++
 packages/uuid/namespaces.lst               |  4 ++++
 packages/uuid/src/libuuid.pp               |  6 ++++++
 packages/uuid/src/macuuid.pp               | 10 ++++++++++
 5 files changed, 26 insertions(+)
 create mode 100644 packages/uuid/namespaced/System.Libuuid.pp
 create mode 100644 packages/uuid/namespaced/System.Macuuid.pp
 create mode 100644 packages/uuid/namespaces.lst

diff --git a/packages/uuid/namespaced/System.Libuuid.pp b/packages/uuid/namespaced/System.Libuuid.pp
new file mode 100644
index 0000000000..97066d79d7
--- /dev/null
+++ b/packages/uuid/namespaced/System.Libuuid.pp
@@ -0,0 +1,3 @@
+unit System.Libuuid;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i libuuid.pp}
diff --git a/packages/uuid/namespaced/System.Macuuid.pp b/packages/uuid/namespaced/System.Macuuid.pp
new file mode 100644
index 0000000000..e230b6f12b
--- /dev/null
+++ b/packages/uuid/namespaced/System.Macuuid.pp
@@ -0,0 +1,3 @@
+unit System.Macuuid;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i macuuid.pp}
diff --git a/packages/uuid/namespaces.lst b/packages/uuid/namespaces.lst
new file mode 100644
index 0000000000..5425e06f6d
--- /dev/null
+++ b/packages/uuid/namespaces.lst
@@ -0,0 +1,4 @@
+src/macuuid.pp=namespaced/System.Macuuid.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/libuuid.pp=namespaced/System.Libuuid.pp
diff --git a/packages/uuid/src/libuuid.pp b/packages/uuid/src/libuuid.pp
index 78fbd62b58..87600bdc3d 100644
--- a/packages/uuid/src/libuuid.pp
+++ b/packages/uuid/src/libuuid.pp
@@ -1,10 +1,16 @@
 {$mode objfpc}
 {$H+}
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit Libuuid;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils,System.DynLibs;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils,dynlibs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Var
   LibUUIDName : String = 'libuuid.so.1';
diff --git a/packages/uuid/src/macuuid.pp b/packages/uuid/src/macuuid.pp
index 226c24acd7..68a9f481ee 100644
--- a/packages/uuid/src/macuuid.pp
+++ b/packages/uuid/src/macuuid.pp
@@ -1,17 +1,27 @@
 {$mode objfpc}
 {$H+}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit macuuid;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Function CreateMacGUID(Out GUID : TGUID) : Integer;
 
 
 Implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses UnixApi.Types, System.Net.Sockets, UnixApi.Base, UnixApi.Unix;
+{$ELSE FPC_DOTTEDUNITS}
 uses unixtype, sockets, baseunix, unix;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const 
   MAX_ADJUSTMENT = 10;