diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index 7e6ea7d47325..d98caaa46aee 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -1,32 +1,31 @@
 PORTNAME=	avrdude
-PORTVERSION=	7.0
-PORTREVISION=	3
+PORTVERSION=	7.1
+#PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Program for programming the on-chip memory of Atmel AVR CPUs
 WWW=		https://www.nongnu.org/avrdude/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GNU_CONFIGURE=	yes
 USES=		libtool localbase readline cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	avrdudes
 GH_PROJECT=	avrdude
 GH_TAGNAME=	v${PORTVERSION}
 
 OPTIONS_DEFINE=		FTDI PARPORT
 OPTIONS_DEFAULT=	FTDI
 FTDI_DESC=		libftdi support
 FTDI_LIB_DEPENDS=	libftdi1.so:devel/libftdi1
 PARPORT_DESC=		support for parallel-port programmers
-PARPORT_CONFIGURE_ENABLE= parport
+PARPORT_CMAKE_ON=	-DHAVE_PARPORT=1
 
 # man page currently not handled by CMake
 # https://github.com/avrdudes/avrdude/issues/947
 post-install:
 	${GZIP_CMD} < ${WRKSRC}/src/avrdude.1 > ${STAGEDIR}/${MANPREFIX}/man/man1/avrdude.1.gz
 
 .include <bsd.port.mk>
diff --git a/devel/avrdude/distinfo b/devel/avrdude/distinfo
index 87de5cb3a4c7..d6c99c0a5e41 100644
--- a/devel/avrdude/distinfo
+++ b/devel/avrdude/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652012102
-SHA256 (avrdudes-avrdude-7.0-v7.0_GH0.tar.gz) = 5de0f7f51c3ebffcd2bfecd6a0544bd468c55400e09f7d7533a1cd67ddc63a95
-SIZE (avrdudes-avrdude-7.0-v7.0_GH0.tar.gz) = 2354082
+TIMESTAMP = 1673299439
+SHA256 (avrdudes-avrdude-7.1-v7.1_GH0.tar.gz) = 016a5c95746fadc169cfb3009f6aa306ccdea2ff279fdb6fddcbe7526d84e5eb
+SIZE (avrdudes-avrdude-7.1-v7.1_GH0.tar.gz) = 2496230
diff --git a/devel/avrdude/files/patch-src_jtagmkII.c b/devel/avrdude/files/patch-src_jtagmkII.c
deleted file mode 100644
index 17ca7c9a968e..000000000000
--- a/devel/avrdude/files/patch-src_jtagmkII.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/jtagmkII.c.orig	2022-05-07 20:39:47 UTC
-+++ src/jtagmkII.c
-@@ -1840,8 +1840,8 @@ void jtagmkII_close(PROGRAMMER * pgm)
- 
-   avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close()\n", progname);
- 
--  if (pgm->flag & PGM_FL_IS_PDI) {
--    /* When in PDI mode, restart target. */
-+  if (pgm->flag & (PGM_FL_IS_PDI|PGM_FL_IS_JTAG)) {
-+    /* When in PDI or JTAG mode, restart target. */
-     buf[0] = CMND_GO;
-     avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close(): Sending GO command: ",
- 	      progname);