diff --git a/Makefile b/Makefile
index 9e9e2c064e0..13334de568f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2012/05/28 09:38:04 espie Exp $
-# $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
-#
+# $OpenBSD: Makefile,v 1.70 2012/08/18 12:41:37 ajacoutot Exp $
 
 PKGPATH =
 MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile
diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index 190025712c0..8b345401293 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2009/06/01 22:37:50 benoit Exp $
-# $FreeBSD: ports/archivers/fastjar/Makefile,v 1.4 2000/04/24 15:51:08 knu Exp $
+# $OpenBSD: Makefile,v 1.17 2012/08/18 12:41:37 ajacoutot Exp $
 
 COMMENT =	Sun JDK's jar command written entirely in C
 
diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index d8e1d8dad28..938b574abea 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/12/18 09:01:19 ajacoutot Exp $
-# $FreeBSD: ports/archivers/lzop/Makefile,v 1.3 2000/06/22 05:51:49 will Exp $
+# $OpenBSD: Makefile,v 1.30 2012/08/18 12:41:37 ajacoutot Exp $
 
 COMMENT=	fast file compressor similar to gzip
 
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 656c874b270..ee38c51a578 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2011/11/04 13:25:59 jasper Exp $
-# $FreeBSD: Makefile,v 1.12 1999/02/17 22:25:36 ache Exp $
+# $OpenBSD: Makefile,v 1.25 2012/08/18 12:41:37 ajacoutot Exp $
 
 COMMENT=	extract files from ARJ archives
 
diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile
index ee23579bbdd..bbe0c83ae06 100644
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2011/05/09 17:08:00 sthen Exp $
-# $FreeBSD: ports/audio/ascd/Makefile,v 1.17 2000/09/25 12:21:17 asami Exp $
+# $OpenBSD: Makefile,v 1.24 2012/08/18 12:41:37 ajacoutot Exp $
 
 COMMENT= 		cd player for Afterstep or Window Maker
 DISTNAME=		ascd-0.13.2
diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
index dfc1cc58210..0ff30611fc0 100644
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/09/06 00:04:28 sthen Exp $
-# $FreeBSD: ports/audio/toolame/Makefile,v 1.9 2004/02/08 01:13:48 lioux Exp $
-#
+# $OpenBSD: Makefile,v 1.7 2012/08/18 12:41:37 ajacoutot Exp $
 
 COMMENT=		optimized mpeg 1/2 layer 2 audio encoder
 
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 66283378435..29ee369bc0b 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/10/18 16:57:47 espie Exp $
-# $FreeBSD: Makefile,v 1.2 1999/03/03 03:48:56 jkoshy Exp $
+# $OpenBSD: Makefile,v 1.25 2012/08/18 12:41:37 ajacoutot Exp $
 
 COMMENT=	self-scaling network benchmark
 
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 9510e448252..001db3ecff9 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2012/04/30 15:33:16 kurt Exp $
-# $FreeBSD: Makefile,v 1.4 1999/01/10 20:12:06 steve Exp $
+# $OpenBSD: Makefile,v 1.46 2012/08/18 12:41:37 ajacoutot Exp $
 
 COMMENT-main=	garbage collection and memory leak detection for C and C++
 COMMENT-atomic=	access to hardware provided atomic memory operations
diff --git a/devel/c2hs/Makefile b/devel/c2hs/Makefile
index 40782b68ada..14136e2c0f4 100644
--- a/devel/c2hs/Makefile
+++ b/devel/c2hs/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2011/12/27 21:11:17 kili Exp $
-# $FreeBSD: ports/devel/hs-c2hs/Makefile,v 1.20 2004/03/25 08:29:28 obraun Exp $
+# $OpenBSD: Makefile,v 1.21 2012/08/18 12:41:37 ajacoutot Exp $
 
 COMMENT=		interface generator for Haskell to C bindings
 
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 8b0ce4a3da3..48ac0c6dcd3 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/03/22 15:27:57 sthen Exp $
-# $FreeBSD: Makefile,v 1.5 2000/05/30 23:19:09 jasone Exp $
+# $OpenBSD: Makefile,v 1.20 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	like make(1), but more powerful and clean
 
