diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index 862070517a77..294ff8dded7a 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -1,24 +1,22 @@
 # Created by: Bill Fumerola <billf@chc-chimes.com>
 
 PORTNAME=	stamp
 PORTVERSION=	2.0.8
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	fuz@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}#' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
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,21 +1,21 @@
---- 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:
 -        @for subdir in $(DATADIRS); do \
 -          files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \
 -          for file in $$files; do \
 -            echo $$subdir/$$file; \
 -          done; \
 -        done
 +	@for subdir in $(DATADIRS); do \
 +	  files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \
 +	  for file in $$files; do \
 +	    echo $$subdir/$$file; \
 +	  done; \
 +	done
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
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,10 +1,10 @@
---- 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>
  #include <stdio.h>
 +#include <stdlib.h>
  #include <string.h>
  #include <getopt.h>
  #include "gstamp.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,10 +1,10 @@
---- 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@city-net.com
  */
 +#include <sys/shm.h>
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
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,10 +1,10 @@
---- 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@city-net.com
  */
  #include <gtk/gtk.h>
 +#include <stdlib.h>
  #include <string.h>
  #include "gstamp.h"
  #include "../lib/rcfile.h"
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,9 +1,9 @@
---- 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>
 +#include <string.h>
  #include <jpeglib.h>
  #include <setjmp.h>
  #include "common.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,13 +1,13 @@
---- 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) ;
    }
  
 -  if ((!(strcmp(Args->Infile,""))) ||
 -      (!(strcmp(Args->Outfile,"")))) {
 +  if ((Args->Infile == NULL) ||
 +      (Args->Outfile == NULL)) {
      fprintf(stderr, "stamp: You must specify both an input and output JPEG image.\n") ;
      exit(ERR_MISSIOFILE) ;
    }
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,9 +1,9 @@
---- 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>
 +#include <string.h>
  #include <jpeglib.h>
  #include "../lib/common.h"