diff --git a/net/pwhois/Makefile b/net/pwhois/Makefile
index 7484b2c25e3c..eb0a50d43b22 100644
--- a/net/pwhois/Makefile
+++ b/net/pwhois/Makefile
@@ -1,58 +1,60 @@
 PORTNAME=	pwhois
 PORTVERSION=	2.2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://pwhois.org/get/ \
 		ZI
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Whois-compatible framework for disclosing routing data
 WWW=		https://pwhois.org/
 
 RUN_DEPENDS=	p5-DBI>0:databases/p5-DBI \
+		p5-File-Temp>0:devel/p5-File-Temp \
 		p5-Time-Format>0:devel/p5-Time-Format \
 		p5-Log-Dispatch>0:devel/p5-Log-Dispatch \
 		p5-Net-DNS>0:dns/p5-Net-DNS \
 		p5-Net-Telnet>0:net/p5-Net-Telnet \
 		p5-Net-CIDR>0:net-mgmt/p5-Net-CIDR \
 		p5-RPSL-Parser>0:devel/p5-RPSL-Parser \
 		${DBD_MYSQL}
 
+USES=		mysql shebangfix tar:tgz
+
 FETCH_ARGS=	-p
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
-USES=		mysql shebangfix tar:tgz
 SHEBANG_FILES=	pwhois-updatedb
 USE_RC_SUBR=	${PORTNAME}d
 SUB_FILES=	pkg-message 512.pwhois-updatedb
 SUB_LIST=	TOUCH="${TOUCH}" RM="${RM}" CHOWN="${CHOWN}" \
 		USER="${USERS}" GROUP="${GROUPS}" INSTALL="${INSTALL}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		-e 's|CC = gcc |CC = ${CC}|g' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/etc/pwhois/|${ETCDIR}/|g' \
 		-e 's|/var/pwhois/|/var/db/pwhois/|g' \
 		-e 's|/var/log/|/var/log/pwhois/|g' \
 		-e 's|/var/db/log/|/var/log/pwhois/|g' \
 		${WRKSRC}/main.c ${WRKSRC}/pwhois-updatedb \
 		${WRKSRC}/pwhois_pwdump.c ${WRKSRC}/pwhoisd.conf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/512.pwhois-updatedb \
 		${STAGEDIR}${PREFIX}/etc/periodic/daily/
 	${INSTALL_PROGRAM} ${WRKSRC}/pwhoisd ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${WRKSRC}/pwhois-pwdump ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/pwhois-updatedb ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_DATA} ${WRKSRC}/pwhoisd.conf \
 		${STAGEDIR}${ETCDIR}/pwhoisd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/mysql/createdb.sql ${STAGEDIR}${DATADIR}/
 	@${MKDIR} ${STAGEDIR}/var/db/pwhois
 	@${MKDIR} ${STAGEDIR}/var/log/pwhois
 
 .include <bsd.port.mk>
diff --git a/net/pwhois/files/patch-pwhois-updatedb b/net/pwhois/files/patch-pwhois-updatedb
index a5bd3c62e5c2..5b66fd3b003f 100644
--- a/net/pwhois/files/patch-pwhois-updatedb
+++ b/net/pwhois/files/patch-pwhois-updatedb
@@ -1,38 +1,69 @@
---- pwhois-updatedb.orig	2013-10-08 18:59:42 UTC
+--- pwhois-updatedb.orig	2025-02-28 17:42:32 UTC
 +++ pwhois-updatedb
-@@ -975,7 +975,7 @@ sub connect
+@@ -9,7 +9,8 @@ use Getopt::Long;
+ use strict;
+ use DBI;
+ use Getopt::Long;
+-use POSIX qw(strftime tmpnam O_RDWR O_CREAT O_EXCL);
++use POSIX qw(strftime O_RDWR O_CREAT O_EXCL);
++use File::Temp qw/ :POSIX /;
+ use Fcntl qw(:DEFAULT :flock);
+ use Log::Dispatch;
+ use Log::Dispatch::Screen;
+@@ -112,9 +113,9 @@ my $current_registry = -1;
+ my $current_registry = -1;
+ 
+ # DO NOT MODIFY UNLESS YOU KNOW WHAT YOU ARE DOING: EDIT THE CONFIG FILE IF POSSIBLE
+-# See: /etc/pwhois/pwhoisd.conf or -c option to specify a different config file
++# See: /usr/local/etc/pwhois/pwhoisd.conf or -c option to specify a different config file
+ 
+-my $DEFAULT_CONFIG = '/etc/pwhois/pwhoisd.conf';
++my $DEFAULT_CONFIG = '/usr/local/etc/pwhois/pwhoisd.conf';
+ my $DEFAULT_PIDFILE='/var/run/pwhoisd.pid';
+ my $DEFAULT_DATABASE_TYPE = 'mysql';
+ my $DEFAULT_DATABASE_SERVER = '';
+@@ -989,7 +990,7 @@ sub connect
  	my $passwd = shift;
  
  
 -	my $session = Net::Telnet->new(timeout => 10,
 +	my $session = Net::Telnet->new(timeout => 300,
  				       telnetmode=>0,
  				       cmd_remove_mode => 1
  				       );
-@@ -3133,7 +3133,7 @@ sub readMRTdump
+@@ -3156,7 +3157,7 @@ sub readMRTdump
  
      @st = stat($fd);
  
 -    if(!defined(@st))
 +    if(!@st)
      {
          $errcode = -2;
      }
-@@ -3763,7 +3763,7 @@ sub parseOrganisationObject
+@@ -3795,7 +3796,7 @@ sub parseOrganisationObject
  
          #printMap(%obj);
  
 -        return -$numlines if(!(defined($orgId) && defined($orgName) && defined(@addrs)));
 +        return -$numlines if(!(defined($orgId) && defined($orgName) && (@addrs)));
  
          $country = "" if(!defined($country));
          $country = substr(normalizeValue($country), 0, $fields_length{'organization.country'});
-@@ -4035,7 +4035,7 @@ sub parsePersonObject
+@@ -4072,7 +4073,7 @@ sub parsePersonObject
          #printMap(%obj);
  
          $source = 0 if(!defined($source));
 -        return -$numlines if(!(defined($person) && defined(@addrs) && defined($officePhone) &&
 +        return -$numlines if(!(defined($person) && (@addrs) && defined($officePhone) &&
                                 defined($mailbox) && defined($pocHandle) && defined($source)));
  
          for($j1 = 0; $j1 < 6; $j1++){
+@@ -4156,7 +4157,7 @@ sub parseRoleObject
+         $source = 0 if(!defined($source));
+         $mailbox = $obj{'notify'} if (!defined($mailbox) || "unread@" eq substr($mailbox, 0, 7));
+         $mailbox = $obj{'abuse-mailbox'} if (!defined($mailbox) || "unread@" eq substr($mailbox, 0, 7));
+-        return -$numlines if(!(defined($role) && defined(@addrs) &&
++        return -$numlines if(!(defined($role) && (@addrs) &&
+ 			defined($mailbox) && defined($pocHandle) && defined($source)));
+         ($mailbox) = $mailbox =~ m/^\s*([^\s]+)/;
+         for($j1 = 0; $j1 < 6; $j1++){