diff --git a/devel/cvs2cl/Makefile b/devel/cvs2cl/Makefile
index 5ea27de2c72..11a32169254 100644
--- a/devel/cvs2cl/Makefile
+++ b/devel/cvs2cl/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/10/18 17:47:52 espie Exp $
-# $FreeBSD: ports/devel/cvs2cl/Makefile,v 1.8 2000/07/09 03:15:07 knu Exp $
+# $OpenBSD: Makefile,v 1.20 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	generate GNU-style ChangeLogs from CVS repositories
 
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 4fd8cb6dc95..7608dfdaaec 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2011/06/02 13:41:38 ajacoutot Exp $
-# $FreeBSD: ports/devel/cvsweb/Makefile,v 1.28 2000/09/23 20:48:45 knu Exp $
+# $OpenBSD: Makefile,v 1.43 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	WWW CGI script to browse CVS repository trees
 
diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index c50ee07aaaf..076639e6473 100644
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/04/16 10:51:39 sthen Exp $
-# $FreeBSD: ports/devel/ffcall/Makefile,v 1.2 2001/08/31 14:20:18 sobomax Exp $
-# Original From:                jagapen@home.com
+# $OpenBSD: Makefile,v 1.20 2012/08/18 12:41:38 ajacoutot Exp $
 
 # m68k: mmap configure test causes system hang
 # arm: doesn't build super-old and broken assember files
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 9ca0ecd01f9..00affb859a5 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2012/05/17 05:01:35 ajacoutot Exp $
-# $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13 21:30:19 peter Exp $
+# $OpenBSD: Makefile,v 1.42 2012/08/18 12:41:38 ajacoutot Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 mips64 mips64el powerpc sparc sparc64 hppa
 
diff --git a/devel/shtool/Makefile b/devel/shtool/Makefile
index f5ae845dd4a..5ef100c2fab 100644
--- a/devel/shtool/Makefile
+++ b/devel/shtool/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2010/10/18 17:48:13 espie Exp $
-# $FreeBSD: Makefile,v 1.3 1999/04/29 15:32:56 rse Exp $
+# $OpenBSD: Makefile,v 1.33 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	GNU Portable Shell Tool
 
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 0666d970a57..27e095ab14e 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2012/04/28 18:07:12 stu Exp $
-# $FreeBSD: ports/devel/tclcl/Makefile,v 1.4 1999/11/28 18:31:57 steve Exp $
+# $OpenBSD: Makefile,v 1.27 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	Tcl/C++ interface used by ns and nam
 
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index a3598d5827f..d5323761640 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2012/04/22 10:49:11 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $
+# $OpenBSD: Makefile,v 1.70 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=		X11/Motif GUI text editor
 
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index ca3240da389..759e2b74886 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2012/05/30 18:48:59 shadchin Exp $
-# $FreeBSD: ports/editors/texmaker/Makefile,v 1.2 2004/01/09 09:16:33 krion Exp $
+# $OpenBSD: Makefile,v 1.18 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=		LaTeX development environment
 DISTNAME=		texmaker-3.3.4
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 1540e45487d..b1603f2a689 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2011/12/02 14:36:14 espie Exp $
-# $FreeBSD: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
+# $OpenBSD: Makefile,v 1.54 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT =	dungeon explorin', hackin', game.  Piece of cake
 V =		3.4.3
diff --git a/graphics/exiftran/files/Makefile b/graphics/exiftran/files/Makefile
index 79c41822fbe..df7e5b8094e 100644
--- a/graphics/exiftran/files/Makefile
+++ b/graphics/exiftran/files/Makefile
@@ -1,5 +1,4 @@
-# $FreeBSD: ports/graphics/exiftran/files/Makefile,v 1.1 2011/06/03 12:51:23 mm Exp $
-# $OpenBSD: Makefile,v 1.1.1.1 2011/10/04 07:28:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2012/08/18 12:41:38 ajacoutot Exp $
 
 SUBDIR= build/exiftran build/thumbnail.cgi
 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 93789467556..5f4c1bfc50c 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2012/03/29 13:38:31 sthen Exp $
-# $FreeBSD: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $
+# $OpenBSD: Makefile,v 1.67 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	image manipulation library for X11
 
