summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--devel/Makefile1
-rw-r--r--devel/gccmakedep/Makefile1
-rw-r--r--devel/gccmakedep/pkg/PLIST1
-rw-r--r--devel/xcb-proto/Makefile1
-rw-r--r--devel/xcb-util-m4/Makefile1
-rw-r--r--devel/xcb-util-m4/pkg/PLIST1
-rw-r--r--devel/xorg-util-macros/Makefile1
-rw-r--r--devel/xorg-util-macros/pkg/PLIST1
-rw-r--r--devel/xorgproto/Makefile1
-rw-r--r--fonts/Makefile1
-rw-r--r--fonts/Makefile.inc1
-rw-r--r--fonts/dejavu-fonts/Makefile1
-rw-r--r--fonts/dejavu-fonts/pkg/PLIST1
-rw-r--r--fonts/font-adobe-100dpi/Makefile1
-rw-r--r--fonts/font-adobe-100dpi/pkg/PLIST1
-rw-r--r--fonts/font-adobe-75dpi/Makefile1
-rw-r--r--fonts/font-adobe-75dpi/pkg/PLIST1
-rw-r--r--fonts/font-adobe-utopia-100dpi/Makefile1
-rw-r--r--fonts/font-adobe-utopia-100dpi/pkg/PLIST1
-rw-r--r--fonts/font-adobe-utopia-75dpi/Makefile1
-rw-r--r--fonts/font-adobe-utopia-75dpi/pkg/PLIST1
-rw-r--r--fonts/font-adobe-utopia-type1/Makefile1
-rw-r--r--fonts/font-adobe-utopia-type1/pkg/PLIST1
-rw-r--r--fonts/font-arabic-misc/Makefile1
-rw-r--r--fonts/font-arabic-misc/pkg/PLIST1
-rw-r--r--fonts/font-bh-100dpi/Makefile1
-rw-r--r--fonts/font-bh-100dpi/pkg/PLIST1
-rw-r--r--fonts/font-bh-75dpi/Makefile1
-rw-r--r--fonts/font-bh-75dpi/pkg/PLIST1
-rw-r--r--fonts/font-bh-lucidatypewriter-100/Makefile1
-rw-r--r--fonts/font-bh-lucidatypewriter-100/pkg/PLIST1
-rw-r--r--fonts/font-bh-lucidatypewriter-75/Makefile1
-rw-r--r--fonts/font-bh-lucidatypewriter-75/pkg/PLIST1
-rw-r--r--fonts/font-cursor-misc/Makefile1
-rw-r--r--fonts/font-cursor-misc/pkg/PLIST1
-rw-r--r--fonts/xfonts-alias/Makefile1
-rw-r--r--fonts/xfonts-alias/pkg/PLIST1
-rw-r--r--fonts/xfonts-encodings/Makefile1
-rw-r--r--fonts/xfonts-encodings/pkg/PLIST1
-rw-r--r--fonts/xorg-font-util/Makefile1
-rw-r--r--fonts/xorg-font-util/pkg/PLIST1
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/libGLU/Makefile1
-rw-r--r--graphics/libGLU/pkg/PLIST1
-rw-r--r--graphics/libepoxy/Makefile1
-rw-r--r--graphics/libepoxy/patches/patch-src_dispatch_common_c1
-rw-r--r--graphics/libepoxy/pkg/PLIST1
-rw-r--r--graphics/mesa/Makefile1
-rw-r--r--graphics/mesa/patches/patch-meson_build1
-rw-r--r--graphics/mesa/patches/patch-src_gallium_auxiliary_rtasm_rtasm_execmem_c1
-rw-r--r--graphics/mesa/patches/patch-src_gallium_frontends_lavapipe_meson_build1
-rw-r--r--graphics/mesa/patches/patch-src_gbm_backends_dri_gbm_dri_c1
-rw-r--r--graphics/mesa/patches/patch-src_glx_dri_common_c1
-rw-r--r--graphics/mesa/patches/patch-src_glx_meson_build1
-rw-r--r--graphics/mesa/patches/patch-src_loader_loader_c1
-rw-r--r--graphics/mesa/patches/patch-src_mapi_u_execmem_c1
-rw-r--r--graphics/mesa/patches/patch-src_mesa_main_execmem_c1
-rw-r--r--graphics/mesa/patches/patch-src_util_build_id_c1
-rw-r--r--graphics/mesa/patches/patch-src_util_build_id_h1
-rw-r--r--graphics/mesa/patches/patch-src_util_disk_cache_h1
-rw-r--r--graphics/mesa/patches/patch-src_util_disk_cache_os_c1
-rw-r--r--graphics/mesa/patches/patch-src_util_os_file_c1
-rw-r--r--graphics/mesa/patches/patch-src_util_rand_xor_c1
-rw-r--r--graphics/mesa/patches/patch-src_util_u_atomic_c1
-rw-r--r--graphics/mesa/patches/patch-src_util_u_cpu_detect_c1
-rw-r--r--graphics/mesa/pkg/PLIST1
-rw-r--r--graphics/pixman/Makefile1
-rw-r--r--graphics/pixman/pkg/PLIST1
-rw-r--r--meta/Makefile1
-rw-r--r--meta/xenocara/Makefile1
-rw-r--r--meta/xenocara/pkg/PLIST1
-rw-r--r--print/Makefile1
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/libpciaccess/Makefile1
-rw-r--r--sysutils/libpciaccess/patches/patch-src_openbsd_pci_c1
-rw-r--r--sysutils/libpciaccess/pkg/PLIST1
-rw-r--r--sysutils/sessreg/Makefile1
-rw-r--r--sysutils/sessreg/pkg/PLIST1
-rw-r--r--x11/Makefile1
-rw-r--r--x11/bdftopcf/Makefile1
-rw-r--r--x11/bdftopcf/patches/patch-Makefile_am1
-rw-r--r--x11/bdftopcf/patches/patch-bdftopcf_c1
-rw-r--r--x11/bdftopcf/patches/patch-configure_ac1
-rw-r--r--x11/bdftopcf/pkg/PLIST1
-rw-r--r--x11/cwm/Makefile1
-rw-r--r--x11/cwm/pkg/PLIST1
-rw-r--r--x11/editres/Makefile1
-rw-r--r--x11/fontconfig/patches/patch-fc-cache_meson_build1
-rw-r--r--x11/fonttosfnt/Makefile1
-rw-r--r--x11/fonttosfnt/pkg/PLIST1
-rw-r--r--x11/fvwm-obsd/Makefile1
-rw-r--r--x11/fvwm-obsd/pkg/PLIST1
-rw-r--r--x11/libICE/Makefile1
-rw-r--r--x11/libICE/pkg/PLIST1
-rw-r--r--x11/libSM/Makefile1
-rw-r--r--x11/libSM/pkg/PLIST1
-rw-r--r--x11/libX11/Makefile1
-rw-r--r--x11/libXScrnSaver/Makefile1
-rw-r--r--x11/libXScrnSaver/pkg/PLIST1
-rw-r--r--x11/libXau/Makefile1
-rw-r--r--x11/libXau/pkg/PLIST1
-rw-r--r--x11/libXaw/Makefile1
-rw-r--r--x11/libXaw/pkg/PLIST1
-rw-r--r--x11/libXcomposite/Makefile1
-rw-r--r--x11/libXcomposite/pkg/PLIST1
-rw-r--r--x11/libXdamage/Makefile1
-rw-r--r--x11/libXdamage/pkg/PLIST1
-rw-r--r--x11/libXdmcp/Makefile1
-rw-r--r--x11/libXdmcp/pkg/PLIST1
-rw-r--r--x11/libXext/Makefile1
-rw-r--r--x11/libXext/pkg/PLIST1
-rw-r--r--x11/libXfixes/Makefile1
-rw-r--r--x11/libXfixes/pkg/PLIST1
-rw-r--r--x11/libXi/Makefile1
-rw-r--r--x11/libXi/pkg/PLIST1
-rw-r--r--x11/libXinerama/Makefile1
-rw-r--r--x11/libXinerama/pkg/PLIST1
-rw-r--r--x11/libXmu/Makefile1
-rw-r--r--x11/libXmu/pkg/PLIST1
-rw-r--r--x11/libXpm/Makefile1
-rw-r--r--x11/libXpm/pkg/PLIST1
-rw-r--r--x11/libXpresent/Makefile1
-rw-r--r--x11/libXpresent/pkg/PLIST1
-rw-r--r--x11/libXrandr/Makefile1
-rw-r--r--x11/libXrandr/pkg/PLIST1
-rw-r--r--x11/libXrender/Makefile1
-rw-r--r--x11/libXrender/pkg/PLIST1
-rw-r--r--x11/libXres/Makefile1
-rw-r--r--x11/libXres/pkg/PLIST1
-rw-r--r--x11/libXt/Makefile1
-rw-r--r--x11/libXt/pkg/PLIST1
-rw-r--r--x11/libXtst/Makefile1
-rw-r--r--x11/libXtst/pkg/PLIST1
-rw-r--r--x11/libXv/Makefile1
-rw-r--r--x11/libXv/pkg/PLIST1
-rw-r--r--x11/libXxf86vm/Makefile1
-rw-r--r--x11/libXxf86vm/pkg/PLIST1
-rw-r--r--x11/libfontenc/Makefile1
-rw-r--r--x11/libfontenc/pkg/PLIST1
-rw-r--r--x11/libxcb/Makefile1
-rw-r--r--x11/libxkbfile/Makefile1
-rw-r--r--x11/libxkbfile/pkg/PLIST1
-rw-r--r--x11/libxshmfence/Makefile1
-rw-r--r--x11/libxshmfence/patches/patch-configure_ac1
-rw-r--r--x11/libxshmfence/patches/patch-src_xshmfence_alloc_c1
-rw-r--r--x11/libxshmfence/patches/patch-src_xshmfence_futex_h1
-rw-r--r--x11/libxshmfence/pkg/PLIST1
-rw-r--r--x11/xbacklight/Makefile1
-rw-r--r--x11/xbacklight/pkg/PLIST1
-rw-r--r--x11/xbitmaps/Makefile1
-rw-r--r--x11/xbitmaps/pkg/PLIST1
-rw-r--r--x11/xcb-util-cursor/Makefile1
-rw-r--r--x11/xcb-util-cursor/pkg/PLIST1
-rw-r--r--x11/xcb-util-image/Makefile1
-rw-r--r--x11/xcb-util-image/pkg/PLIST1
-rw-r--r--x11/xcb-util-keysyms/Makefile1
-rw-r--r--x11/xcb-util-keysyms/pkg/PLIST1
-rw-r--r--x11/xcb-util-renderutil/Makefile1
-rw-r--r--x11/xcb-util-renderutil/pkg/PLIST1
-rw-r--r--x11/xcb-util-wm/Makefile1
-rw-r--r--x11/xcb-util-wm/pkg/PLIST1
-rw-r--r--x11/xcb-util-xrm/Makefile1
-rw-r--r--x11/xcb-util-xrm/pkg/PLIST1
-rw-r--r--x11/xcb-util/Makefile1
-rw-r--r--x11/xcb-util/pkg/PLIST1
-rw-r--r--x11/xconsole/Makefile1
-rw-r--r--x11/xconsole/patches/patch-Makefile_am1
-rw-r--r--x11/xconsole/patches/patch-configure_ac1
-rw-r--r--x11/xconsole/patches/patch-privsep_c1
-rw-r--r--x11/xconsole/patches/patch-xconsole_c1
-rw-r--r--x11/xconsole/patches/patch-xconsole_h1
-rw-r--r--x11/xconsole/pkg/PLIST1
-rw-r--r--x11/xenodm/Makefile1
-rw-r--r--x11/xenodm/patches/patch-config_Xsetup_01
-rw-r--r--x11/xenodm/pkg/PLIST1
-rw-r--r--x11/xf86-input-keyboard/Makefile1
-rw-r--r--x11/xf86-input-keyboard/pkg/PLIST1
-rw-r--r--x11/xf86-input-mouse/Makefile1
-rw-r--r--x11/xf86-input-mouse/patches/patch-src_bsd_mouse_c1
-rw-r--r--x11/xf86-input-mouse/pkg/PLIST1
-rw-r--r--x11/xf86-input-ws/Makefile1
-rw-r--r--x11/xf86-input-ws/pkg/PLIST1
-rw-r--r--x11/xf86-video-intel/Makefile1
-rw-r--r--x11/xf86-video-intel/patches/patch-configure_ac1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_compat-api_h1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_intel_device_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_intel_list_h1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_sna_compiler_h1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_sna_fb_fbpict_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_sna_gen8_render_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_sna_kgem_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_sna_sna_accel_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_sna_sna_acpi_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_sna_sna_composite_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_sna_sna_driver_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_sna_sna_h1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_uxa_intel_display_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_uxa_intel_driver_c1
-rw-r--r--x11/xf86-video-intel/patches/patch-src_uxa_intel_h1
-rw-r--r--x11/xf86-video-intel/pkg/PLIST1
-rw-r--r--x11/xhost/Makefile1
-rw-r--r--x11/xhost/pkg/PLIST1
-rw-r--r--x11/xinit/Makefile1
-rw-r--r--x11/xinit/pkg/PLIST1
-rw-r--r--x11/xkbcomp/Makefile1
-rw-r--r--x11/xkbcomp/pkg/PLIST1
-rw-r--r--x11/xkeyboard-config/Makefile1
-rw-r--r--x11/xkeyboard-config/pkg/PLIST1
-rw-r--r--x11/xlockmore-obsd/Makefile1
-rw-r--r--x11/xlockmore-obsd/pkg/PLIST1
-rw-r--r--x11/xlogo/Makefile1
-rw-r--r--x11/xlogo/pkg/PLIST1
-rw-r--r--x11/xmag/Makefile1
-rw-r--r--x11/xmag/pkg/PLIST1
-rw-r--r--x11/xmodmap/Makefile1
-rw-r--r--x11/xmodmap/pkg/PLIST1
-rw-r--r--x11/xrandr/Makefile1
-rw-r--r--x11/xrandr/pkg/PLIST1
-rw-r--r--x11/xrdb/Makefile1
-rw-r--r--x11/xrdb/pkg/PLIST1
-rw-r--r--x11/xset/Makefile1
-rw-r--r--x11/xset/pkg/PLIST1
-rw-r--r--x11/xsetroot/Makefile1
-rw-r--r--x11/xsetroot/pkg/PLIST1
-rw-r--r--x11/xterm/patches/patch-XTerm_ad1
-rw-r--r--x11/xterm/patches/patch-misc_c1
-rw-r--r--x11/xterm/patches/patch-ptydata_c1
-rw-r--r--x11/xterm/patches/patch-xterm_h1
-rw-r--r--x11/xtrans/Makefile1
-rw-r--r--x11/xtrans/patches/patch-Xtranssock_c1
-rw-r--r--x11/xtrans/patches/patch-Xtransutil_c1
-rw-r--r--x11/xtrans/pkg/PLIST1
233 files changed, 0 insertions, 233 deletions
diff --git a/Makefile b/Makefile
index 3b51560..d3cd5f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
SUBDIR =
SUBDIR += devel
diff --git a/devel/Makefile b/devel/Makefile
index 676aff6..1e11e39 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
SUBDIR =
SUBDIR += xcb-proto
diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile
index 9d6b61f..ecba646 100644
--- a/devel/gccmakedep/Makefile
+++ b/devel/gccmakedep/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Create dependencies in makefiles
DISTNAME = gccmakedep-1.0.3
diff --git a/devel/gccmakedep/pkg/PLIST b/devel/gccmakedep/pkg/PLIST
index b7d7d44..097438e 100644
--- a/devel/gccmakedep/pkg/PLIST
+++ b/devel/gccmakedep/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
bin/gccmakedep
@man man/man1/gccmakedep.1
diff --git a/devel/xcb-proto/Makefile b/devel/xcb-proto/Makefile
index 91fecf7..77afb2f 100644
--- a/devel/xcb-proto/Makefile
+++ b/devel/xcb-proto/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.80 2019/04/01 07:35:45 bentley Exp $
COMMENT = XCB prototypes
DISTNAME = xcb-proto-1.15.2
diff --git a/devel/xcb-util-m4/Makefile b/devel/xcb-util-m4/Makefile
index 3017e6e..1e9b5af 100644
--- a/devel/xcb-util-m4/Makefile
+++ b/devel/xcb-util-m4/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
COMMENT = GNU autoconf macros shared across XCB projects
CATEGORIES = devel
diff --git a/devel/xcb-util-m4/pkg/PLIST b/devel/xcb-util-m4/pkg/PLIST
index d2671c5..9115d4f 100644
--- a/devel/xcb-util-m4/pkg/PLIST
+++ b/devel/xcb-util-m4/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
share/aclocal/
share/aclocal/ax_compare_version.m4
share/aclocal/xcb_util_common.m4
diff --git a/devel/xorg-util-macros/Makefile b/devel/xorg-util-macros/Makefile
index 7484379..294f8ef 100644
--- a/devel/xorg-util-macros/Makefile
+++ b/devel/xorg-util-macros/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = GNU autoconf macros shared across X.Org projects
DISTNAME = util-macros-1.19.3
diff --git a/devel/xorg-util-macros/pkg/PLIST b/devel/xorg-util-macros/pkg/PLIST
index b29e6cf..87473d9 100644
--- a/devel/xorg-util-macros/pkg/PLIST
+++ b/devel/xorg-util-macros/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
share/aclocal/
share/aclocal/xorg-macros.m4
share/pkgconfig/xorg-macros.pc
diff --git a/devel/xorgproto/Makefile b/devel/xorgproto/Makefile
index 4a8f353..59687e8 100644
--- a/devel/xorgproto/Makefile
+++ b/devel/xorgproto/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Window System unified protocol definitions
DISTNAME = xorgproto-2022.1
diff --git a/fonts/Makefile b/fonts/Makefile
index ddb2b1b..bb34541 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
SUBDIR =
SUBDIR += dejavu-fonts
diff --git a/fonts/Makefile.inc b/fonts/Makefile.inc
index f92a5a5..4f3eb4d 100644
--- a/fonts/Makefile.inc
+++ b/fonts/Makefile.inc
@@ -1,4 +1,3 @@
-# $OpenBSD$
.if ${DISTNAME:Mfont-*}
CONFIGURE_ARGS += --disable-all-encodings --enable-iso8859-1
diff --git a/fonts/dejavu-fonts/Makefile b/fonts/dejavu-fonts/Makefile
index d8c76fc..59aaf9d 100644
--- a/fonts/dejavu-fonts/Makefile
+++ b/fonts/dejavu-fonts/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/dejavu-fonts/pkg/PLIST b/fonts/dejavu-fonts/pkg/PLIST
index d660082..7455771 100644
--- a/fonts/dejavu-fonts/pkg/PLIST
+++ b/fonts/dejavu-fonts/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
lib/X11/fonts/TTF/DejaVuMathTeXGyre.ttf
lib/X11/fonts/TTF/DejaVuSans-Bold.ttf
lib/X11/fonts/TTF/DejaVuSans-BoldOblique.ttf
diff --git a/fonts/font-adobe-100dpi/Makefile b/fonts/font-adobe-100dpi/Makefile
index adc8ebe..8b08785 100644
--- a/fonts/font-adobe-100dpi/Makefile
+++ b/fonts/font-adobe-100dpi/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-adobe-100dpi/pkg/PLIST b/fonts/font-adobe-100dpi/pkg/PLIST
index df21ff2..00fb8f6 100644
--- a/fonts/font-adobe-100dpi/pkg/PLIST
+++ b/fonts/font-adobe-100dpi/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
lib/X11/fonts/100dpi/courB08-ISO8859-1.pcf.gz
lib/X11/fonts/100dpi/courB08.pcf.gz
lib/X11/fonts/100dpi/courB10-ISO8859-1.pcf.gz
diff --git a/fonts/font-adobe-75dpi/Makefile b/fonts/font-adobe-75dpi/Makefile
index 7dc758e..54d8542 100644
--- a/fonts/font-adobe-75dpi/Makefile
+++ b/fonts/font-adobe-75dpi/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-adobe-75dpi/pkg/PLIST b/fonts/font-adobe-75dpi/pkg/PLIST
index 0fc4ed5..e0d418e 100644
--- a/fonts/font-adobe-75dpi/pkg/PLIST
+++ b/fonts/font-adobe-75dpi/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/75dpi
lib/X11/fonts/75dpi/courB08-ISO8859-1.pcf.gz
lib/X11/fonts/75dpi/courB08.pcf.gz
diff --git a/fonts/font-adobe-utopia-100dpi/Makefile b/fonts/font-adobe-utopia-100dpi/Makefile
index 0d9badb..e19abdf 100644
--- a/fonts/font-adobe-utopia-100dpi/Makefile
+++ b/fonts/font-adobe-utopia-100dpi/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-adobe-utopia-100dpi/pkg/PLIST b/fonts/font-adobe-utopia-100dpi/pkg/PLIST
index e516077..16414aa 100644
--- a/fonts/font-adobe-utopia-100dpi/pkg/PLIST
+++ b/fonts/font-adobe-utopia-100dpi/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/100dpi
lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
lib/X11/fonts/100dpi/UTBI__10.pcf.gz
diff --git a/fonts/font-adobe-utopia-75dpi/Makefile b/fonts/font-adobe-utopia-75dpi/Makefile
index bef1a9c..5e5de76 100644
--- a/fonts/font-adobe-utopia-75dpi/Makefile
+++ b/fonts/font-adobe-utopia-75dpi/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-adobe-utopia-75dpi/pkg/PLIST b/fonts/font-adobe-utopia-75dpi/pkg/PLIST
index 07fac1e..7e485d1 100644
--- a/fonts/font-adobe-utopia-75dpi/pkg/PLIST
+++ b/fonts/font-adobe-utopia-75dpi/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/75dpi
lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
lib/X11/fonts/75dpi/UTBI__10.pcf.gz
diff --git a/fonts/font-adobe-utopia-type1/Makefile b/fonts/font-adobe-utopia-type1/Makefile
index e0ede31..9e4cfb5 100644
--- a/fonts/font-adobe-utopia-type1/Makefile
+++ b/fonts/font-adobe-utopia-type1/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-adobe-utopia-type1/pkg/PLIST b/fonts/font-adobe-utopia-type1/pkg/PLIST
index f3b06bf..090dbbb 100644
--- a/fonts/font-adobe-utopia-type1/pkg/PLIST
+++ b/fonts/font-adobe-utopia-type1/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/Type1
lib/X11/fonts/Type1/UTBI____.afm
lib/X11/fonts/Type1/UTBI____.pfa
diff --git a/fonts/font-arabic-misc/Makefile b/fonts/font-arabic-misc/Makefile
index 6008d4f..3e2493a 100644
--- a/fonts/font-arabic-misc/Makefile
+++ b/fonts/font-arabic-misc/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-arabic-misc/pkg/PLIST b/fonts/font-arabic-misc/pkg/PLIST
index fc28e45..eb3f915 100644
--- a/fonts/font-arabic-misc/pkg/PLIST
+++ b/fonts/font-arabic-misc/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/misc
lib/X11/fonts/misc/arabic24.pcf.gz
@comment lib/X11/fonts/misc/fonts.dir
diff --git a/fonts/font-bh-100dpi/Makefile b/fonts/font-bh-100dpi/Makefile
index ee67359..daeda58 100644
--- a/fonts/font-bh-100dpi/Makefile
+++ b/fonts/font-bh-100dpi/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-bh-100dpi/pkg/PLIST b/fonts/font-bh-100dpi/pkg/PLIST
index dc08e57..039b60d 100644
--- a/fonts/font-bh-100dpi/pkg/PLIST
+++ b/fonts/font-bh-100dpi/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/100dpi
@comment lib/X11/fonts/100dpi/fonts.dir
lib/X11/fonts/100dpi/luBIS08-ISO8859-1.pcf.gz
diff --git a/fonts/font-bh-75dpi/Makefile b/fonts/font-bh-75dpi/Makefile
index ad682b4..97c1dc5 100644
--- a/fonts/font-bh-75dpi/Makefile
+++ b/fonts/font-bh-75dpi/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-bh-75dpi/pkg/PLIST b/fonts/font-bh-75dpi/pkg/PLIST
index 5943003..48df16f 100644
--- a/fonts/font-bh-75dpi/pkg/PLIST
+++ b/fonts/font-bh-75dpi/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/75dpi
@comment lib/X11/fonts/75dpi/fonts.dir
lib/X11/fonts/75dpi/luBIS08-ISO8859-1.pcf.gz
diff --git a/fonts/font-bh-lucidatypewriter-100/Makefile b/fonts/font-bh-lucidatypewriter-100/Makefile
index d59920c..586a548 100644
--- a/fonts/font-bh-lucidatypewriter-100/Makefile
+++ b/fonts/font-bh-lucidatypewriter-100/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-bh-lucidatypewriter-100/pkg/PLIST b/fonts/font-bh-lucidatypewriter-100/pkg/PLIST
index 41e316a..07e5361 100644
--- a/fonts/font-bh-lucidatypewriter-100/pkg/PLIST
+++ b/fonts/font-bh-lucidatypewriter-100/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/100dpi
@comment lib/X11/fonts/100dpi/fonts.dir
lib/X11/fonts/100dpi/lutBS08-ISO8859-1.pcf.gz
diff --git a/fonts/font-bh-lucidatypewriter-75/Makefile b/fonts/font-bh-lucidatypewriter-75/Makefile
index 9a35460..fa31d2c 100644
--- a/fonts/font-bh-lucidatypewriter-75/Makefile
+++ b/fonts/font-bh-lucidatypewriter-75/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-bh-lucidatypewriter-75/pkg/PLIST b/fonts/font-bh-lucidatypewriter-75/pkg/PLIST
index 0a0775b..f284a6c 100644
--- a/fonts/font-bh-lucidatypewriter-75/pkg/PLIST
+++ b/fonts/font-bh-lucidatypewriter-75/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/75dpi
@comment lib/X11/fonts/75dpi/fonts.dir
lib/X11/fonts/75dpi/lutBS08-ISO8859-1.pcf.gz
diff --git a/fonts/font-cursor-misc/Makefile b/fonts/font-cursor-misc/Makefile
index 99a092a..c14ad53 100644
--- a/fonts/font-cursor-misc/Makefile
+++ b/fonts/font-cursor-misc/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/font-cursor-misc/pkg/PLIST b/fonts/font-cursor-misc/pkg/PLIST
index fd4bdbd..73e026d 100644
--- a/fonts/font-cursor-misc/pkg/PLIST
+++ b/fonts/font-cursor-misc/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@fontdir lib/X11/fonts/misc
lib/X11/fonts/misc/cursor.pcf.gz
@comment lib/X11/fonts/misc/fonts.dir
diff --git a/fonts/xfonts-alias/Makefile b/fonts/xfonts-alias/Makefile
index ddc0783..beeb32c 100644
--- a/fonts/xfonts-alias/Makefile
+++ b/fonts/xfonts-alias/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/xfonts-alias/pkg/PLIST b/fonts/xfonts-alias/pkg/PLIST
index 8ab8710..5d271c0 100644
--- a/fonts/xfonts-alias/pkg/PLIST
+++ b/fonts/xfonts-alias/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
lib/X11/fonts/100dpi/fonts.alias-xorg
lib/X11/fonts/75dpi/fonts.alias-xorg
lib/X11/fonts/cyrillic/fonts.alias-xorg
diff --git a/fonts/xfonts-encodings/Makefile b/fonts/xfonts-encodings/Makefile
index fda61e0..b0eb5fc 100644
--- a/fonts/xfonts-encodings/Makefile
+++ b/fonts/xfonts-encodings/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:12 sthen Exp $
PKG_ARCH = *
diff --git a/fonts/xfonts-encodings/pkg/PLIST b/fonts/xfonts-encodings/pkg/PLIST
index 6da6f97..fe13e90 100644
--- a/fonts/xfonts-encodings/pkg/PLIST
+++ b/fonts/xfonts-encodings/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
lib/X11/fonts/encodings/adobe-dingbats.enc.gz
lib/X11/fonts/encodings/adobe-standard.enc.gz
lib/X11/fonts/encodings/adobe-symbol.enc.gz
diff --git a/fonts/xorg-font-util/Makefile b/fonts/xorg-font-util/Makefile
index 77667cd..6d1f7ae 100644
--- a/fonts/xorg-font-util/Makefile
+++ b/fonts/xorg-font-util/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X.Org font package creation/installation utilities
DISTNAME = font-util-1.3.2
diff --git a/fonts/xorg-font-util/pkg/PLIST b/fonts/xorg-font-util/pkg/PLIST
index b6ee3db..11814c3 100644
--- a/fonts/xorg-font-util/pkg/PLIST
+++ b/fonts/xorg-font-util/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/bdftruncate
@bin bin/ucs2any
lib/X11/fonts/util/map-ISO8859-1
diff --git a/graphics/Makefile b/graphics/Makefile
index bf73fe6..8115cb3 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
SUBDIR =
SUBDIR += libepoxy
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index c8b4bb0..4895487 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Mesa OpenGL Utility library
V = 9.0.1
diff --git a/graphics/libGLU/pkg/PLIST b/graphics/libGLU/pkg/PLIST
index e60570b..1f6f670 100644
--- a/graphics/libGLU/pkg/PLIST
+++ b/graphics/libGLU/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/GL/
include/GL/glu.h
include/GL/glu_mangle.h
diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile
index 546e935..7028f36 100644
--- a/graphics/libepoxy/Makefile
+++ b/graphics/libepoxy/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = library for handling OpenGL function pointer management
V = 1.5.9
diff --git a/graphics/libepoxy/patches/patch-src_dispatch_common_c b/graphics/libepoxy/patches/patch-src_dispatch_common_c
index b26662c..75ead26 100644
--- a/graphics/libepoxy/patches/patch-src_dispatch_common_c
+++ b/graphics/libepoxy/patches/patch-src_dispatch_common_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/dispatch_common.c
--- src/dispatch_common.c.orig
diff --git a/graphics/libepoxy/pkg/PLIST b/graphics/libepoxy/pkg/PLIST
index 1c2790b..41fdd87 100644
--- a/graphics/libepoxy/pkg/PLIST
+++ b/graphics/libepoxy/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/epoxy/common.h
include/epoxy/egl.h
include/epoxy/egl_generated.h
diff --git a/graphics/mesa/Makefile b/graphics/mesa/Makefile
index 7d2f122..1c83a4c 100644
--- a/graphics/mesa/Makefile
+++ b/graphics/mesa/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
#ONLY_FOR_ARCHS = ???
#NOT_FOR_ARCHS = ???
diff --git a/graphics/mesa/patches/patch-meson_build b/graphics/mesa/patches/patch-meson_build
index dd317d7..55956d2 100644
--- a/graphics/mesa/patches/patch-meson_build
+++ b/graphics/mesa/patches/patch-meson_build
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: meson.build
--- meson.build.orig
diff --git a/graphics/mesa/patches/patch-src_gallium_auxiliary_rtasm_rtasm_execmem_c b/graphics/mesa/patches/patch-src_gallium_auxiliary_rtasm_rtasm_execmem_c
index dcb3c3e..c148eab 100644
--- a/graphics/mesa/patches/patch-src_gallium_auxiliary_rtasm_rtasm_execmem_c
+++ b/graphics/mesa/patches/patch-src_gallium_auxiliary_rtasm_rtasm_execmem_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/gallium/auxiliary/rtasm/rtasm_execmem.c
--- src/gallium/auxiliary/rtasm/rtasm_execmem.c.orig
diff --git a/graphics/mesa/patches/patch-src_gallium_frontends_lavapipe_meson_build b/graphics/mesa/patches/patch-src_gallium_frontends_lavapipe_meson_build
index c52fbf9..9edad01 100644
--- a/graphics/mesa/patches/patch-src_gallium_frontends_lavapipe_meson_build
+++ b/graphics/mesa/patches/patch-src_gallium_frontends_lavapipe_meson_build
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/gallium/frontends/lavapipe/meson.build
--- src/gallium/frontends/lavapipe/meson.build.orig
diff --git a/graphics/mesa/patches/patch-src_gbm_backends_dri_gbm_dri_c b/graphics/mesa/patches/patch-src_gbm_backends_dri_gbm_dri_c
index 7f03976..836b948 100644
--- a/graphics/mesa/patches/patch-src_gbm_backends_dri_gbm_dri_c
+++ b/graphics/mesa/patches/patch-src_gbm_backends_dri_gbm_dri_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/gbm/backends/dri/gbm_dri.c
--- src/gbm/backends/dri/gbm_dri.c.orig
diff --git a/graphics/mesa/patches/patch-src_glx_dri_common_c b/graphics/mesa/patches/patch-src_glx_dri_common_c
index 244ba35..03ec71a 100644
--- a/graphics/mesa/patches/patch-src_glx_dri_common_c
+++ b/graphics/mesa/patches/patch-src_glx_dri_common_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/glx/dri_common.c
--- src/glx/dri_common.c.orig
diff --git a/graphics/mesa/patches/patch-src_glx_meson_build b/graphics/mesa/patches/patch-src_glx_meson_build
index d6dcf22..7e02501 100644
--- a/graphics/mesa/patches/patch-src_glx_meson_build
+++ b/graphics/mesa/patches/patch-src_glx_meson_build
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/glx/meson.build
--- src/glx/meson.build.orig
diff --git a/graphics/mesa/patches/patch-src_loader_loader_c b/graphics/mesa/patches/patch-src_loader_loader_c
index bc564b0..82a5702 100644
--- a/graphics/mesa/patches/patch-src_loader_loader_c
+++ b/graphics/mesa/patches/patch-src_loader_loader_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/loader/loader.c
--- src/loader/loader.c.orig
diff --git a/graphics/mesa/patches/patch-src_mapi_u_execmem_c b/graphics/mesa/patches/patch-src_mapi_u_execmem_c
index 17b7968..c6cad33 100644
--- a/graphics/mesa/patches/patch-src_mapi_u_execmem_c
+++ b/graphics/mesa/patches/patch-src_mapi_u_execmem_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/mapi/u_execmem.c
--- src/mapi/u_execmem.c.orig
diff --git a/graphics/mesa/patches/patch-src_mesa_main_execmem_c b/graphics/mesa/patches/patch-src_mesa_main_execmem_c
index 7dd374d..441f637 100644
--- a/graphics/mesa/patches/patch-src_mesa_main_execmem_c
+++ b/graphics/mesa/patches/patch-src_mesa_main_execmem_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/mesa/main/execmem.c
--- src/mesa/main/execmem.c.orig
diff --git a/graphics/mesa/patches/patch-src_util_build_id_c b/graphics/mesa/patches/patch-src_util_build_id_c
index 9403ff0..c9a38ff 100644
--- a/graphics/mesa/patches/patch-src_util_build_id_c
+++ b/graphics/mesa/patches/patch-src_util_build_id_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/util/build_id.c
--- src/util/build_id.c.orig
diff --git a/graphics/mesa/patches/patch-src_util_build_id_h b/graphics/mesa/patches/patch-src_util_build_id_h
index 7ae2a09..9275bbc 100644
--- a/graphics/mesa/patches/patch-src_util_build_id_h
+++ b/graphics/mesa/patches/patch-src_util_build_id_h
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/util/build_id.h
--- src/util/build_id.h.orig
diff --git a/graphics/mesa/patches/patch-src_util_disk_cache_h b/graphics/mesa/patches/patch-src_util_disk_cache_h
index 25f1121..17f32e0 100644
--- a/graphics/mesa/patches/patch-src_util_disk_cache_h
+++ b/graphics/mesa/patches/patch-src_util_disk_cache_h
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/util/disk_cache.h
--- src/util/disk_cache.h.orig
diff --git a/graphics/mesa/patches/patch-src_util_disk_cache_os_c b/graphics/mesa/patches/patch-src_util_disk_cache_os_c
index dddfebc..caace62 100644
--- a/graphics/mesa/patches/patch-src_util_disk_cache_os_c
+++ b/graphics/mesa/patches/patch-src_util_disk_cache_os_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/util/disk_cache_os.c
--- src/util/disk_cache_os.c.orig
diff --git a/graphics/mesa/patches/patch-src_util_os_file_c b/graphics/mesa/patches/patch-src_util_os_file_c
index a6d6422..041fa99 100644
--- a/graphics/mesa/patches/patch-src_util_os_file_c
+++ b/graphics/mesa/patches/patch-src_util_os_file_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/util/os_file.c
--- src/util/os_file.c.orig
diff --git a/graphics/mesa/patches/patch-src_util_rand_xor_c b/graphics/mesa/patches/patch-src_util_rand_xor_c
index 79bb4fe..59ac477 100644
--- a/graphics/mesa/patches/patch-src_util_rand_xor_c
+++ b/graphics/mesa/patches/patch-src_util_rand_xor_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/util/rand_xor.c
--- src/util/rand_xor.c.orig
diff --git a/graphics/mesa/patches/patch-src_util_u_atomic_c b/graphics/mesa/patches/patch-src_util_u_atomic_c
index 84bcb43..a72ffd7 100644
--- a/graphics/mesa/patches/patch-src_util_u_atomic_c
+++ b/graphics/mesa/patches/patch-src_util_u_atomic_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/util/u_atomic.c
--- src/util/u_atomic.c.orig
diff --git a/graphics/mesa/patches/patch-src_util_u_cpu_detect_c b/graphics/mesa/patches/patch-src_util_u_cpu_detect_c
index eaa9e51..246013f 100644
--- a/graphics/mesa/patches/patch-src_util_u_cpu_detect_c
+++ b/graphics/mesa/patches/patch-src_util_u_cpu_detect_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/util/u_cpu_detect.c
--- src/util/u_cpu_detect.c.orig
diff --git a/graphics/mesa/pkg/PLIST b/graphics/mesa/pkg/PLIST
index f4fd144..b5bbd1e 100644
--- a/graphics/mesa/pkg/PLIST
+++ b/graphics/mesa/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/EGL/
include/EGL/egl.h
include/EGL/eglext.h
diff --git a/graphics/pixman/Makefile b/graphics/pixman/Makefile
index bf516b2..f324257 100644
--- a/graphics/pixman/Makefile
+++ b/graphics/pixman/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = low-level software library for pixel manipulation
DISTNAME = pixman-0.40.0
diff --git a/graphics/pixman/pkg/PLIST b/graphics/pixman/pkg/PLIST
index 7b0f3c8..0a3e674 100644
--- a/graphics/pixman/pkg/PLIST
+++ b/graphics/pixman/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/pixman-1/
include/pixman-1/pixman-version.h
include/pixman-1/pixman.h
diff --git a/meta/Makefile b/meta/Makefile
index 8450d05..6c560f1 100644
--- a/meta/Makefile
+++ b/meta/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
SUBDIR =
SUBDIR += xenocara
diff --git a/meta/xenocara/Makefile b/meta/xenocara/Makefile
index 44c3e2a..87aa937 100644
--- a/meta/xenocara/Makefile
+++ b/meta/xenocara/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
COMMENT = Xenocara meta package
diff --git a/meta/xenocara/pkg/PLIST b/meta/xenocara/pkg/PLIST
index 8666d3a..e69de29 100644
--- a/meta/xenocara/pkg/PLIST
+++ b/meta/xenocara/pkg/PLIST
@@ -1 +0,0 @@
-@comment $OpenBSD$
diff --git a/print/Makefile b/print/Makefile
index e3572bb..0660925 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
SUBDIR =
SUBDIR += freetype2
diff --git a/sysutils/Makefile b/sysutils/Makefile
index d84e37d..b3bbab7 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
SUBDIR =
SUBDIR += libdrm
diff --git a/sysutils/libpciaccess/Makefile b/sysutils/libpciaccess/Makefile
index 98b2c00..7e6277a 100644
--- a/sysutils/libpciaccess/Makefile
+++ b/sysutils/libpciaccess/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Generic PCI access library
diff --git a/sysutils/libpciaccess/patches/patch-src_openbsd_pci_c b/sysutils/libpciaccess/patches/patch-src_openbsd_pci_c
index 7d712dd..31dce07 100644
--- a/sysutils/libpciaccess/patches/patch-src_openbsd_pci_c
+++ b/sysutils/libpciaccess/patches/patch-src_openbsd_pci_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/openbsd_pci.c
--- src/openbsd_pci.c.orig
diff --git a/sysutils/libpciaccess/pkg/PLIST b/sysutils/libpciaccess/pkg/PLIST
index 0f136f8..32b07ec 100644
--- a/sysutils/libpciaccess/pkg/PLIST
+++ b/sysutils/libpciaccess/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/pciaccess.h
lib/libpciaccess.a
lib/libpciaccess.la
diff --git a/sysutils/sessreg/Makefile b/sysutils/sessreg/Makefile
index 0df9fbf..a56c9c9 100644
--- a/sysutils/sessreg/Makefile
+++ b/sysutils/sessreg/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Utility to manage utmp & wtmp entries for X sessions
DISTNAME = sessreg-1.1.2
diff --git a/sysutils/sessreg/pkg/PLIST b/sysutils/sessreg/pkg/PLIST
index 86610b5..228d614 100644
--- a/sysutils/sessreg/pkg/PLIST
+++ b/sysutils/sessreg/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/sessreg
@man man/man1/sessreg.1
diff --git a/x11/Makefile b/x11/Makefile
index d6a3328..9dee025 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD$
SUBDIR =
SUBDIR += fontconfig
diff --git a/x11/bdftopcf/Makefile b/x11/bdftopcf/Makefile
index 7aae53b..6939ab2 100644
--- a/x11/bdftopcf/Makefile
+++ b/x11/bdftopcf/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = utility to convert font formats
DISTNAME = bdftopcf-1.1
diff --git a/x11/bdftopcf/patches/patch-Makefile_am b/x11/bdftopcf/patches/patch-Makefile_am
index c866556..66e60e6 100644
--- a/x11/bdftopcf/patches/patch-Makefile_am
+++ b/x11/bdftopcf/patches/patch-Makefile_am
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: Makefile.am
--- Makefile.am.orig
diff --git a/x11/bdftopcf/patches/patch-bdftopcf_c b/x11/bdftopcf/patches/patch-bdftopcf_c
index 27d0988..f2caba7 100644
--- a/x11/bdftopcf/patches/patch-bdftopcf_c
+++ b/x11/bdftopcf/patches/patch-bdftopcf_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Unveil support
diff --git a/x11/bdftopcf/patches/patch-configure_ac b/x11/bdftopcf/patches/patch-configure_ac
index 211a66b..1756438 100644
--- a/x11/bdftopcf/patches/patch-configure_ac
+++ b/x11/bdftopcf/patches/patch-configure_ac
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: configure.ac
--- configure.ac.orig
diff --git a/x11/bdftopcf/pkg/PLIST b/x11/bdftopcf/pkg/PLIST
index c952db8..47af3c6 100644
--- a/x11/bdftopcf/pkg/PLIST
+++ b/x11/bdftopcf/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/bdftopcf
@man man/man1/bdftopcf.1
diff --git a/x11/cwm/Makefile b/x11/cwm/Makefile
index dbc57d5..9385c8b 100644
--- a/x11/cwm/Makefile
+++ b/x11/cwm/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = cwm is a window manager for X11
DISTNAME = cwm-6.7
diff --git a/x11/cwm/pkg/PLIST b/x11/cwm/pkg/PLIST
index be69b31..9b602c3 100644
--- a/x11/cwm/pkg/PLIST
+++ b/x11/cwm/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/cwm
@man man/man1/cwm.1
@man man/man5/cwmrc.5
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index 7ce9598..b804345 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = a dynamic resource editor for X Toolkit applications
diff --git a/x11/fontconfig/patches/patch-fc-cache_meson_build b/x11/fontconfig/patches/patch-fc-cache_meson_build
index 8f654d2..e169ea2 100644
--- a/x11/fontconfig/patches/patch-fc-cache_meson_build
+++ b/x11/fontconfig/patches/patch-fc-cache_meson_build
@@ -1,4 +1,3 @@
-$OpenBSD$
Don't run fc-cache !
diff --git a/x11/fonttosfnt/Makefile b/x11/fonttosfnt/Makefile
index ed6c222..2688974 100644
--- a/x11/fonttosfnt/Makefile
+++ b/x11/fonttosfnt/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = utility to convert font formats
DISTNAME = fonttosfnt-1.2.1
diff --git a/x11/fonttosfnt/pkg/PLIST b/x11/fonttosfnt/pkg/PLIST
index ea1d80c..e2da46a 100644
--- a/x11/fonttosfnt/pkg/PLIST
+++ b/x11/fonttosfnt/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/fonttosfnt
@man man/man1/fonttosfnt.1
diff --git a/x11/fvwm-obsd/Makefile b/x11/fvwm-obsd/Makefile
index 3384699..cf8ca46 100644
--- a/x11/fvwm-obsd/Makefile
+++ b/x11/fvwm-obsd/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = fvwm is a window manager for X11
DISTNAME = fvwm-obsd-2.2.5
diff --git a/x11/fvwm-obsd/pkg/PLIST b/x11/fvwm-obsd/pkg/PLIST
index 075ee59..3a5574d 100644
--- a/x11/fvwm-obsd/pkg/PLIST
+++ b/x11/fvwm-obsd/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/fvwm
@bin bin/xpmroot
include/bitmaps/
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index c6c26a4..6a5443b 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Inter-Client Exchange Library
DISTNAME = libICE-1.0.10
diff --git a/x11/libICE/pkg/PLIST b/x11/libICE/pkg/PLIST
index 9c78cfd..c435df2 100644
--- a/x11/libICE/pkg/PLIST
+++ b/x11/libICE/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/ICE/
include/X11/ICE/ICE.h
include/X11/ICE/ICEconn.h
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 1799628..a1117f8 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Session Management Library
DISTNAME = libSM-1.2.3
diff --git a/x11/libSM/pkg/PLIST b/x11/libSM/pkg/PLIST
index eb5d53b..6ed402e 100644
--- a/x11/libSM/pkg/PLIST
+++ b/x11/libSM/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/SM/
include/X11/SM/SM.h
include/X11/SM/SMlib.h
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 110887f..f28e7ff 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = the X protocol library
DISTNAME = libX11-1.8.1
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index 4174549..c387de1 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X11 Screen Saver Library
DISTNAME = libXScrnSaver-1.2.3
diff --git a/x11/libXScrnSaver/pkg/PLIST b/x11/libXScrnSaver/pkg/PLIST
index bfeb551..5f4ebe1 100644
--- a/x11/libXScrnSaver/pkg/PLIST
+++ b/x11/libXScrnSaver/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/scrnsaver.h
@static-lib lib/libXss.a
lib/libXss.la
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 84a58f1..8b68d24 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = functions for handling Xauthority files and entries.
DISTNAME = libXau-1.0.9
diff --git a/x11/libXau/pkg/PLIST b/x11/libXau/pkg/PLIST
index 4dc0bfb..a4b6345 100644
--- a/x11/libXau/pkg/PLIST
+++ b/x11/libXau/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/Xauth.h
lib/libXau.a
lib/libXau.la
diff --git a/x11/libXaw/Makefile b/x11/libXaw/Makefile
index f22282e..4481f0a 100644
--- a/x11/libXaw/Makefile
+++ b/x11/libXaw/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Athena Widget Set
DISTNAME = libXaw-1.0.14
diff --git a/x11/libXaw/pkg/PLIST b/x11/libXaw/pkg/PLIST
index 7c04925..53b3116 100644
--- a/x11/libXaw/pkg/PLIST
+++ b/x11/libXaw/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/Xaw/
include/X11/Xaw/AllWidgets.h
include/X11/Xaw/AsciiSink.h
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index c60d3aa..0657eea 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = library for the Composite extension to the X11 protocol
DISTNAME = libXcomposite-0.4.5
diff --git a/x11/libXcomposite/pkg/PLIST b/x11/libXcomposite/pkg/PLIST
index 8d5e685..99a9b6c 100644
--- a/x11/libXcomposite/pkg/PLIST
+++ b/x11/libXcomposite/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/Xcomposite.h
@static-lib lib/libXcomposite.a
lib/libXcomposite.la
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 642a951..c073964 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Damage Extension library
DISTNAME = libXdamage-1.1.5
diff --git a/x11/libXdamage/pkg/PLIST b/x11/libXdamage/pkg/PLIST
index 4224ef1..fa6c02b 100644
--- a/x11/libXdamage/pkg/PLIST
+++ b/x11/libXdamage/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/
include/X11/extensions/Xdamage.h
lib/libXdamage.a
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 1279706..0f73109 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Display Manager Control Protocol library
DISTNAME = libXdmcp-1.1.3
diff --git a/x11/libXdmcp/pkg/PLIST b/x11/libXdmcp/pkg/PLIST
index 5c00d56..f2d7dc8 100644
--- a/x11/libXdmcp/pkg/PLIST
+++ b/x11/libXdmcp/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/Xdmcp.h
@static-lib lib/libXdmcp.a
lib/libXdmcp.la
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 146082f..f5bc030 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = library for common extensions to the X11 protocol
DISTNAME = libXext-1.3.4
diff --git a/x11/libXext/pkg/PLIST b/x11/libXext/pkg/PLIST
index c0fe65d..520e535 100644
--- a/x11/libXext/pkg/PLIST
+++ b/x11/libXext/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/
include/X11/extensions/MITMisc.h
include/X11/extensions/XEVI.h
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index 604a67f..ad9cdb1 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Xlib-based library for the XFIXES Extension
DISTNAME = libXfixes-6.0.0
diff --git a/x11/libXfixes/pkg/PLIST b/x11/libXfixes/pkg/PLIST
index 15f0647..f6bf83f 100644
--- a/x11/libXfixes/pkg/PLIST
+++ b/x11/libXfixes/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/
include/X11/extensions/Xfixes.h
lib/libXfixes.a
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 7689d4a..52b387f 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = library for the X Input Extension
DISTNAME = libXi-1.8
diff --git a/x11/libXi/pkg/PLIST b/x11/libXi/pkg/PLIST
index e50a801..9f09eb7 100644
--- a/x11/libXi/pkg/PLIST
+++ b/x11/libXi/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/XInput.h
include/X11/extensions/XInput2.h
@static-lib lib/libXi.a
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index fa96754..6f83ca4 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = API for Xinerama extension to X11 Protocol
DISTNAME = libXinerama-1.1.4
diff --git a/x11/libXinerama/pkg/PLIST b/x11/libXinerama/pkg/PLIST
index 1562af0..de097b0 100644
--- a/x11/libXinerama/pkg/PLIST
+++ b/x11/libXinerama/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/Xinerama.h
include/X11/extensions/panoramiXext.h
@static-lib lib/libXinerama.a
diff --git a/x11/libXmu/Makefile b/x11/libXmu/Makefile
index c3fdb7b..fb3dbbb 100644
--- a/x11/libXmu/Makefile
+++ b/x11/libXmu/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X miscellaneous utility routines library
DISTNAME = libXmu-1.1.3
diff --git a/x11/libXmu/pkg/PLIST b/x11/libXmu/pkg/PLIST
index ff536c9..e652697 100644
--- a/x11/libXmu/pkg/PLIST
+++ b/x11/libXmu/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/Xmu/
include/X11/Xmu/Atoms.h
include/X11/Xmu/CharSet.h
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 905935c..dca850f 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Pixmap (XPM) image file format library
DISTNAME = libXpm-3.5.13
diff --git a/x11/libXpm/pkg/PLIST b/x11/libXpm/pkg/PLIST
index ee5694d..66fa0f5 100644
--- a/x11/libXpm/pkg/PLIST
+++ b/x11/libXpm/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/cxpm
@bin bin/sxpm
include/X11/xpm.h
diff --git a/x11/libXpresent/Makefile b/x11/libXpresent/Makefile
index a2924dd..c0ef375 100644
--- a/x11/libXpresent/Makefile
+++ b/x11/libXpresent/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Xlib-based library for the X Present Extension
DISTNAME = libXpresent-1.0.0
diff --git a/x11/libXpresent/pkg/PLIST b/x11/libXpresent/pkg/PLIST
index f1ebf11..cde807d 100644
--- a/x11/libXpresent/pkg/PLIST
+++ b/x11/libXpresent/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/Xpresent.h
@static-lib lib/libXpresent.a
lib/libXpresent.la
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index d92e960..0ae9956 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Xlib Resize, Rotate and Reflection (RandR) extension library
DISTNAME = libXrandr-1.5.1
diff --git a/x11/libXrandr/pkg/PLIST b/x11/libXrandr/pkg/PLIST
index d627ae0..94abef0 100644
--- a/x11/libXrandr/pkg/PLIST
+++ b/x11/libXrandr/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/Xrandr.h
lib/libXrandr.a
lib/libXrandr.la
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 41ff6cf..42163ed 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = library for the Render Extension to the X11 protocol
DISTNAME = libXrender-0.9.10
diff --git a/x11/libXrender/pkg/PLIST b/x11/libXrender/pkg/PLIST
index ac2eb2b..c5b8dca 100644
--- a/x11/libXrender/pkg/PLIST
+++ b/x11/libXrender/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/
include/X11/extensions/Xrender.h
lib/libXrender.a
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 1bf9968..37e4ad7 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Xlib-based X-Resource extension client library
DISTNAME = libXres-1.2.1
diff --git a/x11/libXres/pkg/PLIST b/x11/libXres/pkg/PLIST
index 8d94aa9..d72462f 100644
--- a/x11/libXres/pkg/PLIST
+++ b/x11/libXres/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/XRes.h
@static-lib lib/libXRes.a
lib/libXRes.la
diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index b8f819c..ecd61d4 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Toolkit Intrinsics library
DISTNAME = libXt-1.2.1
diff --git a/x11/libXt/pkg/PLIST b/x11/libXt/pkg/PLIST
index 01258bf..c91b1a5 100644
--- a/x11/libXt/pkg/PLIST
+++ b/x11/libXt/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/CallbackI.h
include/X11/Composite.h
include/X11/CompositeP.h
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 800ab03..61f55db 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Test library
DISTNAME = libXtst-1.2.3
diff --git a/x11/libXtst/pkg/PLIST b/x11/libXtst/pkg/PLIST
index 568a283..a4bf180 100644
--- a/x11/libXtst/pkg/PLIST
+++ b/x11/libXtst/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/XTest.h
include/X11/extensions/record.h
@static-lib lib/libXtst.a
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index ce90cd5..562cede 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = library for the X Video extension to the X Window System
DISTNAME = libXv-1.0.11
diff --git a/x11/libXv/pkg/PLIST b/x11/libXv/pkg/PLIST
index 02645d4..3f41473 100644
--- a/x11/libXv/pkg/PLIST
+++ b/x11/libXv/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/
include/X11/extensions/Xvlib.h
@static-lib lib/libXv.a
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index 0832445..430e252 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Xlib-based library for the XFree86-VidMode X extension
DISTNAME = libXxf86vm-1.1.4
diff --git a/x11/libXxf86vm/pkg/PLIST b/x11/libXxf86vm/pkg/PLIST
index 7d27a54..e05e7e4 100644
--- a/x11/libXxf86vm/pkg/PLIST
+++ b/x11/libXxf86vm/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/
include/X11/extensions/xf86vmode.h
lib/libXxf86vm.a
diff --git a/x11/libfontenc/Makefile b/x11/libfontenc/Makefile
index 976ea84..4328c2e 100644
--- a/x11/libfontenc/Makefile
+++ b/x11/libfontenc/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X font encoding library
DISTNAME = libfontenc-1.1.4
diff --git a/x11/libfontenc/pkg/PLIST b/x11/libfontenc/pkg/PLIST
index 7c990b2..8313e4f 100644
--- a/x11/libfontenc/pkg/PLIST
+++ b/x11/libfontenc/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/fonts/
include/X11/fonts/fontenc.h
lib/libfontenc.a
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index a7ecd4a..c423b5c 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = the X protocol C-language binding library
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index b4053b8..afe8999 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = XKB file handling routines
DISTNAME = libxkbfile-1.1.0
diff --git a/x11/libxkbfile/pkg/PLIST b/x11/libxkbfile/pkg/PLIST
index c688279..89f6740 100644
--- a/x11/libxkbfile/pkg/PLIST
+++ b/x11/libxkbfile/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/extensions/
include/X11/extensions/XKBbells.h
include/X11/extensions/XKBconfig.h
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index 1d5982d..a44b1f4 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = shared memory SyncFence synchronization primitive
DISTNAME = libxshmfence-1.3
diff --git a/x11/libxshmfence/patches/patch-configure_ac b/x11/libxshmfence/patches/patch-configure_ac
index 0b7faed..0b54ca5 100644
--- a/x11/libxshmfence/patches/patch-configure_ac
+++ b/x11/libxshmfence/patches/patch-configure_ac
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: configure.ac
--- configure.ac.orig
diff --git a/x11/libxshmfence/patches/patch-src_xshmfence_alloc_c b/x11/libxshmfence/patches/patch-src_xshmfence_alloc_c
index 7e25867..c41b30f 100644
--- a/x11/libxshmfence/patches/patch-src_xshmfence_alloc_c
+++ b/x11/libxshmfence/patches/patch-src_xshmfence_alloc_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/xshmfence_alloc.c
--- src/xshmfence_alloc.c.orig
diff --git a/x11/libxshmfence/patches/patch-src_xshmfence_futex_h b/x11/libxshmfence/patches/patch-src_xshmfence_futex_h
index 99e2a7a..786b7b2 100644
--- a/x11/libxshmfence/patches/patch-src_xshmfence_futex_h
+++ b/x11/libxshmfence/patches/patch-src_xshmfence_futex_h
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/xshmfence_futex.h
--- src/xshmfence_futex.h.orig
diff --git a/x11/libxshmfence/pkg/PLIST b/x11/libxshmfence/pkg/PLIST
index f21e00a..7b68798 100644
--- a/x11/libxshmfence/pkg/PLIST
+++ b/x11/libxshmfence/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/xshmfence.h
lib/libxshmfence.a
lib/libxshmfence.la
diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile
index 9b4ce95..029fcb9 100644
--- a/x11/xbacklight/Makefile
+++ b/x11/xbacklight/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = adjust backlight brightness in X using RandR extension
diff --git a/x11/xbacklight/pkg/PLIST b/x11/xbacklight/pkg/PLIST
index e649b4b..34fd190 100644
--- a/x11/xbacklight/pkg/PLIST
+++ b/x11/xbacklight/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xbacklight
@man man/man1/xbacklight.1
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
index 310ed8b..f16411b 100644
--- a/x11/xbitmaps/Makefile
+++ b/x11/xbitmaps/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = XBM format bitmaps commonly used in X.Org applications
DISTNAME = xbitmaps-1.1.2
diff --git a/x11/xbitmaps/pkg/PLIST b/x11/xbitmaps/pkg/PLIST
index 460f687..befe9d4 100644
--- a/x11/xbitmaps/pkg/PLIST
+++ b/x11/xbitmaps/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/bitmaps/
include/X11/bitmaps/1x1
include/X11/bitmaps/2x2
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 8a497c3..0a85917 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = utilitiy libraries for X cursor management
DISTNAME = xcb-util-cursor-0.1.3
diff --git a/x11/xcb-util-cursor/pkg/PLIST b/x11/xcb-util-cursor/pkg/PLIST
index 8ced8ac..9a9f9d1 100644
--- a/x11/xcb-util-cursor/pkg/PLIST
+++ b/x11/xcb-util-cursor/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/xcb/xcb_cursor.h
@static-lib lib/libxcb-cursor.a
lib/libxcb-cursor.la
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 48fbe9e..817dbac 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = utilitiy libraries for image management
DISTNAME = xcb-util-image-0.4.0
diff --git a/x11/xcb-util-image/pkg/PLIST b/x11/xcb-util-image/pkg/PLIST
index 8612daf..d468e3d 100644
--- a/x11/xcb-util-image/pkg/PLIST
+++ b/x11/xcb-util-image/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/xcb/xcb_bitops.h
include/xcb/xcb_image.h
include/xcb/xcb_pixel.h
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index fd3f83d..16aeb82 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = utilitiy libraries for keysyms management
DISTNAME = xcb-util-keysyms-0.4.0
diff --git a/x11/xcb-util-keysyms/pkg/PLIST b/x11/xcb-util-keysyms/pkg/PLIST
index c174c97..0115855 100644
--- a/x11/xcb-util-keysyms/pkg/PLIST
+++ b/x11/xcb-util-keysyms/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/xcb/xcb_keysyms.h
@static-lib lib/libxcb-keysyms.a
lib/libxcb-keysyms.la
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index 595e91b..662f679 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = utilitiy libraries for the render extension
DISTNAME = xcb-util-renderutil-0.3.9
diff --git a/x11/xcb-util-renderutil/pkg/PLIST b/x11/xcb-util-renderutil/pkg/PLIST
index bf24611..fe71b7e 100644
--- a/x11/xcb-util-renderutil/pkg/PLIST
+++ b/x11/xcb-util-renderutil/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/xcb/xcb_renderutil.h
@static-lib lib/libxcb-render-util.a
lib/libxcb-render-util.la
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index 2de3cf9..cbf4dc7 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = utilitiy libraries for Window Manager and inter-client
DISTNAME = xcb-util-wm-0.4.1
diff --git a/x11/xcb-util-wm/pkg/PLIST b/x11/xcb-util-wm/pkg/PLIST
index 7cf0530..1191c32 100644
--- a/x11/xcb-util-wm/pkg/PLIST
+++ b/x11/xcb-util-wm/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/xcb/xcb_ewmh.h
include/xcb/xcb_icccm.h
@static-lib lib/libxcb-ewmh.a
diff --git a/x11/xcb-util-xrm/Makefile b/x11/xcb-util-xrm/Makefile
index 93da5b2..879ad95 100644
--- a/x11/xcb-util-xrm/Makefile
+++ b/x11/xcb-util-xrm/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = utility functions for the X resource manager
GH_TAGNAME = v1.3
diff --git a/x11/xcb-util-xrm/pkg/PLIST b/x11/xcb-util-xrm/pkg/PLIST
index 22d04c8..66fb6f5 100644
--- a/x11/xcb-util-xrm/pkg/PLIST
+++ b/x11/xcb-util-xrm/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/xcb/xcb_xrm.h
@static-lib lib/libxcb-xrm.a
lib/libxcb-xrm.la
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index 1aae6d7..a3498f2 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = the X protocol library
DISTNAME = xcb-util-0.4.0
diff --git a/x11/xcb-util/pkg/PLIST b/x11/xcb-util/pkg/PLIST
index d16e899..164c57a 100644
--- a/x11/xcb-util/pkg/PLIST
+++ b/x11/xcb-util/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/xcb/xcb_atom.h
include/xcb/xcb_aux.h
include/xcb/xcb_event.h
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index a3f09f3..7f59e11 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = displays /dev/console messages in an X window
DISTNAME = xconsole-1.0.7
diff --git a/x11/xconsole/patches/patch-Makefile_am b/x11/xconsole/patches/patch-Makefile_am
index 7a90bd8..70f88a1 100644
--- a/x11/xconsole/patches/patch-Makefile_am
+++ b/x11/xconsole/patches/patch-Makefile_am
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: Makefile.am
--- Makefile.am.orig
diff --git a/x11/xconsole/patches/patch-configure_ac b/x11/xconsole/patches/patch-configure_ac
index 45250ee..dc55216 100644
--- a/x11/xconsole/patches/patch-configure_ac
+++ b/x11/xconsole/patches/patch-configure_ac
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: configure.ac
--- configure.ac.orig
diff --git a/x11/xconsole/patches/patch-privsep_c b/x11/xconsole/patches/patch-privsep_c
index a047384..a12b921 100644
--- a/x11/xconsole/patches/patch-privsep_c
+++ b/x11/xconsole/patches/patch-privsep_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: privsep.c
--- privsep.c.orig
diff --git a/x11/xconsole/patches/patch-xconsole_c b/x11/xconsole/patches/patch-xconsole_c
index 0bdfe31..038b984 100644
--- a/x11/xconsole/patches/patch-xconsole_c
+++ b/x11/xconsole/patches/patch-xconsole_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: xconsole.c
--- xconsole.c.orig
diff --git a/x11/xconsole/patches/patch-xconsole_h b/x11/xconsole/patches/patch-xconsole_h
index 949ce37..c845002 100644
--- a/x11/xconsole/patches/patch-xconsole_h
+++ b/x11/xconsole/patches/patch-xconsole_h
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: xconsole.h
--- xconsole.h.orig
diff --git a/x11/xconsole/pkg/PLIST b/x11/xconsole/pkg/PLIST
index ae2d12f..f73a07c 100644
--- a/x11/xconsole/pkg/PLIST
+++ b/x11/xconsole/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xconsole
@man man/man1/xconsole.1
share/X11/app-defaults/
diff --git a/x11/xenodm/Makefile b/x11/xenodm/Makefile
index 909f597..52302ff 100644
--- a/x11/xenodm/Makefile
+++ b/x11/xenodm/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Xenocara display manager
DISTNAME = xenodm-20.7
diff --git a/x11/xenodm/patches/patch-config_Xsetup_0 b/x11/xenodm/patches/patch-config_Xsetup_0
index 66376c4..639ee64 100644
--- a/x11/xenodm/patches/patch-config_Xsetup_0
+++ b/x11/xenodm/patches/patch-config_Xsetup_0
@@ -1,4 +1,3 @@
-$OpenBSD$
Fix root_weave location
diff --git a/x11/xenodm/pkg/PLIST b/x11/xenodm/pkg/PLIST
index 19c689d..feb50c5 100644
--- a/x11/xenodm/pkg/PLIST
+++ b/x11/xenodm/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xenodm
lib/X11/xenodm/
lib/X11/xenodm/pixmaps/
diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile
index 11df08b..cf280d8 100644
--- a/x11/xf86-input-keyboard/Makefile
+++ b/x11/xf86-input-keyboard/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = input driver for the X keyboard
DISTNAME = xf86-input-keyboard-1.9.0
CATEGORIES = x11
diff --git a/x11/xf86-input-keyboard/pkg/PLIST b/x11/xf86-input-keyboard/pkg/PLIST
index b84d6d7..2ecc40b 100644
--- a/x11/xf86-input-keyboard/pkg/PLIST
+++ b/x11/xf86-input-keyboard/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
lib/modules/
lib/modules/input/
lib/modules/input/kbd_drv.a
diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile
index ce2b4d6..cd97805 100644
--- a/x11/xf86-input-mouse/Makefile
+++ b/x11/xf86-input-mouse/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = input driver for the X mouse
DISTNAME = xf86-input-mouse-1.9.3
CATEGORIES = x11
diff --git a/x11/xf86-input-mouse/patches/patch-src_bsd_mouse_c b/x11/xf86-input-mouse/patches/patch-src_bsd_mouse_c
index 621cad9..2c2155e 100644
--- a/x11/xf86-input-mouse/patches/patch-src_bsd_mouse_c
+++ b/x11/xf86-input-mouse/patches/patch-src_bsd_mouse_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/bsd_mouse.c
--- src/bsd_mouse.c.orig
diff --git a/x11/xf86-input-mouse/pkg/PLIST b/x11/xf86-input-mouse/pkg/PLIST
index 4a843ea..e509f9f 100644
--- a/x11/xf86-input-mouse/pkg/PLIST
+++ b/x11/xf86-input-mouse/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/xorg/xf86-mouse-properties.h
lib/modules/input/mouse_drv.a
lib/modules/input/mouse_drv.la
diff --git a/x11/xf86-input-ws/Makefile b/x11/xf86-input-ws/Makefile
index 33a505f..0de5ccb 100644
--- a/x11/xf86-input-ws/Makefile
+++ b/x11/xf86-input-ws/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = input driver for wsmouse pointers devices
DISTNAME = xf86-input-ws-1.3.0
CATEGORIES = x11
diff --git a/x11/xf86-input-ws/pkg/PLIST b/x11/xf86-input-ws/pkg/PLIST
index 28af847..d7bfe56 100644
--- a/x11/xf86-input-ws/pkg/PLIST
+++ b/x11/xf86-input-ws/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/xorg/
include/xorg/ws-properties.h
lib/modules/
diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index 496c412..1977c26 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = video driver for Intel integrated graphics chipsets
DISTNAME = xf86-video-intel-2.99.916
CATEGORIES = x11
diff --git a/x11/xf86-video-intel/patches/patch-configure_ac b/x11/xf86-video-intel/patches/patch-configure_ac
index e4e3bd9..c481b25 100644
--- a/x11/xf86-video-intel/patches/patch-configure_ac
+++ b/x11/xf86-video-intel/patches/patch-configure_ac
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: configure.ac
--- configure.ac.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_compat-api_h b/x11/xf86-video-intel/patches/patch-src_compat-api_h
index 945182f..ca46d8c 100644
--- a/x11/xf86-video-intel/patches/patch-src_compat-api_h
+++ b/x11/xf86-video-intel/patches/patch-src_compat-api_h
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/compat-api.h
--- src/compat-api.h.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_intel_device_c b/x11/xf86-video-intel/patches/patch-src_intel_device_c
index 3381904..2d4d3c1 100644
--- a/x11/xf86-video-intel/patches/patch-src_intel_device_c
+++ b/x11/xf86-video-intel/patches/patch-src_intel_device_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/intel_device.c
--- src/intel_device.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_intel_list_h b/x11/xf86-video-intel/patches/patch-src_intel_list_h
index 57396a2..e9f635f 100644
--- a/x11/xf86-video-intel/patches/patch-src_intel_list_h
+++ b/x11/xf86-video-intel/patches/patch-src_intel_list_h
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/intel_list.h
--- src/intel_list.h.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_sna_compiler_h b/x11/xf86-video-intel/patches/patch-src_sna_compiler_h
index 329f0d1..3489e91 100644
--- a/x11/xf86-video-intel/patches/patch-src_sna_compiler_h
+++ b/x11/xf86-video-intel/patches/patch-src_sna_compiler_h
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/sna/compiler.h
--- src/sna/compiler.h.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_sna_fb_fbpict_c b/x11/xf86-video-intel/patches/patch-src_sna_fb_fbpict_c
index e59492c..8a928c9 100644
--- a/x11/xf86-video-intel/patches/patch-src_sna_fb_fbpict_c
+++ b/x11/xf86-video-intel/patches/patch-src_sna_fb_fbpict_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/sna/fb/fbpict.c
--- src/sna/fb/fbpict.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_sna_gen8_render_c b/x11/xf86-video-intel/patches/patch-src_sna_gen8_render_c
index 03d64b0..e60065d 100644
--- a/x11/xf86-video-intel/patches/patch-src_sna_gen8_render_c
+++ b/x11/xf86-video-intel/patches/patch-src_sna_gen8_render_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/sna/gen8_render.c
--- src/sna/gen8_render.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_sna_kgem_c b/x11/xf86-video-intel/patches/patch-src_sna_kgem_c
index 24853e8..52ff16a 100644
--- a/x11/xf86-video-intel/patches/patch-src_sna_kgem_c
+++ b/x11/xf86-video-intel/patches/patch-src_sna_kgem_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/sna/kgem.c
--- src/sna/kgem.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_sna_sna_accel_c b/x11/xf86-video-intel/patches/patch-src_sna_sna_accel_c
index 1ad58df..29d477b 100644
--- a/x11/xf86-video-intel/patches/patch-src_sna_sna_accel_c
+++ b/x11/xf86-video-intel/patches/patch-src_sna_sna_accel_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/sna/sna_accel.c
--- src/sna/sna_accel.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_sna_sna_acpi_c b/x11/xf86-video-intel/patches/patch-src_sna_sna_acpi_c
index 130f1ad..65cf54e 100644
--- a/x11/xf86-video-intel/patches/patch-src_sna_sna_acpi_c
+++ b/x11/xf86-video-intel/patches/patch-src_sna_sna_acpi_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/sna/sna_acpi.c
--- src/sna/sna_acpi.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_sna_sna_composite_c b/x11/xf86-video-intel/patches/patch-src_sna_sna_composite_c
index 3eff81c..9b83965 100644
--- a/x11/xf86-video-intel/patches/patch-src_sna_sna_composite_c
+++ b/x11/xf86-video-intel/patches/patch-src_sna_sna_composite_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/sna/sna_composite.c
--- src/sna/sna_composite.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_sna_sna_driver_c b/x11/xf86-video-intel/patches/patch-src_sna_sna_driver_c
index 352b73c..d80a530 100644
--- a/x11/xf86-video-intel/patches/patch-src_sna_sna_driver_c
+++ b/x11/xf86-video-intel/patches/patch-src_sna_sna_driver_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/sna/sna_driver.c
--- src/sna/sna_driver.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_sna_sna_h b/x11/xf86-video-intel/patches/patch-src_sna_sna_h
index 18d4176..427f076 100644
--- a/x11/xf86-video-intel/patches/patch-src_sna_sna_h
+++ b/x11/xf86-video-intel/patches/patch-src_sna_sna_h
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/sna/sna.h
--- src/sna/sna.h.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_uxa_intel_display_c b/x11/xf86-video-intel/patches/patch-src_uxa_intel_display_c
index b0bf0d1..fab8b7f 100644
--- a/x11/xf86-video-intel/patches/patch-src_uxa_intel_display_c
+++ b/x11/xf86-video-intel/patches/patch-src_uxa_intel_display_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/uxa/intel_display.c
--- src/uxa/intel_display.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_uxa_intel_driver_c b/x11/xf86-video-intel/patches/patch-src_uxa_intel_driver_c
index 54c46bb..8aa5e70 100644
--- a/x11/xf86-video-intel/patches/patch-src_uxa_intel_driver_c
+++ b/x11/xf86-video-intel/patches/patch-src_uxa_intel_driver_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/uxa/intel_driver.c
--- src/uxa/intel_driver.c.orig
diff --git a/x11/xf86-video-intel/patches/patch-src_uxa_intel_h b/x11/xf86-video-intel/patches/patch-src_uxa_intel_h
index 268529b..906de13 100644
--- a/x11/xf86-video-intel/patches/patch-src_uxa_intel_h
+++ b/x11/xf86-video-intel/patches/patch-src_uxa_intel_h
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: src/uxa/intel.h
--- src/uxa/intel.h.orig
diff --git a/x11/xf86-video-intel/pkg/PLIST b/x11/xf86-video-intel/pkg/PLIST
index c8155e8..ff5997a 100644
--- a/x11/xf86-video-intel/pkg/PLIST
+++ b/x11/xf86-video-intel/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
lib/modules/drivers/intel_drv.a
lib/modules/drivers/intel_drv.la
@so lib/modules/drivers/intel_drv.so
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index 1fbe585..3e55b53 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Window System access control
diff --git a/x11/xhost/pkg/PLIST b/x11/xhost/pkg/PLIST
index 9fe6081..e06b6ac 100644
--- a/x11/xhost/pkg/PLIST
+++ b/x11/xhost/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xhost
@man man/man1/xhost.1
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index cbf35ee..479e0da 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X server & client startup utilities
DISTNAME = xinit-1.4.1
diff --git a/x11/xinit/pkg/PLIST b/x11/xinit/pkg/PLIST
index 0de0e04..2373766 100644
--- a/x11/xinit/pkg/PLIST
+++ b/x11/xinit/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
bin/startx
@bin bin/xinit
@man man/man1/startx.1
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index d439cb7..21c54a2 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = compiler for X server keymaps
DISTNAME = xkbcomp-1.4.5
CATEGORIES = x11
diff --git a/x11/xkbcomp/pkg/PLIST b/x11/xkbcomp/pkg/PLIST
index 7658e16..9d34f6a 100644
--- a/x11/xkbcomp/pkg/PLIST
+++ b/x11/xkbcomp/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xkbcomp
lib/pkgconfig/xkbcomp.pc
@man man/man1/xkbcomp.1
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 9d0084d..ced9f71 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Keyboard Configuration Database
DISTNAME = xkeyboard-config-2.27
diff --git a/x11/xkeyboard-config/pkg/PLIST b/x11/xkeyboard-config/pkg/PLIST
index 471a70c..fccd894 100644
--- a/x11/xkeyboard-config/pkg/PLIST
+++ b/x11/xkeyboard-config/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
share/X11/xkb/compat/README
share/X11/xkb/compat/accessx
share/X11/xkb/compat/basic
diff --git a/x11/xlockmore-obsd/Makefile b/x11/xlockmore-obsd/Makefile
index 812fa8e..46e542c 100644
--- a/x11/xlockmore-obsd/Makefile
+++ b/x11/xlockmore-obsd/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = lockscreen program for X
DISTNAME = xlockmore-obsd-5.22
diff --git a/x11/xlockmore-obsd/pkg/PLIST b/x11/xlockmore-obsd/pkg/PLIST
index ddd37c4..1d3a8aa 100644
--- a/x11/xlockmore-obsd/pkg/PLIST
+++ b/x11/xlockmore-obsd/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@group auth
@mode 2755
@bin bin/xlock
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index 0673c62..6b9d795 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Window System logo
diff --git a/x11/xlogo/pkg/PLIST b/x11/xlogo/pkg/PLIST
index cc1e0b9..f10970c 100644
--- a/x11/xlogo/pkg/PLIST
+++ b/x11/xlogo/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xlogo
@man man/man1/xlogo.1
share/X11/app-defaults/XLogo
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index cf331c6..6033e53 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Window System magnifier
diff --git a/x11/xmag/pkg/PLIST b/x11/xmag/pkg/PLIST
index d845dab..b0a9389 100644
--- a/x11/xmag/pkg/PLIST
+++ b/x11/xmag/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xmag
@man man/man1/xmag.1
share/X11/app-defaults/Xmag
diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile
index f1daa9e..594a090 100644
--- a/x11/xmodmap/Makefile
+++ b/x11/xmodmap/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = utility for modifying keymaps and pointer button mappings
diff --git a/x11/xmodmap/pkg/PLIST b/x11/xmodmap/pkg/PLIST
index 2be453d..7a6a0bf 100644
--- a/x11/xmodmap/pkg/PLIST
+++ b/x11/xmodmap/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xmodmap
@man man/man1/xmodmap.1
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index be1e5db..18b0bfd 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = primitive command line interface to RandR extension
diff --git a/x11/xrandr/pkg/PLIST b/x11/xrandr/pkg/PLIST
index 24ca02b..ffcb066 100644
--- a/x11/xrandr/pkg/PLIST
+++ b/x11/xrandr/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xkeystone
@bin bin/xrandr
@man man/man1/xrandr.1
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index e41a44e..c9c2e1c 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X resource database utility
DISTNAME = xrdb-1.2.1
diff --git a/x11/xrdb/pkg/PLIST b/x11/xrdb/pkg/PLIST
index 0d5d67d..e2b841e 100644
--- a/x11/xrdb/pkg/PLIST
+++ b/x11/xrdb/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xrdb
@man man/man1/xrdb.1
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index c70ef87..b9bac09 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = user preference utility for X
diff --git a/x11/xset/pkg/PLIST b/x11/xset/pkg/PLIST
index fa76b30..f32912d 100644
--- a/x11/xset/pkg/PLIST
+++ b/x11/xset/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xset
@man man/man1/xset.1
diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile
index be9b783..e1fd014 100644
--- a/x11/xsetroot/Makefile
+++ b/x11/xsetroot/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = Root window parameter setting utility for X
DISTNAME = xsetroot-1.1.2
diff --git a/x11/xsetroot/pkg/PLIST b/x11/xsetroot/pkg/PLIST
index f1bee3a..d68fb36 100644
--- a/x11/xsetroot/pkg/PLIST
+++ b/x11/xsetroot/pkg/PLIST
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PLIST,v$
@bin bin/xsetroot
@man man/man1/xsetroot.1
diff --git a/x11/xterm/patches/patch-XTerm_ad b/x11/xterm/patches/patch-XTerm_ad
index 71bf827..ea4e468 100644
--- a/x11/xterm/patches/patch-XTerm_ad
+++ b/x11/xterm/patches/patch-XTerm_ad
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: XTerm.ad
--- XTerm.ad.orig
diff --git a/x11/xterm/patches/patch-misc_c b/x11/xterm/patches/patch-misc_c
index 5c4f523..0671d64 100644
--- a/x11/xterm/patches/patch-misc_c
+++ b/x11/xterm/patches/patch-misc_c
@@ -1,4 +1,3 @@
-$OpenBSD$
ten Xs for mkstemp template
diff --git a/x11/xterm/patches/patch-ptydata_c b/x11/xterm/patches/patch-ptydata_c
index fa7cf5f..75800bb 100644
--- a/x11/xterm/patches/patch-ptydata_c
+++ b/x11/xterm/patches/patch-ptydata_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: ptydata.c
--- ptydata.c.orig
diff --git a/x11/xterm/patches/patch-xterm_h b/x11/xterm/patches/patch-xterm_h
index 9ddb35b..1c47cc8 100644
--- a/x11/xterm/patches/patch-xterm_h
+++ b/x11/xterm/patches/patch-xterm_h
@@ -1,4 +1,3 @@
-$OpenBSD$
OpenBSD build defines
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 7d6a76b..6e77e4e 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -1,4 +1,3 @@
-# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
COMMENT = X Window System Protocols Transport layer shared code
DISTNAME = xtrans-1.4.0
diff --git a/x11/xtrans/patches/patch-Xtranssock_c b/x11/xtrans/patches/patch-Xtranssock_c
index 4d4fc28..e2972c7 100644
--- a/x11/xtrans/patches/patch-Xtranssock_c
+++ b/x11/xtrans/patches/patch-Xtranssock_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: Xtranssock.c
--- Xtranssock.c.orig
diff --git a/x11/xtrans/patches/patch-Xtransutil_c b/x11/xtrans/patches/patch-Xtransutil_c
index 0f26934..83b02d3 100644
--- a/x11/xtrans/patches/patch-Xtransutil_c
+++ b/x11/xtrans/patches/patch-Xtransutil_c
@@ -1,4 +1,3 @@
-$OpenBSD$
Index: Xtransutil.c
--- Xtransutil.c.orig
diff --git a/x11/xtrans/pkg/PLIST b/x11/xtrans/pkg/PLIST
index 5672f62..927bd37 100644
--- a/x11/xtrans/pkg/PLIST
+++ b/x11/xtrans/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v$
include/X11/Xtrans/
include/X11/Xtrans/Xtrans.c
include/X11/Xtrans/Xtrans.h