From e39d6574ce09e9cb69b2de2783802c5c26d413a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= <daniel@turtleware.eu>
Date: Mon, 9 Mar 2026 12:31:52 +0100
Subject: [PATCH] sockets: put the package in the same file as the
 implementation

build-module on rebuild reloads only files that have changes, so if we had
updated only sockets.lisp, then the package is not defined when the file is
recompiled and loaded.
---
 contrib/sockets/package.lisp | 25 -------------------------
 contrib/sockets/sockets.lisp | 14 ++++++++++++++
 src/compile.lsp.in           |  3 +--
 3 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 contrib/sockets/package.lisp

diff --git a/contrib/sockets/package.lisp b/contrib/sockets/package.lisp
deleted file mode 100644
index e491dddc3..000000000
--- a/contrib/sockets/package.lisp
+++ /dev/null
@@ -1,25 +0,0 @@
-;; -*- Mode: Lisp; Syntax: Common-Lisp -*-
-;; $Id$
-
-;; This file is based on SBCL's SB-BSD-SOCKET module and has been
-;; heavily modified to work with ECL by Julian Stecklina.
-;; Port to Windows Sockets contributed by M. Goffioul.
-
-;; You may do whatever you want with this file. (PUBLIC DOMAIN)
-
-;; Trivial stuff is copied from SBCL's SB-BSD-SOCKETS, which is also
-;; in the public domain.
-
-(defpackage "SB-BSD-SOCKETS"
-  (:use "CL" "FFI" "SI")
-  (:export "GET-HOST-BY-NAME" "GET-HOST-BY-ADDRESS"
-           "SOCKET-BIND" "SOCKET-ACCEPT" "SOCKET-CONNECT"
-           "SOCKET-PEERNAME" "SOCKET-NAME" "SOCKET-LISTEN"
-           "SOCKET-RECEIVE" "SOCKET-CLOSE" "SOCKET-MAKE-STREAM"
-           "GET-PROTOCOL-BY-NAME" "MAKE-INET-ADDRESS" "LOCAL-SOCKET"
-           "UNKNOWN-PROTOCOL" "UNKNOWN-PROTOCOL-NAME"
-           "SOCKET" "INET-SOCKET" "SOCKET-FILE-DESCRIPTOR" #+:win32 "NAMED-PIPE-SOCKET"
-           "SOCKET-FAMILY" "SOCKET-PROTOCOL" "SOCKET-TYPE"
-           "SOCKET-ERROR" "NAME-SERVICE-ERROR" "NON-BLOCKING-MODE"
-           "HOST-ENT-NAME" "HOST-ENT-ALIASES" "HOST-ENT-ADDRESS-TYPE"
-           "HOST-ENT-ADDRESSES" "HOST-ENT" "HOST-ENT-ADDRESS" "SOCKET-SEND"))
diff --git a/contrib/sockets/sockets.lisp b/contrib/sockets/sockets.lisp
index 8f3260f35..ed6c1e86c 100755
--- a/contrib/sockets/sockets.lisp
+++ b/contrib/sockets/sockets.lisp
@@ -10,6 +10,20 @@
 ;; Trivial stuff is copied from SBCL's SB-BSD-SOCKETS, which is also
 ;; in the public domain.
 
+(defpackage "SB-BSD-SOCKETS"
+  (:use "CL" "FFI" "SI")
+  (:export "GET-HOST-BY-NAME" "GET-HOST-BY-ADDRESS"
+           "SOCKET-BIND" "SOCKET-ACCEPT" "SOCKET-CONNECT"
+           "SOCKET-PEERNAME" "SOCKET-NAME" "SOCKET-LISTEN"
+           "SOCKET-RECEIVE" "SOCKET-CLOSE" "SOCKET-MAKE-STREAM"
+           "GET-PROTOCOL-BY-NAME" "MAKE-INET-ADDRESS" "LOCAL-SOCKET"
+           "UNKNOWN-PROTOCOL" "UNKNOWN-PROTOCOL-NAME"
+           "SOCKET" "INET-SOCKET" "SOCKET-FILE-DESCRIPTOR" #+:win32 "NAMED-PIPE-SOCKET"
+           "SOCKET-FAMILY" "SOCKET-PROTOCOL" "SOCKET-TYPE"
+           "SOCKET-ERROR" "NAME-SERVICE-ERROR" "NON-BLOCKING-MODE"
+           "HOST-ENT-NAME" "HOST-ENT-ALIASES" "HOST-ENT-ADDRESS-TYPE"
+           "HOST-ENT-ADDRESSES" "HOST-ENT" "HOST-ENT-ADDRESS" "SOCKET-SEND"))
+
 (in-package "SB-BSD-SOCKETS")
 
 ;; Obviously this requires the one or other form of BSD compatible
diff --git a/src/compile.lsp.in b/src/compile.lsp.in
index 402ee5c2b..cd97c78e8 100755
--- a/src/compile.lsp.in
+++ b/src/compile.lsp.in
@@ -297,8 +297,7 @@
 
 #+WANTS-SOCKETS
 (build-module "sockets"
-              '("ext:sockets;package.lisp"
-                "ext:sockets;sockets.lisp")
+              '("ext:sockets;sockets.lisp")
               :dir "build:ext;"
               :prefix "EXT"
               :builtin