diff --git a/graphics/mpeg_encode/Makefile b/graphics/mpeg_encode/Makefile
index 3282695c0c0..360554cd20d 100644
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/11/22 10:16:08 espie Exp $
-# $FreeBSD: ports/graphics/mpeg_encode/Makefile,v 1.11 2000/10/28 13:05:25 lioux Exp $
+# $OpenBSD: Makefile,v 1.15 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	UCB's MPEG-I video stream encoder
 
diff --git a/graphics/mplex/Makefile b/graphics/mplex/Makefile
index 52794f77faa..e6cfcc6bcde 100644
--- a/graphics/mplex/Makefile
+++ b/graphics/mplex/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2007/09/15 20:09:42 simon Exp $
-# $FreeBSD: ports/graphics/mplex/Makefile,v 1.8 2000/05/29 23:54:39 steve Exp $
-#
+# $OpenBSD: Makefile,v 1.9 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	Multiplexes MPEG component streams into system layers
 
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index 45283ef82ea..7cc3b6a2ee8 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2012/06/15 20:57:43 benoit Exp $
-# $FreeBSD: Makefile,v 1.1 1999/12/22 14:53:53 jedgar Exp $
+# $OpenBSD: Makefile,v 1.55 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT =		optimizer for PNG files
 
diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile
index 0a23dc03de5..9488ae4e786 100644
--- a/graphics/vid/Makefile
+++ b/graphics/vid/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/11/17 08:05:16 espie Exp $
-# $FreeBSD: ports/graphics/vid/Makefile,v 1.5 2001/02/21 07:48:56 roger Exp $
+# $OpenBSD: Makefile,v 1.15 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	get images from USB cameras using the OV511(+) chipsets
 
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index b2433f14201..ab80105e7b0 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/11/17 08:05:16 espie Exp $
-# $FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp $
+# $OpenBSD: Makefile,v 1.24 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	view complete directories of X bitmaps and X pixmaps
 
diff --git a/japanese/Wnn/Makefile b/japanese/Wnn/Makefile
index acdd4efd55e..d921340ed3a 100644
--- a/japanese/Wnn/Makefile
+++ b/japanese/Wnn/Makefile
@@ -1,7 +1,4 @@
-# From FreeBSD:		Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
-#
-# $FreeBSD: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $
-# $OpenBSD: Makefile,v 1.64 2012/01/26 08:03:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.65 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT-main = 		Japanese input method
 COMMENT-dict =		dictionaries for Japanese Wnn
diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile
index d2f2df1de35..9d3278974d5 100644
--- a/japanese/jvim/Makefile
+++ b/japanese/jvim/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/12/02 14:36:14 espie Exp $
-# $FreeBSD: Makefile,v 1.1.1.1 1998/07/10 14:05:19 kuriyama Exp $
+# $OpenBSD: Makefile,v 1.31 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	Japanized Vim
 COMMENT-canna=	Japanized Vim, canna input method
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 030ed2a55ca..8118c89ea44 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -1,12 +1,4 @@
-# imported from FreeBSD on 28 jul 98
-# New ports collection makefile for:	jless
-# Version required:	332
-# Date created:		7 March 1995
-# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#
-# $FreeBSD: Makefile,v 1.13 1998/07/17 20:36:13 steve Exp $
-# $OpenBSD: Makefile,v 1.22 2010/10/18 18:13:15 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.23 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	less + zcat + ISO-2022 - a pager similar to more and pg
 
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index 04132055717..fc73591f842 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/24 21:06:28 sthen Exp $
-# $FreeBSD: Makefile,v 1.1.1.1 1999/01/18 04:50:26 steve Exp $
+# $OpenBSD: Makefile,v 1.22 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	fast POSIX-compliant awk
 
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 3c601fc3be1..73ccb543dfb 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2012/04/28 18:06:29 stu Exp $
-# $FreeBSD: ports/lang/otcl/Makefile,v 1.6 1999/11/28 18:31:28 steve Exp $
+# $OpenBSD: Makefile,v 1.33 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	MIT Object Tcl
 
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 9e923b99444..9711701a6cf 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2011/03/14 09:17:01 sthen Exp $
-# $FreeBSD: ports/math/fftw/Makefile,v 1.11 2000/06/16 21:51:38 asami Exp $
-# Original from: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
+# $OpenBSD: Makefile,v 1.16 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	C routines for computing the Discrete Fourier Transform
 
