diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index b2e0b295a882..a39e24085b93 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	pmd
 DISTVERSION=	7.3.0
 CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTNAME}_releases/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-dist-${DISTVERSION}-bin
 
 MAINTAINER=	tiago.gasiba@gmail.com
 COMMENT=	Static analysis tool for Java source code
 WWW=		https://pmd.github.io/
 
 LICENSE=	APACHE20 BSD4CLAUSE
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe zip
 CPE_VENDOR=	pmd_project
 USE_JAVA=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-bin-${DISTVERSION}
 PLIST_SUB+=	ETCDIR=${ETCDIR} PORTVERSION=${DISTVERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/bin/${PORTNAME}
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%ETCDIR%%|${ETCDIR}|g' \
+		${WRKSRC}/bin/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/simplelogger.properties \
 		${STAGEDIR}${ETCDIR}/simplelogger.properties.sample
 	cd ${WRKSRC} && ${COPYTREE_SHARE} sbom ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/devel/pmd/files/patch-bin_pmd b/devel/pmd/files/patch-bin_pmd
index 2702c407262e..8106a67775e0 100644
--- a/devel/pmd/files/patch-bin_pmd
+++ b/devel/pmd/files/patch-bin_pmd
@@ -1,79 +1,79 @@
 --- bin/pmd.orig	2024-07-21 02:20:21 UTC
 +++ bin/pmd
 @@ -1,4 +1,4 @@
--#!/usr/local/bin/bash
+-#!/bin/bash
 +#!/bin/sh
  
  is_cygwin() {
      case "$(uname)" in
 @@ -48,17 +48,7 @@ set_lib_dir() {
  
  set_lib_dir() {
    if [ -z "${LIB_DIR}" ]; then
 -    # Allow for symlinks to this script
 -    if [ -L "$0" ]; then
 -      local script_real_loc=$(readlink "$0")
 -    else
 -      local script_real_loc=${BASH_SOURCE[0]:-${(%):-%x}}
 -    fi
 -    local script_dir=$(dirname "${script_real_loc}")
 -
 -    pushd "${script_dir}/../lib" >/dev/null
 -    readonly LIB_DIR=$(pwd -P)
 -    popd >/dev/null
 +    readonly LIB_DIR=%%PREFIX%%/share/java/pmd
    fi
  }
  
 @@ -70,17 +60,7 @@ set_conf_dir() {
  
  set_conf_dir() {
    if [ -z ${CONF_DIR} ]; then
 -    # Allow for symlinks to this script
 -    if [ -L $0 ]; then
 -      local script_real_loc=$(readlink "$0")
 -    else
 -      local script_real_loc=${BASH_SOURCE[0]:-${(%):-%x}}
 -    fi
 -    local script_dir=$(dirname "${script_real_loc}")
 -
 -    pushd "${script_dir}/../conf" >/dev/null
 -    readonly CONF_DIR=$(pwd -P)
 -    popd >/dev/null
-+    readonly CONF_DIR=%%PREFIX%%/etc/pmd
++    readonly CONF_DIR=%%ETCDIR%%
    fi
  }
  
 @@ -90,12 +70,12 @@ check_conf_dir() {
    fi
  }
  
 -function script_exit() {
 +script_exit() {
      echo "$1" >&2
      exit 1
  }
  
 -function check_java() {
 +check_java() {
    java -version >/dev/null 2>&1
    if [ $? -ne 0 ]; then
      script_exit "No java executable found in PATH"
 @@ -153,7 +133,7 @@ jre_specific_vm_options() {
    fi
  }
  
 -function add_pmd_classpath() {
 +add_pmd_classpath() {
      if [ -n "$classpath" ]; then
          classpath="$classpath:${CONF_DIR}:${LIB_DIR}/*"
      else
 @@ -161,7 +141,7 @@ function add_pmd_classpath() {
      fi
  }
  
 -function add_openjfx_classpath() {
 +add_openjfx_classpath() {
    if [ "${APPNAME}" = "designer" ]
    then
      if [ "$java_vendor" = "openjdk" ] && [ "$java_ver" -lt 100 ]