git: f9550e0e8396 - 2021Q3 - graphics/stamp: Unbreak with -fno-common
Fernando Apesteguía
fernape at FreeBSD.org
Thu Aug 19 06:08:44 UTC 2021
The branch 2021Q3 has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f9550e0e8396f9f69ccdb81e890bd3fa5d8f298a
commit f9550e0e8396f9f69ccdb81e890bd3fa5d8f298a
Author: Robert Clausecker <fuz at fuz.su>
AuthorDate: 2021-08-18 09:07:09 +0000
Commit: Fernando Apesteguía <fernape at FreeBSD.org>
CommitDate: 2021-08-19 06:03:07 +0000
graphics/stamp: Unbreak with -fno-common
* Submitter becomes MAINTAINER. Already maintainer of several ports.
* Define LICENSE
While here:
* Remake old patches
* Add USES localbase
PR: 257911
MFH: 2021Q3
(cherry picked from commit 06483f297b98098167fd63364c1dba82d355474a)
---
graphics/stamp/Makefile | 12 +++++-------
graphics/stamp/files/patch-Makefile.in | 6 +++---
graphics/stamp/files/patch-gstamp_gstamp.c | 4 ++--
...atch-gstamp_gstamp_misc.c => patch-gstamp_gstamp__misc.c} | 4 ++--
...stamp_gstamp_signals.c => patch-gstamp_gstamp__signals.c} | 4 ++--
graphics/stamp/files/patch-gstamp_gstamp__ui.c | 7 +++++++
graphics/stamp/files/patch-gstamp_gstamp_ui.c | 7 -------
graphics/stamp/files/patch-lib_common.c | 4 ++--
graphics/stamp/files/patch-lib_ftplib.c | 10 ++++++++++
graphics/stamp/files/patch-lib_ftplib.h | 11 +++++++++++
graphics/stamp/files/patch-lib_rcfile.c | 6 +++---
graphics/stamp/files/patch-lib_transmogrify.c | 4 ++--
12 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index 862070517a77..294ff8dded7a 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -2,20 +2,18 @@
PORTNAME= stamp
PORTVERSION= 2.0.8
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics
MASTER_SITES= SF
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= fuz at fuz.su
COMMENT= Adds a graphical, configurable timestamp to a grayscale image
-BROKEN_FreeBSD_13= ld: error: duplicate symbol: DefaultNetbuf
-BROKEN_FreeBSD_14= ld: error: duplicate symbol: DefaultNetbuf
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
-USES= jpeg
+USES= jpeg localbase
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's#/usr/local/share/stamp#${DATADIR}#' \
diff --git a/graphics/stamp/files/patch-Makefile.in b/graphics/stamp/files/patch-Makefile.in
index ccd944f6b2e5..ad03108a1c92 100644
--- a/graphics/stamp/files/patch-Makefile.in
+++ b/graphics/stamp/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2011-03-12 21:24:42.000000000 +0100
-+++ Makefile.in 2011-03-12 21:25:00.000000000 +0100
-@@ -329,12 +329,12 @@ maintainer-clean-generic clean mostlycle
+--- Makefile.in.orig 1999-03-10 10:54:42 UTC
++++ Makefile.in
+@@ -329,12 +329,12 @@ maintainer-clean-generic clean mostlyclean distclean m
.PHONY: files
files:
diff --git a/graphics/stamp/files/patch-gstamp_gstamp.c b/graphics/stamp/files/patch-gstamp_gstamp.c
index 30976d4b5613..2a4455f8d404 100644
--- a/graphics/stamp/files/patch-gstamp_gstamp.c
+++ b/graphics/stamp/files/patch-gstamp_gstamp.c
@@ -1,5 +1,5 @@
---- gstamp/gstamp.c.orig 2011-03-12 21:29:21.000000000 +0100
-+++ gstamp/gstamp.c 2011-03-12 21:29:42.000000000 +0100
+--- gstamp/gstamp.c.orig 1999-03-10 06:27:04 UTC
++++ gstamp/gstamp.c
@@ -7,6 +7,7 @@
#include <gtk/gtk.h>
diff --git a/graphics/stamp/files/patch-gstamp_gstamp_misc.c b/graphics/stamp/files/patch-gstamp_gstamp__misc.c
similarity index 55%
rename from graphics/stamp/files/patch-gstamp_gstamp_misc.c
rename to graphics/stamp/files/patch-gstamp_gstamp__misc.c
index 20c8c0a91323..2d974cb78e1b 100644
--- a/graphics/stamp/files/patch-gstamp_gstamp_misc.c
+++ b/graphics/stamp/files/patch-gstamp_gstamp__misc.c
@@ -1,5 +1,5 @@
---- gstamp/gstamp_misc.c.orig 2011-03-12 21:33:49.000000000 +0100
-+++ gstamp/gstamp_misc.c 2011-03-12 21:34:16.000000000 +0100
+--- gstamp/gstamp_misc.c.orig 1999-03-11 08:32:44 UTC
++++ gstamp/gstamp_misc.c
@@ -2,6 +2,7 @@
Eric Werner - 19 FEB 1999
ebw at city-net.com
diff --git a/graphics/stamp/files/patch-gstamp_gstamp_signals.c b/graphics/stamp/files/patch-gstamp_gstamp__signals.c
similarity index 53%
rename from graphics/stamp/files/patch-gstamp_gstamp_signals.c
rename to graphics/stamp/files/patch-gstamp_gstamp__signals.c
index 19926a639db3..cdfa5b38eebb 100644
--- a/graphics/stamp/files/patch-gstamp_gstamp_signals.c
+++ b/graphics/stamp/files/patch-gstamp_gstamp__signals.c
@@ -1,5 +1,5 @@
---- gstamp/gstamp_signals.c.orig 2011-03-12 21:31:32.000000000 +0100
-+++ gstamp/gstamp_signals.c 2011-03-12 21:31:44.000000000 +0100
+--- gstamp/gstamp_signals.c.orig 1999-03-11 08:32:30 UTC
++++ gstamp/gstamp_signals.c
@@ -3,6 +3,7 @@
ebw at city-net.com
*/
diff --git a/graphics/stamp/files/patch-gstamp_gstamp__ui.c b/graphics/stamp/files/patch-gstamp_gstamp__ui.c
new file mode 100644
index 000000000000..f67df776dc36
--- /dev/null
+++ b/graphics/stamp/files/patch-gstamp_gstamp__ui.c
@@ -0,0 +1,7 @@
+--- gstamp/gstamp_ui.c.orig 1999-03-11 08:31:59 UTC
++++ gstamp/gstamp_ui.c
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include <gtk/gtk.h>
+ #include "gstamp.h"
+
diff --git a/graphics/stamp/files/patch-gstamp_gstamp_ui.c b/graphics/stamp/files/patch-gstamp_gstamp_ui.c
deleted file mode 100644
index 7a4380560404..000000000000
--- a/graphics/stamp/files/patch-gstamp_gstamp_ui.c
+++ /dev/null
@@ -1,7 +0,0 @@
---- gstamp/gstamp_ui.c.orig 2011-03-12 21:31:56.000000000 +0100
-+++ gstamp/gstamp_ui.c 2011-03-12 21:32:20.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include <gtk/gtk.h>
- #include "gstamp.h"
-
diff --git a/graphics/stamp/files/patch-lib_common.c b/graphics/stamp/files/patch-lib_common.c
index 276b677f222c..abf94acab6ed 100644
--- a/graphics/stamp/files/patch-lib_common.c
+++ b/graphics/stamp/files/patch-lib_common.c
@@ -1,5 +1,5 @@
---- lib/common.c.orig 2011-03-12 21:28:20.000000000 +0100
-+++ lib/common.c 2011-03-12 21:28:30.000000000 +0100
+--- lib/common.c.orig 1999-03-11 08:29:53 UTC
++++ lib/common.c
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
diff --git a/graphics/stamp/files/patch-lib_ftplib.c b/graphics/stamp/files/patch-lib_ftplib.c
new file mode 100644
index 000000000000..64e36df878a6
--- /dev/null
+++ b/graphics/stamp/files/patch-lib_ftplib.c
@@ -0,0 +1,10 @@
+--- lib/ftplib.c.orig 2021-08-17 12:18:12 UTC
++++ lib/ftplib.c
+@@ -77,6 +77,7 @@ static char *version =
+ "ftplib Release 3 12/xx/97, copyright 1996, 1997 Thomas Pfau";
+
+ GLOBALDEF int ftplib_debug = 0;
++netbuf *DefaultNetbuf;
+
+ #if defined(__unix__) || defined(VMS)
+ #define net_read read
diff --git a/graphics/stamp/files/patch-lib_ftplib.h b/graphics/stamp/files/patch-lib_ftplib.h
new file mode 100644
index 000000000000..d5aaff23819b
--- /dev/null
+++ b/graphics/stamp/files/patch-lib_ftplib.h
@@ -0,0 +1,11 @@
+--- lib/ftplib.h.orig 2021-08-17 12:17:32 UTC
++++ lib/ftplib.h
+@@ -55,7 +55,7 @@ extern "C" {
+ typedef struct NetBuf netbuf;
+
+ /* v1 compatibility stuff */
+-netbuf *DefaultNetbuf;
++extern netbuf *DefaultNetbuf;
+
+ #define ftplib_lastresp FtpLastResponse(DefaultNetbuf)
+ #define ftpInit FtpInit
diff --git a/graphics/stamp/files/patch-lib_rcfile.c b/graphics/stamp/files/patch-lib_rcfile.c
index aec536730309..24615ad302c9 100644
--- a/graphics/stamp/files/patch-lib_rcfile.c
+++ b/graphics/stamp/files/patch-lib_rcfile.c
@@ -1,6 +1,6 @@
---- lib/rcfile.c.orig Fri Dec 24 15:02:25 1999
-+++ lib/rcfile.c Fri Dec 24 15:06:09 1999
-@@ -101,8 +101,8 @@
+--- lib/rcfile.c.orig 1999-03-11 08:30:32 UTC
++++ lib/rcfile.c
+@@ -101,8 +101,8 @@ if ((!(strcmp(Args->LowerFont,""))) &&
exit(ERR_NOLFONT) ;
}
diff --git a/graphics/stamp/files/patch-lib_transmogrify.c b/graphics/stamp/files/patch-lib_transmogrify.c
index 204d77f11ba1..1e2f810e2b8b 100644
--- a/graphics/stamp/files/patch-lib_transmogrify.c
+++ b/graphics/stamp/files/patch-lib_transmogrify.c
@@ -1,5 +1,5 @@
---- lib/transmogrify.c.orig 2011-03-12 21:28:42.000000000 +0100
-+++ lib/transmogrify.c 2011-03-12 21:28:55.000000000 +0100
+--- lib/transmogrify.c.orig 1999-03-10 11:40:33 UTC
++++ lib/transmogrify.c
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
More information about the dev-commits-ports-branches
mailing list