diff --git a/math/netcdf/Makefile b/math/netcdf/Makefile
index e3578e16d62..0c9065c799f 100644
--- a/math/netcdf/Makefile
+++ b/math/netcdf/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2012/03/29 13:38:40 sthen Exp $ 
-# $FreeBSD: ports/math/netcdf/Makefile,v 1.7 2000/06/16 21:51:39 asami Exp $
+# $OpenBSD: Makefile,v 1.19 2012/08/18 12:41:38 ajacoutot Exp $ 
 
 COMMENT=	library for machine-independent, array-oriented data access
 
diff --git a/misc/deco/Makefile b/misc/deco/Makefile
index 362c19c0071..4425aff30fe 100644
--- a/misc/deco/Makefile
+++ b/misc/deco/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/11/05 08:24:49 sthen Exp $
-# $FreeBSD: Makefile,v 1.1.1.1 1998/03/27 11:56:44 tg Exp $
+# $OpenBSD: Makefile,v 1.22 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	Demos Commander, a free Norton Commander clone
 
diff --git a/misc/delay/Makefile b/misc/delay/Makefile
index 6929751eef7..52f3dea3147 100644
--- a/misc/delay/Makefile
+++ b/misc/delay/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2012/03/29 13:38:40 sthen Exp $
-# $FreeBSD: Makefile,v 1.1.1.1 1999/03/05 17:07:28 nectar Exp $
+# $OpenBSD: Makefile,v 1.21 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	delay program with feedback to the user
 
diff --git a/misc/ytree/Makefile b/misc/ytree/Makefile
index 93fc64e1888..8330f567c89 100644
--- a/misc/ytree/Makefile
+++ b/misc/ytree/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2012/01/29 02:26:52 william Exp $
-# $FreeBSD: ports/misc/ytree/Makefile,v 1.10 2000/04/30 20:15:23 steve Exp $
+# $OpenBSD: Makefile,v 1.14 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	DOS-XTREE(tm) look-a-like file manager
 
diff --git a/net/clog/Makefile b/net/clog/Makefile
index 372b2b56492..779d2e769d6 100644
--- a/net/clog/Makefile
+++ b/net/clog/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/18 18:36:46 espie Exp $
-# $FreeBSD: Makefile,v 1.1.1.1 1997/11/05 11:39:40 obrien Exp $
+# $OpenBSD: Makefile,v 1.22 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	tcp connection logger daemon
 
diff --git a/net/fping/Makefile b/net/fping/Makefile
index 601c16d14a4..9df255d8bef 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2012/03/29 13:38:48 sthen Exp $
-# $FreeBSD: ports/net/fping/Makefile,v 1.8 2000/03/22 00:26:51 obrien Exp $
+# $OpenBSD: Makefile,v 1.30 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT =		quickly ping N hosts w/o flooding the network
 
diff --git a/net/irc/Makefile b/net/irc/Makefile
index 166c96c08a9..516595dab6b 100644
--- a/net/irc/Makefile
+++ b/net/irc/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2012/04/28 10:51:44 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.19 1998/12/09 20:15:29 billf Exp $
+# $OpenBSD: Makefile,v 1.33 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	internet relay chat (irc) server
 
diff --git a/net/mudix/Makefile b/net/mudix/Makefile
index 85db3d0b51b..7522d6920c2 100644
--- a/net/mudix/Makefile
+++ b/net/mudix/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/15 22:36:55 merdely Exp $
-# $FreeBSD: ports/net/mudix/Makefile,v 1.6 2001/06/22 19:39:12 dwcjr Exp $
+# $OpenBSD: Makefile,v 1.6 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	ncurses-based MUD client with triggers, aliases, colors
 
