diff --git a/games/nethack32/files/patch-dgn_comp.6 b/games/nethack32/files/patch-dgn_comp.6
index af171b21e70b..02ae84b6ff6b 100644
--- a/games/nethack32/files/patch-dgn_comp.6
+++ b/games/nethack32/files/patch-dgn_comp.6
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- doc/dgn_comp.6.orig	Mon Apr 12 09:28:09 2004
 +++ doc/dgn_comp.6	Mon Apr 12 09:28:33 2004
 @@ -396,7 +396,7 @@
diff --git a/games/nethack32/files/patch-dlb.6 b/games/nethack32/files/patch-dlb.6
index d7d7ed16feca..14d52abc9eb3 100644
--- a/games/nethack32/files/patch-dlb.6
+++ b/games/nethack32/files/patch-dlb.6
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- doc/dlb.6.orig	Mon Apr 12 09:28:09 2004
 +++ doc/dlb.6	Mon Apr 12 09:28:54 2004
 @@ -74,7 +74,7 @@
diff --git a/games/nethack32/files/patch-include-config.h b/games/nethack32/files/patch-include-config.h
index 42a4f2fa23f2..697163cc389d 100644
--- a/games/nethack32/files/patch-include-config.h
+++ b/games/nethack32/files/patch-include-config.h
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- include/config.h.orig	Tue Dec 10 13:20:07 1996
 +++ include/config.h	Sat Apr 10 01:01:28 2004
 @@ -211,7 +211,7 @@
diff --git a/games/nethack32/files/patch-include-unixconf.h b/games/nethack32/files/patch-include-unixconf.h
index b5c24ee2719d..c7e0a5fc8691 100644
--- a/games/nethack32/files/patch-include-unixconf.h
+++ b/games/nethack32/files/patch-include-unixconf.h
@@ -1,6 +1,5 @@
-diff -ruN ./include/unixconf.h ../nethack-3.2.2/include/unixconf.h
 --- ./include/unixconf.h	Wed Dec 11 05:20:08 1996
-+++ ../nethack-3.2.2/include/unixconf.h	Sun Mar 21 17:25:02 1999
++++ ./include/unixconf.h	Sun Mar 21 17:25:02 1999
 @@ -31,7 +31,7 @@
  
  /* define any of the following that are appropriate */
diff --git a/games/nethack32/files/patch-lev_comp.6 b/games/nethack32/files/patch-lev_comp.6
index 32f1f9171e8d..836e1f531c6f 100644
--- a/games/nethack32/files/patch-lev_comp.6
+++ b/games/nethack32/files/patch-lev_comp.6
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- doc/lev_comp.6.orig	Mon Apr 12 09:28:09 2004
 +++ doc/lev_comp.6	Mon Apr 12 09:29:20 2004
 @@ -563,7 +563,7 @@
diff --git a/games/nethack32/files/patch-nethack.6 b/games/nethack32/files/patch-nethack.6
index e023491d7317..1fe6c607ea6f 100644
--- a/games/nethack32/files/patch-nethack.6
+++ b/games/nethack32/files/patch-nethack.6
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- doc/nethack.6.orig	Mon Apr 12 09:28:09 2004
 +++ doc/nethack.6	Mon Apr 12 09:30:52 2004
 @@ -3,7 +3,7 @@
diff --git a/games/nethack32/files/patch-recover.6 b/games/nethack32/files/patch-recover.6
index a252961f0cbc..9126718396bf 100644
--- a/games/nethack32/files/patch-recover.6
+++ b/games/nethack32/files/patch-recover.6
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- doc/recover.6.orig	Mon Apr 12 09:28:09 2004
 +++ doc/recover.6	Mon Apr 12 09:31:27 2004
 @@ -31,7 +31,7 @@
diff --git a/games/nethack32/files/patch-sys-unix-Makefile.doc b/games/nethack32/files/patch-sys-unix-Makefile.doc
index d6ba657426a0..bc8810153d3b 100644
--- a/games/nethack32/files/patch-sys-unix-Makefile.doc
+++ b/games/nethack32/files/patch-sys-unix-Makefile.doc
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- sys/unix/Makefile.doc.orig	Tue Dec 10 13:20:08 1996
 +++ sys/unix/Makefile.doc	Sun Apr 11 23:08:20 2004
 @@ -31,15 +31,15 @@
diff --git a/games/nethack32/files/patch-sys-unix-Makefile.top b/games/nethack32/files/patch-sys-unix-Makefile.top
index 66c0054d804e..099a2930f0cc 100644
--- a/games/nethack32/files/patch-sys-unix-Makefile.top
+++ b/games/nethack32/files/patch-sys-unix-Makefile.top
@@ -1,5 +1,3 @@
-$FreeBSD$
-
 --- sys/unix/Makefile.top.orig	Tue Dec 10 13:20:10 1996
 +++ sys/unix/Makefile.top	Sun Apr 11 23:25:22 2004
 @@ -14,16 +14,16 @@