Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Oct 2024 12:46:45 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: f8d0a3ff0fc8 - 2024Q4 - www/publicfile: fix build on 15-CURRENT
Message-ID:  <202410281246.49SCkjZq076219@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by fuz:

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

commit f8d0a3ff0fc8d5cc0aa054b96951ac53f8f91fdb
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-10-25 11:22:30 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-10-28 12:46:10 +0000

    www/publicfile: fix build on 15-CURRENT
    
    "extern int errno;" no longer works to get errno.  Include <errno.h>
    instead to fix the build.
    
    MFH:            2024Q4
    (cherry picked from commit ba183df93e32704930045e2ad7a90432bc07dba4)
---
 www/publicfile/files/patch-Makefile          | 12 ++++++------
 www/publicfile/files/patch-auto_home_stage.h |  4 ++--
 www/publicfile/files/patch-error.h           | 11 +++++++++++
 www/publicfile/files/patch-fetch.c           |  8 ++++----
 www/publicfile/files/patch-hier.c            |  6 +++---
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/www/publicfile/files/patch-Makefile b/www/publicfile/files/patch-Makefile
index b866e30ee586..35ce26a1214b 100644
--- a/www/publicfile/files/patch-Makefile
+++ b/www/publicfile/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	1999-11-09 08:23:46.000000000 +0100
-+++ Makefile	2014-08-21 12:29:41.000000000 +0200
-@@ -32,6 +32,14 @@
+--- Makefile.orig	1999-11-09 07:23:46 UTC
++++ Makefile
+@@ -32,6 +32,14 @@ compile auto_home.c
  compile auto_home.c
  	./compile auto_home.c
  
@@ -15,7 +15,7 @@
  byte_chr.o: \
  compile byte_chr.c byte.h
  	./compile byte_chr.c
-@@ -231,7 +239,7 @@
+@@ -231,7 +239,7 @@ hier.o: \
  	./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
  
  hier.o: \
@@ -24,7 +24,7 @@
  	./compile hier.c
  
  httpd: \
-@@ -257,9 +265,9 @@
+@@ -257,9 +265,9 @@ install: \
  	./compile httpdate.c
  
  install: \
@@ -36,7 +36,7 @@
  	open.a error.a str.a 
  
  install.o: \
-@@ -268,8 +276,8 @@
+@@ -268,8 +276,8 @@ instcheck: \
  	./compile install.c
  
  instcheck: \
diff --git a/www/publicfile/files/patch-auto_home_stage.h b/www/publicfile/files/patch-auto_home_stage.h
index 9b12a18e6e49..35880e55a9a9 100644
--- a/www/publicfile/files/patch-auto_home_stage.h
+++ b/www/publicfile/files/patch-auto_home_stage.h
@@ -1,5 +1,5 @@
---- /dev/null	2014-08-21 12:22:00.000000000 +0200
-+++ auto_home_stage.h	2014-08-21 12:25:14.000000000 +0200
+--- auto_home_stage.h.orig	2024-10-25 11:20:18 UTC
++++ auto_home_stage.h
 @@ -0,0 +1,6 @@
 +#ifndef AUTO_HOME_STAGE_H_
 +#define AUTO_HOME_STAGE_H_
diff --git a/www/publicfile/files/patch-error.h b/www/publicfile/files/patch-error.h
new file mode 100644
index 000000000000..e466f6122d08
--- /dev/null
+++ b/www/publicfile/files/patch-error.h
@@ -0,0 +1,11 @@
+--- error.h.orig	2024-10-25 11:21:26 UTC
++++ error.h
+@@ -1,7 +1,7 @@
+ #ifndef ERROR_H
+ #define ERROR_H
+ 
+-extern int errno;
++#include <errno.h>
+ 
+ extern int error_intr;
+ extern int error_nomem;
diff --git a/www/publicfile/files/patch-fetch.c b/www/publicfile/files/patch-fetch.c
index 9193103aed5a..be6f256cba76 100644
--- a/www/publicfile/files/patch-fetch.c
+++ b/www/publicfile/files/patch-fetch.c
@@ -1,6 +1,6 @@
---- fetch.c.orig	1999-11-08 23:23:46.000000000 -0800
-+++ fetch.c	2014-01-29 15:19:43.000000000 -0800
-@@ -82,7 +82,7 @@
+--- fetch.c.orig	1999-11-09 07:23:46 UTC
++++ fetch.c
+@@ -82,7 +82,7 @@ static void list(char *fn,int flaglong)
    substdio_puts(&ss,"\r\n");
  }
  
@@ -9,7 +9,7 @@
  {
    DIR *dir;
    direntry *d;
-@@ -122,7 +122,7 @@
+@@ -122,7 +122,7 @@ static int doit(char *fn,int fddata,int fdfile,int how
        for (;;) {
  	r = read(fdfile,inbuf,sizeof inbuf);
  	if (r == -1) {
diff --git a/www/publicfile/files/patch-hier.c b/www/publicfile/files/patch-hier.c
index 587e3885207b..be93922dd715 100644
--- a/www/publicfile/files/patch-hier.c
+++ b/www/publicfile/files/patch-hier.c
@@ -1,6 +1,6 @@
---- hier.c.orig	Tue Apr 20 11:26:00 2004
-+++ hier.c	Tue Apr 20 11:26:06 2004
-@@ -2,9 +2,9 @@
+--- hier.c.orig	1999-11-09 07:23:46 UTC
++++ hier.c
+@@ -2,9 +2,9 @@ void hier()
  
  void hier()
  {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410281246.49SCkjZq076219>