diff --git a/net/nam/Makefile b/net/nam/Makefile
index 4285718d3bf..251f91110c6 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2012/04/28 18:08:16 stu Exp $
-# $FreeBSD: ports/net/nam/Makefile,v 1.3 1999/11/29 03:46:08 steve Exp $
+# $OpenBSD: Makefile,v 1.35 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	UCB/LBNL Network Animator
 
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 4e0928dc057..bb48eae17d4 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2012/04/28 18:07:56 stu Exp $
-# $FreeBSD: ports/net/ns/Makefile,v 1.3 1999/11/28 18:31:26 steve Exp $
+# $OpenBSD: Makefile,v 1.41 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	UCB/LBNL Network Simulator Version 2
 
diff --git a/net/nslint/Makefile b/net/nslint/Makefile
index a13e2734763..2f3839db286 100644
--- a/net/nslint/Makefile
+++ b/net/nslint/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:35 espie Exp $
-# $FreeBSD: ports/net/nslint/Makefile,v 1.10 2000/04/09 18:12:37 cpiazza Exp $
+# $OpenBSD: Makefile,v 1.10 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=		performs consistency checks on BIND files
 
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 877e48133dd..f27166277c8 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2012/05/07 05:09:47 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.2 1998/08/11 09:57:51 andreas Exp $
+# $OpenBSD: Makefile,v 1.33 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	network usage, interface similar to top(1)
 
diff --git a/net/pchar/Makefile b/net/pchar/Makefile
index a57f6d265ea..b6d815b34fe 100644
--- a/net/pchar/Makefile
+++ b/net/pchar/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2010/10/18 18:36:56 espie Exp $
-# $FreeBSD: ports/net/pchar/Makefile,v 1.1.1.1 1999/11/04 08:33:26 obrien Exp $
+# $OpenBSD: Makefile,v 1.23 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	Sandia Internet path characterization tool
 
diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile
index 52e43be40f2..1ec9b001f44 100644
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/18 18:36:57 espie Exp $
-# $FreeBSD: Makefile,v 1.10 1999/01/06 17:11:23 dt Exp $
+# $OpenBSD: Makefile,v 1.24 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	userland smbfs --- SMB to NFS protocols converter
 
diff --git a/net/tcpshow/Makefile b/net/tcpshow/Makefile
index eb4b3276422..3d3597fa3b2 100644
--- a/net/tcpshow/Makefile
+++ b/net/tcpshow/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/18 18:36:58 espie Exp $
-# $FreeBSD: Makefile,v 1.2 1997/11/10 11:33:04 asami Exp $
+# $OpenBSD: Makefile,v 1.24 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	decode tcpdump(1) output
 
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 87fcc70ab7a..da102a95d85 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/10/18 18:36:59 espie Exp $
-# $FreeBSD: Makefile,v 1.16 1999/02/16 03:06:21 jseger Exp $
+# $OpenBSD: Makefile,v 1.25 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	programmable MUD client, with macro support and more
 
diff --git a/net/trafd/Makefile b/net/trafd/Makefile
index 37aeb7ffd9a..33dd11ace0e 100644
--- a/net/trafd/Makefile
+++ b/net/trafd/Makefile
@@ -1,5 +1,4 @@
-# $FreeBSD: ports/net/trafd/Makefile,v 1.4 2000/07/07 19:22:10 steve Exp $
-# $OpenBSD: Makefile,v 1.10 2012/04/27 09:19:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	BPF traffic collector
 
diff --git a/net/xarchie/Makefile b/net/xarchie/Makefile
index 9d9c9fc79bd..0b20fffea40 100644
--- a/net/xarchie/Makefile
+++ b/net/xarchie/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/24 21:30:02 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.12 1996/12/01 01:23:22 obrien Exp $
+# $OpenBSD: Makefile,v 1.22 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	X11 front-end program for the archie network search service
 
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index fed69e0719d..8f159705fd5 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2012/03/29 13:38:49 sthen Exp $
-# $FreeBSD: Makefile,v 1.6 1998/06/21 02:42:33 jseger Exp $
+# $OpenBSD: Makefile,v 1.44 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT-main=	free and portable TrueType font rendering engine
 COMMENT-doc=	documentation for FreeType
diff --git a/russian/d1489/Makefile b/russian/d1489/Makefile
index 8e7ec7f5683..54009199632 100644
--- a/russian/d1489/Makefile
+++ b/russian/d1489/Makefile
@@ -1,5 +1,4 @@
-# $FreeBSD: ports/russian/d1489/Makefile,v 1.12 1999/08/31 06:49:57 mharo Exp $
-# $OpenBSD: Makefile,v 1.13 2011/03/21 20:02:41 shadchin Exp $
+# $OpenBSD: Makefile,v 1.14 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	cp866<>koi8-r & cp1251<>koi8-r decoders and font converter
 
diff --git a/security/libotr/Makefile b/security/libotr/Makefile
index 3df9dcbe99a..1675d157465 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2012/04/04 06:45:27 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.2 2005/04/21 14:22:54 pav Exp $
+# $OpenBSD: Makefile,v 1.15 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	portable OTR messaging library and toolkit
 
diff --git a/security/nbaudit/Makefile b/security/nbaudit/Makefile
index 22bc4f0e77a..1b330c91632 100644
--- a/security/nbaudit/Makefile
+++ b/security/nbaudit/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2012/01/26 08:03:57 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.1.1.1 1998/02/14 04:10:30 obrien Exp $
+# $OpenBSD: Makefile,v 1.22 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	NetBIOS Auditing Tool / Security Kit
 
diff --git a/security/portscanner/Makefile b/security/portscanner/Makefile
index 96c2d9255e8..f45b5f00997 100644
--- a/security/portscanner/Makefile
+++ b/security/portscanner/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2012/03/29 13:38:49 sthen Exp $
-# $FreeBSD: Makefile,v 1.5 1999/01/26 22:19:07 billf Exp $
+# $OpenBSD: Makefile,v 1.18 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	simple and easy to use TCP port scanner
 
diff --git a/security/slurpie/Makefile b/security/slurpie/Makefile
index c879b1ae1d3..9e3bbc2f0d4 100644
--- a/security/slurpie/Makefile
+++ b/security/slurpie/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/09/15 23:30:01 merdely Exp $
-# $FreeBSD: ports/security/slurpie/Makefile,v 1.4 2000/11/06 00:09:26 obrien Exp $
+# $OpenBSD: Makefile,v 1.7 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	distributed passwd file cracker
 
diff --git a/security/strobe/Makefile b/security/strobe/Makefile
index 0ba6ec19aee..9a6cb657f82 100644
--- a/security/strobe/Makefile
+++ b/security/strobe/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2010/10/18 21:41:47 espie Exp $
-# $FreeBSD: Makefile,v 1.5 1999/03/09 00:16:14 jseger Exp $
+# $OpenBSD: Makefile,v 1.21 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	fast scatter/gather TCP port scanner
 
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 2096f4b85ba..27ce1252c8b 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2012/05/20 21:42:50 sthen Exp $
-# $FreeBSD: ports/sysutils/e2fsprogs/Makefile,v 1.8 2003/02/20 19:00:47 knu Exp $
+# $OpenBSD: Makefile,v 1.27 2012/08/18 12:41:38 ajacoutot Exp $
 
 COMMENT=	utilities to manipulate ext2 filesystems
 
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 6231bd5dc7a..c7005a93b2f 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/11/20 17:22:42 espie Exp $
-# $FreeBSD: Makefile,v 1.4 1997/03/10 12:07:35 asami Exp $
+# $OpenBSD: Makefile,v 1.26 2012/08/18 12:41:38 ajacoutot Exp $
 
 ONLY_FOR_ARCHS= ${APM_ARCHS}
 
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 2fb51cdec7a..1f917dd3b4f 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2012/05/08 15:18:17 sthen Exp $
-# $FreeBSD: Makefile,v 1.4 1997/07/10 03:25:28 jfieber Exp $
+# $OpenBSD: Makefile,v 1.22 2012/08/18 12:41:39 ajacoutot Exp $
 
 COMMENT=	character entity sets from ISO 8879:1986 (SGML)
 
diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile
index 3dae2cf6bd6..04352d1f756 100644
--- a/textproc/linuxdoc/Makefile
+++ b/textproc/linuxdoc/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/06/15 11:37:59 sthen Exp $
-# $FreeBSD: Makefile,v 1.4 1998/01/17 17:25:46 jfieber Exp $
+# $OpenBSD: Makefile,v 1.20 2012/08/18 12:41:39 ajacoutot Exp $
 
 COMMENT=	Linuxdoc SGML DTD
 
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index 40c187687f3..97c5872c97a 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -1,11 +1,4 @@
-# New ports collection makefile for:	sgmlformat
-# Version required:	1.6
-# Date created:		July 16, 1997
-# Whom:			jfieber
-#
-# $FreeBSD: Makefile,v 1.9 1998/02/21 21:59:37 jfieber Exp $
-# $OpenBSD: Makefile,v 1.20 2011/06/23 22:50:29 naddy Exp $
-#
+# $OpenBSD: Makefile,v 1.21 2012/08/18 12:41:39 ajacoutot Exp $
 
 COMMENT=	generate groff/HTML from linuxdoc/docbook SGML documents
 
diff --git a/www/xmhtml/Makefile b/www/xmhtml/Makefile
index 9daa922164e..9fec868b82e 100644
--- a/www/xmhtml/Makefile
+++ b/www/xmhtml/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/09/16 12:00:09 espie Exp $
-# $FreeBSD: ports/x11-toolkits/xmhtml/Makefile,v 1.15 2001/06/29 05:19:06 lkoeller Exp $
-# Original from: Peter Hawkins <thepish@freebsd.org>
+# $OpenBSD: Makefile,v 1.20 2012/08/18 12:41:39 ajacoutot Exp $
 
 COMMENT=	Motif widget capable of displaying HTML 3.2 conforming text
 
diff --git a/x11/dclock/Makefile b/x11/dclock/Makefile
index f321dd1f6f9..2c34c528dd7 100644
--- a/x11/dclock/Makefile
+++ b/x11/dclock/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/24 21:15:31 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.9 1999/08/31 06:52:30 mharo Exp $
+# $OpenBSD: Makefile,v 1.22 2012/08/18 12:41:39 ajacoutot Exp $
 
 COMMENT=	digital clock with optional military time and alarm
 
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 89b641ff8ce..e9b5c7592c7 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.102 2012/08/04 15:06:55 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
+# $OpenBSD: Makefile,v 1.103 2012/08/18 12:41:39 ajacoutot Exp $
 
 COMMENT-main=		C++ X11 GUI toolkit
 COMMENT-examples=	examples and tutorial for qt3
diff --git a/x11/tvtwm/Makefile b/x11/tvtwm/Makefile
index 2f6d4aced4b..c4a2edc4d29 100644
--- a/x11/tvtwm/Makefile
+++ b/x11/tvtwm/Makefile
@@ -1,5 +1,4 @@
-# $FreeBSD: ports/x11-wm/tvtwm/Makefile,v 1.17 1999/08/31 06:53:15 mharo Exp $
-# $OpenBSD: Makefile,v 1.23 2010/10/24 21:15:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2012/08/18 12:41:39 ajacoutot Exp $
 
 COMMENT=	twm with a virtual desktop
 
diff --git a/x11/viewfax/Makefile b/x11/viewfax/Makefile
index 2b77ccd468d..954b03b60ca 100644
--- a/x11/viewfax/Makefile
+++ b/x11/viewfax/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/10/24 21:15:35 ajacoutot Exp $
-# $FreeBSD: Makefile,v 1.9 1998/03/07 23:26:23 jmz Exp $
+# $OpenBSD: Makefile,v 1.25 2012/08/18 12:41:39 ajacoutot Exp $
 
 COMMENT=	display files containing g3 and/or g4 coded fax pages
 
diff --git a/x11/wmthemeinstall/Makefile b/x11/wmthemeinstall/Makefile
index 99d5b417c7c..56a0d62c15a 100644
--- a/x11/wmthemeinstall/Makefile
+++ b/x11/wmthemeinstall/Makefile
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2012/03/29 13:39:01 sthen Exp $
-# $FreeBSD: ports/x11-wm/wmthemeinstall/Makefile,v 1.5 2000/10/05 06:42:57 reg Exp $
+# $OpenBSD: Makefile,v 1.22 2012/08/18 12:41:39 ajacoutot Exp $
 
 COMMENT=		neat theme manager for Window Maker